Skip to content

Commit 1fee512

Browse files
committed
use tachibk extension for backups
1 parent a72df3d commit 1fee512

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) {
8484

8585
// Delete older backups
8686
val numberOfBackups = numberOfBackups()
87-
val backupRegex = Regex("""tachiyomi_full_\d+-\d+-\d+_\d+-\d+.proto.gz""")
88-
dir.listFiles { _, filename -> backupRegex.matches(filename) }
87+
val oldBackupRegex = Regex("""tachiyomi_full_\d+-\d+-\d+_\d+-\d+.proto.gz""")
88+
val newBackupRegex = Regex("""tachiyomi_full_\d+-\d+-\d+_\d+-\d+.tachibk""")
89+
dir.listFiles { _, filename -> (oldBackupRegex.matches(filename) || newBackupRegex.matches(filename)) }
8990
.orEmpty()
9091
.sortedByDescending { it.name }
9192
.drop(numberOfBackups - 1)

app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFull.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ import java.util.Locale
77
object BackupFull {
88
fun getDefaultFilename(): String {
99
val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
10-
return "tachiyomi_full_$date.proto.gz"
10+
return "tachiyomi_full_$date.tachibk"
1111
}
1212
}

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class SettingsBackupController : SettingsController() {
205205
uri?.path?.let {
206206
val fileName = DocumentFile.fromSingleUri(activity, uri)?.name ?: uri.toString()
207207
when {
208-
fileName.endsWith(".proto.gz") -> {
208+
fileName.endsWith(".proto.gz") || fileName.endsWith(".tachibk") -> {
209209
val options = arrayOf(
210210
R.string.full_restore_offline,
211211
R.string.full_restore_online

app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
<string name="tracker_not_logged_in">Not logged in: %1$s</string>
376376
<string name="backup_created">Backup created</string>
377377
<string name="invalid_backup_file">Invalid backup file</string>
378-
<string name="invalid_backup_file_type">Invalid backup file type: %1$s\nIt should end with ".proto.gz" or ".json".</string>
378+
<string name="invalid_backup_file_type">Invalid backup file type: %1$s\nIt should end with ".proto.gz", ".tachibk", or ".json".</string>
379379
<string name="invalid_backup_file_missing_data">File is missing data.</string>
380380
<string name="invalid_backup_file_missing_manga">Backup does not contain any manga.</string>
381381
<string name="backup_restore_missing_sources">Missing sources:</string>

0 commit comments

Comments
 (0)