Merge pull request #34 from Amzd/State-property-on-app-fix

Fixed stored @State properties on App

Contributors.md

@@ -4,3 +4,4 @@
 - [Greg Cotten](https://github.com/gregcotten)
 - [Zev Eisenberg](https://github.com/ZevEisenberg)
 - [Jay Wren](https://github.com/jrwren)
+- [Amzd](https://github.com/amzd)

Sources/Adwaita/Model/Data Flow/State.swift

@@ -37,7 +37,13 @@ public struct State<Value>: StateProtocol {
     /// Get and set the value without updating the views.
     public var rawValue: Value {
         get {
-            content.storage.value as! Value
+            if let readValue, !content.fetched {
+                let newValue = readValue()
+                content.storage.value = newValue
+                content.fetched = true
+                return newValue
+            }
+            return content.storage.value as! Value
         }
         nonmutating set {
             content.storage.value = newValue
@@ -54,6 +60,8 @@ public struct State<Value>: StateProtocol {
 
     /// The function for updating the value in the settings file.
     private var writeValue: (() -> Void)?
+    /// The function for reading the value in the settings file.
+    var readValue: (() -> Value)?
 
     /// The value with an erased type.
     public var value: Any {
@@ -97,6 +105,8 @@ public struct State<Value>: StateProtocol {
         var internalStorage: Storage?
         /// The initial value.
         private var initialValue: Value
+        /// Whether the value has already been fetched from the file stored on the system.
+        var fetched = false
 
         /// Initialize the content.
         /// - Parameter storage: The storage.
@@ -159,15 +169,18 @@ public struct State<Value>: StateProtocol {
 
     /// Get the settings directory path.
     /// - Returns: The path.
-    private func dirPath() -> URL {
+    private func dirPath() -> URL? {
-        Self.userDataDir()
+        guard let folder = content.storage.folder ?? GTUIApp.appID else {
-            .appendingPathComponent(content.storage.folder ?? GTUIApp.appID, isDirectory: true)
+            return nil
+        }
+        return Self.userDataDir()
+            .appendingPathComponent(folder, isDirectory: true)
     }
 
     /// Get the settings file path.
     /// - Returns: The path.
-    private func filePath() -> URL {
+    private func filePath() -> URL? {
-        dirPath().appendingPathComponent("\(content.storage.key ?? "temporary").json")
+        dirPath()?.appendingPathComponent("\(content.storage.key ?? "temporary").json")
     }
 
 }
@@ -187,32 +200,41 @@ extension State where Value: Codable {
         self.forceUpdates = forceUpdates
         content.storage.key = key
         content.storage.folder = folder
-        checkFile()
+        let value = self
-        readValue()
+        self.readValue = {
+            value.checkFile()
+            return value.readActualValue() ?? wrappedValue
+        }
         self.writeValue = writeCodableValue
     }
 
     /// Check whether the settings file exists, and, if not, create it.
     private func checkFile() {
         let fileManager = FileManager.default
-        if !fileManager.fileExists(atPath: dirPath().path) {
+        guard let dirPath = dirPath(), let filePath = filePath() else {
+            print("Stored state value accessed before initializing app id.")
+            return
+        }
+        if !fileManager.fileExists(atPath: dirPath.path) {
             try? fileManager.createDirectory(
-                at: .init(fileURLWithPath: dirPath().path),
+                at: .init(fileURLWithPath: dirPath.path),
                 withIntermediateDirectories: true,
                 attributes: nil
             )
         }
-        if !fileManager.fileExists(atPath: filePath().path) {
+        if !fileManager.fileExists(atPath: filePath.path) {
-            fileManager.createFile(atPath: filePath().path, contents: .init(), attributes: nil)
+            fileManager.createFile(atPath: filePath.path, contents: .init(), attributes: nil)
         }
     }
 
     /// Update the local value with the value from the file.
-    private func readValue() {
+    private func readActualValue() -> Value? {
-        let data = try? Data(contentsOf: filePath())
+        if let filePath = filePath(),
-        if let data, let value = try? JSONDecoder().decode(Value.self, from: data) {
+           let data = try? Data(contentsOf: filePath),
-            rawValue = value
+           let value = try? JSONDecoder().decode(Value.self, from: data) {
+            return value
         }
+        return nil
     }
 
     /// Update the value on the file with the local value.
@@ -220,7 +242,10 @@ extension State where Value: Codable {
         let encoder = JSONEncoder()
         encoder.outputFormatting = .prettyPrinted
         let data = try? encoder.encode(rawValue)
-        try? data?.write(to: filePath())
+        guard let filePath = filePath() else {
+            return
+        }
+        try? data?.write(to: filePath)
     }
 
 }

Sources/Adwaita/Model/User Interface/App/App.swift

@@ -25,6 +25,7 @@ public protocol App {
 
     /// The app's application ID.
     var id: String { get }
+
     /// The app's windows.
     @SceneBuilder var scene: Scene { get }
     // swiftlint:disable implicitly_unwrapped_optional

Sources/Adwaita/Model/User Interface/App/GTUIApp.swift

@@ -13,8 +13,7 @@ public class GTUIApp {
     /// The handlers which are called when a state changes.
     static var updateHandlers: [(Bool) -> Void] = []
     /// The app's id for the file name for storing the data.
-    static var appID = "temporary"
+    static var appID: String?
-
     /// The pointer to the application.
     public var pointer: UnsafeMutablePointer<GtkApplication>?
     /// Fields for additional information.