Fix slow download speed and add more resources. (#2)

* Fix slow download speed and add more resoources. * Check to update function
diegotl · Oct 19, 2023 · af54e63 · af54e63
1 parent 113c79f
commit af54e63
Show file tree

Hide file tree

Showing 12 changed files with 234 additions and 88 deletions.
diff --git a/Empusa.xcodeproj/project.pbxproj b/Empusa.xcodeproj/project.pbxproj
@@ -17,6 +17,8 @@
 		3F3B176E2ADDE117000283AE /* DestinationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3B176D2ADDE117000283AE /* DestinationView.swift */; };
 		3F3B17702ADDE16A000283AE /* ResourcesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3B176F2ADDE16A000283AE /* ResourcesView.swift */; };
 		3F3B17722ADDE25D000283AE /* DataProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F3B17712ADDE25D000283AE /* DataProgressView.swift */; };
+		3FCE9D2D2AE0944C00A4E3F5 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 3FCE9D2C2AE0944C00A4E3F5 /* Sparkle */; };
+		3FCE9D312AE17F5F00A4E3F5 /* CheckForUpdatesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FCE9D302AE17F5F00A4E3F5 /* CheckForUpdatesView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -43,6 +45,8 @@
 		3F3B176D2ADDE117000283AE /* DestinationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DestinationView.swift; sourceTree = "<group>"; };
 		3F3B176F2ADDE16A000283AE /* ResourcesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesView.swift; sourceTree = "<group>"; };
 		3F3B17712ADDE25D000283AE /* DataProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataProgressView.swift; sourceTree = "<group>"; };
+		3FCE9D2E2AE0FE2E00A4E3F5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		3FCE9D302AE17F5F00A4E3F5 /* CheckForUpdatesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckForUpdatesView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -51,6 +55,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				3F21D3412ADD77E700B6A5D9 /* EmpusaKit in Frameworks */,
+				3FCE9D2D2AE0944C00A4E3F5 /* Sparkle in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -107,6 +112,7 @@
 		3F21D3352ADADC8D00B6A5D9 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				3FCE9D2E2AE0FE2E00A4E3F5 /* Info.plist */,
 				3F21D30E2ADADC7400B6A5D9 /* Assets.xcassets */,
 			);
 			path = Resources;
@@ -135,6 +141,7 @@
 				3F3B176D2ADDE117000283AE /* DestinationView.swift */,
 				3F3B176F2ADDE16A000283AE /* ResourcesView.swift */,
 				3F3B17712ADDE25D000283AE /* DataProgressView.swift */,
+				3FCE9D302AE17F5F00A4E3F5 /* CheckForUpdatesView.swift */,
 			);
 			path = "UI Components";
 			sourceTree = "<group>";
@@ -157,6 +164,7 @@
 			name = Empusa;
 			packageProductDependencies = (
 				3F21D3402ADD77E700B6A5D9 /* EmpusaKit */,
+				3FCE9D2C2AE0944C00A4E3F5 /* Sparkle */,
 			);
 			productName = SwitchSDTool;
 			productReference = 3F21D3072ADADC7300B6A5D9 /* Empusa.app */;
@@ -208,6 +216,9 @@
 				Base,
 			);
 			mainGroup = 3F21D2FE2ADADC7300B6A5D9;
+			packageReferences = (
+				3FCE9D2B2AE0944C00A4E3F5 /* XCRemoteSwiftPackageReference "Sparkle" */,
+			);
 			productRefGroup = 3F21D3082ADADC7300B6A5D9 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -243,6 +254,7 @@
 			files = (
 				3F3B17702ADDE16A000283AE /* ResourcesView.swift in Sources */,
 				3F21D30D2ADADC7300B6A5D9 /* MainView.swift in Sources */,
+				3FCE9D312AE17F5F00A4E3F5 /* CheckForUpdatesView.swift in Sources */,
 				3F3B17722ADDE25D000283AE /* DataProgressView.swift in Sources */,
 				3F21D30B2ADADC7300B6A5D9 /* EmpusaApp.swift in Sources */,
 				3F3B176E2ADDE117000283AE /* DestinationView.swift in Sources */,
@@ -396,11 +408,12 @@
 				CODE_SIGN_ENTITLEMENTS = Empusa/Empusa.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = D97MJ3844Q;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = Empusa/Resources/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "εmpusa";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -409,7 +422,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = nl.trevisa.diego.Empusa;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -425,11 +438,12 @@
 				CODE_SIGN_ENTITLEMENTS = Empusa/Empusa.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = D97MJ3844Q;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = Empusa/Resources/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "εmpusa";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -438,7 +452,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = nl.trevisa.diego.Empusa;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -516,11 +530,27 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCRemoteSwiftPackageReference section */
+		3FCE9D2B2AE0944C00A4E3F5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/sparkle-project/Sparkle";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.5.1;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
 		3F21D3402ADD77E700B6A5D9 /* EmpusaKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = EmpusaKit;
 		};
+		3FCE9D2C2AE0944C00A4E3F5 /* Sparkle */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3FCE9D2B2AE0944C00A4E3F5 /* XCRemoteSwiftPackageReference "Sparkle" */;
+			productName = Sparkle;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 3F21D2FF2ADADC7300B6A5D9 /* Project object */;

diff --git a/Empusa.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Empusa.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "sparkle",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/sparkle-project/Sparkle",
+      "state" : {
+        "revision" : "1f07f4096e52f19b5e7abaa697b7fc592b7ff57c",
+        "version" : "2.5.1"
+      }
+    },
     {
       "identity" : "zip",
       "kind" : "remoteSourceControl",

diff --git a/Empusa/EmpusaApp.swift b/Empusa/EmpusaApp.swift
@@ -1,14 +1,27 @@
 import SwiftUI
+import Sparkle
 
 @main
 struct EmpusaApp: App {
+    private let updaterController: SPUStandardUpdaterController = .init(
+        startingUpdater: true,
+        updaterDelegate: nil,
+        userDriverDelegate: nil
+    )
+
     var body: some Scene {
         WindowGroup {
             MainView(
                 model: EmpusaModel()
             )
-            .frame(width: 680, height: 400)
+            .frame(width: 680, height: 420)
         }
         .windowResizability(.contentSize)
+        .commands {
+            CommandGroup(replacing: CommandGroupPlacement.newItem) {}
+            CommandGroup(after: .appInfo) {
+                CheckForUpdatesView(updater: updaterController.updater)
+            }
+        }
     }
 }
diff --git a/Empusa/EmpusaModel.swift b/Empusa/EmpusaModel.swift
@@ -113,6 +113,11 @@ final class EmpusaModel: ObservableObject {
                     into: selectedVolume.url,
                     progressSubject: progressSubject
                 )
+
+                self.alertData = .init(
+                    title: "Success",
+                    message: "Selected resources have been downloaded into the selected destination."
+                )
             } catch {
                 alertData = .init(error: error)
             }
@@ -170,7 +175,7 @@ final class EmpusaModel: ObservableObject {
 
             self.alertData = .init(
                 title: "Success",
-                message: "Backup sucessfully restored to the selected volume"
+                message: "Backup sucessfully restored to the selected destination."
             )
         }
     }

diff --git a/Empusa/Resources/Info.plist b/Empusa/Resources/Info.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SUFeedURL</key>
+	<string>https://empusa.pacotevicio.app/sparkle.xml</string>
+    <key>SUPublicEDKey</key>
+    <string>62os1l9hx8vk8noKLn706G/htYbpMlhOP2TTJQFa66w=</string>
+</dict>
+</plist>
diff --git a/Empusa/UI Components/CheckForUpdatesView.swift b/Empusa/UI Components/CheckForUpdatesView.swift
@@ -0,0 +1,26 @@
+import SwiftUI
+import Sparkle
+
+final class CheckForUpdatesViewModel: ObservableObject {
+    @Published var canCheckForUpdates = false
+
+    init(updater: SPUUpdater) {
+        updater.publisher(for: \.canCheckForUpdates)
+            .assign(to: &$canCheckForUpdates)
+    }
+}
+
+struct CheckForUpdatesView: View {
+    @ObservedObject private var checkForUpdatesViewModel: CheckForUpdatesViewModel
+    private let updater: SPUUpdater
+
+    init(updater: SPUUpdater) {
+        self.updater = updater
+        self.checkForUpdatesViewModel = CheckForUpdatesViewModel(updater: updater)
+    }
+
+    var body: some View {
+        Button("Check for Updates...", action: updater.checkForUpdates)
+            .disabled(!checkForUpdatesViewModel.canCheckForUpdates)
+    }
+}
diff --git a/Packages/EmpusaKit/Sources/EmpusaKit/Client/Client.swift b/Packages/EmpusaKit/Sources/EmpusaKit/Client/Client.swift
@@ -2,14 +2,17 @@ import Foundation
 import Combine
 
 protocol ClientProtocol {
-    func request<T: Decodable>(url: URL) async throws -> T
+    func request<T: Decodable>(
+        url: URL
+    ) async throws -> T
+
     func downloadFile(
         url: URL,
         progressSubject: CurrentValueSubject<Double, Never>
-    ) async throws -> Data
+    ) async throws -> URL
 }
 
-final class Client: ClientProtocol {
+final class Client: NSObject, ClientProtocol {
     func request<T: Decodable>(url: URL) async throws -> T {
         let request = URLRequest(url: url)
         let (data, response) = try await URLSession
@@ -26,21 +29,16 @@ final class Client: ClientProtocol {
     func downloadFile(
         url: URL,
         progressSubject: CurrentValueSubject<Double, Never>
-    ) async throws -> Data {
-        let (asyncBytes, urlResponse) = try await URLSession
-            .shared
-            .bytes(from: url)
-
-        let length = urlResponse.expectedContentLength
-        var data = Data()
-        data.reserveCapacity(Int(length))
-
-        for try await byte in asyncBytes {
-            data.append(byte)
-            let downloadProgress = Double(data.count) / Double(length)
-            progressSubject.send(downloadProgress)
+    ) async throws -> URL {
+        // TODO: implement download progress
+        defer {
+            progressSubject.send(1)
         }
 
-        return data
+        let (localUrl, response) = try await URLSession
+            .shared
+            .download(from: url)
+
+        return localUrl
     }
 }
diff --git a/Packages/EmpusaKit/Sources/EmpusaKit/ContentManager.swift b/Packages/EmpusaKit/Sources/EmpusaKit/ContentManager.swift
@@ -42,43 +42,48 @@ public final class ContentManager: ContentManagerProtocol {
 
             // Download asset
             progressTitleSubject.send("Downloading \(resource.assetFileName)...")
-            let asset = try await githubService.downloadAsset(
+            let assetFileTempUrl = try await githubService.downloadAsset(
                 for: resource,
                 progressSubject: downloadProgressSubject
             )
 
-            progressTitleSubject.send("Saving \(resource.assetFileName)...")
-            let assetFilePath = try await storageService.saveFile(
-                data: asset,
-                fileName: resource.assetFileName
+            // Rename asset file
+            let assetFileUrl = assetFileTempUrl
+                .deletingLastPathComponent()
+                .appending(component: resource.assetFileName)
+
+            try storageService.moveItem(
+                at: assetFileTempUrl,
+                to: assetFileUrl
             )
 
-            let extractedPath = try {
+            let extractedUrl = try {
                 if resource.isAssetZipped {
                     // Unzip asset
                     progressTitleSubject.send("Unzipping \(resource.assetFileName)...")
                     return try storageService.unzipFile(
-                        at: assetFilePath,
+                        at: assetFileUrl,
                         progressSubject: unzipProgressSubject
                     )
                 } else {
+                    // Do nothing
                     unzipProgressSubject.send(1)
-                    return assetFilePath
+                    return assetFileUrl
                 }
             }()
 
             // Copy asset to SD
             progressTitleSubject.send("Copying contents of \(resource.assetFileName) into destination...")
             try resource.handleAsset(
-                at: extractedPath,
+                at: extractedUrl,
                 destination: destination,
                 progressSubject: mergeProgressSubject
             )
 
             // Delete downloaded files on disk
             progressTitleSubject.send("Removing temporary files...")
-            storageService.removeItem(at: assetFilePath)
-            storageService.removeItem(at: extractedPath)
+            storageService.removeItem(at: assetFileUrl)
+            storageService.removeItem(at: extractedUrl)
 
             cancellable.cancel()
         }

diff --git a/Packages/EmpusaKit/Sources/EmpusaKit/Extensions/FileManager+FoldersMerger.swift b/Packages/EmpusaKit/Sources/EmpusaKit/Extensions/FileManager+FoldersMerger.swift
@@ -10,19 +10,15 @@ extension FileManager {
         .init(subsystem: "nl.trevisa.diego.Empusa.Services", category: "FileManager")
     }
 
-    enum ActionType {
-        case move
-        case copy
-    }
-
     enum ConflictResolution {
         case keepSource
         case keepDestination
     }
 
     func moveFile(
         at location: URL,
-        to destination: URL
+        to destination: URL,
+        progressSubject: CurrentValueSubject<Double, Never>
     ) {
         let fileName = location.lastPathComponent
         let filedestination = destination.appending(path: fileName)
@@ -50,6 +46,8 @@ extension FileManager {
         } catch {
             logger.error("Move file error: \(error.localizedDescription)")
         }
+
+        progressSubject.send(1)
     }
 
     func merge(