From b456d69aec1b72b619c37d6b0a5df38a3c76cf0a Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 21 Nov 2020 12:22:46 -0500
Subject: [PATCH] Remove "full_" from v3 backup default file names
(cherry picked from commit 47a172df1f4f84ee190b0551fb19cff1bff3914c)
---
.../eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt | 2 +-
.../eu/kanade/tachiyomi/data/backup/full/models/BackupFull.kt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
index df657c0f6..322eb169a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
@@ -90,7 +90,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
// Delete older backups
val numberOfBackups = numberOfBackups()
- val backupRegex = Regex("""tachiyomi_full_\d+-\d+-\d+_\d+-\d+.proto.gz""")
+ val backupRegex = Regex("""tachiyomi_\d+-\d+-\d+_\d+-\d+.proto.gz""")
dir.listFiles { _, filename -> backupRegex.matches(filename) }
.orEmpty()
.sortedByDescending { it.name }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFull.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFull.kt
index 79f40d432..3ed6328b0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFull.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFull.kt
@@ -7,6 +7,6 @@ import java.util.Locale
object BackupFull {
fun getDefaultFilename(): String {
val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
- return "tachiyomi_full_$date.proto.gz"
+ return "tachiyomi_$date.proto.gz"
}
}