Skip to content

Commit fe44ccc

Browse files
committed
fix mangabaka download directory
1 parent 7786fc7 commit fe44ccc

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

komf-app/src/main/kotlin/snd/komf/app/config/ConfigLoader.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ class ConfigLoader(private val yaml: Yaml) {
4545
val appriseConfig = config.notifications.apprise
4646
val discordConfig = config.notifications.discord
4747
val templatesDirectory = configDirectory ?: notificationConfig.templatesDirectory
48+
val mangaBakaDirectory = configDirectory?.let { "$it/mangabaka" }
49+
?: config.metadataProviders.mangabakaDatabaseDir
4850

4951
val appriseUrls = System.getenv("KOMF_APPRISE_URLS")?.ifBlank { null }
5052
?.split(",")?.toList()
@@ -67,11 +69,11 @@ class ConfigLoader(private val yaml: Yaml) {
6769
val logLevel = System.getenv("KOMF_LOG_LEVEL")?.ifBlank { null } ?: config.logLevel
6870

6971
val metadataProvidersConfig = config.metadataProviders
70-
val malClientId = System.getenv("KOMF_METADATA_PROVIDERS_MAL_CLIENT_ID")?.ifBlank { null }?.toString()
72+
val malClientId = System.getenv("KOMF_METADATA_PROVIDERS_MAL_CLIENT_ID")?.ifBlank { null }
7173
?: metadataProvidersConfig.malClientId
72-
val comicVineApiKey = System.getenv("KOMF_METADATA_PROVIDERS_COMIC_VINE_API_KEY")?.ifBlank { null }?.toString()
74+
val comicVineApiKey = System.getenv("KOMF_METADATA_PROVIDERS_COMIC_VINE_API_KEY")?.ifBlank { null }
7375
?: metadataProvidersConfig.comicVineApiKey
74-
val bangumiToken = System.getenv("KOMF_METADATA_PROVIDERS_BANGUMI_TOKEN")?.ifBlank { null }?.toString()
76+
val bangumiToken = System.getenv("KOMF_METADATA_PROVIDERS_BANGUMI_TOKEN")?.ifBlank { null }
7577
?: metadataProvidersConfig.bangumiToken
7678

7779
return config.copy(
@@ -91,7 +93,8 @@ class ConfigLoader(private val yaml: Yaml) {
9193
metadataProviders = metadataProvidersConfig.copy(
9294
malClientId = malClientId,
9395
comicVineApiKey = comicVineApiKey,
94-
bangumiToken = bangumiToken
96+
bangumiToken = bangumiToken,
97+
mangabakaDatabaseDir = mangaBakaDirectory
9598
),
9699
notifications = config.notifications.copy(
97100
templatesDirectory = templatesDirectory,

komf-core/src/commonMain/kotlin/snd/komf/providers/mangabaka/db/MangaBakaDbDownloader.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ class MangaBakaDbDownloader(
9191
databaseFile.deleteIfExists()
9292
dbMetadata.delete()
9393
progressFlow.emit(
94-
MangaBakaDownloadProgress.ErrorEvent(
95-
e.message ?: "Encountered unexpected error during database download"
96-
)
94+
MangaBakaDownloadProgress.ErrorEvent("${e::class.simpleName}: ${e.message}")
9795
)
9896
} finally {
9997
lockedMutex.unlock()

0 commit comments

Comments
 (0)