Minor updates

(cherry picked from commit 3f0db60a999cb30ff249ae4cc6a720c2a49c319a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt

app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt

@@ -108,7 +108,7 @@ object SettingsBackupScreen : SearchableSettings {
                     showCreateDialog = false
                     flag = it
                     try {
-                        chooseBackupDir.launch(Backup.getBackupFilename())
+                        chooseBackupDir.launch(Backup.getFilename())
                     } catch (e: ActivityNotFoundException) {
                         flag = 0
                         context.toast(R.string.file_picker_error)

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

@@ -132,17 +132,14 @@ class BackupManager(
 
                     // Delete older backups
                     val numberOfBackups = backupPreferences.numberOfBackups().get()
-                    // SY -->
-                    val backupRegex = Regex("""tachiyomi(?:_sy)?_\d+-\d+-\d+_\d+-\d+.proto.gz""")
-                    // SY <--
-                    dir.listFiles { _, filename -> backupRegex.matches(filename) }
+                    dir.listFiles { _, filename -> Backup.filenameRegex.matches(filename) }
                         .orEmpty()
                         .sortedByDescending { it.name }
                         .drop(numberOfBackups - 1)
                         .forEach { it.delete() }
 
                     // Create new file to place backup
-                    dir.createFile(Backup.getBackupFilename())
+                    dir.createFile(Backup.getFilename())
                 } else {
                     UniFile.fromUri(context, uri)
                 }

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

@@ -18,7 +18,9 @@ data class Backup(
 ) {
 
     companion object {
-        fun getBackupFilename(): String {
+        val filenameRegex = """tachiyomi(?:_sy)?_\d+-\d+-\d+_\d+-\d+.proto.gz""".toRegex()
+
+        fun getFilename(): String {
             val date = SimpleDateFormat("yyyy-MM-dd_HH-mm", Locale.getDefault()).format(Date())
             return "tachiyomi_sy_$date.proto.gz"
         }

app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt

@@ -15,9 +15,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import logcat.LogPriority
 import okhttp3.Response
 import okio.buffer
 import okio.sink
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.chapter.model.Chapter
 import uy.kohesive.injekt.injectLazy
 import java.io.File
@@ -130,6 +132,7 @@ class ChapterCache(private val context: Context) {
             editor.commit()
             editor.abortUnlessCommitted()
         } catch (e: Exception) {
+            logcat(LogPriority.WARN, e) { "Failed to put page list to cache" }
             // Ignore.
         } finally {
             editor?.abortUnlessCommitted()
@@ -207,7 +210,7 @@ class ChapterCache(private val context: Context) {
      * @return status of deletion for the file.
      */
     private fun removeFileFromCache(file: String): Boolean {
-        // Make sure we don't delete the journal file (keeps track of cache).
+        // Make sure we don't delete the journal file (keeps track of cache)
         if (file == "journal" || file.startsWith("journal.")) {
             return false
         }
@@ -215,9 +218,10 @@ class ChapterCache(private val context: Context) {
         return try {
             // Remove the extension from the file to get the key of the cache
             val key = file.substringBeforeLast(".")
-            // Remove file from cache.
+            // Remove file from cache
             diskCache.remove(key)
         } catch (e: Exception) {
+            logcat(LogPriority.WARN, e) { "Failed to remove file from cache" }
             false
         }
     }