From 12774c54eea6712aecf9d230f89fb2bd1ebe5698 Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 7 Sep 2023 22:15:50 -0400 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. (cherry picked from commit cc018cee182f880ebfe07e45809a98d0f6d73220) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt --- .../java/eu/kanade/tachiyomi/data/backup/models/Backup.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 d6635f869..13eed1563 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 @@ -18,11 +19,11 @@ data class Backup( ) { companion object { - val filenameRegex = """tachiyomi(?:_sy)?_\d+-\d+-\d+_\d+-\d+.proto.gz""".toRegex() + val filenameRegex = """${BuildConfig.APPLICATION_ID}_\d+-\d+-\d+_\d+-\d+.tachibk""".toRegex() fun getFilename(): String { val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date()) - return "tachiyomi_sy_$date.proto.gz" + return "${BuildConfig.APPLICATION_ID}_$date.tachibk" } } }