Implemented auto restart max retry limit

waicool20 · Apr 29, 2017 · 023e55a · 023e55a
1 parent 4a97631
commit 023e55a
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 172 deletions.
diff --git a/.idea/modules/-858112391/KAGA_main.iml b/.idea/modules/-858112391/KAGA_main.iml
diff --git a/.idea/modules/-858112391/KAGA_test.iml b/.idea/modules/-858112391/KAGA_test.iml
diff --git a/src/main/kotlin/com/waicool20/kaga/config/KagaConfig.kt b/src/main/kotlin/com/waicool20/kaga/config/KagaConfig.kt
@@ -29,6 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.waicool20.kaga.Kaga
 import com.waicool20.kaga.util.listen
 import javafx.beans.property.SimpleBooleanProperty
+import javafx.beans.property.SimpleIntegerProperty
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.property.SimpleStringProperty
 import org.slf4j.LoggerFactory
@@ -45,6 +46,7 @@ class KagaConfig(currentProfile: String = "",
                  preventLock: Boolean = false,
                  clearConsoleOnStart: Boolean = true,
                  autoRestartOnKCAutoCrash: Boolean = true,
+                 autoRestartMaxRetries: Int = 10,
                  debugModeEnabled: Boolean = true,
                  showDebugOnStart: Boolean = true,
                  showStatsOnStart: Boolean = true) {
@@ -54,6 +56,7 @@ class KagaConfig(currentProfile: String = "",
     @JsonIgnore val preventLockProperty = SimpleBooleanProperty(preventLock)
     @JsonIgnore val clearConsoleOnStartProperty = SimpleBooleanProperty(clearConsoleOnStart)
     @JsonIgnore val autoRestartOnKCAutoCrashProperty = SimpleBooleanProperty(autoRestartOnKCAutoCrash)
+    @JsonIgnore val autoRestartMaxRetriesProperty = SimpleIntegerProperty(autoRestartMaxRetries)
     @JsonIgnore val debugModeEnabledProperty = SimpleBooleanProperty(debugModeEnabled)
     @JsonIgnore val showDebugOnStartProperty = SimpleBooleanProperty(showDebugOnStart)
     @JsonIgnore val showStatsOnStartProperty = SimpleBooleanProperty(showStatsOnStart)
@@ -64,6 +67,7 @@ class KagaConfig(currentProfile: String = "",
     @get:JsonProperty var preventLock by preventLockProperty
     @get:JsonProperty var clearConsoleOnStart by clearConsoleOnStartProperty
     @get:JsonProperty var autoRestartOnKCAutoCrash by autoRestartOnKCAutoCrashProperty
+    @get:JsonProperty var autoRestartMaxRetries by autoRestartMaxRetriesProperty
     @get:JsonProperty var debugModeEnabled by debugModeEnabledProperty
     @get:JsonProperty var showDebugOnStart by showDebugOnStartProperty
     @get:JsonProperty var showStatsOnStart by showStatsOnStartProperty

diff --git a/src/main/kotlin/com/waicool20/kaga/kcauto/KancolleAuto.kt b/src/main/kotlin/com/waicool20/kaga/kcauto/KancolleAuto.kt
@@ -39,7 +39,7 @@ class KancolleAuto {
 
     var statsTracker = KancolleAutoStatsTracker()
 
-    fun startAndWait(newSession: Boolean = true, saveConfig: Boolean = true) {
+    fun startAndWait(saveConfig: Boolean = true) {
         if (saveConfig) Kaga.PROFILE!!.save(Kaga.CONFIG.kancolleAutoRootDirPath.resolve("config.ini"))
         val args = listOf(
                 "java",
@@ -68,8 +68,12 @@ class KancolleAuto {
                 logger.info("Kancolle Auto didn't terminate gracefully")
                 saveCrashLog()
                 if (Kaga.CONFIG.autoRestartOnKCAutoCrash) {
-                    logger.info("Auto Restart enabled...attempting restart")
-                    statsTracker.trackNewChild()
+                    if (statsTracker.crashes < Kaga.CONFIG.autoRestartMaxRetries) {
+                        logger.info("Auto Restart enabled...attempting restart")
+                        statsTracker.trackNewChild()
+                    } else {
+                        logger.info("Auto restart retry limit reached, terminating current session.")
+                    }
                 }
             } else {
                 break

diff --git a/src/main/kotlin/com/waicool20/kaga/views/KagaView.kt b/src/main/kotlin/com/waicool20/kaga/views/KagaView.kt
@@ -173,7 +173,7 @@ class KagaView {
                 startStopButton.style = "-fx-background-color: red"
                 profileSelectionHBox.isDisable = true
             }
-            Kaga.KANCOLLE_AUTO.startAndWait(saveConfig = saveConfig)
+            Kaga.KANCOLLE_AUTO.startAndWait(saveConfig)
             Platform.runLater {
                 kagaStatus.text = notRunningText
                 startStopButton.text = "Start"

diff --git a/src/main/kotlin/com/waicool20/kaga/views/tabs/PreferencesTabView.kt b/src/main/kotlin/com/waicool20/kaga/views/tabs/PreferencesTabView.kt
@@ -23,16 +23,20 @@ package com.waicool20.kaga.views.tabs
 import com.waicool20.kaga.Kaga
 import com.waicool20.kaga.config.KagaConfig
 import com.waicool20.kaga.util.AlertFactory
+import com.waicool20.kaga.util.bind
 import javafx.fxml.FXML
 import javafx.scene.control.CheckBox
 import javafx.scene.control.Hyperlink
+import javafx.scene.control.Spinner
+import javafx.scene.control.SpinnerValueFactory
 import java.awt.Desktop
 import java.nio.file.Path
 
 class PreferencesTabView {
     @FXML private lateinit var preventLockCheckBox: CheckBox
     @FXML private lateinit var clearConsoleCheckBox: CheckBox
     @FXML private lateinit var restartSessionCheckBox: CheckBox
+    @FXML private lateinit var maxRetriesSpinner: Spinner<Int>
     @FXML private lateinit var debugModeEnableCheckBox: CheckBox
     @FXML private lateinit var showDebugCheckBox: CheckBox
     @FXML private lateinit var showStatsCheckBox: CheckBox
@@ -50,6 +54,7 @@ class PreferencesTabView {
             kancolleAutoRootPathLink.setOnAction { openFile(kancolleAutoRootDirPath) }
             sikulixJarPathLink.text = sikulixJarPath.toString()
             kancolleAutoRootPathLink.text = kancolleAutoRootDirPath.toString()
+            maxRetriesSpinner.valueFactory = SpinnerValueFactory.IntegerSpinnerValueFactory(0, Int.MAX_VALUE)
         }
     }
 
@@ -67,6 +72,7 @@ class PreferencesTabView {
             preventLockCheckBox.selectedProperty().bindBidirectional(preventLockProperty)
             clearConsoleCheckBox.selectedProperty().bindBidirectional(clearConsoleOnStartProperty)
             restartSessionCheckBox.selectedProperty().bindBidirectional(autoRestartOnKCAutoCrashProperty)
+            maxRetriesSpinner.bind(autoRestartMaxRetriesProperty)
             debugModeEnableCheckBox.selectedProperty().bindBidirectional(debugModeEnabledProperty)
             showDebugCheckBox.selectedProperty().bindBidirectional(showDebugOnStartProperty)
             showStatsCheckBox.selectedProperty().bindBidirectional(showStatsOnStartProperty)