Improvements around the Extended info from Trakt

CouchTrackerCore/Core/Defaults.swift

@@ -1,8 +1,9 @@
 import TraktSwift
 
 public enum Defaults {
-  public static let showsSyncOptions = WatchedShowEntitiesSyncOptions(extended: Extended.fullEpisodes,
-                                                                      hiddingSpecials: false)
+  public static let showsSyncOptions = WatchedShowEntitiesSyncOptions(extended: .full,
+                                                                      hiddingSpecials: false,
+                                                                      seasonExtended: [.full, .episodes])
   public static let appState = AppState(userSettings: nil, hideSpecials: false)
 
   public static let itemsPerPage = 30

CouchTrackerCore/Show/Episode/ShowEpisodeAPIRepository.swift

@@ -46,8 +46,8 @@ public final class ShowEpisodeAPIRepository: ShowEpisodeRepository {
       guard let strongSelf = self else { return Single.error(CouchTrackerError.selfDeinitialized) }
 
       let options = WatchedShowEntitySyncOptions(showIds: showIds,
-                                                 episodeExtended: .fullEpisodes,
-                                                 seasonOptions: .yes(number: season, extended: .fullEpisodes),
+                                                 episodeExtended: .full,
+                                                 seasonOptions: .yes(number: season, extended: [.full, .episodes]),
                                                  hiddingSpecials: strongSelf.hideSpecials)
 
       return strongSelf.synchronizer.syncWatchedShow(using: options)

CouchTrackerCore/Synchronizer/CentralSynchronizer.swift

@@ -29,7 +29,7 @@ public final class CentralSynchronizer {
 
   private static func syncOptionsFor(appState: AppState) -> WatchedShowEntitiesSyncOptions {
     let defaultOptions = Defaults.showsSyncOptions
-    return WatchedShowEntitiesSyncOptions(extended: defaultOptions.extended, hiddingSpecials: appState.hideSpecials)
+    return WatchedShowEntitiesSyncOptions(extended: defaultOptions.extended, hiddingSpecials: appState.hideSpecials, seasonExtended: [.full, .episodes])
   }
 }
 

CouchTrackerCore/Synchronizer/Downloaders/DefaultWatchedShowEntitiesDownloader.swift

@@ -37,7 +37,7 @@ public final class DefaultWatchedShowEntitiesDownloader: WatchedShowEntitiesDown
   // MARK: - Public Interface
 
   public func syncWatchedShowEntities(using options: WatchedShowEntitiesSyncOptions) -> Observable<WatchedShowEntity> {
-    return fetchWatchedShowsFromAPI(options: options).asObservable()
+    return fetchWatchedShowsFromAPI().asObservable()
       .flatMap { [weak self] baseShows -> Observable<BaseShowWithGenres> in
         guard let strongSelf = self else { return Observable.empty() }
         return strongSelf.mapToBaseShowWithGenres(baseShows).asObservable()
@@ -77,16 +77,16 @@ public final class DefaultWatchedShowEntitiesDownloader: WatchedShowEntitiesDown
 
     let showOptions = WatchedShowEntitySyncOptions(showIds: show.ids,
                                                    episodeExtended: options.extended,
-                                                   seasonOptions: .yes(number: nil, extended: options.extended),
+                                                   seasonOptions: .yes(number: nil, extended: options.seasonExtended),
                                                    hiddingSpecials: options.hiddingSpecials)
 
     return showSynchronizer.syncWatchedShowEntitiy(using: showOptions).map { builder in
       builder.set(detailShow: detailShow)
     }
   }
 
-  private func fetchWatchedShowsFromAPI(options: WatchedShowEntitiesSyncOptions) -> Single<[BaseShow]> {
-    let target = Sync.watched(type: .shows, extended: options.extended)
+  private func fetchWatchedShowsFromAPI() -> Single<[BaseShow]> {
+    let target = Sync.watched(type: .shows, extended: [.full, .noSeasons])
     return trakt.sync.rx.request(target)
       .filterSuccessfulStatusAndRedirectCodes()
       .map([BaseShow].self)

CouchTrackerCore/Synchronizer/Downloaders/DefaultWatchedShowEntityDownloader.swift

@@ -84,7 +84,7 @@ public final class DefaultWatchedShowEntityDownloader: WatchedShowEntityDownload
 
   private func setSeasons(using options: WatchedShowEntitySyncOptions,
                           number: Int?,
-                          seasonExtended: Extended,
+                          seasonExtended: [Extended],
                           into builder: WatchedShowBuilder) -> Single<WatchedShowBuilder> {
     return fetchSeasonsFromAPI(using: options, seasonExtended: seasonExtended, number: number)
       .map { seasons -> [WatchedSeasonEntityBuilder] in
@@ -113,7 +113,7 @@ public final class DefaultWatchedShowEntityDownloader: WatchedShowEntityDownload
   }
 
   private func fetchSeasonsFromAPI(using options: WatchedShowEntitySyncOptions,
-                                   seasonExtended: Extended,
+                                   seasonExtended: [Extended],
                                    number: Int?) -> Single<[Season]> {
     let target = Seasons.summary(showId: options.showIds.realId, exteded: seasonExtended)
     let seasonsSingle = trakt.seasons.rx.request(target)

CouchTrackerCore/Synchronizer/SyncOptions.swift

@@ -2,7 +2,7 @@ import TraktSwift
 
 public enum SeasonSyncOptions {
   case none
-  case yes(number: Int?, extended: Extended)
+  case yes(number: Int?, extended: [Extended])
 }
 
 public struct WatchedShowEntitySyncOptions {
@@ -22,9 +22,11 @@ public struct WatchedShowEntitySyncOptions {
 public struct WatchedShowEntitiesSyncOptions {
   public let extended: Extended
   public let hiddingSpecials: Bool
+  public let seasonExtended: [Extended]
 
-  public init(extended: Extended, hiddingSpecials: Bool) {
+  public init(extended: Extended, hiddingSpecials: Bool, seasonExtended: [Extended]) {
     self.extended = extended
     self.hiddingSpecials = hiddingSpecials
+    self.seasonExtended = seasonExtended
   }
 }

CouchTrackerCoreTests/ShowDetails/ShowDetailsRepositoryTest.swift

@@ -14,7 +14,7 @@ final class ShowOverviewRepositoryTest: XCTestCase {
 
     let expectedShow = TraktEntitiesMock.createTraktShowDetails()
 
-    _ = repository.fetchDetailsOfShow(with: "game-of-thrones", extended: .fullEpisodes)
+    _ = repository.fetchDetailsOfShow(with: "game-of-thrones", extended: .full)
       .subscribe(onSuccess: { show in
         testExpectation.fulfill()
         XCTAssertEqual(show, expectedShow)

CouchTrackerCoreTests/Shows/Progress/ShowsProgressMocks.swift

@@ -13,7 +13,7 @@ extension ShowsProgressMenuOptions {
 
 enum ShowsProgressMocks {
   static func createWatchedShowsMock() -> [BaseShow] {
-    return try! JSONDecoder().decode([BaseShow].self, from: Sync.watched(type: .shows, extended: .full).sampleData)
+    return try! JSONDecoder().decode([BaseShow].self, from: Sync.watched(type: .shows, extended: [.full]).sampleData)
   }
 
   static func createShowMock(_ showId: String) -> BaseShow? {

CouchTrackerSync/CouchTrackerSync.swift

@@ -31,7 +31,7 @@ func startSync(options: SyncOptions) -> Observable<BaseShow> {
 }
 
 private func syncMain(_ options: SyncOptions) -> Observable<BaseShow> {
-  return Current.syncWatchedShows(.noSeasons)
+  return Current.syncWatchedShows(.full)
     .flatMap { Observable.from($0) }
     .flatMap { watchedProgress(options: options.watchedProgress, baseShow: $0) }
 }

TraktSwift/Endpoints/Movies.swift

@@ -1,7 +1,13 @@
 import Moya
 
 public enum Movies {
+  /**
+   Only accepts .default or .full for Extended
+   */
   case trending(page: Int, limit: Int, extended: Extended)
+  /**
+   Only accepts .default or .full for Extended
+   */
   case summary(movieId: String, extended: Extended)
 }
 

TraktSwift/Endpoints/Seasons.swift

@@ -1,7 +1,10 @@
 import Moya
 
 public enum Seasons {
-  case summary(showId: String, exteded: Extended)
+  /**
+   Accepts, .default, .full,  and .episodes for Extended
+   */
+  case summary(showId: String, exteded: [Extended])
 }
 
 extension Seasons: TraktType {
@@ -15,7 +18,7 @@ extension Seasons: TraktType {
   public var task: Task {
     switch self {
     case let .summary(_, exteded):
-      return .requestParameters(parameters: ["extended": exteded.rawValue], encoding: URLEncoding.default)
+      return .requestParameters(parameters: ["extended": exteded.separatedByComma()], encoding: URLEncoding.default)
     }
   }
 

TraktSwift/Endpoints/Shows.swift

@@ -1,12 +1,33 @@
 import Moya
 
 public enum Shows {
+  /**
+   Only accepts .default or .full for Extended
+   */
   case trending(page: Int, limit: Int, extended: Extended)
+  /**
+   Only accepts .default or .full for Extended
+   */
   case popular(page: Int, limit: Int, extended: Extended)
+  /**
+   Only accepts .default or .full for Extended
+   */
   case played(period: Period, page: Int, limit: Int, extended: Extended)
+  /**
+   Only accepts .default or .full for Extended
+   */
   case watched(period: Period, page: Int, limit: Int, extended: Extended)
+  /**
+   Only accepts .default or .full for Extended
+   */
   case collected(period: Period, page: Int, limit: Int, extended: Extended)
+  /**
+   Only accepts .default or .full for Extended
+   */
   case anticipated(page: Int, limit: Int, extended: Extended)
+  /**
+   Only accepts .default or .full for Extended
+   */
   case summary(showId: String, extended: Extended)
   case watchedProgress(showId: String, hidden: Bool, specials: Bool, countSpecials: Bool)
 }

TraktSwift/Endpoints/Sync.swift

@@ -1,7 +1,10 @@
 import Moya
 
 public enum Sync {
-  case watched(type: WatchedType, extended: Extended)
+  /**
+   Accepts .min, .default, .full, .noSeasons and .full for Extended
+   */
+  case watched(type: WatchedType, extended: [Extended])
   case addToHistory(items: SyncItems)
   case removeFromHistory(items: SyncItems)
   case history(params: HistoryParameters?)
@@ -47,7 +50,7 @@ extension Sync: TraktType {
   public var task: Task {
     switch self {
     case let .watched(_, extended):
-      return .requestParameters(parameters: ["extended": extended.rawValue], encoding: URLEncoding.default)
+      return .requestParameters(parameters: ["extended": extended.separatedByComma()], encoding: URLEncoding.default)
     case let .history(parameters):
       guard let params = parameters else {
         return .requestPlain

TraktSwift/Extensions.swift

@@ -0,0 +1,5 @@
+extension Sequence where Element == Extended {
+  public func separatedByComma() -> String {
+    return self.map { $0.rawValue }.joined(separator: ",")
+  }
+}

TraktSwift/Models/Enums/Extended.swift

@@ -4,5 +4,4 @@ public enum Extended: String {
   case full
   case noSeasons = "noseasons"
   case episodes
-  case fullEpisodes = "full,episodes"
 }

TraktSwiftTests/JSONParsingTests.swift

@@ -42,7 +42,7 @@ final class JSONParsingTests: XCTestCase {
     setupTraktForAuthentication(token)
 
     // Then
-    _ = trakt.sync.rx.request(.watched(type: .shows, extended: .full)).map([BaseShow].self).asObservable().subscribe(observer)
+    _ = trakt.sync.rx.request(.watched(type: .shows, extended: [.full])).map([BaseShow].self).asObservable().subscribe(observer)
 
     XCTAssertEqual(observer.events.count, 2)
     let event = observer.events.first!

TraktSwiftTests/SeasonsTests.swift

@@ -21,7 +21,7 @@ final class SeasonsTests: XCTestCase {
   }
 
   func testSeasons_requestSummaryforSeason_parseModels() {
-    let target = Seasons.summary(showId: "the-100", exteded: .fullEpisodes)
+    let target = Seasons.summary(showId: "the-100", exteded: [.full, .episodes])
 
     let res = scheduler.start {
       self.seasonsProvider.rx.request(target)

TraktSwiftTests/ShowsTest.swift

@@ -22,7 +22,7 @@ final class ShowsTest: XCTestCase {
   }
 
   func testShows_requestSummaryForAShow_parseToModels() {
-    let target = Shows.summary(showId: "game-of-thrones", extended: .fullEpisodes)
+    let target = Shows.summary(showId: "game-of-thrones", extended: .full)
     let disposable = showsProvider.rx.request(target)
       .map(Show.self)
       .asObservable()

TraktSwiftTests/TestableTrakt.swift

@@ -1,9 +1,8 @@
-@testable import CouchTrackerSync
 import Moya
-import TraktSwift
+@testable import TraktSwift
 
-public class TestableTrakt: Trakt, TraktProvider {
-  override func createProvider<T>(forTarget target: T.Type) -> MoyaProvider<T> where T: TraktType {
+public class TestableTrakt: Trakt {
+    override public func createProvider<T>(forTarget target: T.Type) -> MoyaProvider<T> where T: TraktType {
     let provider = super.createProvider(forTarget: target)
 
     return MoyaProvider(endpointClosure: provider.endpointClosure,