Improve persist

lslqtz · Sep 30, 2024 · 643bc88 · 643bc88
1 parent dd00af8
commit 643bc88
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/Sources/bclm_loop/main.swift b/Sources/bclm_loop/main.swift
@@ -433,9 +433,12 @@ struct BCLMLoop: ParsableCommand {
         func run() {
             if persist(false) {
                 print("Already persisting! Re-persist...\n")
+                _ = removePlist()
+            }
+
+            if updatePlist(targetBatteryLevel: targetBatteryLevel, targetBatteryMargin: targetBatteryMargin) && persist(true) {
+                print("Success!")
             }
-            updatePlist(targetBatteryLevel: targetBatteryLevel, targetBatteryMargin: targetBatteryMargin)
-            _ = persist(true)
         }
     }
 
@@ -452,7 +455,10 @@ struct BCLMLoop: ParsableCommand {
             if !persist(false) {
                 fputs("Already not persisting!\n", stderr)
             }
-            removePlist()
+
+            if removePlist() {
+                print("Success!")
+            }
         }
     }
 }

diff --git a/Sources/bclm_loop/persist.swift b/Sources/bclm_loop/persist.swift
@@ -67,7 +67,7 @@ func isPersistent() -> Bool {
     }
 }
 
-func updatePlist(targetBatteryLevel: Int, targetBatteryMargin: Int) {
+func updatePlist(targetBatteryLevel: Int, targetBatteryMargin: Int) -> Bool {
     let preferences =
             Preferences(
                 Label: plist,
@@ -89,15 +89,21 @@ func updatePlist(targetBatteryLevel: Int, targetBatteryMargin: Int) {
     do {
         let data = try encoder.encode(preferences)
         try data.write(to: path)
+        return true
     } catch {
         print(error)
     }
+
+    return false
 }
 
-func removePlist() {
+func removePlist() -> Bool {
     do {
         try FileManager.default.removeItem(at: URL(fileURLWithPath: plist_path))
+        return true
     } catch {
         print(error)
     }
+
+    return false
 }