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

Support requesting 4k media in discover (#685)

Browse source 
## Description
If the server support it and the user has permission, allows for
requesting 4K media

### Related issues
A follow up to #558
This commit is contained in:
Ray 2026-01-12 21:55:50 -05:00 • committed by GitHub
parent 4c7c465c67
commit 80670c3e0f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 138 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/com/github/damontecres/wholphin/services/SeerrServerRepository.kt
View file

@ -7,12 +7,15 @@ import androidx.lifecycle.lifecycleScope
import com.github.damontecres.wholphin.api.seerr.SeerrApiClient
import com.github.damontecres.wholphin.api.seerr.model.AuthJellyfinPostRequest
import com.github.damontecres.wholphin.api.seerr.model.AuthLocalPostRequest
import com.github.damontecres.wholphin.api.seerr.model.PublicSettings
import com.github.damontecres.wholphin.api.seerr.model.User
import com.github.damontecres.wholphin.data.SeerrServerDao
import com.github.damontecres.wholphin.data.ServerRepository
import com.github.damontecres.wholphin.data.model.SeerrAuthMethod
import com.github.damontecres.wholphin.data.model.SeerrPermission
import com.github.damontecres.wholphin.data.model.SeerrServer
import com.github.damontecres.wholphin.data.model.SeerrUser
import com.github.damontecres.wholphin.data.model.hasPermission
import com.github.damontecres.wholphin.services.hilt.StandardOkHttpClient
import com.github.damontecres.wholphin.ui.launchIO
import com.github.damontecres.wholphin.util.LoadingState
@ -60,8 +63,9 @@ class SeerrServerRepository
user: SeerrUser,
userConfig: SeerrUserConfig,
) {
val publicSettings = seerrApi.api.settingsApi.settingsPublicGet()
_current.update {
CurrentSeerr(server, user, userConfig)
CurrentSeerr(server, user, userConfig, publicSettings)
}
}
@ -134,13 +138,8 @@ class SeerrServerRepository
passwordOrApiKey: String,
): LoadingState {
val api = SeerrApiClient(url, passwordOrApiKey, okHttpClient)
try {
login(api, authMethod, username, passwordOrApiKey)
return LoadingState.Success
} catch (ex: Exception) {
Timber.w(ex, "Error testing seerr connection")
return LoadingState.Error(ex)
}
login(api, authMethod, username, passwordOrApiKey)
return LoadingState.Success
}
suspend fun removeServer() {
@ -159,7 +158,18 @@ data class CurrentSeerr(
val server: SeerrServer,
val user: SeerrUser,
val config: SeerrUserConfig,
)
val serverConfig: PublicSettings,
) {
val request4kMovieEnabled: Boolean
get() =
(serverConfig.movie4kEnabled ?: false) &&
config.hasPermission(SeerrPermission.REQUEST_4K_MOVIE)
val request4kTvEnabled: Boolean
get() =
(serverConfig.series4kEnabled ?: false) &&
config.hasPermission(SeerrPermission.REQUEST_4K_TV)
}
private suspend fun login(
client: SeerrApiClient,