Skip to content

fix: graceful per-provider failure handling #316

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

Open
sloth-of-all-trades wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −14
Open

fix: graceful per-provider failure handling #316

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
54 changes: 40 additions & 14 deletions komf-mediaserver/src/commonMain/kotlin/snd/komf/mediaserver/metadata/MetadataService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,32 @@ class MetadataService(
val providers = metadataProviders.providers(libraryId.value)

return providers
.map { coroutineScope.async { it.searchSeries(seriesName) } }
.map { provider ->
coroutineScope.async {
try {
provider.searchSeries(seriesName)
} catch (e: Exception) {
logger.error(e) { "search failed for provider ${provider.providerName()}" }
emptyList()
}
}
}
.flatMap { it.await() }
}

suspend fun searchSeriesMetadata(seriesName: String): Collection<SeriesSearchResult> {
val providers = metadataProviders.defaultProvidersList()
return providers
.map { coroutineScope.async { it.searchSeries(seriesName) } }
.map { provider ->
coroutineScope.async {
try {
provider.searchSeries(seriesName)
} catch (e: Exception) {
logger.error(e) { "search failed for provider ${provider.providerName()}" }
emptyList()
}
}
}
.flatMap { it.await() }
}

Expand Down Expand Up @@ -231,7 +249,9 @@ class MetadataService(
val result = try {
provider.matchSeriesMetadata(createMatchQuery(searchTitle, series, books))
} catch (e: Exception) {
throw ProviderException(provider.providerName(), e)
logger.error(e) { "match failed for provider ${provider.providerName()}" }
eventFlow.emit(ProviderErrorEvent(provider.providerName(), "${e::class.simpleName}: ${e.message}"))
null
}

if (result != null) {
Expand Down Expand Up @@ -268,7 +288,8 @@ class MetadataService(
}.toMap()

} catch (e: Exception) {
throw ProviderException(provider.providerName(), e)
logger.error(e) { "book metadata fetch failed for provider ${provider.providerName()}" }
metadataMatch.mapValues { it.value?.let { null } }
}
}

Expand Down Expand Up @@ -333,17 +354,22 @@ class MetadataService(
return providers
.map { provider ->
coroutineScope.async {
matchSeries(
series = series,
books = books,
searchTitles = searchTitles,
provider = provider,
bookEdition = edition,
eventFlow = eventFlow
).also {
eventFlow.emit(ProviderCompletedEvent(provider.providerName()))
try {
matchSeries(
series = series,
books = books,
searchTitles = searchTitles,
provider = provider,
bookEdition = edition,
eventFlow = eventFlow
).also {
eventFlow.emit(ProviderCompletedEvent(provider.providerName()))
}
} catch (e: Exception) {
logger.error(e) { "aggregation failed for provider ${provider.providerName()}" }
eventFlow.emit(ProviderErrorEvent(provider.providerName(), "${e::class.simpleName}: ${e.message}"))
null
}

}
}
.mapNotNull { it.await() }
Expand Down