fix lint errors

lukepistrol · Oct 4, 2024 · a4a4e33 · a4a4e33
1 parent 9619f0d
commit a4a4e33
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 13 deletions.
diff --git a/TimeMachineStatus.xcodeproj/project.pbxproj b/TimeMachineStatus.xcodeproj/project.pbxproj
@@ -473,7 +473,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [[ \"$(uname -m)\" == arm64 ]]; then\n    export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif which swiftlint > /dev/null; then\n  if $CI; then\n    echo \"Skipping SwiftLint (CI)\"\n  else\n    swiftlint\n  fi\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [[ \"$(uname -m)\" == arm64 ]]; then\n    export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif which swiftlint > /dev/null; then\n  if [[ $CI ]]; then\n    echo \"Skipping SwiftLint (CI)\"\n  else\n    swiftlint\n  fi\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/TimeMachineStatus.xcodeproj/xcshareddata/xcschemes/TimeMachineStatus.xcscheme b/TimeMachineStatus.xcodeproj/xcshareddata/xcschemes/TimeMachineStatus.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "28A002162AFBBFC300E2A01E"
+               BuildableName = "TimeMachineStatus.app"
+               BlueprintName = "TimeMachineStatus"
+               ReferencedContainer = "container:TimeMachineStatus.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "28A002162AFBBFC300E2A01E"
+            BuildableName = "TimeMachineStatus.app"
+            BlueprintName = "TimeMachineStatus"
+            ReferencedContainer = "container:TimeMachineStatus.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "28A002162AFBBFC300E2A01E"
+            BuildableName = "TimeMachineStatus.app"
+            BlueprintName = "TimeMachineStatus"
+            ReferencedContainer = "container:TimeMachineStatus.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/TimeMachineStatus/Components/ExpandableSection.swift b/TimeMachineStatus/Components/ExpandableSection.swift
@@ -37,7 +37,7 @@ struct ExpandableSection<C: View, H: View>: View {
                 HStack {
                     header()
                     Spacer()
-                    Image(systemName: "chevron.right")
+                    Image(systemSymbol: .chevronRight)
                         .rotationEffect(expanded ? .degrees(90) : .zero)
                         .padding(.horizontal, 12)
                         .contentShape(.rect)

diff --git a/TimeMachineStatus/Components/HideWindowControlsViewModifier.swift b/TimeMachineStatus/Components/HideWindowControlsViewModifier.swift
@@ -11,13 +11,13 @@
 
 import SwiftUI
 
-private struct HideWindowControllsViewModifier: ViewModifier {
+private struct HideWindowControlsViewModifier: ViewModifier {
 
     let types: [NSWindow.ButtonType]
 
     func body(content: Content) -> some View {
         content
-            .onReceive(NotificationCenter.default.publisher(for: NSWindow.didBecomeKeyNotification)) { notification in
+            .onReceive(NotificationCenter.default.publisher(for: NSWindow.didBecomeKeyNotification)) { _ in
                 guard let window = NSApplication.shared.windows.first(where: { $0.isKeyWindow }) else { return }
                 hideWindowControls(for: window)
             }
@@ -38,6 +38,6 @@ extension View {
             .zoomButton
         ]
     ) -> some View {
-        modifier(HideWindowControllsViewModifier(types: types))
+        modifier(HideWindowControlsViewModifier(types: types))
     }
 }
diff --git a/TimeMachineStatus/Components/UserfacingErrorView.swift b/TimeMachineStatus/Components/UserfacingErrorView.swift
@@ -38,7 +38,7 @@ struct UserfacingErrorView: View {
                 if let action = error.action {
                     Divider()
                     switch action {
-                    case .link(let title, let url):
+                    case let .link(title, url):
                         Button(title) {
                             NSWorkspace.shared.open(url)
                         }

diff --git a/TimeMachineStatus/Model/Preferences/Preferences.swift b/TimeMachineStatus/Model/Preferences/Preferences.swift
@@ -40,7 +40,7 @@ struct Preferences: Decodable {
         )
         self.destinations = try container
             .decodeIfPresent([Destination].self, forKey: .destinations)?
-            .sorted {$0.lastKnownVolumeName ?? "" < $1.lastKnownVolumeName ?? "" }
+            .sorted { $0.lastKnownVolumeName ?? "" < $1.lastKnownVolumeName ?? "" }
         self.skipPaths = try container.decodeIfPresent([String].self, forKey: .skipPaths)
     }
 
@@ -144,13 +144,13 @@ extension Destination {
             bytesAvailable: .random(in: 10_000_000_000...100_000_000_000),
             filesystemTypeName: "APFS",
             lastKnownEncryptionState: "Encrypted",
-            quotaGB: .random(in: 400...1000),
+            quotaGB: .random(in: 400...1_000),
             networkURL: network ? "smb://nas.local/share" : nil,
             destinationID: UUID(),
             consistencyScanDate: .distantPast,
             referenceLocalSnapshotDate: .now,
-            snapshotDates: [.distantPast, .now.addingTimeInterval(.random(in: -100000...0))],
-            attemptDates: [.distantPast, .now.addingTimeInterval(.random(in: -100000...0))]
+            snapshotDates: [.distantPast, .now.addingTimeInterval(.random(in: -100_000...0))],
+            attemptDates: [.distantPast, .now.addingTimeInterval(.random(in: -100_000...0))]
         )
     }
 }
diff --git a/TimeMachineStatus/TimeMachineStatusApp.swift b/TimeMachineStatus/TimeMachineStatusApp.swift
@@ -11,8 +11,8 @@
 
 import Logging
 import LoggingOSLog
-import SwiftUI
 @_exported import SFSafeSymbols
+import SwiftUI
 
 @main
 struct TimeMachineStatusApp: App {

diff --git a/TimeMachineStatus/ViewModel/TMUtility.swift b/TimeMachineStatus/ViewModel/TMUtility.swift
@@ -87,7 +87,7 @@ class TMUtilityImpl: TMUtility {
 
     var canReadPreferences: Bool {
         do {
-            let _ = try Data(contentsOf: Constants.URLs.timeMachinePreferencesPlist)
+            _ = try Data(contentsOf: Constants.URLs.timeMachinePreferencesPlist)
             return true
         } catch {
             return false

diff --git a/TimeMachineStatus/Views/MenuView.swift b/TimeMachineStatus/Views/MenuView.swift
@@ -266,7 +266,11 @@ struct MenuView: View {
 
 #Preview("Light Error") {
     MenuView(
-        utility: TMUtilityMock(preferences: .mock, error: .preferencesFilePermissionNotGranted, canReadPreferences: false),
+        utility: TMUtilityMock(
+            preferences: .mock,
+            error: .preferencesFilePermissionNotGranted,
+            canReadPreferences: false
+        ),
         updater: SPUStandardUpdaterController(updaterDelegate: nil, userDriverDelegate: nil).updater
     )
     .preferredColorScheme(.light)