Merge branch 'migrate-to-app-group-documents'

Passepartout/Sources/AppConstants.swift

@@ -97,7 +97,7 @@ class AppConstants {
         private static let fileName = "Debug.log"
         
         static var fileURL: URL {
-            return FileManager.default.userURL(for: .cachesDirectory, appending: fileName)
+            return GroupConstants.App.cachesURL.appendingPathComponent(fileName)
         }
 
         private static let console: ConsoleDestination = {

Passepartout/Sources/GroupConstants.swift

@@ -53,6 +53,25 @@ class GroupConstants {
         
         static let tunnelIdentifier = "com.algoritmico.macos.Passepartout.Tunnel"
         #endif
+
+        private static var containerURL: URL {
+            guard let url = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup) else {
+                fatalError("Unable to access App Group container")
+            }
+            return url
+        }
+
+        static let documentsURL: URL = {
+            let url = containerURL.appendingPathComponent("Documents", isDirectory: true)
+            try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
+            return url
+        }()
+
+        static let cachesURL: URL = {
+            let url = containerURL.appendingPathComponent("Library/Caches", isDirectory: true)
+            try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
+            return url
+        }()
     }
     
     class VPN {

Passepartout/Sources/Model/ConnectionService.swift

@@ -58,7 +58,11 @@ class ConnectionService: Codable {
     var directory: String? = nil
     
     var rootURL: URL {
-        return FileManager.default.userURL(for: .documentDirectory, appending: directory)
+        var url = GroupConstants.App.documentsURL
+        if let directory = directory {
+            url.appendPathComponent(directory)
+        }
+        return url
     }
     
     private var providersURL: URL {

Passepartout/Sources/Model/TransientStore.swift

@@ -36,7 +36,7 @@ class TransientStore {
     static let shared = TransientStore()
     
     private static var serviceURL: URL {
-        return FileManager.default.userURL(for: .documentDirectory, appending: AppConstants.Store.serviceFilename)
+        return GroupConstants.App.documentsURL.appendingPathComponent(AppConstants.Store.serviceFilename)
     }
     
     let service: ConnectionService
@@ -51,6 +51,7 @@ class TransientStore {
     }
 
     private init() {
+        TransientStore.migrateDocumentsToAppGroup()
 
         // this must be graceful
         ConnectionService.migrateJSON(from: TransientStore.serviceURL, to: TransientStore.serviceURL)
@@ -85,4 +86,35 @@ class TransientStore {
             service.saveProfiles()
         }
     }
+    
+    //
+    
+    private static func migrateDocumentsToAppGroup() {
+        var hasMigrated = false
+        let oldDocumentsURL = FileManager.default.userURL(for: .documentDirectory, appending: nil)
+        let newDocumentsURL = GroupConstants.App.documentsURL
+        log.debug("App documentsURL: \(oldDocumentsURL)")
+        log.debug("Group documentsURL: \(newDocumentsURL)")
+        let fm = FileManager.default
+        do {
+            for c in try fm.contentsOfDirectory(atPath: oldDocumentsURL.path) {
+                guard c != "Inbox" else {
+                    continue
+                }
+                let old = oldDocumentsURL.appendingPathComponent(c)
+                let new = newDocumentsURL.appendingPathComponent(c)
+                log.verbose("Move:")
+                log.verbose("\tFROM: \(old)")
+                log.verbose("\tTO: \(new)")
+                try fm.moveItem(at: old, to: new)
+                hasMigrated = true
+            }
+        } catch let e {
+            hasMigrated = false
+            log.error("Could not migrate documents to App Group: \(e)")
+        }
+        if hasMigrated {
+            log.debug("Documents migrated to App Group")
+        }
+    }
 }

Passepartout/Sources/Services/InfrastructureFactory.swift

@@ -75,7 +75,7 @@ class InfrastructureFactory {
         }
         self.bundle = bundle
 
-        cachePath = FileManager.default.userURL(for: .cachesDirectory, appending: nil)
+        cachePath = GroupConstants.App.cachesURL
         cache = [:]
         lastUpdate = [:]
     }