Merge pull request #23 from ServerDriven/develop

Screen and Image File Store and Provider

Author: 0xLeif

Package.swift

@@ -18,7 +18,7 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
         .package(name: "ScreenData", url: "https://github.com/ServerDriven/ScreenData-swift", from: "0.4.1"),
-        .package(name: "ScreenDataNavigation", url: "https://github.com/ServerDriven/ScreenDataNavigation-swift", from: "0.5.0"),
+        .package(name: "ScreenDataNavigation", url: "https://github.com/ServerDriven/ScreenDataNavigation-swift", from: "1.0.0"),
         .package(url: "https://github.com/0xLeif/Chronicle", from: "0.2.3")
     ],
     targets: [

README.md

@@ -121,9 +121,9 @@ Before showing a `SDScreen` you can override the ScreenDataUI default values. Yo
 SDScreenProvider.default = ScreenProvider()
 
 // MARK: SDScreenStore default
-// UserDefaultScreenStorer is from ScreenDataNavigation
+// FileScreenStore is from ScreenDataNavigation
 
-SDScreenStore.default = UserDefaultScreenStorer(baseKey: "example")
+SDScreenStore.default = FileScreenStore(baseKey: "example")
 
 // MARK: SDCustomViews
 // Views that conform to SDCustomizedView

Sources/ScreenDataUI/Helpers/SDImage/SDImageProviding.swift

@@ -29,7 +29,7 @@ public struct SDImageURLProvider: SDImageProviding {
                     }
 
                     guard let data = data else {
-                        log(level: .error("Could not load Image for URL (\(url)). Response: \(String(describing: response)).", nil))
+                        log(level: .error("(SDImageURLProvider) Could not load Image for URL (\(url)). Response: \(String(describing: response)).", nil))
                         promise(.success(nil))
                         return
                     }
@@ -42,17 +42,19 @@ public struct SDImageURLProvider: SDImageProviding {
     }
 }
 
-public struct SDImageUserDefaultsProvider: SDImageProviding {
+public struct SDImageFileProvider: SDImageProviding {
     public init() { }
 
     public func image(forURL url: URL) -> AnyPublisher<UIImage?, Error> {
         Future { promise in
-            let imageData: Data? = UserDefaults.standard.data(
-                forKey: url.absoluteString
-            )
+            let key = url.absoluteString.replacingOccurrences(of: "/", with: "-")
+            let path = FileManager.default.urls(
+                for: .documentDirectory,
+                   in: .userDomainMask
+            )[0].appendingPathComponent(key)
 
-            guard let data = imageData else {
-                log(level: .error("Could not load Image for URL (\(url)).", nil))
+            guard let data = try? Data(contentsOf: path) else {
+                log(level: .error("(SDImageFileProvider) Could not load Image from path (\(path.absoluteString)).", nil))
                 promise(.success(nil))
                 return
             }
@@ -63,11 +65,11 @@ public struct SDImageUserDefaultsProvider: SDImageProviding {
     }
 }
 
-public struct SDImageURLUserDefaultsProvider: SDImageProviding {
+public struct SDImageURLFileProvider: SDImageProviding {
     public init() { }
 
     public func image(forURL url: URL) -> AnyPublisher<UIImage?, Error> {
-        SDImageUserDefaultsProvider()
+        SDImageFileProvider()
             .image(forURL: url)
             .flatMap { image -> AnyPublisher<UIImage?, Error> in
                 guard let image = image else {

Sources/ScreenDataUI/Helpers/SDImage/SDImageStoring.swift

@@ -13,16 +13,21 @@ public protocol SDImageStoring {
     func store(image: UIImage?, forURL url: URL) -> AnyPublisher<Void, Error>
 }
 
-public struct SDImageUserDefaultsStorer: SDImageStoring {
+public struct SDImageFileStore: SDImageStoring {
     public init() { }
 
     public func store(image: UIImage?, forURL url: URL) -> AnyPublisher<Void, Error> {
         Future { promise in
+            let key = url.absoluteString.replacingOccurrences(of: "/", with: "-")
+            let path = FileManager.default.urls(
+                for: .documentDirectory,
+                   in: .userDomainMask
+            )[0].appendingPathComponent(key)
+            
             if let imageData = image?.pngData() {
-                UserDefaults.standard.set(imageData, forKey: url.absoluteString)
-            } else {
-                UserDefaults.standard.set(nil, forKey: url.absoluteString)
+                try? imageData.write(to: path)
             }
+            
             promise(.success(()))
         }
         .eraseToAnyPublisher()

Sources/ScreenDataUI/Navigation/SDScreenProvider.swift

@@ -17,15 +17,9 @@ public struct SDScreenProvider: ScreenProviding {
 
     public func screen(forID id: String) -> AnyPublisher<SomeScreen, Error> {
         guard let provider = SDScreenProvider.default else {
-            return ScreenDataNavigation.MockScreenProvider(
-                mockScreen: SomeScreen(
-                    title: "Mock Screen",
-                    backgroundColor: SomeColor(red: 1, green: 1, blue: 1),
-                    someView: SomeText(title: "Set SDScreenProvider.default").someView
-                )
-            )
-            .screen(forID: id)
-            .eraseToAnyPublisher()
+            return FileScreenProvider(baseKey: "SDScreenStore")
+                .screen(forID: id)
+                .eraseToAnyPublisher()
         }
 
         return provider.screen(forID: id)

Sources/ScreenDataUI/Navigation/SDScreenStore.swift

@@ -19,7 +19,7 @@ public struct SDScreenStore: ScreenStoring {
     public func store(screens: [SomeScreen]) -> AnyPublisher<Void, Error> {
         guard let store = SDScreenStore.default else {
             log(level: .info("Saving SomeScreens: \(screens.map(\.id))"))
-            return ScreenDataNavigation.UserDefaultScreenStorer(baseKey: "SDScreenStore")
+            return FileScreenStore(baseKey: "SDScreenStore")
                 .store(screens: screens)
         }
 

Sources/ScreenDataUI/Views/SDScreen.swift

@@ -25,7 +25,12 @@ public struct SDScreen: View, Equatable {
                 }
                 .eraseToAnyPublisher()
                 .sink(
-                    receiveCompletion: { _ in sema.signal() },
+                    receiveCompletion: { completion in
+                        if case let .failure(error) = completion {
+                            log(level: .error("SDScreen.init -> SDScreenStore.store", error))
+                        }
+                        sema.signal()
+                    },
                     receiveValue: { _ in }
                 )