Handle TMDb seasons not updating (#1910)

chrisbanes · Jun 26, 2024 · 949c113 · 949c113
1 parent b90d454
commit 949c113
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 188 deletions.
diff --git a/core/base/src/commonMain/kotlin/app/tivi/extensions/Combine.kt b/core/base/src/commonMain/kotlin/app/tivi/extensions/Combine.kt
diff --git a/core/base/src/commonMain/kotlin/app/tivi/extensions/LetIf.kt b/core/base/src/commonMain/kotlin/app/tivi/extensions/LetIf.kt
diff --git a/core/base/src/commonMain/kotlin/app/tivi/util/Result.kt b/core/base/src/commonMain/kotlin/app/tivi/util/Result.kt
@@ -5,12 +5,12 @@ package app.tivi.util
 
 import kotlinx.coroutines.CancellationException
 
-inline fun Result<*>.onException(
-  block: (Throwable) -> Unit,
-) {
-  val e = exceptionOrNull()
-  when {
-    e is CancellationException -> throw e
-    e != null -> block(e)
+inline fun <T, R> T.cancellableRunCatching(block: T.() -> R): Result<R> {
+  return try {
+    Result.success(block())
+  } catch (ce: CancellationException) {
+    throw ce
+  } catch (e: Throwable) {
+    Result.failure(e)
   }
 }
diff --git a/data/episodes/src/commonMain/kotlin/app/tivi/data/episodes/SeasonsEpisodesRepository.kt b/data/episodes/src/commonMain/kotlin/app/tivi/data/episodes/SeasonsEpisodesRepository.kt
@@ -20,6 +20,7 @@ import app.tivi.data.util.inPast
 import app.tivi.data.util.syncerForEntity
 import app.tivi.inject.ApplicationScope
 import app.tivi.util.Logger
+import app.tivi.util.cancellableRunCatching
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.hours
 import kotlinx.coroutines.CancellationException
@@ -49,7 +50,7 @@ class SeasonsEpisodesRepository(
   private val tmdbEpisodeDataSource: TmdbEpisodeDataSource,
   private val traktEpisodeWatchesDataSource: EpisodeWatchesDataSource,
   private val traktAuthRepository: TraktAuthRepository,
-  logger: Logger,
+  private val logger: Logger,
 ) {
   private val seasonSyncer = syncerForEntity(
     entityDao = seasonsDao,
@@ -106,17 +107,27 @@ class SeasonsEpisodesRepository(
     val traktDeferred = async { traktSeasonsDataSource.getSeasonsEpisodes(showId) }
     val tmdbDeferred = async { tmdbSeasonsDataSource.getSeasonsEpisodes(showId) }
 
-    val trakt = traktDeferred.await().distinctBy { it.first.number }
-    val tmdb = tmdbDeferred.await().distinctBy { it.first.number }
+    val traktResult = cancellableRunCatching {
+      traktDeferred.await().distinctBy { it.first.number }
+    }.onFailure {
+      logger.i(it) { "Error whilst fetching seasons from Trakt" }
+    }.getOrDefault(emptyList())
 
-    trakt.associate { (traktSeason, traktEpisodes) ->
+    val tmdbResult = cancellableRunCatching {
+      tmdbDeferred.await().distinctBy { it.first.number }
+    }.onFailure {
+      logger.i(it) { "Error whilst fetching seasons from TMDb" }
+    }.getOrNull()
+
+    traktResult.associate { (traktSeason, traktEpisodes) ->
       val localSeason = seasonsDao.seasonWithTraktId(traktSeason.traktId!!)
         ?: Season(showId = showId)
 
       val mergedSeason = mergeSeason(
         local = localSeason,
         trakt = traktSeason,
-        tmdb = tmdb.firstOrNull { it.first.number == traktSeason.number }?.first
+        tmdb = tmdbResult
+          ?.firstOrNull { it.first.number == traktSeason.number }?.first
           ?: Season.EMPTY,
       )
 
@@ -156,25 +167,14 @@ class SeasonsEpisodesRepository(
       traktEpisodeDataSource.getEpisode(season.showId, season.number!!, local.number!!)
     }
     val tmdbDeferred = async {
-      runCatching {
+      cancellableRunCatching {
         tmdbEpisodeDataSource.getEpisode(season.showId, season.number!!, local.number!!)
       }.getOrNull()
     }
 
-    val trakt = try {
-      traktDeferred.await()
-    } catch (ce: CancellationException) {
-      throw ce
-    } catch (e: Exception) {
-      null
-    }
-    val tmdb = try {
-      tmdbDeferred.await()
-    } catch (ce: CancellationException) {
-      throw ce
-    } catch (e: Exception) {
-      null
-    }
+    val trakt = cancellableRunCatching { traktDeferred.await() }.getOrNull()
+    val tmdb = cancellableRunCatching { tmdbDeferred.await() }.getOrNull()
+
     check(trakt != null || tmdb != null)
 
     episodesDao.upsert(

diff --git a/ui/discover/src/commonMain/kotlin/app/tivi/home/discover/DiscoverPresenter.kt b/ui/discover/src/commonMain/kotlin/app/tivi/home/discover/DiscoverPresenter.kt
@@ -28,7 +28,6 @@ import app.tivi.screens.RecommendedShowsScreen
 import app.tivi.screens.ShowDetailsScreen
 import app.tivi.screens.TrendingShowsScreen
 import app.tivi.util.Logger
-import app.tivi.util.onException
 import com.slack.circuit.retained.collectAsRetainedState
 import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.Navigator
@@ -104,7 +103,7 @@ class DiscoverPresenter(
                 page = UpdatePopularShows.Page.REFRESH,
                 forceRefresh = event.fromUser,
               ),
-            ).onException { e ->
+            ).onFailure { e ->
               logger.i(e)
               uiMessageManager.emitMessage(UiMessage(e))
             }
@@ -115,7 +114,7 @@ class DiscoverPresenter(
                 page = UpdateTrendingShows.Page.REFRESH,
                 forceRefresh = event.fromUser,
               ),
-            ).onException { e ->
+            ).onFailure { e ->
               logger.i(e)
               uiMessageManager.emitMessage(UiMessage(e))
             }
@@ -125,7 +124,7 @@ class DiscoverPresenter(
               updateRecommendedShows.value.invoke(
                 UpdateRecommendedShows.Params(forceRefresh = event.fromUser),
               ).also { result ->
-                result.onException { e ->
+                result.onFailure { e ->
                   logger.i(e)
                   uiMessageManager.emitMessage(UiMessage(e))
                 }

diff --git a/ui/episode/details/src/commonMain/kotlin/app/tivi/episodedetails/EpisodeDetailsPresenter.kt b/ui/episode/details/src/commonMain/kotlin/app/tivi/episodedetails/EpisodeDetailsPresenter.kt
@@ -23,7 +23,6 @@ import app.tivi.screens.EpisodeTrackScreen
 import app.tivi.screens.ShowDetailsScreen
 import app.tivi.screens.ShowSeasonsScreen
 import app.tivi.util.Logger
-import app.tivi.util.onException
 import com.slack.circuit.retained.collectAsRetainedState
 import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.Navigator
@@ -78,7 +77,7 @@ class EpisodeDetailsPresenter(
           scope.launch {
             updateEpisodeDetails.value.invoke(
               UpdateEpisodeDetails.Params(screen.id, event.fromUser),
-            ).onException { e ->
+            ).onFailure { e ->
               logger.i(e)
               uiMessageManager.emitMessage(UiMessage(e))
             }
@@ -95,7 +94,7 @@ class EpisodeDetailsPresenter(
           scope.launch {
             removeEpisodeWatches.value.invoke(
               RemoveEpisodeWatches.Params(screen.id),
-            ).onException { e ->
+            ).onFailure { e ->
               logger.i(e)
               uiMessageManager.emitMessage(UiMessage(e))
             }
@@ -106,7 +105,7 @@ class EpisodeDetailsPresenter(
           scope.launch {
             removeEpisodeWatch.value.invoke(
               RemoveEpisodeWatch.Params(event.id),
-            ).onException { e ->
+            ).onFailure { e ->
               logger.i(e)
               uiMessageManager.emitMessage(UiMessage(e))
             }

diff --git a/ui/episode/track/src/commonMain/kotlin/app/tivi/episode/track/EpisodeTrackPresenter.kt b/ui/episode/track/src/commonMain/kotlin/app/tivi/episode/track/EpisodeTrackPresenter.kt
@@ -19,7 +19,6 @@ import app.tivi.domain.interactors.UpdateEpisodeDetails
 import app.tivi.domain.observers.ObserveEpisodeDetails
 import app.tivi.screens.EpisodeTrackScreen
 import app.tivi.util.Logger
-import app.tivi.util.onException
 import com.slack.circuit.retained.collectAsRetainedState
 import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.Navigator
@@ -90,7 +89,7 @@ class EpisodeTrackPresenter(
           scope.launch {
             updateEpisodeDetails.value.invoke(
               UpdateEpisodeDetails.Params(screen.id, event.fromUser),
-            ).onException { e ->
+            ).onFailure { e ->
               logger.i(e)
               uiMessageManager.emitMessage(UiMessage(e))
             }
@@ -133,7 +132,7 @@ class EpisodeTrackPresenter(
               if (result.isSuccess) {
                 navigator.pop()
               }
-              result.onException { e ->
+              result.onFailure { e ->
                 logger.i(e)
                 uiMessageManager.emitMessage(UiMessage(e))
               }

diff --git a/ui/library/src/commonMain/kotlin/app/tivi/home/library/LibraryPresenter.kt b/ui/library/src/commonMain/kotlin/app/tivi/home/library/LibraryPresenter.kt
@@ -29,7 +29,6 @@ import app.tivi.screens.LibraryScreen
 import app.tivi.screens.ShowDetailsScreen
 import app.tivi.settings.TiviPreferences
 import app.tivi.util.Logger
-import app.tivi.util.onException
 import com.slack.circuit.retained.collectAsRetainedState
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.CircuitContext
@@ -111,7 +110,7 @@ class LibraryPresenter(
             if (getTraktAuthState.value.invoke().getOrThrow() == TraktAuthState.LOGGED_IN) {
               updateLibraryShows.value.invoke(
                 UpdateLibraryShows.Params(event.fromUser),
-              ).onException { e ->
+              ).onFailure { e ->
                 logger.i(e)
                 uiMessageManager.emitMessage(UiMessage(e))
               }

diff --git a/ui/search/src/commonMain/kotlin/app/tivi/home/search/SearchPresenter.kt b/ui/search/src/commonMain/kotlin/app/tivi/home/search/SearchPresenter.kt
@@ -18,7 +18,6 @@ import app.tivi.domain.interactors.SearchShows
 import app.tivi.screens.SearchScreen
 import app.tivi.screens.ShowDetailsScreen
 import app.tivi.util.Logger
-import app.tivi.util.onException
 import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.Navigator
@@ -70,7 +69,7 @@ class SearchPresenter(
       val result = searchShows.value.invoke(SearchShows.Params(query))
       results = result.getOrDefault(emptyList())
 
-      result.onException { e ->
+      result.onFailure { e ->
         logger.i(e)
         uiMessageManager.emitMessage(UiMessage(e))
       }