Apply swiftformat

Author: sergeymakinen

ResticScheduler/AdvancedSettings.swift

@@ -23,8 +23,8 @@ class AdvancedSettings: Model {
       return _error
     }
 
+    private let lock = OSAllocatedUnfairLock()
     private var needRefresh = true
-    private var lock = OSAllocatedUnfairLock()
     private var _value = ""
     private var _error = false
 

ResticScheduler/AppDelegate.swift

@@ -81,7 +81,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
       let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
       self.notificationCenter!.add(request, withCompletionHandler: { error in
         guard error == nil else {
-          TypeLogger.function().warning("Notification request addition error: \(error!.localizedDescription, privacy: .public)")
+          TypeLogger.function().warning("Couldn't add notification request: \(error!.localizedDescription, privacy: .public)")
           return
         }
       })

ResticScheduler/EditableList.swift

@@ -33,9 +33,9 @@ class EditableList: Model {
     super.init()
     publisher = self.data.publisher.sink { [weak self] _ in
       guard let self else { return }
-      guard !self.ignoringChanges else { return }
+      guard !ignoringChanges else { return }
 
-      self.ignoringChanges {
+      ignoringChanges {
         self.selection = nil
         self.id = 0
         self.list = self.data.wrappedValue.map { value in self.makeListItem(value) }

ResticScheduler/ResticScheduler.swift

@@ -39,7 +39,7 @@ class ResticScheduler: Model, ResticSchedulerProtocol {
 
   private var isBackupStale: Bool {
     let interval = Duration.seconds(AppEnvironment.shared.backupFrequency)
-    return self.lastSuccessfulBackup == nil || self.lastSuccessfulBackup!.timeIntervalSinceNow >= TimeInterval(interval.components.seconds * 2)
+    return lastSuccessfulBackup == nil || lastSuccessfulBackup!.timeIntervalSinceNow >= TimeInterval(interval.components.seconds * 2)
   }
 
   override private init() {
@@ -120,7 +120,7 @@ class ResticScheduler: Model, ResticSchedulerProtocol {
       backupScheduler!.interval = TimeInterval(interval.components.seconds)
       backupScheduler!.repeats = true
       backupScheduler!.schedule { [weak self] completion in
-        guard let self, let scheduler = self.backupScheduler else {
+        guard let self, let scheduler = backupScheduler else {
           completion(.deferred)
           return
         }
@@ -148,7 +148,7 @@ class ResticScheduler: Model, ResticSchedulerProtocol {
       staleBackupScheduler!.qualityOfService = .background
       staleBackupScheduler!.interval = TimeInterval(Self.staleBackupCheckInterval.components.seconds)
       staleBackupScheduler!.schedule { [weak self] completion in
-        guard let self, let scheduler = self.staleBackupScheduler else {
+        guard let self, let scheduler = staleBackupScheduler else {
           completion(.deferred)
           return
         }
@@ -157,7 +157,7 @@ class ResticScheduler: Model, ResticSchedulerProtocol {
           completion(.deferred)
           return
         }
-        guard self.isBackupStale else {
+        guard isBackupStale else {
           completion(.finished)
           return
         }
@@ -169,7 +169,7 @@ class ResticScheduler: Model, ResticSchedulerProtocol {
           }
         }
       }
-      TypeLogger.function().info("Rescheduled stale backup check, interval: \(Self.staleBackupCheckInterval.formatted(.units(allowed: [.days, .hours, .minutes, .seconds], width: .wide)), privacy: .public), stale: \(self.isBackupStale)")
+      TypeLogger.function().info("Rescheduled stale backup check, interval: \(Self.staleBackupCheckInterval.formatted(.units(allowed: [.days, .hours, .minutes, .seconds], width: .wide)), privacy: .public), stale: \(self.isBackupStale, privacy: .public)")
     }
   }
 }

ResticSchedulerKit/ResticRunner.swift

@@ -66,14 +66,14 @@ public enum ProcessError: CustomNSError, LocalizedError, _ObjectiveCBridgeableEr
 
   public var errorCode: Int {
     switch self {
-    case .abnormalTermination: return Code.abnormalTermination.rawValue
+    case .abnormalTermination: Code.abnormalTermination.rawValue
     }
   }
 
   public var errorUserInfo: [String: Any] {
     switch self {
     case let .abnormalTermination(terminationStatus, standardError):
-      return [
+      [
         NSLocalizedDescriptionKey: errorDescription!,
         UserInfoKey.terminationStatus.rawValue: terminationStatus,
         UserInfoKey.standardError.rawValue: standardError,
@@ -83,7 +83,7 @@ public enum ProcessError: CustomNSError, LocalizedError, _ObjectiveCBridgeableEr
 
   public var errorDescription: String? {
     switch self {
-    case let .abnormalTermination(terminationStatus, standardError): return "Process exited with code \(terminationStatus): \(standardError != "" ? standardError : "<no output>")"
+    case let .abnormalTermination(terminationStatus, standardError): "Process exited with code \(terminationStatus): \(standardError != "" ? standardError : "<no output>")"
     }
   }
 
@@ -115,17 +115,17 @@ public enum BackupError: CustomNSError, LocalizedError, _ObjectiveCBridgeableErr
 
   public var errorCode: Int {
     switch self {
-    case .preparationInProcess: return Code.preparationInProcess.rawValue
-    case .backupInProcess: return Code.backupInProcess.rawValue
-    case .backupNotRunning: return Code.backupNotRunning.rawValue
+    case .preparationInProcess: Code.preparationInProcess.rawValue
+    case .backupInProcess: Code.backupInProcess.rawValue
+    case .backupNotRunning: Code.backupNotRunning.rawValue
     }
   }
 
   public var errorDescription: String? {
     switch self {
-    case .preparationInProcess: return "Backup preparation in process"
-    case .backupInProcess: return "Backup in process"
-    case .backupNotRunning: return "Backup not running"
+    case .preparationInProcess: "Backup preparation in process"
+    case .backupInProcess: "Backup in process"
+    case .backupNotRunning: "Backup not running"
     }
   }
 

ResticSchedulerKit/Utilities.swift

@@ -9,10 +9,10 @@ public enum XPCConnectionError: LocalizedError {
 
   public var errorDescription: String? {
     switch self {
-    case .connectionInterrupted: return "XPC connection interrupted"
-    case .connectionInvalidated: return "XPC connection invalidated"
-    case .invalidRemoteObject: return "Invalid XPC remote object"
-    case let .remoteMessageFailed(error): return "XPC remote message failed: \(error.localizedDescription)"
+    case .connectionInterrupted: "XPC connection interrupted"
+    case .connectionInvalidated: "XPC connection invalidated"
+    case .invalidRemoteObject: "Invalid XPC remote object"
+    case let .remoteMessageFailed(error): "XPC remote message failed: \(error.localizedDescription)"
     }
   }
 }