refactor(backup): Manage options from BackupCreator

app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt

@@ -5,11 +5,17 @@ import android.net.Uri
 import co.touchlab.kermit.Logger
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.data.backup.BackupFileValidator
+import eu.kanade.tachiyomi.data.backup.models.BackupCategory
+import eu.kanade.tachiyomi.data.backup.models.BackupManga
+import eu.kanade.tachiyomi.data.backup.models.BackupPreference
+import eu.kanade.tachiyomi.data.backup.models.BackupSource
+import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences
 import eu.kanade.tachiyomi.data.backup.create.creators.CategoriesBackupCreator
 import eu.kanade.tachiyomi.data.backup.create.creators.MangaBackupCreator
 import eu.kanade.tachiyomi.data.backup.create.creators.PreferenceBackupCreator
 import eu.kanade.tachiyomi.data.backup.create.creators.SourcesBackupCreator
 import eu.kanade.tachiyomi.data.backup.models.Backup
+import eu.kanade.tachiyomi.domain.manga.models.Manga
 import java.io.FileOutputStream
 import java.time.Instant
 import kotlinx.serialization.protobuf.ProtoBuf
@@ -67,13 +73,13 @@ class BackupCreator(
             }
 
             val readNotFavorites = if (options.readManga) getManga.awaitReadNotFavorites() else emptyList()
-            val backupManga = mangaBackupCreator(getManga.awaitFavorites() + readNotFavorites, options)
+            val backupManga = backupMangas(getManga.awaitFavorites() + readNotFavorites, options)
             val backup = Backup(
                 backupManga = backupManga,
-                backupCategories = categoriesBackupCreator(options),
+                backupCategories = backupCategories(options),
-                backupSources = sourcesBackupCreator(backupManga),
+                backupSources = backupSources(backupManga),
-                backupPreferences = preferenceBackupCreator.backupAppPreferences(options),
+                backupPreferences = backupAppPreferences(options),
-                backupSourcePreferences = preferenceBackupCreator.backupSourcePreferences(options),
+                backupSourcePreferences = backupSourcePreferences(options),
             )
 
             val byteArray = parser.encodeToByteArray(Backup.serializer(), backup)
@@ -101,4 +107,32 @@ class BackupCreator(
             throw e
         }
     }
+
+    private suspend fun backupCategories(options: BackupOptions): List<BackupCategory> {
+        if (!options.categories) return emptyList()
+
+        return categoriesBackupCreator()
+    }
+
+    private suspend fun backupMangas(mangas: List<Manga>, options: BackupOptions): List<BackupManga> {
+        if (!options.libraryEntries) return emptyList()
+
+        return mangaBackupCreator(mangas, options)
+    }
+
+    private fun backupSources(mangas: List<BackupManga>): List<BackupSource> {
+        return sourcesBackupCreator(mangas)
+    }
+
+    private fun backupAppPreferences(options: BackupOptions): List<BackupPreference> {
+        if (!options.appPrefs) return emptyList()
+
+        return preferenceBackupCreator.createApp(includePrivatePreferences = options.includePrivate)
+    }
+
+    private fun backupSourcePreferences(options: BackupOptions): List<BackupSourcePreferences> {
+        if (!options.sourcePrefs) return emptyList()
+
+        return preferenceBackupCreator.createSource(includePrivatePreferences = options.includePrivate)
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/CategoriesBackupCreator.kt

@@ -14,9 +14,7 @@ class CategoriesBackupCreator(
      *
      * @return list of [BackupCategory] to be backed up
      */
-    suspend operator fun invoke(options: BackupOptions): List<BackupCategory> {
+    suspend operator fun invoke(): List<BackupCategory> {
-        if (!options.categories) return emptyList()
-
         return getCategories.await()
             .map { BackupCategory.copyFrom(it) }
     }

app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt

@@ -20,8 +20,6 @@ class MangaBackupCreator(
     private val getChapter: GetChapter = Injekt.get(),
 ) {
     suspend operator fun invoke(mangas: List<Manga>, options: BackupOptions): List<BackupManga> {
-        if (!options.libraryEntries) return emptyList()
-
         return mangas.map {
             backupManga(it, options)
         }

app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/PreferenceBackupCreator.kt

@@ -23,21 +23,19 @@ class PreferenceBackupCreator(
     private val sourceManager: SourceManager = Injekt.get(),
     private val preferenceStore: PreferenceStore = Injekt.get(),
 ) {
-    fun backupAppPreferences(options: BackupOptions): List<BackupPreference> {
+    fun createApp(includePrivatePreferences: Boolean): List<BackupPreference> {
-        if (!options.appPrefs) return emptyList()
         return preferenceStore.getAll().toBackupPreferences()
-            .withPrivatePreferences(options.includePrivate)
+            .withPrivatePreferences(includePrivatePreferences)
     }
 
-    fun backupSourcePreferences(options: BackupOptions): List<BackupSourcePreferences> {
+    fun createSource(includePrivatePreferences: Boolean): List<BackupSourcePreferences> {
-        if (!options.sourcePrefs) return emptyList()
         return sourceManager.getOnlineSources()
             .filterIsInstance<ConfigurableSource>()
             .map {
                 BackupSourcePreferences(
                     it.preferenceKey(),
                     it.sourcePreferences().all.toBackupPreferences()
-                        .withPrivatePreferences(options.includePrivate),
+                        .withPrivatePreferences(includePrivatePreferences),
                 )
             }
     }