config backup; log backup duration

Author: lhns

app/src/main/java/de/lolhens/resticui/BackupManager.kt

@@ -247,6 +247,8 @@ class BackupManager private constructor(context: Context) {
 
         updateNotification(context, folder.id, activeBackup)
 
+        val beforeBackup = ZonedDateTime.now()
+
         resticRepo.backup(
             listOf(folder.path),
             { progress ->
@@ -267,19 +269,23 @@ class BackupManager private constructor(context: Context) {
                 if (throwable == null || cancelled) null
                 else throwable.message
 
+            val afterBackup = ZonedDateTime.now()
+
             val historyEntry = BackupHistoryEntry(
-                timestamp = ZonedDateTime.now(),
-                duration = HourDuration(Duration.ZERO),
+                timestamp = afterBackup,
+                duration = Duration.ofMillis(
+                    afterBackup.toInstant().toEpochMilli() - beforeBackup.toInstant().toEpochMilli()
+                ),
                 scheduled = scheduled,
                 cancelled = cancelled,
                 snapshotId = summary?.snapshot_id,
                 errorMessage = errorMessage
             )
 
             configure { config ->
-                config.copy(folders = config.folders.map { folder ->
-                    if (folder.id == folder.id) folder.plusHistoryEntry(historyEntry)
-                    else folder
+                config.copy(folders = config.folders.map { currentFolder ->
+                    if (currentFolder.id == folder.id) currentFolder.plusHistoryEntry(historyEntry)
+                    else currentFolder
                 })
             }
 
@@ -291,7 +297,7 @@ class BackupManager private constructor(context: Context) {
                 if (removeOld && throwable == null && (folder.keepLast != null || folder.keepWithin != null)) {
                     resticRepo.forget(
                         folder.keepLast,
-                        folder.keepWithin?.duration,
+                        folder.keepWithin,
                         prune = true
                     ).handle { _, _ ->
                         callback()

app/src/main/java/de/lolhens/resticui/Serializers.kt

@@ -6,6 +6,8 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.long
 import java.io.File
 import java.net.URI
 import java.time.Duration
@@ -22,17 +24,21 @@ object ZonedDateTimeSerializer : KSerializer<ZonedDateTime> {
         ZonedDateTime.parse(decoder.decodeString())
 }
 
-data class HourDuration(val duration: Duration)
-
-object HourDurationSerializer : KSerializer<HourDuration> {
+object DurationSerializer : KSerializer<Duration> {
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor((HourDuration::class).simpleName!!, PrimitiveKind.LONG)
-
-    override fun serialize(encoder: Encoder, value: HourDuration) =
-        encoder.encodeLong(value.duration.toHours())
-
-    override fun deserialize(decoder: Decoder): HourDuration =
-        HourDuration(Duration.ofHours(decoder.decodeLong()))
+        PrimitiveSerialDescriptor("Custom${(Duration::class).simpleName!!}", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: Duration) =
+        encoder.encodeString("${value.toMillis()}ms")
+
+    override fun deserialize(decoder: Decoder): Duration {
+        val value = decoder.decodeSerializableValue(JsonPrimitive.serializer())
+        if (value.isString && value.content.endsWith("ms")) {
+            return Duration.ofMillis(value.content.dropLast(2).toLong())
+        } else {
+            return Duration.ofHours(value.long)
+        }
+    }
 }
 
 object FileSerializer : KSerializer<File> {

app/src/main/java/de/lolhens/resticui/config/BackupHistoryEntry.kt

@@ -1,16 +1,16 @@
 package de.lolhens.resticui.config
 
-import de.lolhens.resticui.HourDuration
-import de.lolhens.resticui.HourDurationSerializer
+import de.lolhens.resticui.DurationSerializer
 import de.lolhens.resticui.ZonedDateTimeSerializer
 import de.lolhens.resticui.restic.ResticSnapshotId
 import kotlinx.serialization.Serializable
+import java.time.Duration
 import java.time.ZonedDateTime
 
 @Serializable
 data class BackupHistoryEntry(
     val timestamp: @Serializable(with = ZonedDateTimeSerializer::class) ZonedDateTime,
-    val duration: @Serializable(with = HourDurationSerializer::class) HourDuration,
+    val duration: @Serializable(with = DurationSerializer::class) Duration,
     val scheduled: Boolean,
     val cancelled: Boolean,
     val snapshotId: ResticSnapshotId?,

app/src/main/java/de/lolhens/resticui/config/ConfigManager.kt

@@ -6,6 +6,7 @@ import androidx.security.crypto.MasterKey
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.nio.charset.StandardCharsets
+import java.time.Instant
 
 class ConfigManager(
     context: Context,
@@ -54,13 +55,22 @@ class ConfigManager(
             return Config.fromJsonString(json)
         }
 
+        fun backupConfigFile(file: File) {
+            if (file.exists()) {
+                val now = Instant.now().toEpochMilli()
+                val configFileBackup = context.dataDir.resolve("${configFile.name}.$now.backup")
+                file.copyTo(configFileBackup)
+            }
+        }
+
         Secret.loadKey(context)
 
         if (configFile.exists()) {
             try {
                 return readConfigFile(configFile)
             } catch (e: Exception) {
                 e.printStackTrace()
+                backupConfigFile(configFile)
             }
         }
 
@@ -71,6 +81,7 @@ class ConfigManager(
                 return readConfigFile(configFile)
             } catch (e: Exception) {
                 e.printStackTrace()
+                backupConfigFile(configFile)
             }
         }
 
@@ -80,6 +91,7 @@ class ConfigManager(
                 return readEncryptedConfig(context, encryptedConfigFile)
             } catch (e: Exception) {
                 e.printStackTrace()
+                backupConfigFile(encryptedConfigFile)
             }
         }
 

app/src/main/java/de/lolhens/resticui/config/FolderConfig.kt

@@ -1,11 +1,11 @@
 package de.lolhens.resticui.config
 
+import de.lolhens.resticui.DurationSerializer
 import de.lolhens.resticui.FileSerializer
-import de.lolhens.resticui.HourDuration
-import de.lolhens.resticui.HourDurationSerializer
 import de.lolhens.resticui.ui.folder.FolderEditFragment
 import kotlinx.serialization.Serializable
 import java.io.File
+import java.time.Duration
 import java.time.ZonedDateTime
 
 @Serializable
@@ -16,7 +16,7 @@ data class FolderConfig(
     val path: @Serializable(with = FileSerializer::class) File,
     val schedule: String,
     val keepLast: Int? = null,
-    val keepWithin: @Serializable(with = HourDurationSerializer::class) HourDuration? = null,
+    val keepWithin: @Serializable(with = DurationSerializer::class) Duration? = null,
     val history: List<BackupHistoryEntry> = emptyList()
 ) {
     fun repo(config: Config): RepoConfig? = config.repos.find { it.base.id == repoId }
@@ -41,8 +41,7 @@ data class FolderConfig(
     fun shouldBackup(dateTime: ZonedDateTime): Boolean {
         val scheduleMinutes = FolderEditFragment.schedules.find { it.first == schedule }?.second
         if (scheduleMinutes == null || scheduleMinutes < 0) return false
-        val lastBackup = lastBackup(filterScheduled = true)?.timestamp
-        if (lastBackup == null) return true
+        val lastBackup = lastBackup(filterScheduled = true)?.timestamp ?: return true
         var quantized = lastBackup.withMinute(0).withSecond(0).withNano(0)
         if (scheduleMinutes >= 24 * 60)
             quantized = quantized.withHour(0)

app/src/main/java/de/lolhens/resticui/ui/folder/FolderEditFragment.kt

@@ -5,7 +5,6 @@ import android.view.*
 import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import de.lolhens.resticui.BackupManager
-import de.lolhens.resticui.HourDuration
 import de.lolhens.resticui.R
 import de.lolhens.resticui.config.FolderConfig
 import de.lolhens.resticui.config.FolderConfigId
@@ -110,7 +109,7 @@ class FolderEditFragment : Fragment() {
             binding.editFolder.setText(folder.path.path)
             binding.spinnerSchedule.setSelection(schedules.indexOfFirst { it.first == folder.schedule })
             val scheduleIndex = retainProfiles.indexOfFirst {
-                it.toLong() == folder.keepWithin?.duration?.toHours()
+                it.toLong() == folder.keepWithin?.toHours()
             }
             binding.spinnerRetainWithin.setSelection(if (scheduleIndex == -1) 0 else scheduleIndex)
         }
@@ -134,7 +133,7 @@ class FolderEditFragment : Fragment() {
                 val schedule = binding.spinnerSchedule.selectedItem?.toString()
                 val keepWithin =
                     if (retainProfiles[binding.spinnerRetainWithin.selectedItemPosition] < 0) null
-                    else HourDuration(Duration.ofHours(retainProfiles[binding.spinnerRetainWithin.selectedItemPosition].toLong()))
+                    else Duration.ofHours(retainProfiles[binding.spinnerRetainWithin.selectedItemPosition].toLong())
 
                 if (
                     repo != null &&

app/src/main/java/de/lolhens/resticui/ui/folder/FolderFragment.kt

@@ -73,7 +73,7 @@ class FolderFragment : Fragment() {
                     if (folder.keepLast == null) "" else "in last ${folder.keepLast}",
                     if (folder.keepWithin == null) "" else "within ${
                         Formatters.durationDaysHours(
-                            folder.keepWithin.duration
+                            folder.keepWithin
                         )
                     }"
                 ).filter { it.isNotEmpty() }.joinToString(" and ")