From 8a8d8f71893074eace0383282fabf94b0cb01d93 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 1 Jan 2021 16:43:32 -0500
Subject: [PATCH] Include source name in backup restore error logs (closes
 #4230)

(cherry picked from commit 3bb2102eb46af2ae2c03e505ade2512666b5cc91)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
---
 .../tachiyomi/data/backup/full/FullBackupRestore.kt      | 9 +++++----
 .../tachiyomi/data/backup/legacy/LegacyBackupRestore.kt  | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
index 250b91181..a139a4e5b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
@@ -99,16 +99,17 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier, private val
         manga = EXHMigrations.migrateBackupEntry(manga)
         // SY <--
 
+        val source = backupManager.sourceManager.get(manga.source)
+        val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
+
         try {
-            val source = backupManager.sourceManager.get(manga.source)
             if (source != null || !online) {
                 restoreMangaData(manga, source, chapters, categories, history, tracks, backupCategories, mergedMangaReferences, flatMetadata, online)
             } else {
-                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
-                errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
+                errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}")
             }
         } catch (e: Exception) {
-            errors.add(Date() to "${manga.title} - ${e.message}")
+            errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
         }
 
         restoreProgress += 1
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
index e424ee28b..1f283ce55 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
@@ -118,16 +118,17 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
         manga = EXHMigrations.migrateBackupEntry(manga)
         // <-- EXH
 
+        val source = backupManager.sourceManager.get(manga.source)
+        val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
+
         try {
-            val source = backupManager.sourceManager.get(manga.source)
             if (source != null) {
                 restoreMangaData(manga, source, chapters, categories, history, tracks)
             } else {
-                val sourceName = sourceMapping[manga.source] ?: manga.source.toString()
-                errors.add(Date() to "${manga.title} - ${context.getString(R.string.source_not_found_name, sourceName)}")
+                errors.add(Date() to "${manga.title} [$sourceName]: ${context.getString(R.string.source_not_found_name, sourceName)}")
             }
         } catch (e: Exception) {
-            errors.add(Date() to "${manga.title} - ${e.message}")
+            errors.add(Date() to "${manga.title} [$sourceName]: ${e.message}")
         }
 
         restoreProgress += 1