refactor(home): optimize home catalogs loader

flixclusiveorg · Sep 30, 2024 · b1be7a3 · b1be7a3
1 parent ab437cc
commit b1be7a3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 // Version
 val versionMajor = 2
 val versionMinor = 1
-val versionPatch = 1
+val versionPatch = 2
 val versionBuild = 0
 val applicationName: String = libs.versions.applicationName.get()
 val _applicationId: String = libs.versions.applicationId.get()

diff --git a/domain/home/src/main/kotlin/com/flixclusive/domain/home/HomeItemsProviderUseCase.kt b/domain/home/src/main/kotlin/com/flixclusive/domain/home/HomeItemsProviderUseCase.kt
@@ -2,7 +2,8 @@ package com.flixclusive.domain.home
 
 import com.flixclusive.core.network.util.Resource
 import com.flixclusive.core.ui.common.util.PagingState
-import com.flixclusive.core.util.coroutines.AppDispatchers
+import com.flixclusive.core.util.coroutines.AppDispatchers.Companion.launchOnIO
+import com.flixclusive.core.util.coroutines.AppDispatchers.Companion.withDefaultContext
 import com.flixclusive.core.util.exception.safeCall
 import com.flixclusive.data.configuration.AppConfigurationManager
 import com.flixclusive.data.provider.ProviderManager
@@ -20,11 +21,9 @@ import com.flixclusive.model.provider.ProviderCatalog
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.random.Random
@@ -55,20 +54,23 @@ class HomeItemsProviderUseCase @Inject constructor(
     }
 
     operator fun invoke() {
-        AppDispatchers.Default.scope.launch {
+        launchOnIO {
             _state.update { it.copy(status = Resource.Loading) }
+
             try {
-                val catalogs = getHomeRecommendations()
+                val catalogs = withDefaultContext { getHomeRecommendations() }
                 _state.update {
                     it.copy(
                         catalogs = catalogs,
                         rowItems = List(catalogs.size) { emptyList() },
-                        rowItemsPagingState = catalogs.map { catalog ->
-                            PaginationStateInfo(
-                                canPaginate = catalog.canPaginate,
-                                pagingState = if (!catalog.canPaginate) PagingState.PAGINATING_EXHAUST else PagingState.IDLE,
-                                currentPage = 1
-                            )
+                        rowItemsPagingState = withDefaultContext {
+                            catalogs.map { catalog ->
+                                PaginationStateInfo(
+                                    canPaginate = catalog.canPaginate,
+                                    pagingState = if (!catalog.canPaginate) PagingState.PAGINATING_EXHAUST else PagingState.IDLE,
+                                    currentPage = 1
+                                )
+                            }
                         }
                     )
                 }
@@ -110,17 +112,14 @@ class HomeItemsProviderUseCase @Inject constructor(
             it.flatMap { api -> api.catalogs }
         }.distinctUntilChanged()
 
-        AppDispatchers.Default.scope.launch {
-            configurationProvider.configurationStatus
-                .combine(catalogs) { configStatus, catalogs ->
-                    configStatus to catalogs
-                }
-                .collectLatest { (configStatus, catalogs) ->
-                    if (configStatus is Resource.Success) {
-                        _state.update { it.copy(providerCatalogs = catalogs) }
-                        invoke()
-                    }
+        launchOnIO {
+            catalogs.collectLatest {
+                _state.update {  homeState ->
+                    homeState.copy(providerCatalogs = it)
                 }
+
+                invoke()
+            }
         }
     }
 
@@ -166,6 +165,7 @@ class HomeItemsProviderUseCase @Inject constructor(
             }
         }
     }
+
     private suspend fun getHeaderItem(catalogs: List<Catalog>): Film? {
         val traversedCatalogs = mutableSetOf<Int>()
         val traversedFilms = mutableSetOf<String>()