nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle empty mediaSources

Browse source
This commit is contained in:
jarnedemeulemeester 2021-08-25 11:00:58 +02:00
parent 2ff9239e8c
commit d53fbf3369
No known key found for this signature in database
GPG key ID: 60884A0C1EBA43E5
6 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt
View file

@ -37,7 +37,7 @@ class EpisodeBottomSheetFragment : BottomSheetDialogFragment() {
binding.playButton.setOnClickListener { binding.playButton.setOnClickListener {
binding.playButton.setImageResource(android.R.color.transparent) binding.playButton.setImageResource(android.R.color.transparent)
binding.progressCircular.visibility = View.VISIBLE binding.progressCircular.visibility = View.VISIBLE
viewModel.preparePlayer() viewModel.preparePlayerItems()
} }
binding.checkButton.setOnClickListener { binding.checkButton.setOnClickListener {

2
app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt
View file

@ -190,7 +190,7 @@ class MediaInfoFragment : Fragment() {
} }
} }
} else if (args.itemType == "Series") { } else if (args.itemType == "Series") {
viewModel.preparePlayer() viewModel.preparePlayerItems()
} }
} }

2
app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepository.kt
View file

@ -32,7 +32,7 @@ interface JellyfinRepository {
seriesId: UUID, seriesId: UUID,
seasonId: UUID, seasonId: UUID,
fields: List<ItemFields>? = null, fields: List<ItemFields>? = null,
startIndex: Int? = null startItemId: UUID? = null
): List<BaseItemDto> ): List<BaseItemDto>
suspend fun getMediaSources(itemId: UUID): List<MediaSourceInfo> suspend fun getMediaSources(itemId: UUID): List<MediaSourceInfo>

4
app/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt
View file

@ -115,7 +115,7 @@ class JellyfinRepositoryImpl(private val jellyfinApi: JellyfinApi) : JellyfinRep
seriesId: UUID, seriesId: UUID,
seasonId: UUID, seasonId: UUID,
fields: List<ItemFields>?, fields: List<ItemFields>?,
startIndex: Int? startItemId: UUID?
): List<BaseItemDto> { ): List<BaseItemDto> {
val episodes: List<BaseItemDto> val episodes: List<BaseItemDto>
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
@ -124,7 +124,7 @@ class JellyfinRepositoryImpl(private val jellyfinApi: JellyfinApi) : JellyfinRep
jellyfinApi.userId!!, jellyfinApi.userId!!,
seasonId = seasonId, seasonId = seasonId,
fields = fields, fields = fields,
startIndex = startIndex startItemId = startItemId
).content.items ?: listOf() ).content.items ?: listOf()
} }
return episodes return episodes

6
app/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt
View file

@ -61,7 +61,7 @@ constructor(
} }
} }
fun preparePlayer() { fun preparePlayerItems() {
_playerItemsError.value = null _playerItemsError.value = null
viewModelScope.launch { viewModelScope.launch {
try { try {
@ -77,12 +77,14 @@ constructor(
val episodes = jellyfinRepository.getEpisodes( val episodes = jellyfinRepository.getEpisodes(
startEpisode.seriesId!!, startEpisode.seriesId!!,
startEpisode.seasonId!!, startEpisode.seasonId!!,
startIndex = startEpisode.indexNumber?.minus(1) startItemId = startEpisode.id
) )
for (episode in episodes) { for (episode in episodes) {
val mediaSources = jellyfinRepository.getMediaSources(episode.id) val mediaSources = jellyfinRepository.getMediaSources(episode.id)
if (mediaSources.isEmpty()) continue
playerItems.add(PlayerItem(episode.id, mediaSources[0].id!!)) playerItems.add(PlayerItem(episode.id, mediaSources[0].id!!))
} }
if (playerItems.isEmpty()) throw Exception("No playable items found")
} }
fun markAsPlayed(itemId: UUID) { fun markAsPlayed(itemId: UUID) {

11
app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt
View file

@ -183,7 +183,7 @@ constructor(private val jellyfinRepository: JellyfinRepository) : ViewModel() {
} }
} }
fun preparePlayer() { fun preparePlayerItems() {
_playerItemsError.value = null _playerItemsError.value = null
viewModelScope.launch { viewModelScope.launch {
try { try {
@ -198,9 +198,14 @@ constructor(private val jellyfinRepository: JellyfinRepository) : ViewModel() {
private suspend fun createPlayerItems(series: BaseItemDto) { private suspend fun createPlayerItems(series: BaseItemDto) {
if (nextUp.value != null) { if (nextUp.value != null) {
val startEpisode = nextUp.value!! val startEpisode = nextUp.value!!
val episodes = jellyfinRepository.getEpisodes(startEpisode.seriesId!!, startEpisode.seasonId!!, startIndex = startEpisode.indexNumber?.minus(1)) val episodes = jellyfinRepository.getEpisodes(
startEpisode.seriesId!!,
startEpisode.seasonId!!,
startItemId = startEpisode.id
)
for (episode in episodes) { for (episode in episodes) {
val mediaSources = jellyfinRepository.getMediaSources(episode.id) val mediaSources = jellyfinRepository.getMediaSources(episode.id)
if (mediaSources.isEmpty()) continue
playerItems.add(PlayerItem(episode.id, mediaSources[0].id!!)) playerItems.add(PlayerItem(episode.id, mediaSources[0].id!!))
} }
} else { } else {
@ -209,10 +214,12 @@ constructor(private val jellyfinRepository: JellyfinRepository) : ViewModel() {
val episodes = jellyfinRepository.getEpisodes(series.id, season.id) val episodes = jellyfinRepository.getEpisodes(series.id, season.id)
for (episode in episodes) { for (episode in episodes) {
val mediaSources = jellyfinRepository.getMediaSources(episode.id) val mediaSources = jellyfinRepository.getMediaSources(episode.id)
if (mediaSources.isEmpty()) continue
playerItems.add(PlayerItem(episode.id, mediaSources[0].id!!)) playerItems.add(PlayerItem(episode.id, mediaSources[0].id!!))
} }
} }
} }
if (playerItems.isEmpty()) throw Exception("No playable items found")
} }
fun navigateToPlayer(mediaSource: MediaSourceInfo) { fun navigateToPlayer(mediaSource: MediaSourceInfo) {