From 7b55b81e2744bb469ddd585b9f4d4ac4029c2402 Mon Sep 17 00:00:00 2001 From: Nikita Aizikovskyi Date: Tue, 30 Jan 2018 12:35:39 -0800 Subject: [PATCH 1/4] Adding type property for Feed.metadata --- r2-shared-swift/OPDS/OpdsMetadata.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/r2-shared-swift/OPDS/OpdsMetadata.swift b/r2-shared-swift/OPDS/OpdsMetadata.swift index a0828788..73193149 100644 --- a/r2-shared-swift/OPDS/OpdsMetadata.swift +++ b/r2-shared-swift/OPDS/OpdsMetadata.swift @@ -15,6 +15,7 @@ public class OpdsMetadata { public var currentPage: Int? public var modified: Date? public var position: Int? + public var type: String? init(title: String) { self.title = title From 45c3d2b6d309b78d73cb9df8b632e1bdb02da82b Mon Sep 17 00:00:00 2001 From: Nikita Aizikovskyi Date: Tue, 30 Jan 2018 14:44:09 -0800 Subject: [PATCH 2/4] OPDS 2.0 support: Renaming type to rdfType and also adding it to publication metadata --- r2-shared-swift/Metadata.swift | 1 + r2-shared-swift/OPDS/OpdsMetadata.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/r2-shared-swift/Metadata.swift b/r2-shared-swift/Metadata.swift index 6056ec71..8a75c55c 100644 --- a/r2-shared-swift/Metadata.swift +++ b/r2-shared-swift/Metadata.swift @@ -46,6 +46,7 @@ public class Metadata { public var source: String? public var epubType = [String]() public var rights: String? + public var rdfType: String? public var otherMetadata = [MetadataItem]() // TODO: support parsing from OPF. diff --git a/r2-shared-swift/OPDS/OpdsMetadata.swift b/r2-shared-swift/OPDS/OpdsMetadata.swift index 73193149..895bd916 100644 --- a/r2-shared-swift/OPDS/OpdsMetadata.swift +++ b/r2-shared-swift/OPDS/OpdsMetadata.swift @@ -15,7 +15,7 @@ public class OpdsMetadata { public var currentPage: Int? public var modified: Date? public var position: Int? - public var type: String? + public var rdfType: String? init(title: String) { self.title = title From e5d132a00f6ab957fa13712d5e1be3eb4886b0de Mon Sep 17 00:00:00 2001 From: Nikita Aizikovskyi Date: Wed, 31 Jan 2018 13:46:54 -0800 Subject: [PATCH 3/4] Adding a public initializer for BelongsTo --- r2-shared-swift/BelongsTo.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/r2-shared-swift/BelongsTo.swift b/r2-shared-swift/BelongsTo.swift index 4886b004..81296eea 100644 --- a/r2-shared-swift/BelongsTo.swift +++ b/r2-shared-swift/BelongsTo.swift @@ -8,6 +8,8 @@ public class BelongsTo { + public init() {} + public var series = [Collection]() public var collection = [Collection]() } From 53bba0653bbbc71f59c131e1a6b7381e6d070c15 Mon Sep 17 00:00:00 2001 From: Nikita Aizikovskyi Date: Wed, 31 Jan 2018 14:46:34 -0800 Subject: [PATCH 4/4] Adding context field to Feed (OPDS 2 support) --- r2-shared-swift/OPDS/Feed.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/r2-shared-swift/OPDS/Feed.swift b/r2-shared-swift/OPDS/Feed.swift index 24b647c6..aadb774f 100644 --- a/r2-shared-swift/OPDS/Feed.swift +++ b/r2-shared-swift/OPDS/Feed.swift @@ -15,6 +15,7 @@ public class Feed { public var groups = [Group]() public var publications = [Publication]() public var navigation = [Link]() + public var context = [String]() public init(title: String) { self.metadata = OpdsMetadata(title: title)