brightdigit · leogdion · Sep 27, 2023 · Sep 19, 2023 · Sep 21, 2023 · Sep 22, 2023
diff --git a/Data/OPML/category_invalidExpansionState.opml b/Data/OPML/category_invalidExpansionState.opml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<opml version="2.0">
+  <head>
+    <title>Illustrating the category attribute</title>
+    <dateCreated>Mon, 31 Oct 2005 19:23:00 GMT</dateCreated>
+    <expansionState>one, two, three</expansionState>
+  </head>
+  <body>
+    <outline text="The Mets are the best team in baseball." category="/Philosophy/Baseball/Mets,/Tourism/New York" created="Mon, 31 Oct 2005 18:21:33 GMT"/>
+  </body>
+</opml>
diff --git a/Sources/SyndiKit/Character.swift b/Sources/SyndiKit/Character.swift
@@ -0,0 +1,14 @@
+//
+//  File.swift
+//  
+//
+//  Created by Ahmed Shendy on 27/09/2023.
+//
+
+import Foundation
+
+extension Character {
+  func asOsmType() -> PodcastLocation.OsmQuery.OsmType? {
+    .init(rawValue: String(self))
+  }
+}
diff --git a/Sources/SyndiKit/Collection.swift b/Sources/SyndiKit/Collection.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+extension Collection {
+    subscript(safe index: Index) -> Element? {
+        return indices.contains(index) ? self[index] : nil
+    }
+}
diff --git a/Sources/SyndiKit/Formats/Feeds/RSS/RSSChannel.swift b/Sources/SyndiKit/Formats/Feeds/RSS/RSSChannel.swift
@@ -45,6 +45,10 @@ public struct RSSChannel: Codable {
   public let wpBaseSiteURL: URL?
   public let wpBaseBlogURL: URL?
 
+  public let podcastLocked: PodcastLocked?
+  public let podcastFundings: [PodcastFunding]
+  public let podcastPeople: [PodcastPerson]
+
   enum CodingKeys: String, CodingKey {
     case title
     case link
@@ -65,6 +69,9 @@ public struct RSSChannel: Codable {
     case wpTags = "wp:tag"
     case wpBaseSiteURL = "wp:baseSiteUrl"
     case wpBaseBlogURL = "wp:baseBlogUrl"
+    case podcastLocked = "podcast:locked"
+    case podcastFundings = "podcast:funding"
+    case podcastPeople = "podcast:person"
   }
 }
 

diff --git a/Sources/SyndiKit/Formats/Feeds/RSS/RSSItem.swift b/Sources/SyndiKit/Formats/Feeds/RSS/RSSItem.swift
@@ -18,7 +18,11 @@ public struct RSSItem: Codable {
   public let itunesExplicit: String?
   public let itunesDuration: iTunesDuration?
   public let itunesImage: iTunesImage?
-  public let podcastPerson: [PodcastPerson]?
+  public let podcastPeople: [PodcastPerson]
+  public let podcastTranscripts: [PodcastTranscript]
+  public let podcastChapters: PodcastChapters?
+  public let podcastSoundbites: [PodcastSoundbite]
+  public let podcastSeason: PodcastSeason?
   public let enclosure: Enclosure?
   public let creators: [String]
   public let wpCommentStatus: CData?
@@ -35,7 +39,7 @@ public struct RSSItem: Codable {
   public let wpModifiedDateGMT: Date?
   public let wpPostName: CData?
   public let wpPostType: CData?
-  public let wpPostMeta: [WordPressElements.PostMeta]?
+  public let wpPostMeta: [WordPressElements.PostMeta]
   public let wpAttachmentURL: URL?
   public let mediaContent: AtomMedia?
   public let mediaThumbnail: AtomMedia?
@@ -58,7 +62,11 @@ public struct RSSItem: Codable {
     itunesExplicit: String? = nil,
     itunesDuration: TimeInterval? = nil,
     itunesImage: iTunesImage? = nil,
-    podcastPerson: [PodcastPerson]? = nil,
+    podcastPeople: [PodcastPerson] = [],
+    podcastTranscripts: [PodcastTranscript] = [],
+    podcastChapters: PodcastChapters? = nil,
+    podcastSoundbites: [PodcastSoundbite] = [],
+    podcastSeason: PodcastSeason? = nil,
     enclosure: Enclosure? = nil,
     creators: [String] = [],
     wpCommentStatus: String? = nil,
@@ -75,7 +83,7 @@ public struct RSSItem: Codable {
     wpModifiedDateGMT: Date? = nil,
     wpPostName: String? = nil,
     wpPostType: String? = nil,
-    wpPostMeta: [WordPressElements.PostMeta]? = nil,
+    wpPostMeta: [WordPressElements.PostMeta] = [],
     wpAttachmentURL: URL? = nil,
     mediaContent: AtomMedia? = nil,
     mediaThumbnail: AtomMedia? = nil
@@ -96,7 +104,11 @@ public struct RSSItem: Codable {
     self.itunesExplicit = itunesExplicit
     self.itunesDuration = itunesDuration.map(iTunesDuration.init)
     self.itunesImage = itunesImage
-    self.podcastPerson = podcastPerson
+    self.podcastPeople = podcastPeople
+    self.podcastTranscripts = podcastTranscripts
+    self.podcastChapters = podcastChapters
+    self.podcastSoundbites = podcastSoundbites
+    self.podcastSeason = podcastSeason
     self.enclosure = enclosure
     self.creators = creators
     self.wpCommentStatus = wpCommentStatus.map(CData.init)
@@ -143,9 +155,26 @@ public struct RSSItem: Codable {
     )
     itunesImage = try container.decodeIfPresent(iTunesImage.self, forKey: .itunesImage)
 
-    podcastPerson = try container.decodeIfPresent(
+    podcastPeople = try container.decodeIfPresent(
       [PodcastPerson].self,
-      forKey: .podcastPerson
+      forKey: .podcastPeople
+    ) ?? []
+    podcastTranscripts = try container.decodeIfPresent(
+      [PodcastTranscript].self,
+      forKey: .podcastTranscripts
+    ) ?? []
+    podcastChapters = try container.decodeIfPresent(
+      PodcastChapters.self,
+      forKey: .podcastChapters
+    )
+    podcastSoundbites = try container.decodeIfPresent(
+      [PodcastSoundbite].self,
+      forKey: .podcastSoundbites
+    ) ?? []
+
+    podcastSeason = try container.decodeIfPresent(
+      PodcastSeason.self,
+      forKey: .podcastSeason
     )
 
     enclosure = try container.decodeIfPresent(Enclosure.self, forKey: .enclosure)
@@ -203,7 +232,7 @@ public struct RSSItem: Codable {
     wpPostMeta = try container.decodeIfPresent(
       [WordPressElements.PostMeta].self,
       forKey: .wpPostMeta
-    )
+    ) ?? []
     wpCommentStatus = try container.decodeIfPresent(CData.self, forKey: .wpCommentStatus)
     wpPingStatus = try container.decodeIfPresent(CData.self, forKey: .wpPingStatus)
     wpStatus = try container.decodeIfPresent(CData.self, forKey: .wpStatus)
@@ -231,7 +260,11 @@ public struct RSSItem: Codable {
     case itunesSubtitle = "itunes:subtitle"
     case itunesSummary = "itunes:summary"
     case itunesExplicit = "itunes:explicit"
-    case podcastPerson = "podcast:person"
+    case podcastPeople = "podcast:person"
+    case podcastTranscripts = "podcast:transcript"
+    case podcastChapters = "podcast:chapters"
+    case podcastSoundbites = "podcast:soundbite"
+    case podcastSeason = "podcast:season"
     case itunesDuration = "itunes:duration"
     case itunesImage = "itunes:image"
     case creators = "dc:creator"

diff --git a/Sources/SyndiKit/Formats/Media/Podcast/PodcastChapters+MimeType.swift b/Sources/SyndiKit/Formats/Media/Podcast/PodcastChapters+MimeType.swift
@@ -0,0 +1,55 @@
+import Foundation
+
+extension PodcastChapters {
+  private enum KnownMimeType: String, Codable {
+    case json = "application/json+chapters"
+
+    init?(caseInsensitive: String) {
+      self.init(rawValue: caseInsensitive)
+    }
+
+    init?(mimeType: MimeType) {
+      switch mimeType {
+      case .json: self = .json
+      case .unknown: return nil
+      }
+    }
+  }
+
+  public enum MimeType: Codable, Equatable, RawRepresentable {
+    case json
+    case unknown(String)
+
+    public var rawValue: String {
+      if let knownMimeType = KnownMimeType(mimeType: self) {
+        return knownMimeType.rawValue
+      } else if case let .unknown(string) = self {
+        return string
+      } else {
+        fatalError("Type attribute of <podcast:chapters> should either be `KnownMimeType`, or unknown!")
+      }
+    }
+
+    public init?(rawValue: String) {
+      if let knownMimeType = KnownMimeType(rawValue: rawValue) {
+        self = .init(knownMimeType: knownMimeType)
+      } else {
+        self = .unknown(rawValue)
+      }
+    }
+
+    public init(caseInsensitive: String) {
+      if let knownMimeType = KnownMimeType(caseInsensitive: caseInsensitive) {
+        self = .init(knownMimeType: knownMimeType)
+      } else {
+        self = .unknown(caseInsensitive)
+      }
+    }
+
+    private init(knownMimeType: KnownMimeType) {
+      switch knownMimeType {
+      case .json: self = .json
+      }
+    }
+  }
+}
diff --git a/Sources/SyndiKit/Formats/Media/Podcast/PodcastChapters.swift b/Sources/SyndiKit/Formats/Media/Podcast/PodcastChapters.swift
@@ -0,0 +1,25 @@
+import Foundation
+
+/// ```xml
+/// <podcast:chapters 
+///   url="https://example.com/episode1/chapters.json"
+///   type="application/json+chapters"
+/// />
+/// ```
+public struct PodcastChapters: Codable, Equatable {
+  public let url: URL
+  public let type: MimeType
+
+  enum CodingKeys: String, CodingKey {
+    case url
+    case type
+  }
+
+  public init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    self.url = try container.decode(URL.self, forKey: .url)
+
+    let typeStr = try container.decode(String.self, forKey: .type)
+    self.type = MimeType(caseInsensitive: typeStr)
+  }
+}
diff --git a/...ndiKit/Formats/Media/PodcastEpisode.swift → ...ormats/Media/Podcast/PodcastEpisode.swift b/...ndiKit/Formats/Media/PodcastEpisode.swift → ...ormats/Media/Podcast/PodcastEpisode.swift
@@ -1,4 +1,6 @@
 import Foundation
+
+
 public protocol PodcastEpisode {
   var title: String? { get }
   var episode: Int? { get }
@@ -37,6 +39,6 @@ struct PodcastEpisodeProperties: PodcastEpisode {
     duration = rssItem.itunesDuration?.value
     image = rssItem.itunesImage
     self.enclosure = enclosure
-    people = rssItem.podcastPerson ?? []
+    people = rssItem.podcastPeople
   }
 }
diff --git a/Sources/SyndiKit/Formats/Media/Podcast/PodcastFunding.swift b/Sources/SyndiKit/Formats/Media/Podcast/PodcastFunding.swift
@@ -0,0 +1,18 @@
+import Foundation
+
+/// ```xml
+/// <podcast:funding
+///   url="https://www.example.com/donations"
+/// >
+///   Support the show!
+/// </podcast:funding>
+/// ```
+public struct PodcastFunding: Codable, Equatable {
+  public let url: URL
+  public let description: String?
+
+  enum CodingKeys: String, CodingKey {
+    case url
+    case description = ""
+  }
+}
diff --git a/Sources/SyndiKit/Formats/Media/Podcast/PodcastLocation+GeoURI.swift b/Sources/SyndiKit/Formats/Media/Podcast/PodcastLocation+GeoURI.swift
@@ -0,0 +1,66 @@
+import Foundation
+
+extension PodcastLocation {
+  /// Examples:
+  ///   - `geo:37.786971,-122.399677`, a simple latlon description.
+  ///   - `geo:37.786971,-122.399677,250`, a latlon including a height of 250 meters above ground level.
+  ///   - `geo:37.786971,-122.399677;u=350`, a latlon with an accuracy ('uncertainty') of 350 meters.
+  public struct GeoURI: Codable, Equatable {
+    let latitude: Double
+    let longitude: Double
+    let height: Int?
+    let accuracy: Double?
+
+    public init(latitude: Double, longitude: Double, height: Int? = nil, accuracy: Double? = nil) {
+      self.latitude = latitude
+      self.longitude = longitude
+      self.height = height
+      self.accuracy = accuracy
+    }
+
+    public init(from decoder: Decoder) throws {
+      let container = try decoder.singleValueContainer()
+      let geoStr = try container.decode(String.self)
+
+      guard
+        let geoScheme = geoStr.split(separator: ":")[safe: 0],
+        geoScheme == "geo" else {
+        throw DecodingError.dataCorrupted(
+          .init(
+            codingPath: [PodcastLocation.CodingKeys.geo],
+            debugDescription: "Invalid prefix for geo attribute: \(geoStr)"
+          )
+        )
+      }
+      guard let geoPath = geoStr.split(separator: ":")[safe: 1] else {
+        throw DecodingError.dataCorrupted(
+          .init(
+            codingPath: [PodcastLocation.CodingKeys.geo],
+            debugDescription: "Invalid path for geo attribute: \(geoStr)"
+          )
+        )
+      }
+      guard
+        let geoCoords = geoPath.split(separator: ";")[safe: 0],
+        let latitude = geoCoords.split(separator: ",")[safe: 0]?.asDouble(),
+        let longitude = geoCoords.split(separator: ",")[safe: 1]?.asDouble()
+      else {
+        throw DecodingError.dataCorrupted(
+          .init(
+            codingPath: [PodcastLocation.CodingKeys.geo],
+            debugDescription: "Invalid coordinates for geo attribute: \(geoStr)"
+          )
+        )
+      }
+      let height = geoCoords.split(separator: ",")[safe: 2]?.asExactInt()
+      let accuracy = geoPath.split(separator: ";")[safe: 1]?
+        .split(separator: "=")[safe: 1]?
+        .asDouble()
+
+      self.latitude = latitude
+      self.longitude = longitude
+      self.height = height
+      self.accuracy = accuracy
+    }
+  }
+}
diff --git a/Sources/SyndiKit/Formats/Media/Podcast/PodcastLocation+OsmQuery.swift b/Sources/SyndiKit/Formats/Media/Podcast/PodcastLocation+OsmQuery.swift
@@ -0,0 +1,51 @@
+import Foundation
+
+extension PodcastLocation {
+  /// Examples:
+  ///   - The United States of America: `R148838`
+  ///   - The Eiffel Tower in Paris: `W5013364`
+  ///   - Paris, but - optionally - the revision made on 8 Jan 2021: `R7444#188`
+  public struct OsmQuery: Codable, Equatable {
+    enum OsmType: String, Codable, CaseIterable {
+      case node = "N"
+      case way = "W"
+      case relation = "R"
+
+      static func isValid(_ rawValue: String) -> Bool {
+        OsmType(rawValue: rawValue) != nil
+      }
+    }
+
+    let id: Int
+    let type: OsmType
+    let revision: Int?
+
+    public init(from decoder: Decoder) throws {
+      let container = try decoder.singleValueContainer()
+
+      var osmStr = try container.decode(String.self)
+
+      guard let osmType = osmStr.removeFirst().asOsmType() else {
+        throw DecodingError.dataCorrupted(
+          .init(
+            codingPath: [PodcastLocation.CodingKeys.osm],
+            debugDescription: "Invalid type for osm attribute: \(osmStr)"
+          )
+        )
+      }
+      guard let osmID = osmStr.split(separator: "#")[safe: 0]?.asExactInt() else {
+        throw DecodingError.dataCorrupted(
+          .init(
+            codingPath: [PodcastLocation.CodingKeys.osm],
+            debugDescription: "Invalid id of type Int for osm attribute: \(osmStr)"
+          )
+        )
+      }
+      let osmRevision = osmStr.split(separator: "#")[safe: 1]?.asInt()
+
+      self.id = osmID
+      self.type = osmType
+      self.revision = osmRevision
+    }
+  }
+}