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

Reimplement guide movement & program fetching

Browse source
This commit is contained in:
Damontecres 2025-11-01 15:22:31 -04:00
parent 841b4a0907
commit 1ecbc37a07
No known key found for this signature in database
2 changed files with 278 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

57
app/src/main/java/com/github/damontecres/wholphin/ui/detail/livetv/LiveTvViewModel.kt
View file

@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.github.damontecres.wholphin.data.model.BaseItem import com.github.damontecres.wholphin.data.model.BaseItem
import com.github.damontecres.wholphin.ui.AppColors import com.github.damontecres.wholphin.ui.AppColors
import com.github.damontecres.wholphin.ui.data.RowColumn
import com.github.damontecres.wholphin.ui.detail.series.SeasonEpisode import com.github.damontecres.wholphin.ui.detail.series.SeasonEpisode
import com.github.damontecres.wholphin.ui.isNotNullOrBlank import com.github.damontecres.wholphin.ui.isNotNullOrBlank
import com.github.damontecres.wholphin.ui.launchIO import com.github.damontecres.wholphin.ui.launchIO
@ -65,8 +66,9 @@ class LiveTvViewModel
val offset = MutableLiveData(0) val offset = MutableLiveData(0)
val programOffset = MutableLiveData(0) val programOffset = MutableLiveData(0)
private val range = 10 private val range = 8
private var currentIndex = 0 private var currentIndex = 0
val fetchedRange = MutableLiveData<IntRange>(0..<range)
fun init(firstLoad: Boolean) { fun init(firstLoad: Boolean) {
start = LocalDateTime.now().truncatedTo(ChronoUnit.HOURS) start = LocalDateTime.now().truncatedTo(ChronoUnit.HOURS)
@ -92,7 +94,7 @@ class LiveTvViewModel
Timber.d("Got ${channels.size} channels") Timber.d("Got ${channels.size} channels")
channelsIdToIndex = channelsIdToIndex =
channels.withIndex().associateBy({ it.value.id }, { it.index }) channels.withIndex().associateBy({ it.value.id }, { it.index })
fetchPrograms(channels.subList(0, range.coerceAtMost(channels.size))) fetchPrograms(channels, 0..<range.coerceAtMost(channels.size))
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
this@LiveTvViewModel.channels.value = channels this@LiveTvViewModel.channels.value = channels
@ -103,12 +105,14 @@ class LiveTvViewModel
private suspend fun fetchProgramsWithLoading(channels: List<TvChannel>) { private suspend fun fetchProgramsWithLoading(channels: List<TvChannel>) {
loading.setValueOnMain(LoadingState.Loading) loading.setValueOnMain(LoadingState.Loading)
fetchPrograms(channels) fetchPrograms(channels, fetchedRange.value!!)
loading.setValueOnMain(LoadingState.Success) loading.setValueOnMain(LoadingState.Success)
} }
private suspend fun fetchPrograms(channels: List<TvChannel>) = private suspend fun fetchPrograms(
mutex.withLock { channels: List<TvChannel>,
range: IntRange,
) = mutex.withLock {
val maxStartDate = start.plusHours(MAX_HOURS).minusMinutes(1) val maxStartDate = start.plusHours(MAX_HOURS).minusMinutes(1)
val minEndDate = start.plusMinutes(1L) val minEndDate = start.plusMinutes(1L)
Timber.v("Fetching programs for ${channels.size} channels") Timber.v("Fetching programs for ${channels.size} channels")
@ -202,6 +206,7 @@ class LiveTvViewModel
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
this@LiveTvViewModel.programs.value = finalProgramList this@LiveTvViewModel.programs.value = finalProgramList
this@LiveTvViewModel.programsByChannel.value = finalProgramsByChannel this@LiveTvViewModel.programsByChannel.value = finalProgramsByChannel
this@LiveTvViewModel.fetchedRange.value = range
} }
} }
@ -310,28 +315,32 @@ class LiveTvViewModel
loading.setValueOnMain(LoadingState.Success) loading.setValueOnMain(LoadingState.Success)
} }
fun onFocusChannel(index: Int): Job? { fun onFocusChannel(position: RowColumn): Job? {
return channels.value?.let { channels -> return channels.value?.let { channels ->
val offset = offset.value!! val fetchedRange = fetchedRange.value!!
val absoluteIndex = offset + index val quarter = (fetchedRange.last - fetchedRange.start) / 4
val rangeStart = (currentIndex - range / 2).coerceAtLeast(0) val rangeStart = fetchedRange.start + quarter
val rangeEnd = (currentIndex + range / 2).coerceAtMost(channels.size) val rangeEnd = fetchedRange.last - quarter
val testRange = rangeStart..<rangeEnd
Timber.v( Timber.v(
"onFocusChannel: index=$index, currentIndex=$currentIndex, offset=$offset, rangeStart=$rangeStart, rangeEnd=$rangeEnd", "onFocusChannel: position=$position, fetchedRange=$fetchedRange, testRange=$testRange",
) )
if (absoluteIndex !in (rangeStart..<rangeEnd)) { val fetchStart = (position.row - range).coerceAtLeast(0)
val fetchStart = (absoluteIndex - range).coerceAtLeast(0) val fetchEnd = (position.row + range).coerceAtMost(channels.size)
val fetchEnd = (absoluteIndex + range).coerceAtMost(channels.size) val newFetchRange = fetchStart..<fetchEnd
Timber.v("Loading more programs for channels $fetchStart=>$fetchEnd") // If current channel is not within +/- range
// And the potential new fetch range is not wholly within the current (eg not near the top or bottom)
// Fetch new data
if (position.row !in testRange && !newFetchRange.within(fetchedRange)) {
Timber.v("Loading more programs for channels $newFetchRange")
return viewModelScope.launchIO { return viewModelScope.launchIO {
fetchPrograms(channels.subList(fetchStart, fetchEnd)) fetchPrograms(channels, newFetchRange)
val programOffset = // withContext(Dispatchers.Main) {
(offset..<fetchStart).sumOf { channelProgramCount[channels[it].id]!! } // this@LiveTvViewModel.offset.value = fetchStart
withContext(Dispatchers.Main) { // currentIndex = index
this@LiveTvViewModel.offset.value = fetchStart // this@LiveTvViewModel.programOffset.value = programOffset
currentIndex = index // }
this@LiveTvViewModel.programOffset.value = programOffset
}
} }
} }
return null return null
@ -339,6 +348,8 @@ class LiveTvViewModel
} }
} }
fun IntRange.within(other: IntRange): Boolean = this.first >= other.first && this.last <= other.last
/** /**
* Returns the number of hours between two [LocalDateTime] * Returns the number of hours between two [LocalDateTime]
*/ */

271
app/src/main/java/com/github/damontecres/wholphin/ui/detail/livetv/TvGuideGrid.kt
View file

@ -48,14 +48,13 @@ import coil3.compose.AsyncImage
import com.github.damontecres.wholphin.ui.components.CircularProgress import com.github.damontecres.wholphin.ui.components.CircularProgress
import com.github.damontecres.wholphin.ui.components.ErrorMessage import com.github.damontecres.wholphin.ui.components.ErrorMessage
import com.github.damontecres.wholphin.ui.components.LoadingPage import com.github.damontecres.wholphin.ui.components.LoadingPage
import com.github.damontecres.wholphin.ui.data.RowColumn
import com.github.damontecres.wholphin.ui.enableMarquee import com.github.damontecres.wholphin.ui.enableMarquee
import com.github.damontecres.wholphin.ui.nav.Destination import com.github.damontecres.wholphin.ui.nav.Destination
import com.github.damontecres.wholphin.ui.rememberInt import com.github.damontecres.wholphin.ui.rememberPosition
import com.github.damontecres.wholphin.ui.tryRequestFocus import com.github.damontecres.wholphin.ui.tryRequestFocus
import com.github.damontecres.wholphin.util.ExceptionHandler import com.github.damontecres.wholphin.util.ExceptionHandler
import com.github.damontecres.wholphin.util.LoadingState import com.github.damontecres.wholphin.util.LoadingState
import com.google.common.cache.CacheBuilder
import com.google.common.cache.CacheLoader
import eu.wewox.programguide.ProgramGuide import eu.wewox.programguide.ProgramGuide
import eu.wewox.programguide.ProgramGuideDimensions import eu.wewox.programguide.ProgramGuideDimensions
import eu.wewox.programguide.ProgramGuideItem import eu.wewox.programguide.ProgramGuideItem
@ -81,7 +80,7 @@ fun TvGuideGrid(
val channels by viewModel.channels.observeAsState(listOf()) val channels by viewModel.channels.observeAsState(listOf())
val programs by viewModel.programs.observeAsState(listOf()) val programs by viewModel.programs.observeAsState(listOf())
val programsByChannel by viewModel.programsByChannel.observeAsState(mapOf()) val programsByChannel by viewModel.programsByChannel.observeAsState(mapOf())
val programOffset by viewModel.programOffset.observeAsState(0) val channelOffset by viewModel.offset.observeAsState(0)
when (val state = loading) { when (val state = loading) {
is LoadingState.Error -> ErrorMessage(state, modifier) is LoadingState.Error -> ErrorMessage(state, modifier)
LoadingState.Pending, LoadingState.Pending,
@ -108,7 +107,7 @@ fun TvGuideGrid(
programs = programsByChannel, programs = programsByChannel,
channelProgramCount = viewModel.channelProgramCount, channelProgramCount = viewModel.channelProgramCount,
start = viewModel.start, start = viewModel.start,
programOffset = programOffset, channelOffset = channelOffset,
onClickChannel = { index, channel -> onClickChannel = { index, channel ->
viewModel.navigationManager.navigateTo( viewModel.navigationManager.navigateTo(
Destination.Playback( Destination.Playback(
@ -117,9 +116,7 @@ fun TvGuideGrid(
), ),
) )
}, },
onFocusChannel = { index -> onFocus = viewModel::onFocusChannel,
viewModel.onFocusChannel(index)
},
onClickProgram = { index, program -> onClickProgram = { index, program ->
if (program.isFake) { if (program.isFake) {
val now = LocalDateTime.now() val now = LocalDateTime.now()
@ -204,17 +201,33 @@ fun TvGuideGrid(
start: LocalDateTime, start: LocalDateTime,
onClickChannel: (Int, TvChannel) -> Unit, onClickChannel: (Int, TvChannel) -> Unit,
onClickProgram: (Int, TvProgram) -> Unit, onClickProgram: (Int, TvProgram) -> Unit,
onFocusChannel: (Int) -> Unit, onFocus: (RowColumn) -> Unit,
programOffset: Int, channelOffset: Int,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val context = LocalContext.current val context = LocalContext.current
val focusManager = LocalFocusManager.current val focusManager = LocalFocusManager.current
val state = rememberSaveableProgramGuideState() val state = rememberSaveableProgramGuideState()
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
var focusedProgramIndex by rememberInt(0) // var focusedProgramIndex by rememberInt(0)
var focusedChannelIndex by rememberInt(0) // var focusedChannelIndex by rememberInt(0)
var focusedItem by rememberPosition(RowColumn(0, 0))
val focusedChannelIndex = focusedItem.row
val focusedProgramIndex =
remember(channelOffset, focusedItem) {
focusedItem.let { focus ->
(channelOffset..<focus.row).sumOf { channelProgramCount[channels[it].id]!! } + focus.column
}
}
LaunchedEffect(focusedProgramIndex) {
val (channelIndex, programIndex) = focusedItem
Timber.v("Focusing on $focusedItem, programIndex=$focusedProgramIndex")
scope.launch(ExceptionHandler()) {
state.animateToProgram(focusedProgramIndex, Alignment.Center)
}
}
val dimensions = val dimensions =
ProgramGuideDimensions( ProgramGuideDimensions(
timelineHourWidth = 240.dp, timelineHourWidth = 240.dp,
@ -224,33 +237,33 @@ fun TvGuideGrid(
currentTimeWidth = 2.dp, currentTimeWidth = 2.dp,
) )
val programsBeforeChannel = // val programsBeforeChannel =
remember { // remember {
CacheBuilder // CacheBuilder
.newBuilder() // .newBuilder()
.maximumSize(200) // .maximumSize(200)
.build<Int, Int>( // .build<Int, Int>(
object : CacheLoader<Int, Int>() { // object : CacheLoader<Int, Int>() {
override fun load(key: Int): Int = // override fun load(key: Int): Int =
( // (
channels // channels
.subList(0, key) // .subList(0, key)
.map { it.id } // .map { it.id }
.sumOf { // .sumOf {
channelProgramCount[it] ?: 0 // channelProgramCount[it] ?: 0
} - programOffset // } - programOffset
).coerceAtLeast(0) // ).coerceAtLeast(0)
}, // },
) // )
} // }
var movementEnabled by remember { mutableStateOf(true) } var movementEnabled by remember { mutableStateOf(true) }
LaunchedEffect(programOffset) { // LaunchedEffect(programOffset) {
movementEnabled = false // movementEnabled = false
programsBeforeChannel.invalidateAll() // programsBeforeChannel.invalidateAll()
Timber.v("Adjusting focusedProgramIndex, $focusedProgramIndex - $programOffset") // Timber.v("Adjusting focusedProgramIndex, $focusedProgramIndex - $programOffset")
focusedProgramIndex = (focusedProgramIndex - programOffset).coerceAtLeast(0) // focusedProgramIndex = (focusedProgramIndex - programOffset).coerceAtLeast(0)
movementEnabled = true // movementEnabled = true
} // }
var gridHasFocus by rememberSaveable { mutableStateOf(false) } var gridHasFocus by rememberSaveable { mutableStateOf(false) }
var channelColumnFocused by rememberSaveable { mutableStateOf(false) } var channelColumnFocused by rememberSaveable { mutableStateOf(false) }
@ -271,13 +284,13 @@ fun TvGuideGrid(
if (!movementEnabled) { if (!movementEnabled) {
return@onPreviewKeyEvent true return@onPreviewKeyEvent true
} }
val newIndex = val item = focusedItem
val newFocusedItem =
when (it.key) { when (it.key) {
Key.Back -> { Key.Back -> {
val pos = programsBeforeChannel.get(focusedChannelIndex) if (item.column > 0) {
if (focusedProgramIndex - pos > 0) {
// Not at beginning of row, so move to beginning // Not at beginning of row, so move to beginning
pos item.copy(column = 0)
} else { } else {
// At beginning, so allow normal back button behavior // At beginning, so allow normal back button behavior
return@onPreviewKeyEvent false return@onPreviewKeyEvent false
@ -287,20 +300,9 @@ fun TvGuideGrid(
Key.DirectionRight -> { Key.DirectionRight -> {
if (channelColumnFocused) { if (channelColumnFocused) {
channelColumnFocused = false channelColumnFocused = false
focusedProgramIndex item.copy(column = 0)
} else { } else {
val nextProgramIndex = focusedProgramIndex + 1 item.copy(column = item.column + 1)
val programsBefore =
programsBeforeChannel.get(focusedChannelIndex)
val relativePosition = nextProgramIndex - programsBefore
val channelPrograms =
programs[channels[focusedChannelIndex].id].orEmpty()
if (relativePosition >= channelPrograms.size) {
focusManager.moveFocus(FocusDirection.Right)
null
} else {
nextProgramIndex
}
} }
} }
@ -308,54 +310,45 @@ fun TvGuideGrid(
if (channelColumnFocused) { if (channelColumnFocused) {
focusManager.moveFocus(FocusDirection.Left) focusManager.moveFocus(FocusDirection.Left)
null null
} else { } else if (item.column == 0) {
val nextProgramIndex = focusedProgramIndex - 1
val programsBefore =
programsBeforeChannel.get(focusedChannelIndex)
val relativePosition = nextProgramIndex - programsBefore
// val channelPrograms =
// programs[channels[focusedChannel].id].orEmpty()
if (relativePosition >= 0) {
nextProgramIndex
} else if (relativePosition == CHANNEL_COLUMN) {
channelColumnFocused = true channelColumnFocused = true
focusedProgramIndex item
} else { } else {
Timber.w("Move left to relativePosition=$relativePosition should not occur") item.copy(column = item.column - 1)
focusManager.moveFocus(FocusDirection.Left)
null
}
} }
} }
Key.DirectionUp -> { Key.DirectionUp -> {
val newFocusedChannelIndex = (focusedChannelIndex - 1) if (item.row <= 0) {
// Timber.v("newFocusedChannelIndex=$newFocusedChannelIndex")
if (newFocusedChannelIndex < 0) {
focusManager.moveFocus(FocusDirection.Up) focusManager.moveFocus(FocusDirection.Up)
null null
} else if (channelColumnFocused) {
focusedChannelIndex = newFocusedChannelIndex
programsBeforeChannel.get(focusedChannelIndex)
} else { } else {
val start = programList[focusedProgramIndex].startHours val newChannelIndex = item.row - 1
focusedChannelIndex = if (channelColumnFocused) {
newFocusedChannelIndex.coerceAtLeast(0) RowColumn(newChannelIndex, 0)
val channelId = channels[focusedChannelIndex].id } else {
val pro = programs[channelId].orEmpty() val currentChannel = channels[item.row].id
val currentProgram =
programs[currentChannel]?.get(item.column)
if (currentProgram == null) {
item
} else {
val start = currentProgram.startHours
val newChannelPrograms =
programs[channels[newChannelIndex].id].orEmpty()
val pIndex = val pIndex =
pro.indexOfFirst { start in (it.startHours..<it.endHours) } newChannelPrograms.indexOfFirst { start in (it.startHours..<it.endHours) }
if (pIndex >= 0) { if (pIndex >= 0) {
programsBeforeChannel.get(focusedChannelIndex) + pIndex RowColumn(newChannelIndex, pIndex)
} else { } else {
val pIndex = pro.indexOfFirst { it.startHours >= start } val pIndex =
newChannelPrograms.indexOfFirst { it.startHours >= start }
if (pIndex >= 0) { if (pIndex >= 0) {
programsBeforeChannel.get(focusedChannelIndex) + pIndex RowColumn(newChannelIndex, pIndex)
} else { } else {
programsBeforeChannel.get(focusedChannelIndex) + ( RowColumn(newChannelIndex, 0)
programs[channelId]?.size }
?: 0 }
)
} }
} }
} }
@ -363,49 +356,53 @@ fun TvGuideGrid(
Key.DirectionDown -> { Key.DirectionDown -> {
// Move channel focus down // Move channel focus down
val newFocusedChannelIndex = (focusedChannelIndex + 1) val newChannelIndex = item.row + 1
if (newFocusedChannelIndex >= channels.size) { if (newChannelIndex >= channels.size) {
// If trying to move below the final channel, then move focus out of the grid // If trying to move below the final channel, then move focus out of the grid
focusManager.moveFocus(FocusDirection.Down) focusManager.moveFocus(FocusDirection.Down)
null null
} else if (channelColumnFocused) { } else if (channelColumnFocused) {
// If focused on the channel column, move down a channel // If focused on the channel column, move down a channel
focusedChannelIndex = RowColumn(newChannelIndex, 0)
newFocusedChannelIndex.coerceAtMost(channels.size - 1)
programsBeforeChannel.get(focusedChannelIndex)
} else { } else {
// Otherwise, moving to a new row // Otherwise, moving to a new row
focusedChannelIndex = // Get current program & its start time
newFocusedChannelIndex.coerceAtMost(channels.size - 1) val currentChannel = channels[item.row].id
val currentProgram =
programs[currentChannel]?.get(item.column)
if (currentProgram == null) {
// Data is loading in the background
item
} else {
val start = currentProgram.startHours
// Get the new row/channel's programs // Get the new row/channel's programs
val channelId = channels[focusedChannelIndex].id val newChannelPrograms =
val pro = programs[channelId].orEmpty() programs[channels[newChannelIndex].id].orEmpty()
// When the currently focused program starts
val start = programList[focusedProgramIndex].startHours
// Find the first program where the start time (of the previously focused program) is in the middle of a program // Find the first program where the start time (of the previously focused program) is in the middle of a program
val pIndex = val pIndex =
pro.indexOfFirst { start in (it.startHours..<it.endHours) } newChannelPrograms.indexOfFirst { start in (it.startHours..<it.endHours) }
if (pIndex >= 0) { if (pIndex >= 0) {
// Found one, so focus on it // Found one, so focus on it
// Get the sum of all of the previous channels' program sizes, plus the index found to convert a relative program index into absolute RowColumn(newChannelIndex, pIndex)
programsBeforeChannel.get(focusedChannelIndex) + pIndex
} else { } else {
// Didn't find one, probably due to missing data // Didn't find one, probably due to missing data
// So now first the first one that starts after the previously focused program // So now first the first one that starts after the previously focused program
val pIndex = pro.indexOfFirst { it.startHours >= start } val pIndex =
newChannelPrograms.indexOfFirst { it.startHours >= start }
if (pIndex >= 0) { if (pIndex >= 0) {
// Found one, so focus on it // Found one, so focus on it
programsBeforeChannel.get(focusedChannelIndex) + pIndex RowColumn(newChannelIndex, pIndex)
} else { } else {
// Did not find one, so focus on the final program in the list // Did not find one, so focus on the final program in the list
programsBeforeChannel.get(focusedChannelIndex) + ( RowColumn(
programs[channelId]?.size newChannelIndex,
?: 0 newChannelPrograms.size - 1,
) )
} }
} }
} }
} }
}
Key.DirectionCenter, Key.Enter, Key.NumPadEnter -> { Key.DirectionCenter, Key.Enter, Key.NumPadEnter -> {
if (channelColumnFocused) { if (channelColumnFocused) {
@ -413,9 +410,15 @@ fun TvGuideGrid(
Timber.v("Clicked on %s", channel) Timber.v("Clicked on %s", channel)
onClickChannel.invoke(focusedChannelIndex, channel) onClickChannel.invoke(focusedChannelIndex, channel)
} else { } else {
val program = programList[focusedProgramIndex] val currentChannel = channels[item.row].id
Timber.v("Clicked on %s", program) val currentProgram =
onClickProgram.invoke(focusedProgramIndex, program) programs[currentChannel]?.get(item.column)
if (currentProgram == null) {
// Data is loading in the background
return@onPreviewKeyEvent true
}
Timber.v("Clicked on %s", currentProgram)
onClickProgram.invoke(focusedProgramIndex, currentProgram)
} }
null null
} }
@ -424,28 +427,34 @@ fun TvGuideGrid(
null null
} }
} }
if (newIndex != null) {
// Timber.v("newIndex=$newIndex") if (newFocusedItem != null) {
if (newIndex >= 0) { focusedItem = newFocusedItem
val before = programsBeforeChannel.get(focusedChannelIndex) onFocus(newFocusedItem)
val max =
before +
channels[focusedChannelIndex].let {
programs[it.id]?.size ?: 0
} - 1
val index = newIndex.coerceIn(before, max)
Timber.v("move: programIndex=$index, channelIndex=$focusedChannelIndex")
scope.launch(ExceptionHandler()) {
focusedProgramIndex = index
state.animateToProgram(index, Alignment.Center)
onFocusChannel.invoke(focusedChannelIndex)
}
return@onPreviewKeyEvent true
} else {
Timber.w("newIndex is <0: $newIndex")
return@onPreviewKeyEvent true return@onPreviewKeyEvent true
} }
} // if (newIndex != null) {
// // Timber.v("newIndex=$newIndex")
// if (newIndex >= 0) {
// val before = programsBeforeChannel.get(focusedChannelIndex)
// val max =
// before +
// channels[focusedChannelIndex].let {
// programs[it.id]?.size ?: 0
// } - 1
// val index = newIndex.coerceIn(before, max)
// Timber.v("move: programIndex=$index, channelIndex=$focusedChannelIndex")
// scope.launch(ExceptionHandler()) {
// focusedProgramIndex = index
// state.animateToProgram(index, Alignment.Center)
// onFocusChannel.invoke(focusedChannelIndex)
// }
// return@onPreviewKeyEvent true
// } else {
// Timber.w("newIndex is <0: $newIndex")
// return@onPreviewKeyEvent true
// }
// }
return@onPreviewKeyEvent false return@onPreviewKeyEvent false
}, },
) { ) {