Skip to content
Draft
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 @@ -74,15 +74,7 @@ data class BaseItem(
}

val subtitleLong: String? by lazy {
if (type == BaseItemKind.EPISODE) {
buildList {
add(data.seasonEpisodePadded)
add(data.name)
add(data.premiereDate?.let { formatDateTime(it) })
}.joinNotBlank(" - ")
} else {
data.productionYear?.toString()
}
data.subtitleLong()
}

val canDelete: Boolean get() = data.canDelete == true
Expand Down Expand Up @@ -334,6 +326,10 @@ data class BaseItem(
} ?: Destination.MediaItem(this)
}

BaseItemKind.RECORDING -> {
Destination.Playback(id, 0)
}

else -> {
Destination.MediaItem(this)
}
Expand Down Expand Up @@ -435,3 +431,14 @@ fun createStudioDestination(
)

val BaseItem.studioNames get() = data.studios?.mapNotNull { it.name }.orEmpty()

fun BaseItemDto.subtitleLong(treatAsEpisode: Boolean = type == BaseItemKind.EPISODE): String? =
if (treatAsEpisode) {
buildList {
add(seasonEpisodePadded)
add(name)
add(premiereDate?.let { formatDateTime(it) })
}.joinNotBlank(" - ")
} else {
productionYear?.toString()
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.github.damontecres.wholphin.data.model.BaseItem
import com.github.damontecres.wholphin.ui.toServerString
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.liveTvApi
import org.jellyfin.sdk.model.api.RecordingStatus
import org.jellyfin.sdk.model.api.TimerInfoDto
import java.util.UUID
import javax.inject.Inject
Expand All @@ -30,6 +31,24 @@ class LiveTvService
return result
}

suspend fun fetchRecordingForProgram(program: BaseItem): BaseItem? {
val timerId = program.data.timerId
val channelId = program.data.channelId
return if (program.data.status == RecordingStatus.IN_PROGRESS.serialName &&
timerId != null &&
channelId != null
) {
// Active recording
val recordings by api.liveTvApi.getRecordings(
channelId = channelId.toString(),
isInProgress = true,
)
recordings.items.firstOrNull { it.timerId == timerId }?.let { BaseItem(it) }
} else {
null
}
}

/**
* Cancel a recording by [timerId]
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,38 @@
package com.github.damontecres.wholphin.ui.detail

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.tv.material3.MaterialTheme
import com.github.damontecres.wholphin.R
import com.github.damontecres.wholphin.data.ServerRepository
import com.github.damontecres.wholphin.data.model.BaseItem
import com.github.damontecres.wholphin.data.model.CollectionFolderFilter
import com.github.damontecres.wholphin.preferences.UserPreferences
import com.github.damontecres.wholphin.services.BackdropService
import com.github.damontecres.wholphin.services.NavigationManager
import com.github.damontecres.wholphin.ui.components.BasicDialog
import com.github.damontecres.wholphin.ui.components.CollectionFolderView
import com.github.damontecres.wholphin.ui.components.DialogItem
import com.github.damontecres.wholphin.ui.components.DialogPopupContent
import com.github.damontecres.wholphin.ui.components.ErrorMessage
import com.github.damontecres.wholphin.ui.components.LoadingPage
import com.github.damontecres.wholphin.ui.components.TabDetails
Expand All @@ -36,8 +48,12 @@ import com.github.damontecres.wholphin.util.DataLoadingState
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.update
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.liveTvApi
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.RecordingStatus
import org.jellyfin.sdk.model.api.TimerInfoDto
import timber.log.Timber
import java.util.UUID
import javax.inject.Inject
Expand Down Expand Up @@ -72,17 +88,46 @@ class LiveTvCollectionViewModel
}
}
}

fun lookupTimerFor(item: BaseItem) {
viewModelScope.launchIO {
val timerId = item.data.timerId
if (timerId != null) {
state.update { it.copy(recordingLookup = DataLoadingState.Loading) }
try {
val timer by api.liveTvApi.getTimer(timerId)
state.update { it.copy(recordingLookup = DataLoadingState.Success(TimerInfo(item, timer))) }
} catch (ex: Exception) {
state.update { it.copy(recordingLookup = DataLoadingState.Error(ex)) }
}
} else {
state.update { it.copy(recordingLookup = DataLoadingState.Error("No timer for recording")) }
}
}
}

fun clearTimer() {
state.update { it.copy(recordingLookup = DataLoadingState.Pending) }
}
}

data class LiveTvRecordingFolderState(
val folders: DataLoadingState<List<TabId>> = DataLoadingState.Pending,
val recordingLookup: DataLoadingState<TimerInfo> = DataLoadingState.Pending,
)

data class TabId(
val title: String,
val id: UUID,
)

data class TimerInfo(
val item: BaseItem,
val timerInfo: TimerInfoDto,
)

val BaseItem.isInProgressRecording: Boolean get() = type == BaseItemKind.RECORDING && data.status == RecordingStatus.IN_PROGRESS.serialName

@Composable
fun CollectionFolderLiveTv(
preferences: UserPreferences,
Expand Down Expand Up @@ -117,7 +162,11 @@ fun CollectionFolderLiveTv(
val onClickItem =
remember {
{ position: Int, item: BaseItem ->
viewModel.navigationManager.navigateTo(item.destination())
if (item.isInProgressRecording) {
viewModel.lookupTimerFor(item)
} else {
viewModel.navigationManager.navigateTo(item.destination())
}
}
}

Expand Down Expand Up @@ -179,4 +228,79 @@ fun CollectionFolderLiveTv(
}
}
}
WatchFromStartDialog(
timer = state.recordingLookup,
onDismissRequest = { viewModel.clearTimer() },
onClickPlay = { id ->
viewModel.navigationManager.navigateTo(Destination.Playback(id, 0))
},
)
}

@Composable
fun WatchFromStartDialog(
timer: DataLoadingState<TimerInfo>,
onDismissRequest: () -> Unit,
onClickPlay: (UUID) -> Unit,
) {
when (timer) {
DataLoadingState.Pending -> {
}

else -> {
BasicDialog(
onDismissRequest = onDismissRequest,
) {
val focusRequester = remember { FocusRequester() }
val modifier = Modifier.padding(24.dp)
when (val t = timer) {
is DataLoadingState.Error -> {
ErrorMessage(t, modifier)
}

DataLoadingState.Loading -> {
Box(modifier) {
CircularProgressIndicator(
color = MaterialTheme.colorScheme.border,
modifier =
Modifier
.align(Alignment.Center)
.size(48.dp),
)
}
}

is DataLoadingState.Success<TimerInfo> -> {
LaunchedEffect(Unit) { focusRequester.requestFocus() }
DialogPopupContent(
title = t.data.item.title ?: "",
waiting = false,
onDismissRequest = onDismissRequest,
dialogItems =
buildList {
add(
DialogItem(
text = R.string.play_from_start,
iconStringRes = R.string.fa_rotate_left,
onClick = { onClickPlay.invoke(t.data.item.id) },
),
)
val channelId = t.data.timerInfo.channelId
if (channelId != null) {
add(
DialogItem(
text = R.string.watch_live,
iconStringRes = R.string.fa_play,
onClick = { onClickPlay.invoke(channelId) },
),
)
}
},
modifier = modifier.focusRequester(focusRequester),
)
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fun Program(
onLongClick: (() -> Unit)?,
modifier: Modifier = Modifier,
) {
val startedBeforeGuide = program.start.isBefore(guideStart)
val startedBeforeGuide = remember(program.start, guideStart) { program.start.isBefore(guideStart) }
val shape =
remember(startedBeforeGuide) {
val cornerSize = 4.dp
Expand Down Expand Up @@ -110,13 +110,13 @@ fun Program(
overflow = TextOverflow.Ellipsis,
modifier = Modifier,
)
val seasonEpisodeLabel =
formatSeasonEpisode(
program.seasonEpisode?.season,
program.seasonEpisode?.episode,
)
val subtitle =
remember(program, seasonEpisodeLabel) {
remember(program.id) {
val seasonEpisodeLabel =
formatSeasonEpisode(
program.seasonEpisode?.season,
program.seasonEpisode?.episode,
)
listOfNotNull(
seasonEpisodeLabel,
program.subtitle,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.github.damontecres.wholphin.ui.detail.livetv

import android.text.format.DateUtils
import android.widget.Toast
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -39,7 +38,6 @@ import com.github.damontecres.wholphin.ui.SlimItemFields
import com.github.damontecres.wholphin.ui.components.ErrorMessage
import com.github.damontecres.wholphin.ui.components.LoadingPage
import com.github.damontecres.wholphin.ui.launchIO
import com.github.damontecres.wholphin.ui.nav.Destination
import com.github.damontecres.wholphin.ui.seasonEpisode
import com.github.damontecres.wholphin.ui.tryRequestFocus
import com.github.damontecres.wholphin.util.DataLoadingState
Expand Down Expand Up @@ -181,25 +179,14 @@ fun DvrSchedule(
showDialog?.let { item ->
val context = LocalContext.current
ProgramDialog(
state = DataLoadingState.Success(item),
state = ProgramDialogState(DataLoadingState.Success(item), item),
canRecord = true,
onDismissRequest = {
showDialog = null
},
onWatch = { program ->
val channelId = program.data.channelId
if (channelId != null) {
viewModel.navigationManager.navigateTo(
Destination.Playback(
itemId = channelId,
positionMs = 0L,
),
)
} else {
Toast
.makeText(context, "Program has no channel ID", Toast.LENGTH_LONG)
.show()
}
showDialog = null
onWatch(context, viewModel.navigationManager, program)
},
onRecord = { _, _ ->
// no-op
Expand Down
Loading
Loading