justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-09 08:01:20 +02:00
Code Issues Projects Packages Wiki Activity Actions

Refresh watching rows first

Browse source
This commit is contained in:
Damontecres 2026-02-05 12:15:29 -05:00
parent 3f4ec24569
commit 70ad1ecdbf
No known key found for this signature in database
1 changed files with 51 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/com/github/damontecres/wholphin/ui/main/HomeViewModel.kt
View file

@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope
import com.github.damontecres.wholphin.data.NavDrawerItemRepository
import com.github.damontecres.wholphin.data.ServerRepository
import com.github.damontecres.wholphin.data.model.BaseItem
import com.github.damontecres.wholphin.data.model.HomeRowConfig
import com.github.damontecres.wholphin.services.BackdropService
import com.github.damontecres.wholphin.services.DatePlayedService
import com.github.damontecres.wholphin.services.FavoriteWatchManager
@ -56,7 +57,7 @@ class HomeViewModel
init {
datePlayedService.invalidateAll()
init()
// init()
}
fun init() {
@ -86,18 +87,17 @@ class HomeViewModel
state.loadingState == LoadingState.Success && state.settings == settings
val semaphore = Semaphore(4)
val loadingRows =
if (refresh) {
state.homeRows
} else {
mutableListOf()
val watchingRowIndexes =
settings.rows
.mapIndexedNotNull { index, row ->
if (isWatchingRow(row.config)) index else null
}
val deferred =
settings.rows.mapIndexed { index, row ->
if (refresh) {
(loadingRows as MutableList).add(HomeRowLoadingState.Loading(row.title))
}
settings.rows
// Load the watching rows first
.sortedByDescending { isWatchingRow(it.config) }
.map { row ->
viewModelScope.async(Dispatchers.IO) {
semaphore.withPermit {
Timber.v("Fetching row: %s", row)
@ -117,14 +117,24 @@ class HomeViewModel
}
}
}
if (refresh) {
deferred.firstOrNull()?.await()?.let {
(loadingRows as MutableList)[0] = it
}
if (refresh && state.homeRows.isNotEmpty() && watchingRowIndexes.isNotEmpty()) {
// Replace watching rows first
Timber.v("Refreshing rows: %s", watchingRowIndexes)
val rows =
deferred
.filterIndexed { index, _ -> index in watchingRowIndexes }
.awaitAll()
_state.update {
val newRows =
it.homeRows.toMutableList().apply {
rows.forEachIndexed { index, row ->
set(watchingRowIndexes[index], row)
}
}
it.copy(
loadingState = LoadingState.Success,
homeRows = loadingRows,
homeRows = newRows,
)
}
}
@ -194,3 +204,11 @@ data class HomeState(
)
}
}
/**
* Whether a row is a "is watching" type
*/
private fun isWatchingRow(row: HomeRowConfig) =
row is HomeRowConfig.ContinueWatching ||
row is HomeRowConfig.NextUp ||
row is HomeRowConfig.ContinueWatchingCombined