github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
arkon 2021-01-01 16:43:32 -05:00
parent b7914909d0
commit 3bb2102eb4
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

@ -67,16 +67,17 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
val history = backupManga.history val history = backupManga.history
val tracks = backupManga.getTrackingImpl() val tracks = backupManga.getTrackingImpl()
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, online) restoreMangaData(manga, source, chapters, categories, history, tracks, backupCategories, 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

@ -86,16 +86,17 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
?: JsonArray() ?: JsonArray()
) )
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