Merge pull request #39 from boscojwho/bosco/fix-calculate-concurrency…

…-crash ^ Fix crash when calling SwiftUI observable on non-main thread.
boscojwho · Dec 1, 2023 · 797e9b9 · 797e9b9
2 parents 6a18590 + ae244ad
commit 797e9b9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/Chinotto.xcodeproj/project.pbxproj b/Chinotto.xcodeproj/project.pbxproj
@@ -530,7 +530,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 14.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -588,7 +588,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 14.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;

diff --git a/Chinotto/StorageView.swift b/Chinotto/StorageView.swift
@@ -105,7 +105,8 @@ final class StorageViewModel: Identifiable {
     private(set) var fileSizeMetadata: [SizeMetadata] = []
 
     /// - Parameter initial: If `true`, only calculates size if not yet calculated.
-    func calculateSize(initial: Bool, recalculate: Bool, shallowMetadata: Bool = false) {
+    @MainActor
+    func calculateSize(initial: Bool, recalculate: Bool, shallowMetadata: Bool = false) async {
         defer { performedInitialLoad = true }
 
         if initial, performedInitialLoad == true {
@@ -149,7 +150,7 @@ final class StorageViewModel: Identifiable {
                 )
             }
         #else
-        self.dirSize = URL.directorySize(
+        self.dirSize = await URL.directorySize(
             url: .init(filePath: directory.userPath, directoryHint: .isDirectory)
         )
         #endif
@@ -226,7 +227,7 @@ struct StorageView: View {
 
     private func reload() {
         Task(priority: .userInitiated) {
-            viewModel.calculateSize(initial: false, recalculate: true)
+            await viewModel.calculateSize(initial: false, recalculate: true)
         }
     }
 

diff --git a/Chinotto/UnifiedStorageView.swift b/Chinotto/UnifiedStorageView.swift
@@ -64,7 +64,7 @@ struct UnifiedStorageView: View {
             await withTaskGroup(of: Void.self, returning: Void.self) { taskGroup in
                 viewModels.forEach { viewModel in
                     taskGroup.addTask(priority: .userInitiated) {
-                        viewModel.calculateSize(initial: false, recalculate: true)
+                        await viewModel.calculateSize(initial: false, recalculate: true)
                     }
                 }
             }

diff --git a/Packages/FileSystem/Package.swift b/Packages/FileSystem/Package.swift
@@ -5,6 +5,7 @@ import PackageDescription
 
 let package = Package(
     name: "FileSystem",
+    platforms: [.macOS(.v14)],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(

diff --git a/Packages/FileSystem/Sources/FileSystem/FileSystem.swift b/Packages/FileSystem/Sources/FileSystem/FileSystem.swift
@@ -145,4 +145,13 @@ public extension URL {
 
         return size
     }
+
+    static func directorySize(url: URL) async -> Int {
+        await withCheckedContinuation { continuation in
+            Task(priority: .userInitiated) {
+                let dirSize = directorySize(url: url)
+                continuation.resume(returning: dirSize)
+            }
+        }
+    }
 }