justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-09 16:11:20 +02:00
Code Issues Projects Packages Wiki Activity Actions

Fix possible TV guide crash & update Play All libraries (#315)

Browse source 
- Fixes a possible crash if the server has Live TV enabled, but no
channels
- Disable Play All/Shuffle for Collections "library"
This commit is contained in:
damontecres 2025-11-24 11:40:15 -05:00 • committed by GitHub
parent 6004687deb
commit 7be4fb5fdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 156 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

105
app/src/main/java/com/github/damontecres/wholphin/data/model/GetItemsFilter.kt
View file

@ -52,56 +52,65 @@ data class GetItemsFilter(
return newFilter
}
fun applyTo(req: GetItemsRequest) =
req.copy(
includeItemTypes = includeItemTypes,
isFavorite = favorite,
genreIds = genres,
minCommunityRating = minCommunityRating,
personIds = persons,
isPlayed = played,
studioIds = studios,
tags = tags,
officialRatings = officialRatings,
years =
buildSet {
years?.letNotEmpty(::addAll)
decades?.forEach { addAll(it..<(it + 10)) }
},
is4k =
videoTypes?.letNotEmpty {
videoTypes.contains(FilterVideoType.FOUR_K).takeIf { it }
},
isHd =
videoTypes?.letNotEmpty {
if (videoTypes.contains(FilterVideoType.HD)) {
true
} else if (videoTypes.contains(FilterVideoType.SD)) {
false
} else {
null
}
},
is3d =
videoTypes?.letNotEmpty {
videoTypes.contains(FilterVideoType.THREE_D).takeIf { it }
},
videoTypes =
videoTypes?.letNotEmpty {
it.mapNotNull {
when (it) {
FilterVideoType.FOUR_K,
FilterVideoType.HD,
FilterVideoType.SD,
FilterVideoType.THREE_D,
-> null
/**
* Add the filtering from this into the [GetItemsRequest], overwriting the fields
*
* @param req the [GetItemsRequest]
* @param overwriteIncludeTypes whether the includeItemTypes field should be overwritten (used from this) or used as-is from the [GetItemsRequest]
*
*/
fun applyTo(
req: GetItemsRequest,
overwriteIncludeTypes: Boolean = true,
) = req.copy(
includeItemTypes = if (overwriteIncludeTypes) includeItemTypes else req.includeItemTypes,
isFavorite = favorite,
genreIds = genres,
minCommunityRating = minCommunityRating,
personIds = persons,
isPlayed = played,
studioIds = studios,
tags = tags,
officialRatings = officialRatings,
years =
buildSet {
years?.letNotEmpty(::addAll)
decades?.forEach { addAll(it..<(it + 10)) }
},
is4k =
videoTypes?.letNotEmpty {
videoTypes.contains(FilterVideoType.FOUR_K).takeIf { it }
},
isHd =
videoTypes?.letNotEmpty {
if (videoTypes.contains(FilterVideoType.HD)) {
true
} else if (videoTypes.contains(FilterVideoType.SD)) {
false
} else {
null
}
},
is3d =
videoTypes?.letNotEmpty {
videoTypes.contains(FilterVideoType.THREE_D).takeIf { it }
},
videoTypes =
videoTypes?.letNotEmpty {
it.mapNotNull {
when (it) {
FilterVideoType.FOUR_K,
FilterVideoType.HD,
FilterVideoType.SD,
FilterVideoType.THREE_D,
-> null
FilterVideoType.BLU_RAY -> VideoType.BLU_RAY
FilterVideoType.DVD -> VideoType.DVD
}
FilterVideoType.BLU_RAY -> VideoType.BLU_RAY
FilterVideoType.DVD -> VideoType.DVD
}
},
)
}
},
)
fun applyTo(req: GetPersonsRequest) =
req.copy(