Merge pull request #24 from p-x9/feature/app-group-directories

fix to handle files directory under the home directory
p-x9 · Oct 12, 2022 · 06d027d · 06d027d
2 parents 092060e + 854dc73
commit 06d027d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Sources/AppContainer/AppContainer.swift b/Sources/AppContainer/AppContainer.swift
@@ -328,6 +328,17 @@ extension AppContainer {
     ///   - src: source path.
     ///   - dst: destination path.
     private func moveContainerContents(src: String, dst: String) throws {
+        if src == dst {
+            return
+        }
+
+        if groupIdentifier != nil {
+            let excludes = Constants.appGroupExcludeFileNames + Container.Directories.allNames
+            try fileManager.createDirectoryIfNotExisted(atPath: dst, withIntermediateDirectories: true)
+            try fileManager.removeChildContents(atPath: dst, excludes: excludes)
+            try fileManager.moveChildContents(atPath: src, toPath: dst, excludes: excludes)
+        }
+
         try Container.Directories.allCases.forEach { directory in
             let source = src + "/" + directory.name
             let destination = dst + "/" + directory.name

diff --git a/Sources/AppContainer/Constants.swift b/Sources/AppContainer/Constants.swift
@@ -14,4 +14,9 @@ enum Constants {
     static let appContainerSettingsPlistName = "settings.plist"
 
     static let containerInfoPlistName = "container.plist"
+
+    static let appGroupExcludeFileNames = [
+        ".com.apple.mobile_container_manager.metadata.plist",
+        "container.plist"
+    ]
 }