Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,17 @@ sealed interface AppPreference<Pref, T> {
},
)

val ShowAllEpisodeVersions =
AppSwitchPreference<AppPreferences>(
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<AppPreferences>(
title = R.string.seek_bar_steps,
Expand Down Expand Up @@ -1324,6 +1335,7 @@ val advancedPreferences =
preferences =
listOf(
AppPreference.OneClickPause,
AppPreference.ShowAllEpisodeVersions,
AppPreference.ControllerTimeout,
AppPreference.CinemaMode,
AppPreference.GlobalContentScale,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -87,6 +89,7 @@ fun ExpandablePlayButtons(
trailerOnClick: (Trailer) -> Unit,
onConfirmDelete: () -> Unit,
chooseVersionParams: ChooseVersionParams?,
loadingVersions: Boolean = false,
buttonOnFocusChanged: (FocusState) -> Unit,
modifier: Modifier = Modifier,
) {
Expand All @@ -101,7 +104,26 @@ fun ExpandablePlayButtons(
}
}

var chooseVersion by remember { mutableStateOf<DialogParams?>(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),
Expand Down Expand Up @@ -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),
)
Expand Down Expand Up @@ -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,
)
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<BaseItem?>)?.data },
Expand All @@ -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
Expand All @@ -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 {
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,13 +17,15 @@ 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
fun FocusedEpisodeFooter(
preferences: UserPreferences,
ep: BaseItem,
chosenStreams: ChosenStreams?,
loadingVersions: Boolean,
playOnClick: (Duration) -> Unit,
moreOnClick: () -> Unit,
watchOnClick: () -> Unit,
Expand All @@ -34,6 +37,7 @@ fun FocusedEpisodeFooter(
buttonOnFocusChanged: (FocusState) -> Unit = {},
) {
val dto = ep.data
val mediaSourceIds = dto.mediaSources.orEmpty().map { it.id ?: "<no-id>" }
val resumePosition = dto.userData?.playbackPositionTicks?.ticks ?: Duration.ZERO
val firstFocus = remember { FocusRequester() }
Row(
Expand All @@ -55,6 +59,7 @@ fun FocusedEpisodeFooter(
trailerOnClick = {},
canDelete = canDelete,
onConfirmDelete = onConfirmDelete,
loadingVersions = loadingVersions,
chooseVersionParams =
remember(chosenStreams, ep, onChooseVersion) {
ChooseVersionParams(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ fun SeriesOverviewContent(
series: BaseItem,
seasons: List<BaseItem?>,
episodes: EpisodeList,
loadingEpisodeVersions: Set<java.util.UUID>,
seasonExtras: List<ExtrasItem>,
chosenStreams: ChosenStreams?,
peopleInEpisode: List<Person>,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -317,6 +321,7 @@ fun SeriesOverviewContent(
preferences = preferences,
ep = ep,
chosenStreams = chosenStreams,
loadingVersions = ep.id in loadingEpisodeVersions,
playOnClick = playOnClick,
moreOnClick = moreOnClick,
watchOnClick = {
Expand Down
Loading