Skip to content

Resolve IMDb ids to TMDB ids before invoking plugin scrapers #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chegri1 wants to merge 1 commit into from
+17 −2
Closed

Resolve IMDb ids to TMDB ids before invoking plugin scrapers #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion composeApp/src/commonMain/kotlin/com/nuvio/app/features/streams/StreamsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.nuvio.app.features.player.PlayerSettingsRepository
import com.nuvio.app.features.plugins.PluginRepository
import com.nuvio.app.features.plugins.pluginContentId
import com.nuvio.app.features.plugins.PluginsUiState
import com.nuvio.app.features.tmdb.TmdbService
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
Expand Down Expand Up @@ -460,13 +461,22 @@ object StreamsRepository {
}
}

// Most scrapers expect a numeric TMDB id, but videoId is frequently an
// IMDb id (e.g. from Cinemeta). Resolve it once up front so every scraper
// gets a usable id instead of each independently failing TMDB lookups.
val resolvedPluginTmdbId = if (pluginProviderGroups.isNotEmpty()) {
runCatchingUnlessCancelled { TmdbService.ensureTmdbId(videoId, type) }.getOrNull()
} else {
null
}

pluginProviderGroups.forEach { providerGroup ->
val includeScraperNameInSubtitle = false
providerGroup.scrapers.forEach { scraper ->
launch {
val completion = PluginRepository.executeScraper(
scraper = scraper,
tmdbId = pluginContentId(
tmdbId = resolvedPluginTmdbId ?: pluginContentId(
videoId = videoId,
season = season,
episode = episode,
Expand Down
7 changes: 6 additions & 1 deletion composeApp/src/commonMain/kotlin/com/nuvio/app/features/tmdb/TmdbService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,13 @@ object TmdbService {
}.getOrNull()
}

// Public demo TMDB v3 key, used as a fallback so IMDb->TMDB id resolution for
// plugin scrapers works even when the user hasn't configured a personal TMDB
// API key. This is the same key several community scraper plugins embed directly.
private const val FALLBACK_API_KEY = "439c478a771f35c05022f9feabcca01c"

private fun currentApiKey(): String? =
TmdbSettingsRepository.snapshot().apiKey.trim().takeIf(String::isNotBlank)
TmdbSettingsRepository.snapshot().apiKey.trim().takeIf(String::isNotBlank) ?: FALLBACK_API_KEY

internal fun normalizeMediaType(mediaType: String): String =
when (mediaType.trim().lowercase()) {
Expand Down