Merge branch 'master' of github.com:Suwayomi/Tachidesk

This commit is contained in:
Aria Moradi 2021-05-19 13:42:59 +04:30
commit 29dea10be2

View File

@ -64,11 +64,7 @@ object LegacyBackupImport : LegacyBackupBase() {
logger.info { logger.info {
""" """
Restore Errors: Restore Errors:
${ ${ errors.joinToString("\n") { "${it.first} - ${it.second}" } }
errors.map {
"${it.first} - ${it.second}"
}.joinToString("\n")
}
Restore Summary: Restore Summary:
- Missing Sources: - Missing Sources:
${validationResult.missingSources.joinToString("\n")} ${validationResult.missingSources.joinToString("\n")}
@ -119,6 +115,8 @@ object LegacyBackupImport : LegacyBackupBase() {
getHttpSource(manga.source) getHttpSource(manga.source)
} catch (e: NullPointerException) { } catch (e: NullPointerException) {
null null
} catch (e: NoSuchElementException) {
null
} }
val sourceName = sourceMapping[manga.source] ?: manga.source.toString() val sourceName = sourceMapping[manga.source] ?: manga.source.toString()