Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include source name in backup restore error logs (closes #4230)

Browse Source 
(cherry picked from commit 3bb2102eb46af2ae2c03e505ade2512666b5cc91)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
This commit is contained in:
arkon 2021-01-01 16:43:32 -05:00 committed by Jobobby04
parent 7a6a33d5fe
commit 8a8d8f7189
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
View File

@ -99,16 +99,17 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
manga = EXHMigrations.migrateBackupEntry(manga) manga = EXHMigrations.migrateBackupEntry(manga)
// SY <-- // SY <--
val source = backupManager.sourceManager.get(manga.source)
val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
try { try {
val source = backupManager.sourceManager.get(manga.source)
if (source != null || !online) { if (source != null || !online) {
restoreMangaData(manga, source, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata, online) restoreMangaData(manga, source, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata, online)
} else { } else {
val sourceName = sourceMapping[manga.source] ?: manga.source.toString() errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}")
errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
} }
} catch (e: Exception) { } catch (e: Exception) {
errors.add(Date() to "${manga.title} - ${e.message}") errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
} }
restoreProgress += 1 restoreProgress += 1

9
app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
View File

@ -118,16 +118,17 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
manga = EXHMigrations.migrateBackupEntry(manga) manga = EXHMigrations.migrateBackupEntry(manga)
// <-- EXH // <-- EXH
val source = backupManager.sourceManager.get(manga.source)
val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
try { try {
val source = backupManager.sourceManager.get(manga.source)
if (source != null) { if (source != null) {
restoreMangaData(manga, source, chapters, categories, history, tracks) restoreMangaData(manga, source, chapters, categories, history, tracks)
} else { } else {
val sourceName = sourceMapping[manga.source] ?: manga.source.toString() errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}")
errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
} }
} catch (e: Exception) { } catch (e: Exception) {
errors.add(Date() to "${manga.title} - ${e.message}") errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
} }
restoreProgress += 1 restoreProgress += 1