Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-08-09 00:17:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 435116bdae into 755f6ff9b8

Browse source
This commit is contained in:
Václav 2026-07-23 18:53:58 -04:00 committed by GitHub
commit 1fec1f5559
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composeApp/src/commonMain/kotlin/com/nuvio/app/features/plugins/PluginModels.kt
View file

@ -79,6 +79,7 @@ data class PluginRuntimeResult(
val infoHash: String? = null,
val headers: Map<String, String>? = null,
val subtitles: List<PluginSubtitleResult>? = null,
val clientResolve: com.nuvio.app.features.streams.StreamClientResolve? = null,
)
@Serializable

1
composeApp/src/commonMain/kotlin/com/nuvio/app/features/streams/StreamFetchSupport.kt
View file

@ -116,6 +116,7 @@ internal fun PluginRuntimeResult.toStreamItem(
addonName = addonName,
addonId = addonId,
streamType = normalizeStreamType(type),
clientResolve = clientResolve,
behaviorHints = if (requestHeaders.isEmpty()) {
StreamBehaviorHints()
} else {

2
composeApp/src/commonMain/kotlin/com/nuvio/app/features/streams/StreamModels.kt
View file

@ -74,7 +74,7 @@ data class StreamItem(
get() = clientResolve?.isDirectDebridCandidate == true
val isInstalledAddonStream: Boolean
get() = addonId.startsWith("addon:")
get() = addonId.startsWith("addon:") || addonId.startsWith("plugin:")
val isTorrentStream: Boolean
get() = !isDirectDebridStream && (

14
composeApp/src/fullCommonMain/kotlin/com/nuvio/app/features/plugins/runtime/PluginRuntime.kt
View file

@ -229,10 +229,19 @@ internal object PluginRuntime {
)
}?.takeIf { it.isNotEmpty() }
val clientResolve = (item["clientResolve"] as? JsonObject)?.let { resolveObj ->
com.nuvio.app.features.streams.StreamClientResolve(
type = resolveObj["type"]?.jsonPrimitive?.contentOrNull,
infoHash = resolveObj["infoHash"]?.jsonPrimitive?.contentOrNull,
service = resolveObj["service"]?.jsonPrimitive?.contentOrNull,
isCached = resolveObj["isCached"]?.jsonPrimitive?.contentOrNull?.toBoolean() ?: resolveObj["isCached"]?.jsonPrimitive?.booleanOrNull
)
}
PluginRuntimeResult(
title = item.stringOrNull("title") ?: item.stringOrNull("name") ?: runBlocking { getString(Res.string.generic_unknown) },
name = item.stringOrNull("name"),
url = url,
url = url ?: "", // Default to empty if missing but clientResolve is present
quality = item.stringOrNull("quality"),
size = item.stringOrNull("size"),
language = item.stringOrNull("language"),
@ -243,8 +252,9 @@ internal object PluginRuntime {
infoHash = item.stringOrNull("infoHash"),
headers = headers,
subtitles = subtitles,
clientResolve = clientResolve,
)
}.filter { it.url.isNotBlank() }
}.filter { it.url.isNotBlank() || it.clientResolve != null }
}.getOrElse { emptyList() }
}