Add restic-less builds

Author: sergeymakinen

.github/workflows/goreleaser.yml .github/workflows/release.yml.github/workflows/goreleaser.yml renamed to .github/workflows/release.yml

@@ -5,9 +5,10 @@ on:
       - '*'
 permissions:
   contents: write
-name: goreleaser
+name: Release
 jobs:
-  GoReleaser:
+  goreleaser:
+    name: GoReleaser
     env:
       RESTIC_VERSION: '0.17.3'
     runs-on: macos-14
@@ -36,6 +37,7 @@ jobs:
       - name: Pack application
         run: |
           (cd Build/Products/Release && zip -9 -r 'Restic Scheduler ${{ github.ref_name }}.zip' 'Restic Scheduler.app')
+          (cd Build/Products/Release && rm 'Restic Scheduler.app/Contents/XPCServices/Restic Runner.xpc/Contents/Resources/restic' && zip -9 -r 'Restic Scheduler ${{ github.ref_name }} (without restic).zip' 'Restic Scheduler.app')
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
@@ -45,8 +47,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload artifacts
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         with:
-          files: 'Build/Products/Release/Restic Scheduler ${{ github.ref_name }}.zip'
+          files: Build/Products/Release/*.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

ResticRunner/ResticRunnerService.swift

@@ -57,7 +57,12 @@ class ResticRunnerService: ResticRunnerProtocol {
     func version(binary: String?, reply: @escaping (String?, Error?) -> Void) {
         let process = Process()
         process.qualityOfService = .userInitiated
-        process.executableURL = resticURL(forBinary: binary)
+        guard let executableURL = resticURL(forBinary: binary) else {
+            reply(nil, ProcessError.missingRestic)
+            return
+        }
+
+        process.executableURL = executableURL
         process.arguments = ["version"]
         let standardOutput = Pipe()
         let standardError = Pipe()
@@ -103,7 +108,12 @@ class ResticRunnerService: ResticRunnerProtocol {
         }
         let process = Process()
         process.qualityOfService = .background
-        process.executableURL = resticURL(forBinary: binary)
+        guard let executableURL = resticURL(forBinary: binary) else {
+            reply(ProcessError.missingRestic)
+            return
+        }
+
+        process.executableURL = executableURL
         process.environment = ProcessInfo.processInfo.environment
             .merging(options.environment) { _, new in new }
             .merging(["RESTIC_PROGRESS_FPS": "0.2"]) { _, new in new }
@@ -237,6 +247,10 @@ class ResticRunnerService: ResticRunnerProtocol {
         }
     }
 
+    func includesBuiltIn(reply: @escaping (Bool) -> Void) {
+        reply(resticURL(forBinary: nil) != nil)
+    }
+
     private func runHook(_ hook: String, ofType type: HookType, loggingTo logURL: URL) {
         do {
             try "\(Self.logPadding)Invoking \(type) hook...\n".append(to: logURL, encoding: .utf8)
@@ -278,16 +292,15 @@ class ResticRunnerService: ResticRunnerProtocol {
                 let error = ProcessError.abnormalTermination(terminationStatus: process.terminationStatus, standardError: standardErrorOutput.trimmingCharacters(in: .whitespacesAndNewlines))
                 TypeLogger.function().error("Failed to run \(type) hook: \(error.localizedDescription, privacy: .public)")
             }
-
         } catch {
             TypeLogger.function().error("\(error.localizedDescription, privacy: .public)")
         }
     }
 }
 
-func resticURL(forBinary binary: String?) -> URL {
+func resticURL(forBinary binary: String?) -> URL? {
     guard let binary, !binary.isEmpty else {
-        return Bundle.main.url(forResource: "restic", withExtension: "")!
+        return Bundle.main.url(forResource: "restic", withExtension: "")
     }
 
     return URL(fileURLWithPath: binary)

ResticScheduler/AdvancedSettingsView.swift

@@ -46,6 +46,7 @@ struct AdvancedSettingsView: View {
     }
 
     @State private var browseBinary = false
+    @State private var includesBuiltIn: Bool?
     @StateObject private var binaryVersion = BinaryVersion()
     @EnvironmentObject private var resticScheduler: ResticScheduler
     @UserDefault(\.binary) private var binary
@@ -87,8 +88,10 @@ struct AdvancedSettingsView: View {
                             .tag(BinaryType.manual)
                             Divider()
                         }
-                        Text("Built-in")
-                            .tag(BinaryType.builtIn)
+                        if includesBuiltIn != false {
+                            Text("Built-in")
+                                .tag(BinaryType.builtIn)
+                        }
                         Text("Other…")
                             .tag(BinaryType.browse)
                     }
@@ -158,7 +161,16 @@ struct AdvancedSettingsView: View {
             arguments,
         ] as [AnyHashable]) { _ in resticScheduler.rescheduleStaleBackupCheck() }
         .onChange(of: binary) { _ in binaryVersion.scheduleUpdate(via: resticScheduler, for: binary) }
-        .onAppear { binaryVersion.scheduleUpdate(via: resticScheduler, for: binary) }
+        .onAppear {
+            if includesBuiltIn == nil {
+                resticScheduler.includesBuiltIn { result in
+                    DispatchQueue.main.async {
+                        includesBuiltIn = result
+                    }
+                }
+            }
+            binaryVersion.scheduleUpdate(via: resticScheduler, for: binary)
+        }
     }
 }
 

ResticScheduler/ResticScheduler.swift

@@ -29,6 +29,11 @@ class ResticScheduler: ObservableObject, ResticSchedulerProtocol {
             activateRemoteObjectProxyWithErrorHandler { error in replyOnce(error) }?.stop(reply: replyOnce)
         }
 
+        func includesBuiltIn(reply: @escaping (Bool) -> Void) {
+            let replyOnce = withCallingReplyOnce(reply)
+            activateRemoteObjectProxyWithErrorHandler { _ in replyOnce(true) }?.includesBuiltIn(reply: replyOnce)
+        }
+
         private func activateRemoteObjectProxyWithErrorHandler(_ handler: @escaping (XPCConnectionError) -> Void) -> ResticRunnerProtocol? {
             NSXPCConnection(serviceName: Self.serviceName).activateRemoteObjectProxyWithErrorHandler(protocol: ResticRunnerProtocol.self) { error in handler(error) }
         }
@@ -216,6 +221,10 @@ class ResticScheduler: ObservableObject, ResticSchedulerProtocol {
         runner.version(binary: binary, reply: completion)
     }
 
+    func includesBuiltIn(completion: @escaping (Bool) -> Void) {
+        runner.includesBuiltIn(reply: completion)
+    }
+
     func rescheduleBackup() {
         lock.withLock {
             backupScheduler?.invalidate()

ResticSchedulerKit/ResticRunner.swift

@@ -57,6 +57,7 @@ import Foundation
 public enum ProcessError: CustomNSError, LocalizedError, _ObjectiveCBridgeableError {
     public enum Code: Int {
         case abnormalTermination = 1
+        case missingRestic = 2
     }
 
     public enum UserInfoKey: String {
@@ -65,12 +66,14 @@ public enum ProcessError: CustomNSError, LocalizedError, _ObjectiveCBridgeableEr
     }
 
     case abnormalTermination(terminationStatus: Int32, standardError: String)
+    case missingRestic
 
     public static let errorDomain = String(describing: Self.self)
 
     public var errorCode: Int {
         switch self {
         case .abnormalTermination: Code.abnormalTermination.rawValue
+        case .missingRestic: Code.missingRestic.rawValue
         }
     }
 
@@ -82,12 +85,15 @@ public enum ProcessError: CustomNSError, LocalizedError, _ObjectiveCBridgeableEr
                 UserInfoKey.terminationStatus.rawValue: terminationStatus,
                 UserInfoKey.standardError.rawValue: standardError,
             ]
+        default:
+            [NSLocalizedDescriptionKey: errorDescription!]
         }
     }
 
     public var errorDescription: String? {
         switch self {
         case let .abnormalTermination(terminationStatus, standardError): "Process exited with code \(terminationStatus): \(standardError != "" ? standardError : "<no output>")"
+        case .missingRestic: "Unavailable built-in restic and no custom was provided"
         }
     }
 
@@ -102,6 +108,8 @@ public enum ProcessError: CustomNSError, LocalizedError, _ObjectiveCBridgeableEr
                 terminationStatus: error.userInfo[UserInfoKey.terminationStatus.rawValue] as! Int32,
                 standardError: error.userInfo[UserInfoKey.standardError.rawValue] as! String
             )
+        case Code.missingRestic.rawValue:
+            self = .missingRestic
         default:
             return nil
         }
@@ -157,4 +165,5 @@ public enum BackupError: CustomNSError, LocalizedError, _ObjectiveCBridgeableErr
     func version(binary: String?, reply: @escaping (String?, Error?) -> Void)
     func backup(binary: String?, options: BackupOptions, reply: @escaping (Error?) -> Void)
     func stop(reply: @escaping (Error?) -> Void)
+    func includesBuiltIn(reply: @escaping (Bool) -> Void)
 }