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

Fix offline restore ignoring manga from not installed sources (fixes #4679)

Browse Source 
(cherry picked from commit 4a5bceb4e49962f0498e69f5200800063d575444)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
This commit is contained in:
arkon 2021-03-20 10:03:13 -04:00 committed by Jobobby04
parent 23091cf50a
commit 6e1adf6e04
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,8 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
restoreManga(it, backup.backupCategories) restoreManga(it, backup.backupCategories)
} }
// TODO: optionally trigger online library + tracker update
return true return true
} }
@ -94,16 +96,10 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
EXHMigrations.migrateBackupEntry(manga) EXHMigrations.migrateBackupEntry(manga)
// SY <-- // SY <--
val source = backupManager.sourceManager.get(manga.source)
val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
try { try {
if (source != null) {
restoreMangaData(manga, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata) restoreMangaData(manga, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata)
} else {
errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}")
}
} catch (e: Exception) { } catch (e: Exception) {
val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}") errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
} }