Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ data class KodanshaBook(

val creators: List<KodanshaCreator>? = null,

val readableUrl: String?,
val readableUrl: String? = null,
)

@JvmInline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class YenPressMetadataProvider(

override suspend fun getSeriesMetadata(seriesId: ProviderSeriesId): ProviderSeriesMetadata {
val allBooks = client.getBookList(YenPressSeriesId(seriesId.value))
val firstBook = allBooks.firstOrNull { it.number != null }
?: (if (allBooks.size == 1) allBooks.first() else null)
?: throw IllegalStateException("Can't find first book")
val firstBook = allBooks.firstOrNull { it.number?.start != null }
?: allBooks.firstOrNull()
?: throw IllegalStateException("No books found for YenPress series ${seriesId.value}")

val seriesBook = client.getBook(firstBook.id)
val thumbnail = if (fetchSeriesCovers) client.getBookThumbnail(seriesBook) else null
Expand Down Expand Up @@ -81,16 +81,6 @@ class YenPressMetadataProvider(
}
}
.firstOrNull { nameMatcher.matches(seriesName, seriesTitleFromBook(it.title.raw)) }
?.let { getSeriesMetadata(it.id) }
}

private suspend fun getSeriesMetadata(seriesId: YenPressSeriesId): ProviderSeriesMetadata? {
val books = client.getBookList(seriesId)
val firstBook = books.find { book -> book.number?.start != null }
?: (if (books.size == 1) books.first() else null)

val seriesBook = firstBook?.let { client.getBook(it.id) } ?: return null
val thumbnail = if (fetchSeriesCovers) client.getBookThumbnail(seriesBook) else null
return metadataMapper.toSeriesMetadata(seriesBook, books, thumbnail)
?.let { getSeriesMetadata(ProviderSeriesId(it.id.value)) }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,13 @@ class MetadataService(
eventFlow.emit(ProviderSeriesEvent(provider.providerName()))
val result = try {
provider.matchSeriesMetadata(createMatchQuery(searchTitle, series, books))
} catch (e: IllegalStateException) {
// Handle YenPress empty book list case gracefully - skip provider
if (e.message?.startsWith("No books found for YenPress series") == true) {
logger.debug { "YenPress has no books for series, skipping provider" }
return null
}
throw ProviderException(provider.providerName(), e)
} catch (e: Exception) {
throw ProviderException(provider.providerName(), e)
}
Expand Down Expand Up @@ -393,6 +400,12 @@ class MetadataService(

return try {
provider.getSeriesMetadata(providerSeriesId)
} catch (e: IllegalStateException) {
// Handle YenPress empty book list case - re-throw without wrapping so it can be handled differently
if (e.message?.startsWith("No books found for YenPress series") == true) {
throw e
}
throw ProviderException(provider.providerName(), e)
} catch (e: Exception) {
throw ProviderException(provider.providerName(), e)
}
Expand Down Expand Up @@ -428,6 +441,15 @@ class MetadataService(
)
)
logger.catching(providerException)
} catch (exception: IllegalStateException) {
// Handle YenPress empty book list case gracefully - log at debug level instead of error
if (exception.message?.startsWith("No books found for YenPress series") == true) {
logger.debug { "YenPress has no books for series: ${exception.message}" }
// Don't emit error event, just complete silently
} else {
eventFlow.emit(ProcessingErrorEvent("${exception::class.simpleName}: ${exception.message}"))
logger.catching(exception)
}
} catch (exception: CancellationException) {
throw exception
} catch (exception: ResponseException) {
Expand Down