Merge branch 'main' into feature/github-actions

diegotl · Oct 20, 2023 · 63d05fc · 63d05fc
2 parents 77d736d + 680ddfd
commit 63d05fc
Show file tree

Hide file tree

Showing 25 changed files with 715 additions and 207 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,10 @@
 		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>"; };
+		3F54EB962AE2553D008A45B0 /* Empusa.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Empusa.xctestplan; sourceTree = "<group>"; };
+		3FC172272AE1D63A00DCBE28 /* EmpusaMacros */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = EmpusaMacros; 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 +57,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				3F21D3412ADD77E700B6A5D9 /* EmpusaKit in Frameworks */,
+				3FCE9D2D2AE0944C00A4E3F5 /* Sparkle in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -99,6 +106,7 @@
 		3F21D31B2ADADC7400B6A5D9 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				3F54EB962AE2553D008A45B0 /* Empusa.xctestplan */,
 				3F21D31C2ADADC7400B6A5D9 /* EmpusaTests.swift */,
 			);
 			path = Tests;
@@ -107,6 +115,7 @@
 		3F21D3352ADADC8D00B6A5D9 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				3FCE9D2E2AE0FE2E00A4E3F5 /* Info.plist */,
 				3F21D30E2ADADC7400B6A5D9 /* Assets.xcassets */,
 			);
 			path = Resources;
@@ -115,6 +124,7 @@
 		3F21D3362ADADE8B00B6A5D9 /* Packages */ = {
 			isa = PBXGroup;
 			children = (
+				3FC172272AE1D63A00DCBE28 /* EmpusaMacros */,
 				3F21D3372ADADEBE00B6A5D9 /* EmpusaKit */,
 			);
 			path = Packages;
@@ -135,6 +145,7 @@
 				3F3B176D2ADDE117000283AE /* DestinationView.swift */,
 				3F3B176F2ADDE16A000283AE /* ResourcesView.swift */,
 				3F3B17712ADDE25D000283AE /* DataProgressView.swift */,
+				3FCE9D302AE17F5F00A4E3F5 /* CheckForUpdatesView.swift */,
 			);
 			path = "UI Components";
 			sourceTree = "<group>";
@@ -157,6 +168,7 @@
 			name = Empusa;
 			packageProductDependencies = (
 				3F21D3402ADD77E700B6A5D9 /* EmpusaKit */,
+				3FCE9D2C2AE0944C00A4E3F5 /* Sparkle */,
 			);
 			productName = SwitchSDTool;
 			productReference = 3F21D3072ADADC7300B6A5D9 /* Empusa.app */;
@@ -208,6 +220,9 @@
 				Base,
 			);
 			mainGroup = 3F21D2FE2ADADC7300B6A5D9;
+			packageReferences = (
+				3FCE9D2B2AE0944C00A4E3F5 /* XCRemoteSwiftPackageReference "Sparkle" */,
+			);
 			productRefGroup = 3F21D3082ADADC7300B6A5D9 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -243,6 +258,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 +412,12 @@
 				CODE_SIGN_ENTITLEMENTS = Empusa/Empusa.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				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 +426,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = nl.trevisa.diego.Empusa;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -425,11 +442,12 @@
 				CODE_SIGN_ENTITLEMENTS = Empusa/Empusa.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				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 +456,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = nl.trevisa.diego.Empusa;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -516,11 +534,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,23 @@
 {
   "pins" : [
+    {
+      "identity" : "sparkle",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/sparkle-project/Sparkle",
+      "state" : {
+        "revision" : "1f07f4096e52f19b5e7abaa697b7fc592b7ff57c",
+        "version" : "2.5.1"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax.git",
+      "state" : {
+        "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
+        "version" : "509.0.0"
+      }
+    },
     {
       "identity" : "zip",
       "kind" : "remoteSourceControl",

diff --git a/Empusa.xcodeproj/xcshareddata/xcschemes/Empusa.xcscheme b/Empusa.xcodeproj/xcshareddata/xcschemes/Empusa.xcscheme
@@ -29,7 +29,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:Empusa Tests/Empusa.xctestplan"
+            reference = "container:Tests/Empusa.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>

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
@@ -77,7 +77,6 @@ final class EmpusaModel: ObservableObject {
     // MARK: - Init
     init() {
         loadExternalVolumes()
-        loadResourcesVersions()
     }
 
     // MARK: - Public functions
@@ -107,18 +106,27 @@ final class EmpusaModel: ObservableObject {
                 .receive(on: RunLoop.main)
                 .assign(to: &$progress)
 
-            do {
-                try await contentManager.download(
-                    resources: selectedResources,
-                    into: selectedVolume.url,
-                    progressSubject: progressSubject
-                )
-            } catch {
-                alertData = .init(error: error)
-            }
+            let result = await contentManager.download(
+                resources: selectedResources,
+                into: selectedVolume,
+                progressSubject: progressSubject
+            )
 
             isProcessing = false
             self.progress = nil
+            loadResourcesVersions()
+
+            if !result.failedResources.isEmpty {
+                alertData = .init(
+                    title: "Alert",
+                    message: "Failed to install \(result.failedResourceNames):\n\n\(result.failedResources.last!.error.localizedDescription)"
+                )
+            } else {
+                alertData = .init(
+                    title: "Success",
+                    message: "Selected resources have been downloaded into the selected destination."
+                )
+            }
         }
     }
 
@@ -170,16 +178,24 @@ 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."
             )
         }
     }
 
     func loadResourcesVersions() {
-        Task { [resourceService, weak self] in
-            self?.isLoadingResources = true
-            self?.availableResources = await resourceService.fetchResources()
-            self?.isLoadingResources = false
+        Task { [weak self] in
+            guard let self else { return }
+            self.isLoadingResources = true
+
+            self.availableResources = await resourceService
+                .fetchResources(for: self.selectedVolume)
+
+            self.selectedResources = availableResources
+                .filter{ $0.preChecked }
+                .map { $0.resource }
+
+            self.isLoadingResources = false
         }
     }
 }
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/Empusa/UI Components/ResourcesView.swift b/Empusa/UI Components/ResourcesView.swift
@@ -25,8 +25,14 @@ struct ResourcesView: View {
                                     model.selectedResources.remove(at: index)
                                 }
                             })) {
-                                Text(displayingResource.formattedName)
-                                    .frame(maxWidth: .infinity, alignment: .leading)
+                                HStack {
+                                    Text(displayingResource.formattedName)
+                                        .frame(maxWidth: .infinity, alignment: .leading)
+
+                                    if let version = displayingResource.version {
+                                        Text(version)
+                                    }
+                                }
                             }
                         }
                     }
@@ -36,6 +42,12 @@ struct ResourcesView: View {
             }
         }
         .disabled(model.isProcessing)
+        .onAppear(perform: {
+            model.loadResourcesVersions()
+        })
+        .onChange(of: model.selectedVolume) { _ in
+            model.loadResourcesVersions()
+        }
     }
 }
 

diff --git a/Packages/EmpusaKit/Package.swift b/Packages/EmpusaKit/Package.swift
@@ -13,13 +13,15 @@ let package = Package(
             targets: ["EmpusaKit"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.2")
+        .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.2"),
+        .package(path: "../EmpusaMacros")
     ],
     targets: [
         .target(
             name: "EmpusaKit",
             dependencies: [
-                .product(name: "Zip", package: "Zip")
+                .product(name: "Zip", package: "Zip"),
+                .product(name: "EmpusaMacros", package: "EmpusaMacros")
             ]
         ),
         .testTarget(