Update service

oversizedev · Jun 8, 2023 · 26c2389 · 26c2389
1 parent 21ca8a6
commit 26c2389
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/.swiftformat b/.swiftformat
@@ -1,2 +1,2 @@
---swiftversion 5.8
+--swiftversion 5.7
 --disable preferKeyPath
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/OversizeFileManagerService/FileManagerSyncService.swift b/Sources/OversizeFileManagerService/FileManagerSyncService.swift
@@ -23,16 +23,9 @@ public class FileManagerSyncService {
 }
 
 extension FileManagerSyncService: FileManagerSyncServiceProtocol {
-    private func downloadFromCloud(url: URL?) async -> Result<Bool, AppError> {
-        do {
-            if let url, url.fileExists() == false {
-                try FileManager.default.startDownloadingUbiquitousItem(at: url)
-                return .success(true)
-            } else {
-                return .failure(.cloudDocuments(type: .fetchItems))
-            }
-        } catch {
-            return .failure(.cloudDocuments(type: .fetchItems))
+    private func downloadFromCloud(url: URL?) async throws  {
+        if let url, url.fileExists() == false {
+            try FileManager.default.startDownloadingUbiquitousItem(at: url)
         }
     }
 
@@ -53,9 +46,11 @@ extension FileManagerSyncService: FileManagerSyncServiceProtocol {
         }
         if location == .iCloud {
             let url = await cloudDocumentsService.giveURL(folder: folder, file: file ?? "file", containerId: nil)
-            let _ = await downloadFromCloud(url: url)
-            guard let url else { return .failure(.cloudDocuments(type: .fetchItems)) }
-            return .success(url)
+            do {
+                try await downloadFromCloud(url: url)
+            } catch {
+                return .failure(.cloudDocuments(type: .fetchItems))
+            }
         } else {
             let url = await fileManagerService.giveURL(folder: folder, file: file ?? "file")
             if url?.fileExists() ?? false {