From 2a83f290a5714c203e67f1bea0518920af736967 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Sat, 22 Jul 2023 17:41:21 +0200
Subject: [PATCH] Use "backupInterval" to disable auto backups (#608)

Gets rid of unnecessary setting
---
 .../tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt     | 3 ++-
 .../src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt  | 1 -
 server/src/main/resources/server-reference.conf                | 3 +--
 server/src/test/resources/server-reference.conf                | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
index a0f3236e..629210d9 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
@@ -56,7 +56,8 @@ object ProtoBackupExport : ProtoBackupBase() {
     fun scheduleAutomatedBackupTask() {
         HAScheduler.deschedule(backupSchedulerJobId)
 
-        if (!serverConfig.automatedBackups) {
+        val areAutomatedBackupsDisabled = serverConfig.backupInterval == 0
+        if (areAutomatedBackupsDisabled) {
             return
         }
 
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
index e1302c84..0c98660c 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
@@ -57,7 +57,6 @@ class ServerConfig(getConfig: () -> Config, moduleName: String = MODULE_NAME) :
     var backupPath: String by overridableConfig
     var backupTime: String by overridableConfig
     var backupInterval: Int by overridableConfig
-    var automatedBackups: Boolean by overridableConfig
     var backupTTL: Int by overridableConfig
 
     companion object {
diff --git a/server/src/main/resources/server-reference.conf b/server/src/main/resources/server-reference.conf
index 994679f6..a6fa2b0a 100644
--- a/server/src/main/resources/server-reference.conf
+++ b/server/src/main/resources/server-reference.conf
@@ -41,6 +41,5 @@ server.systemTrayEnabled = true
 # backup
 server.backupPath = ""
 server.backupTime = "00:00" # range: hour: 0-23, minute: 0-59 - default: "00:00" - time of day at which the automated backup should be triggered
-server.backupInterval = 1 # time in days - range: 1 <= n < ∞ - default: 1 day - interval in which the server will automatically create a backup
-server.automatedBackups = true
+server.backupInterval = 1 # time in days - 0 to disable it - range: 1 <= n < ∞ - default: 1 day - interval in which the server will automatically create a backup
 server.backupTTL = 14 # time in days - 0 to disable it - range: 1 <= n < ∞ - default: 14 days - how long backup files will be kept before they will get deleted
diff --git a/server/src/test/resources/server-reference.conf b/server/src/test/resources/server-reference.conf
index 87765b1f..e013582d 100644
--- a/server/src/test/resources/server-reference.conf
+++ b/server/src/test/resources/server-reference.conf
@@ -35,5 +35,4 @@ server.webUIUpdateCheckInterval = 24
 server.backupPath = ""
 server.backupTime = "00:00"
 server.backupInterval = 1
-server.automatedBackups = true
 server.backupTTL = 14