kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2026-11-04 10:13:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(audio-api): enhance fallback mechanism for text search results in YouTube

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2026-10-16 14:29:43 +06:00
parent 09d77211b9
commit da394d40ea
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
composeApp/src/commonMain/kotlin/dev/krtirtho/spotube/core/zipline/plugin_apis/newpipe_yt/RealNewPipeAudioAPI.kt
View File

@ -193,6 +193,8 @@ class RealNewPipeAudioAPI : AudioAPI, KoinComponent {
val sources = linkedMapOf<String, AudioSource.Basic>() val sources = linkedMapOf<String, AudioSource.Basic>()
val searched = mutableSetOf<Pair<String, SearchKind>>() val searched = mutableSetOf<Pair<String, SearchKind>>()
// Results of the text searches in YouTube's relevance order, used if nothing scores well
val textSearchResults = linkedMapOf<String, AudioSource.Basic>()
for ((stage, request) in plan) { for ((stage, request) in plan) {
if (sources.values.any { it.confidence >= confidentMatch }) break if (sources.values.any { it.confidence >= confidentMatch }) break
if (!searched.add(request)) continue if (!searched.add(request)) continue
@ -208,6 +210,7 @@ class RealNewPipeAudioAPI : AudioAPI, KoinComponent {
"[Search] stage '$stage' best confidence=${scored.maxOfOrNull { it.confidence }} " + "[Search] stage '$stage' best confidence=${scored.maxOfOrNull { it.confidence }} " +
"(need >= $confidentMatch to stop)" "(need >= $confidentMatch to stop)"
} }
if (stage != "isrc") scored.forEach { if (it.id !in textSearchResults) textSearchResults[it.id] = it }
scored.forEach { s -> scored.forEach { s ->
val existing = sources[s.id] val existing = sources[s.id]
if (existing == null || existing.confidence < s.confidence) sources[s.id] = s if (existing == null || existing.confidence < s.confidence) sources[s.id] = s
@ -223,8 +226,19 @@ class RealNewPipeAudioAPI : AudioAPI, KoinComponent {
}.joinToString("\n") }.joinToString("\n")
} }
// Never play a result that does not match the track at all if (matched.isNotEmpty()) return matched.take(5)
return matched.take(5)
// Nothing scored well. Playing YouTube's best text-search guess beats failing playback,
// and ISRC results are skipped because an ISRC text search tends to return unrelated songs.
val fallback = textSearchResults.values.toList()
.sortedByDescending { it.confidence } // stable: ties keep YouTube's relevance order
.take(5)
.ifEmpty { ranked.take(5) }
logger.w {
"[Search] no confident match for '${track.title}'; falling back to best guesses: " +
fallback.joinToString { "${it.id} conf=${it.confidence} '${it.title}'" }
}
return fallback
} }
override suspend fun getStreamsOfAudioSource(source: AudioSource.Basic): List<AudioSource.Streamed> { override suspend fun getStreamsOfAudioSource(source: AudioSource.Basic): List<AudioSource.Streamed> {