Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

feat(data): émet SyncProgress LIVE par catégorie depuis XtreamLiveStrategy

Celtiore8a5a1cf4c415
diff --git a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt
index d6b5e8ac..45103efb 100644
--- a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt
+++ b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt
@@ -243,7 +243,8 @@ class SyncManager @Inject constructor(
categoryFailureWarning = ::categoryFailureWarning,
liveCategorySequentialModeWarning = LIVE_CATEGORY_SEQUENTIAL_MODE_WARNING,
isCurrentlyLowOnMemory = applicationContext::isCurrentlyLowOnMemoryForSync,
- stageChannelItems = catalogStager::stageChannelItems
+ stageChannelItems = catalogStager::stageChannelItems,
+ syncProgressBus = syncProgressBus
)
}
diff --git a/data/src/main/java/com/streamvault/data/sync/SyncManagerXtreamLiveStrategy.kt b/data/src/main/java/com/streamvault/data/sync/SyncManagerXtreamLiveStrategy.kt
index 60e71434..ed977c03 100644
--- a/data/src/main/java/com/streamvault/data/sync/SyncManagerXtreamLiveStrategy.kt
+++ b/data/src/main/java/com/streamvault/data/sync/SyncManagerXtreamLiveStrategy.kt
@@ -13,6 +13,8 @@ import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.Provider
import com.streamvault.domain.model.SyncMetadata
+import com.streamvault.domain.sync.Section
+import com.streamvault.domain.sync.SyncProgress
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlin.system.measureTimeMillis
@@ -40,7 +42,8 @@ internal class SyncManagerXtreamLiveStrategy(
private val categoryFailureWarning: (String, String, Throwable) -> String,
private val liveCategorySequentialModeWarning: String,
private val isCurrentlyLowOnMemory: () -> Boolean = { false },
- private val stageChannelItems: suspend (Long, List<Channel>, MutableSet<Long>, FallbackCategoryCollector, Long?) -> StagedCatalogSnapshot
+ private val stageChannelItems: suspend (Long, List<Channel>, MutableSet<Long>, FallbackCategoryCollector, Long?) -> StagedCatalogSnapshot,
+ private val syncProgressBus: SyncProgressBus
) {
suspend fun syncXtreamLiveCatalog(
provider: Provider,
@@ -409,6 +412,9 @@ internal class SyncManagerXtreamLiveStrategy(
val concurrency = adaptiveConcurrency.coerceAtMost(runtimeProfile.maxCategoryConcurrency)
progress(provider.id, onProgress, "Downloading Live TV by category 0/${categories.size}...")
+ // D11 — le total de catégories LIVE est fige une seule fois ici : la liste
+ // `categories` ne mute plus pendant la recuperation, donc la lambda
+ // `onCategoryCompleted` recoit le meme denominateur a chaque fenetre.
val executionPlan = xtreamSupport.executeCategoryRecoveryPlan(
provider = provider,
categories = categories,
@@ -424,6 +430,22 @@ internal class SyncManagerXtreamLiveStrategy(
stageBatchSize = runtimeProfile.stageBatchSize,
onMappedBatch = ::stageMappedBatch
)
+ },
+ onCategoryCompleted = { completed, total, currentLabel ->
+ // D6 — emission structuree en parallele du callback string deja emis par
+ // `executeCategoryRecoveryPlan` via `progress(...)`. Le compteur cumulatif
+ // `stagedAcceptedCount` est mis a jour de maniere thread-safe sous le
+ // `stageMutex` (cf `stageMappedBatch`), la lecture ici est best-effort
+ // (snapshot UX, pas une metrique business).
+ syncProgressBus.emit(
+ SyncProgress(
+ section = Section.LIVE,
+ current = completed,
+ total = total,
+ currentLabel = currentLabel,
+ itemsIndexed = stagedAcceptedCount
+ )
+ )
}
)
var timedOutcomes = executionPlan.outcomes