From 4ddcf5105f71312c67b7c49fcf0bedcbaec106f4 Mon Sep 17 00:00:00 2001 From: mzoookle Date: Wed, 4 Nov 2026 12:48:03 -0500 Subject: [PATCH] Showing All episode versions. Uses Loading spinner when its getting media source list --- .../wholphin/preferences/AppPreference.kt | 12 +++ .../wholphin/ui/components/Dialogs.kt | 2 +- .../wholphin/ui/components/PlayButtons.kt | 77 ++++++++++++------- .../ui/detail/episode/EpisodeViewModel.kt | 46 +++++++++-- .../ui/detail/series/FocusedEpisodeFooter.kt | 5 ++ .../ui/detail/series/SeriesOverview.kt | 5 ++ .../ui/detail/series/SeriesOverviewContent.kt | 9 ++- .../ui/detail/series/SeriesViewModel.kt | 39 ++++++++++ .../wholphin/util/ApiRequestPager.kt | 51 ++++++++++++ app/src/main/proto/WholphinDataStore.proto | 1 + app/src/main/res/values/strings.xml | 2 + 11 files changed, 213 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt index 68653272bc..0783e8dde8 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt @@ -139,6 +139,17 @@ sealed interface AppPreference { }, ) + val ShowAllEpisodeVersions = + AppSwitchPreference( + title = R.string.show_all_episode_versions, + defaultValue = false, + getter = { it.playbackPreferences.showAllEpisodeVersions }, + setter = { prefs, value -> + prefs.updatePlaybackPreferences { showAllEpisodeVersions = value } + }, + summary = R.string.show_all_episode_versions_summary, + ) + val SeekBarSteps = AppSliderPreference( title = R.string.seek_bar_steps, @@ -1324,6 +1335,7 @@ val advancedPreferences = preferences = listOf( AppPreference.OneClickPause, + AppPreference.ShowAllEpisodeVersions, AppPreference.ControllerTimeout, AppPreference.CinemaMode, AppPreference.GlobalContentScale, diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/Dialogs.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/Dialogs.kt index 76b7dc7711..0937b79417 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/Dialogs.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/Dialogs.kt @@ -285,7 +285,7 @@ fun DialogPopupContent( ) val scope = rememberCoroutineScope() val listState = rememberLazyListState() - val focusRequesters = remember { List(dialogItems.size) { FocusRequester() } } + val focusRequesters = remember(dialogItems.size) { List(dialogItems.size) { FocusRequester() } } LazyColumn( state = listState, modifier = Modifier, diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt index 4137759d5e..43b893ba0e 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt @@ -25,6 +25,7 @@ import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.CircularProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -66,6 +67,7 @@ import com.github.damontecres.wholphin.ui.tryRequestFocus import org.jellyfin.sdk.model.api.ItemSortBy import org.jellyfin.sdk.model.api.SortOrder import org.jellyfin.sdk.model.serializer.toUUIDOrNull +import timber.log.Timber import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds @@ -87,6 +89,7 @@ fun ExpandablePlayButtons( trailerOnClick: (Trailer) -> Unit, onConfirmDelete: () -> Unit, chooseVersionParams: ChooseVersionParams?, + loadingVersions: Boolean = false, buttonOnFocusChanged: (FocusState) -> Unit, modifier: Modifier = Modifier, ) { @@ -101,7 +104,26 @@ fun ExpandablePlayButtons( } } - var chooseVersion by remember { mutableStateOf(null) } + var chooseVersionOpen by remember { mutableStateOf(false) } + val buildChooseVersionDialog = { + val versionParams = requireNotNull(chooseVersionParams) + val sources = versionParams.mediaSources + chooseVersionParams( + resources, + sources, + versionParams.chosenStreams + ?.source + ?.id + ?.toUUIDOrNull(), + ) { idx -> + val source = sources[idx] + versionParams.onChooseVersion.invoke(source) + } + } + // Rebuild the dialog from the latest episode data on every recomposition. + // This matters when PlaybackInfo finishes loading while the dialog is open. + val chooseVersionDialog = + if (chooseVersionOpen) buildChooseVersionDialog() else null LazyRow( horizontalArrangement = Arrangement.spacedBy(16.dp), @@ -137,24 +159,17 @@ fun ExpandablePlayButtons( } } - if (chooseVersionParams != null && chooseVersionParams.mediaSources.size > 1) { - item { + if (loadingVersions || (chooseVersionParams != null && chooseVersionParams.mediaSources.size > 1)) { + item("version") { ExpandableFaButton( - title = R.string.version, + title = if (loadingVersions) R.string.loading else R.string.version, iconStringRes = R.string.fa_file_video, + loading = loadingVersions, + enabled = !loadingVersions, onClick = { - chooseVersion = - chooseVersionParams( - resources, - chooseVersionParams.mediaSources.orEmpty(), - chooseVersionParams.chosenStreams - ?.source - ?.id - ?.toUUIDOrNull(), - ) { idx -> - val source = chooseVersionParams.mediaSources[idx] - chooseVersionParams.onChooseVersion.invoke(source) - } + val versionParams = requireNotNull(chooseVersionParams) + val dialogParams = buildChooseVersionDialog() + chooseVersionOpen = true }, modifier = Modifier.onFocusChanged(buttonOnFocusChanged), ) @@ -214,12 +229,12 @@ fun ExpandablePlayButtons( ) } } - chooseVersion?.let { params -> + chooseVersionDialog?.let { params -> DialogPopup( showDialog = true, title = params.title, dialogItems = params.items, - onDismissRequest = { chooseVersion = null }, + onDismissRequest = { chooseVersionOpen = false }, dismissOnClick = true, waitToLoad = params.fromLongClick, ) @@ -346,6 +361,7 @@ fun ExpandableFaButton( interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, iconColor: Color = Color.Unspecified, enabled: Boolean = true, + loading: Boolean = false, ) { val isFocused = interactionSource.collectIsFocusedAsState().value Button( @@ -365,15 +381,22 @@ fun ExpandableFaButton( Modifier .size(32.dp), ) { - Text( - text = stringResource(iconStringRes), - style = MaterialTheme.typography.titleSmall, - color = iconColor, - fontSize = 16.sp, - fontFamily = FontAwesome, - textAlign = TextAlign.Center, - modifier = Modifier.align(Alignment.Center), - ) + if (loading) { + CircularProgressIndicator( + modifier = Modifier.align(Alignment.Center).size(18.dp), + strokeWidth = 2.dp, + ) + } else { + Text( + text = stringResource(iconStringRes), + style = MaterialTheme.typography.titleSmall, + color = iconColor, + fontSize = 16.sp, + fontFamily = FontAwesome, + textAlign = TextAlign.Center, + modifier = Modifier.align(Alignment.Center), + ) + } } AnimatedVisibility(isFocused) { Text( diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeViewModel.kt index 97aaaf8632..ae4ed2ce67 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeViewModel.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeViewModel.kt @@ -37,6 +37,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import org.jellyfin.sdk.api.client.ApiClient +import org.jellyfin.sdk.api.client.extensions.mediaInfoApi import org.jellyfin.sdk.api.client.extensions.userLibraryApi import org.jellyfin.sdk.model.api.MediaStreamType import timber.log.Timber @@ -70,8 +71,11 @@ class EpisodeViewModel val canDelete = MutableStateFlow(false) + // LifecycleResumeEffect owns initialization. Reuse an in-flight request if + // the screen resumes again before the previous initialization completes. + private var initJob: Job? = null + init { - init() viewModelScope.launchDefault { mediaManagementService.collectCanDelete( state.map { (it.episode as? DataLoadingState.Success)?.data }, @@ -81,13 +85,37 @@ class EpisodeViewModel } } + private suspend fun withFullEpisodeVersions(item: BaseItem): BaseItem { + if (!userPreferencesService.getCurrent().appPreferences.playbackPreferences.showAllEpisodeVersions) { + return item + } + return try { + val playbackInfo = api.mediaInfoApi.getPlaybackInfo(item.id).content + val mediaSources = playbackInfo.mediaSources + if (mediaSources.isEmpty()) { + return item + } + val updatedItem = item.copy( + data = + item.data.copy( + mediaSources = mediaSources, + mediaSourceCount = mediaSources.size, + ), + ) + updatedItem + } catch (ex: Exception) { + Timber.w(ex, "Failed to load media sources for episode %s", item.id) + item + } + } + private fun fetchAndSetItem() { viewModelScope.launchIO { try { val item = api.userLibraryApi.getItem(itemId).content.let { BaseItem.from(it, api) - } + }.let { withFullEpisodeVersions(it) } _state.update { it.copy(episode = DataLoadingState.Success(item)) } } catch (ex: CancellationException) { throw ex @@ -98,14 +126,19 @@ class EpisodeViewModel } } - fun init(): Job = - viewModelScope.launchIO { + fun init(): Job { + initJob?.takeIf { it.isActive }?.let { + Timber.d("Episode initialization already in progress for %s; reusing job", itemId) + return it + } + Timber.d("Starting episode initialization for %s", itemId) + return viewModelScope.launchIO { try { val prefs = userPreferencesService.getCurrent() val item = api.userLibraryApi.getItem(itemId).content.let { BaseItem(it) - } + }.let { withFullEpisodeVersions(it) } val chosenStreams = itemPlaybackRepository.getSelectedTracks(item.id, item, prefs) _state.update { @@ -121,7 +154,8 @@ class EpisodeViewModel Timber.e(ex, "Error getting episode %s", itemId) _state.update { it.copy(episode = DataLoadingState.Error(ex)) } } - } + }.also { initJob = it } + } fun setWatched( itemId: UUID, diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt index 600dee2848..4a55c341dc 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -16,6 +17,7 @@ import com.github.damontecres.wholphin.ui.components.ExpandablePlayButtons import com.github.damontecres.wholphin.ui.data.ChooseVersionParams import org.jellyfin.sdk.model.api.MediaSourceInfo import org.jellyfin.sdk.model.extensions.ticks +import timber.log.Timber import kotlin.time.Duration @Composable @@ -23,6 +25,7 @@ fun FocusedEpisodeFooter( preferences: UserPreferences, ep: BaseItem, chosenStreams: ChosenStreams?, + loadingVersions: Boolean, playOnClick: (Duration) -> Unit, moreOnClick: () -> Unit, watchOnClick: () -> Unit, @@ -34,6 +37,7 @@ fun FocusedEpisodeFooter( buttonOnFocusChanged: (FocusState) -> Unit = {}, ) { val dto = ep.data + val mediaSourceIds = dto.mediaSources.orEmpty().map { it.id ?: "" } val resumePosition = dto.userData?.playbackPositionTicks?.ticks ?: Duration.ZERO val firstFocus = remember { FocusRequester() } Row( @@ -55,6 +59,7 @@ fun FocusedEpisodeFooter( trailerOnClick = {}, canDelete = canDelete, onConfirmDelete = onConfirmDelete, + loadingVersions = loadingVersions, chooseVersionParams = remember(chosenStreams, ep, onChooseVersion) { ChooseVersionParams( diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverview.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverview.kt index ccc8f49394..31c8c27c6c 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverview.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverview.kt @@ -84,6 +84,7 @@ fun SeriesOverview( val extrasRowFocusRequester = remember { FocusRequester() } val state by viewModel.state.collectAsState() + val loadingEpisodeVersions by viewModel.loadingEpisodeVersions.collectAsState() val episodeList = remember(state.episodes) { (state.episodes as? EpisodeList.Success)?.episodes } @@ -198,6 +199,7 @@ fun SeriesOverview( series = st.data, seasons = state.seasons, episodes = state.episodes, + loadingEpisodeVersions = loadingEpisodeVersions, chosenStreams = chosenStreams, peopleInEpisode = state.peopleInEpisode.people, seasonExtras = state.extras, @@ -221,6 +223,9 @@ fun SeriesOverview( viewModel.position.update { it.copy(episodeRowIndex = episodeIndex) } + if (preferences.appPreferences.playbackPreferences.showAllEpisodeVersions) { + viewModel.loadFullEpisodeVersions(episodeIndex) + } }, onClick = { rowFocused = EPISODE_ROW diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverviewContent.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverviewContent.kt index 0759572ccd..76dd5a7f5a 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverviewContent.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesOverviewContent.kt @@ -78,6 +78,7 @@ fun SeriesOverviewContent( series: BaseItem, seasons: List, episodes: EpisodeList, + loadingEpisodeVersions: Set, seasonExtras: List, chosenStreams: ChosenStreams?, peopleInEpisode: List, @@ -242,8 +243,11 @@ fun SeriesOverviewContent( ) { itemsIndexed(eps.episodes) { episodeIndex, episode -> val interactionSource = remember { MutableInteractionSource() } - if (interactionSource.collectIsFocusedAsState().value) { - onFocusEpisode.invoke(episodeIndex) + val isEpisodeFocused = interactionSource.collectIsFocusedAsState().value + LaunchedEffect(isEpisodeFocused, episode?.id) { + if (isEpisodeFocused && episode != null) { + onFocusEpisode.invoke(episodeIndex) + } } BannerCard( name = episode?.name, @@ -317,6 +321,7 @@ fun SeriesOverviewContent( preferences = preferences, ep = ep, chosenStreams = chosenStreams, + loadingVersions = ep.id in loadingEpisodeVersions, playOnClick = playOnClick, moreOnClick = moreOnClick, watchOnClick = { diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesViewModel.kt index 568cece8df..864d0da5cb 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesViewModel.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/SeriesViewModel.kt @@ -80,6 +80,7 @@ import org.jellyfin.sdk.model.api.request.GetItemsRequest import org.jellyfin.sdk.model.api.request.GetSimilarItemsRequest import timber.log.Timber import java.util.UUID +import java.util.concurrent.ConcurrentHashMap @HiltViewModel(assistedFactory = SeriesViewModel.Factory::class) class SeriesViewModel @@ -116,6 +117,9 @@ class SeriesViewModel private val _state = MutableStateFlow(SeriesState()) val state: StateFlow = _state + private val episodeVersionRefreshes = ConcurrentHashMap.newKeySet() + private val _loadingEpisodeVersions = MutableStateFlow>(emptySet()) + val loadingEpisodeVersions: StateFlow> = _loadingEpisodeVersions val position = MutableStateFlow(SeriesOverviewPosition(0, 0)) @@ -490,6 +494,41 @@ class SeriesViewModel updateSeries() } + /** + * When enabled, resolve the focused episode's complete media-source list through + * PlaybackInfo. Some Jellyfin-compatible servers return a reduced list in GetItem. + */ + fun loadFullEpisodeVersions(listIndex: Int) = + viewModelScope.launch(ExceptionHandler() + WholphinDispatchers.IO) { + val episodeList = state.value.episodes as? EpisodeList.Success ?: return@launch + val episode = episodeList.episodes.getOrNull(listIndex) ?: return@launch + // Do not rely on MediaSourceCount here; it may be truncated along with GetItem. + if (!episodeVersionRefreshes.add(episode.id)) return@launch + _loadingEpisodeVersions.update { it + episode.id } + try { + val cacheUpdated = + episodeList.episodes.refreshMediaSources(listIndex, episode.id) + if (!cacheUpdated) { + // The page may have been evicted or the season changed while + // PlaybackInfo was loading; allow a later focus to retry it. + episodeVersionRefreshes.remove(episode.id) + } + _state.update { current -> + // Do not let a response for the previous season replace a newer list. + if (current.episodes === episodeList) { + current.copy(episodes = episodeList) + } else { + current + } + } + } catch (ex: Exception) { + episodeVersionRefreshes.remove(episode.id) + throw ex + } finally { + _loadingEpisodeVersions.update { it - episode.id } + } + } + fun refreshEpisode( itemId: UUID, listIndex: Int, diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/ApiRequestPager.kt b/app/src/main/java/com/github/damontecres/wholphin/util/ApiRequestPager.kt index 2f98fcccca..688cd095b7 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/util/ApiRequestPager.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/util/ApiRequestPager.kt @@ -14,6 +14,7 @@ import org.jellyfin.sdk.api.client.extensions.artistsApi import org.jellyfin.sdk.api.client.extensions.genresApi import org.jellyfin.sdk.api.client.extensions.itemsApi import org.jellyfin.sdk.api.client.extensions.liveTvApi +import org.jellyfin.sdk.api.client.extensions.mediaInfoApi import org.jellyfin.sdk.api.client.extensions.personsApi import org.jellyfin.sdk.api.client.extensions.playlistsApi import org.jellyfin.sdk.api.client.extensions.studiosApi @@ -69,6 +70,56 @@ class ApiRequestPager( return QueryResult(data, result.totalRecordCount) } + /** + * Refresh an item's media sources using PlaybackInfo rather than the item DTO. + * Some Jellyfin-compatible servers expose the complete alternate-version list + * through PlaybackInfo but return a reduced MediaSources list in GetItem. + */ + suspend fun refreshMediaSources( + position: Int, + itemId: UUID, + ): Boolean { + val pageNumber = position / pageSize + val index = position - pageNumber * pageSize + val itemBeforeRequest = + mutex.withLock { + cachedPages.getIfPresent(pageNumber)?.getOrNull(index) + } + + // Keep the network call outside the pager mutex. Focus changes can trigger + // lookups for several episodes; serializing the HTTP calls here made the + // currently focused episode wait behind every earlier lookup. + val playbackInfo = api.mediaInfoApi.getPlaybackInfo(itemId).content + val mediaSources = playbackInfo.mediaSources + if (mediaSources.isEmpty()) { + return true + } + + val (cacheUpdated, finalStoredSources) = + mutex.withLock { + val page = cachedPages.getIfPresent(pageNumber) + val currentItem = page?.getOrNull(index) + // A season/page can change while the request is in flight. Never write + // this response into a different episode that now occupies the index. + if (currentItem != null && currentItem.id == itemId) { + page!![index] = + currentItem.copy( + data = + currentItem.data.copy( + mediaSources = mediaSources, + mediaSourceCount = mediaSources.size, + ), + ) + cachedPages.put(pageNumber, page) + items = ItemList(size, pageSize, cachedPages.asMap()) + true to page[index].data.mediaSources?.size + } else { + false to null + } + } + return cacheUpdated + } + suspend fun refreshItem( position: Int, itemId: UUID, diff --git a/app/src/main/proto/WholphinDataStore.proto b/app/src/main/proto/WholphinDataStore.proto index d5bf570199..f6c9ce6442 100644 --- a/app/src/main/proto/WholphinDataStore.proto +++ b/app/src/main/proto/WholphinDataStore.proto @@ -94,6 +94,7 @@ message PlaybackPreferences { string external_player = 24; bool cinema_mode = 25; DpadSeekMode dpad_seek_mode = 26; + bool show_all_episode_versions = 27; } enum DpadSeekMode { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cf49b42525..0418b3cfd2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,6 +56,8 @@ Go to series Go To Hide playback controls + Show all episode versions + Load the complete available version list for TV episodes Hide debug info Hide Home