From cd550d545a178a79de753ab257410125f8ba6c3a Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sat, 7 Oct 2023 13:08:11 -0700 Subject: [PATCH] Change backup file names We use the application ID now to ensure uniqueness if the same folder is selected between different app versions/forks. This will make more sense once storage settings are unified to a single location. Also changes the file extension while we're at it so people stop accidentally ungzipping it. Co-Authored-By: arkon <4098258+arkon@users.noreply.github.com> --- .../java/eu/kanade/tachiyomi/data/backup/BackupManager.kt | 3 +-- .../java/eu/kanade/tachiyomi/data/backup/models/Backup.kt | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt index 15d3b23151..e52ecde30b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt @@ -77,8 +77,7 @@ class BackupManager(context: Context) : AbstractBackupManager(context) { // Delete older backups val numberOfBackups = numberOfBackups() - val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.proto.gz""") - dir.listFiles { _, filename -> backupRegex.matches(filename) } + dir.listFiles { _, filename -> Backup.filenameRegex.matches(filename) } .orEmpty() .sortedByDescending { it.name } .drop(numberOfBackups - 1) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt index 9416656837..9c790cae82 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt @@ -1,5 +1,6 @@ package eu.kanade.tachiyomi.data.backup.models +import eu.kanade.tachiyomi.BuildConfig import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber import java.text.SimpleDateFormat @@ -15,9 +16,11 @@ data class Backup( @ProtoNumber(101) var backupSources: List = emptyList(), ) { companion object { + val filenameRegex = """(${BuildConfig.APPLICATION_ID}|tachiyomi)?_\d+-\d+-\d+_\d+-\d+\.(tachibk|proto\.gz)""".toRegex() + fun getBackupFilename(): String { val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date()) - return "tachiyomi_$date.proto.gz" + return "${BuildConfig.APPLICATION_ID}_$date.tachibk" } } }