소스 검색

Remove max automatic backups setting

We just always create up to 4 now to simplify it, given the addition of syncing
is going to make this section pretty busy.
arkon 1 년 전
부모
커밋
e3b70ca08d

+ 1 - 9
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt

@@ -76,8 +76,6 @@ object SettingsDataScreen : SearchableSettings {
     @Composable
     private fun getBackupAndRestoreGroup(backupPreferences: BackupPreferences): Preference.PreferenceGroup {
         val context = LocalContext.current
-        val backupIntervalPref = backupPreferences.backupInterval()
-        val backupInterval by backupIntervalPref.collectAsState()
         val lastAutoBackup by backupPreferences.lastAutoBackupTimestamp().collectAsState()
 
         return Preference.PreferenceGroup(
@@ -89,7 +87,7 @@ object SettingsDataScreen : SearchableSettings {
 
                 // Automatic backups
                 Preference.PreferenceItem.ListPreference(
-                    pref = backupIntervalPref,
+                    pref = backupPreferences.backupInterval(),
                     title = stringResource(MR.strings.pref_backup_interval),
                     entries = mapOf(
                         0 to stringResource(MR.strings.off),
@@ -104,12 +102,6 @@ object SettingsDataScreen : SearchableSettings {
                         true
                     },
                 ),
-                Preference.PreferenceItem.ListPreference(
-                    pref = backupPreferences.numberOfBackups(),
-                    enabled = backupInterval != 0,
-                    title = stringResource(MR.strings.pref_backup_slots),
-                    entries = listOf(2, 3, 4, 5).associateWith { it.toString() },
-                ),
                 Preference.PreferenceItem.InfoPreference(
                     stringResource(MR.strings.backup_info) + "\n\n" +
                         stringResource(MR.strings.last_auto_backup_info, relativeTimeSpanString(lastAutoBackup)),

+ 0 - 3
app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

@@ -295,9 +295,6 @@ object Migrations {
                 }
             }
             if (oldVersion < 84) {
-                if (backupPreferences.numberOfBackups().get() == 1) {
-                    backupPreferences.numberOfBackups().set(2)
-                }
                 if (backupPreferences.backupInterval().get() == 0) {
                     backupPreferences.backupInterval().set(12)
                     BackupCreateJob.setupTask(context)

+ 3 - 4
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt

@@ -42,7 +42,6 @@ import tachiyomi.core.preference.Preference
 import tachiyomi.core.preference.PreferenceStore
 import tachiyomi.core.util.system.logcat
 import tachiyomi.data.DatabaseHandler
-import tachiyomi.domain.backup.service.BackupPreferences
 import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.history.interactor.GetHistory
@@ -60,7 +59,6 @@ class BackupCreator(
 
     private val handler: DatabaseHandler = Injekt.get()
     private val sourceManager: SourceManager = Injekt.get()
-    private val backupPreferences: BackupPreferences = Injekt.get()
     private val getCategories: GetCategories = Injekt.get()
     private val getFavorites: GetFavorites = Injekt.get()
     private val getHistory: GetHistory = Injekt.get()
@@ -98,11 +96,10 @@ class BackupCreator(
                     dir = dir.createDirectory("automatic")
 
                     // Delete older backups
-                    val numberOfBackups = backupPreferences.numberOfBackups().get()
                     dir.listFiles { _, filename -> Backup.filenameRegex.matches(filename) }
                         .orEmpty()
                         .sortedByDescending { it.name }
-                        .drop(numberOfBackups - 1)
+                        .drop(MAX_AUTO_BACKUPS - 1)
                         .forEach { it.delete() }
 
                     // Create new file to place backup
@@ -269,3 +266,5 @@ class BackupCreator(
             }
     }
 }
+
+private val MAX_AUTO_BACKUPS: Int = 4

+ 0 - 2
domain/src/main/java/tachiyomi/domain/backup/service/BackupPreferences.kt

@@ -11,8 +11,6 @@ class BackupPreferences(
 
     fun backupsDirectory() = preferenceStore.getString("backup_directory", folderProvider.path())
 
-    fun numberOfBackups() = preferenceStore.getInt("backup_slots", 2)
-
     fun backupInterval() = preferenceStore.getInt("backup_interval", 12)
 
     fun lastAutoBackupTimestamp() = preferenceStore.getLong(Preference.appStateKey("last_auto_backup_timestamp"), 0L)

+ 0 - 1
i18n/src/commonMain/resources/MR/base/strings.xml

@@ -471,7 +471,6 @@
     <string name="pref_restore_backup_summ">Restore library from backup file</string>
     <string name="pref_backup_directory">Backup location</string>
     <string name="pref_backup_interval">Automatic backup frequency</string>
-    <string name="pref_backup_slots">Maximum automatic backups</string>
     <string name="action_create">Create</string>
     <string name="backup_created">Backup created</string>
     <string name="invalid_backup_file">Invalid backup file</string>