From 7fa30191656b1805f49eb33ba74a517dee9e8e32 Mon Sep 17 00:00:00 2001 From: "nosmobilesolutions@gmail.com" Date: Thu, 11 Jun 2020 18:25:20 +0200 Subject: [PATCH 1/6] translate seasons info --- Common/Wrapper/Seasons.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Common/Wrapper/Seasons.swift b/Common/Wrapper/Seasons.swift index 4f266c7..6224407 100644 --- a/Common/Wrapper/Seasons.swift +++ b/Common/Wrapper/Seasons.swift @@ -21,9 +21,13 @@ extension TraktManager { */ @discardableResult - public func getSeasons(showID id: T, extended: [ExtendedType] = [.Min], completion: @escaping SeasonsCompletionHandler) -> URLSessionDataTaskProtocol? { + public func getSeasons(showID id: T, extended: [ExtendedType] = [.Min], translatedInto language: String? = nil, completion: @escaping SeasonsCompletionHandler) -> URLSessionDataTaskProtocol? { + + var query = ["extended": extended.queryString()] + query["translations"] = language + guard var request = mutableRequest(forPath: "shows/\(id)/seasons", - withQuery: ["extended": extended.queryString()], + withQuery: query, isAuthorized: false, withHTTPMethod: .GET) else { return nil } request.cachePolicy = .reloadIgnoringCacheData From 621ed50caac3283f10f703bd5c12ce4e004745e1 Mon Sep 17 00:00:00 2001 From: "nosmobilesolutions@gmail.com" Date: Fri, 12 Jun 2020 11:49:15 +0200 Subject: [PATCH 2/6] episode tranlsations property --- Common/Models/Shows/TraktEpisode.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Common/Models/Shows/TraktEpisode.swift b/Common/Models/Shows/TraktEpisode.swift index 55642cf..21e8bc2 100644 --- a/Common/Models/Shows/TraktEpisode.swift +++ b/Common/Models/Shows/TraktEpisode.swift @@ -23,6 +23,7 @@ public struct TraktEpisode: Codable, Hashable { public let firstAired: Date? public let updatedAt: Date? public let availableTranslations: [String]? + public let translations: TraktShowTranslation? enum CodingKeys: String, CodingKey { case season @@ -36,5 +37,6 @@ public struct TraktEpisode: Codable, Hashable { case firstAired = "first_aired" case updatedAt = "updated_at" case availableTranslations = "available_translations" + case translations } } From 2b8c3aadf29eef92efd6986c4e4dcb2eb78dcbee Mon Sep 17 00:00:00 2001 From: "nosmobilesolutions@gmail.com" Date: Fri, 12 Jun 2020 11:56:41 +0200 Subject: [PATCH 3/6] TranslationsArray --- Common/Models/Shows/TraktEpisode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Models/Shows/TraktEpisode.swift b/Common/Models/Shows/TraktEpisode.swift index 21e8bc2..5537fb4 100644 --- a/Common/Models/Shows/TraktEpisode.swift +++ b/Common/Models/Shows/TraktEpisode.swift @@ -23,7 +23,7 @@ public struct TraktEpisode: Codable, Hashable { public let firstAired: Date? public let updatedAt: Date? public let availableTranslations: [String]? - public let translations: TraktShowTranslation? + public let translations: [TraktShowTranslation]? enum CodingKeys: String, CodingKey { case season From 3574ebd5862f140a92cf51596c7271a802062381 Mon Sep 17 00:00:00 2001 From: "nosmobilesolutions@gmail.com" Date: Fri, 12 Jun 2020 12:22:57 +0200 Subject: [PATCH 4/6] add runtime + fix optional values for translations --- Common/Models/Shows/TraktEpisode.swift | 2 ++ Common/Models/Shows/TraktShowTranslation.swift | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Common/Models/Shows/TraktEpisode.swift b/Common/Models/Shows/TraktEpisode.swift index 5537fb4..b2ea5a7 100644 --- a/Common/Models/Shows/TraktEpisode.swift +++ b/Common/Models/Shows/TraktEpisode.swift @@ -24,6 +24,7 @@ public struct TraktEpisode: Codable, Hashable { public let updatedAt: Date? public let availableTranslations: [String]? public let translations: [TraktShowTranslation]? + public let runtime: Int? enum CodingKeys: String, CodingKey { case season @@ -38,5 +39,6 @@ public struct TraktEpisode: Codable, Hashable { case updatedAt = "updated_at" case availableTranslations = "available_translations" case translations + case runtime } } diff --git a/Common/Models/Shows/TraktShowTranslation.swift b/Common/Models/Shows/TraktShowTranslation.swift index 247c212..6a53f49 100644 --- a/Common/Models/Shows/TraktShowTranslation.swift +++ b/Common/Models/Shows/TraktShowTranslation.swift @@ -9,7 +9,7 @@ import Foundation public struct TraktShowTranslation: Codable, Hashable { - public let title: String - public let overview: String - public let language: String + public let title: String? + public let overview: String? + public let language: String? } From 6c2c57524656336195439c8e774954863120d304 Mon Sep 17 00:00:00 2001 From: "nosmobilesolutions@gmail.com" Date: Fri, 12 Jun 2020 22:15:27 +0200 Subject: [PATCH 5/6] optional episodeCounts --- Common/Models/People/TraktCastMember.swift | 2 +- Common/Models/People/TraktCrewMember.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/Models/People/TraktCastMember.swift b/Common/Models/People/TraktCastMember.swift index 376962f..c5a0e7f 100644 --- a/Common/Models/People/TraktCastMember.swift +++ b/Common/Models/People/TraktCastMember.swift @@ -13,7 +13,7 @@ public struct TVCastMember: Codable, Hashable { public let characters: [String] @available(*, deprecated, renamed: "characters") public let character: String - public let episodeCount: Int + public let episodeCount: Int? public let person: Person enum CodingKeys: String, CodingKey { diff --git a/Common/Models/People/TraktCrewMember.swift b/Common/Models/People/TraktCrewMember.swift index 46e2874..67c4ee7 100644 --- a/Common/Models/People/TraktCrewMember.swift +++ b/Common/Models/People/TraktCrewMember.swift @@ -13,7 +13,7 @@ public struct TVCrewMember: Codable, Hashable { public let jobs: [String] @available(*, deprecated, renamed: "jobs") public let job: String - public let episodeCount: Int + public let episodeCount: Int? public let person: Person enum CodingKeys: String, CodingKey { From 772c635172714bf78b2b7a1113eae33c1f26c6c5 Mon Sep 17 00:00:00 2001 From: "nosmobilesolutions@gmail.com" Date: Sat, 20 Jun 2020 10:03:07 +0200 Subject: [PATCH 6/6] optional values --- Common/Models/People/TraktCrewMember.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Common/Models/People/TraktCrewMember.swift b/Common/Models/People/TraktCrewMember.swift index 67c4ee7..9bc29ee 100644 --- a/Common/Models/People/TraktCrewMember.swift +++ b/Common/Models/People/TraktCrewMember.swift @@ -10,9 +10,9 @@ import Foundation /// Cast member for (show/season/episode)/people API public struct TVCrewMember: Codable, Hashable { - public let jobs: [String] + public let jobs: [String]? @available(*, deprecated, renamed: "jobs") - public let job: String + public let job: String? public let episodeCount: Int? public let person: Person @@ -26,9 +26,9 @@ public struct TVCrewMember: Codable, Hashable { /// Cast member for /movies/.../people API public struct MovieCrewMember: Codable, Hashable { - public let jobs: [String] + public let jobs: [String]? @available(*, deprecated, renamed: "jobs") - public let job: String + public let job: String? public let person: Person enum CodingKeys: String, CodingKey { @@ -40,10 +40,10 @@ public struct MovieCrewMember: Codable, Hashable { /// Cast member for /people/.../shows API public struct PeopleTVCrewMember: Codable, Hashable { - public let jobs: [String] + public let jobs: [String]? @available(*, deprecated, renamed: "jobs") - public let job: String - public let episodeCount: Int + public let job: String? + public let episodeCount: Int? public let show: TraktShow enum CodingKeys: String, CodingKey { @@ -57,9 +57,9 @@ public struct PeopleTVCrewMember: Codable, Hashable { /// Cast member for /people/.../movies API public struct PeopleMovieCrewMember: Codable, Hashable { - public let jobs: [String] + public let jobs: [String]? @available(*, deprecated, renamed: "jobs") - public let job: String + public let job: String? public let movie: TraktMovie enum CodingKeys: String, CodingKey {