Better reactivity and functionality

.gitignore

@@ -97,4 +97,4 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
-.DS_Store
+

.swift-format

@@ -1,69 +0,0 @@
-{
-  "fileScopedDeclarationPrivacy" : {
-    "accessLevel" : "private"
-  },
-  "indentation" : {
-    "tabs" : 1
-  },
-  "indentConditionalCompilationBlocks" : true,
-  "indentSwitchCaseLabels" : false,
-  "lineBreakAroundMultilineExpressionChainComponents" : false,
-  "lineBreakBeforeControlFlowKeywords" : false,
-  "lineBreakBeforeEachArgument" : false,
-  "lineBreakBeforeEachGenericRequirement" : false,
-  "lineLength" : 80,
-  "maximumBlankLines" : 1,
-  "multiElementCollectionTrailingCommas" : true,
-  "noAssignmentInExpressions" : {
-    "allowedFunctions" : [
-      "XCTAssertNoThrow"
-    ]
-  },
-  "prioritizeKeepingFunctionOutputTogether" : false,
-  "respectsExistingLineBreaks" : true,
-  "rules" : {
-    "AllPublicDeclarationsHaveDocumentation" : false,
-    "AlwaysUseLiteralForEmptyCollectionInit" : false,
-    "AlwaysUseLowerCamelCase" : true,
-    "AmbiguousTrailingClosureOverload" : true,
-    "BeginDocumentationCommentWithOneLineSummary" : false,
-    "DoNotUseSemicolons" : true,
-    "DontRepeatTypeInStaticProperties" : true,
-    "FileScopedDeclarationPrivacy" : true,
-    "FullyIndirectEnum" : true,
-    "GroupNumericLiterals" : true,
-    "IdentifiersMustBeASCII" : true,
-    "NeverForceUnwrap" : false,
-    "NeverUseForceTry" : false,
-    "NeverUseImplicitlyUnwrappedOptionals" : false,
-    "NoAccessLevelOnExtensionDeclaration" : true,
-    "NoAssignmentInExpressions" : true,
-    "NoBlockComments" : true,
-    "NoCasesWithOnlyFallthrough" : true,
-    "NoEmptyTrailingClosureParentheses" : true,
-    "NoLabelsInCasePatterns" : true,
-    "NoLeadingUnderscores" : false,
-    "NoParensAroundConditions" : true,
-    "NoPlaygroundLiterals" : true,
-    "NoVoidReturnOnFunctionSignature" : true,
-    "OmitExplicitReturns" : false,
-    "OneCasePerLine" : true,
-    "OneVariableDeclarationPerLine" : true,
-    "OnlyOneTrailingClosureArgument" : true,
-    "OrderedImports" : true,
-    "ReplaceForEachWithForLoop" : true,
-    "ReturnVoidInsteadOfEmptyTuple" : true,
-    "TypeNamesShouldBeCapitalized" : true,
-    "UseEarlyExits" : false,
-    "UseLetInEveryBoundCaseVariable" : true,
-    "UseShorthandTypeNames" : true,
-    "UseSingleLinePropertyGetter" : true,
-    "UseSynthesizedInitializer" : true,
-    "UseTripleSlashForDocumentationComments" : true,
-    "UseWhereClausesInForLoops" : false,
-    "ValidateDocumentationComments" : false
-  },
-  "spacesAroundRangeFormationOperators" : false,
-  "tabWidth" : 4,
-  "version" : 1
-}

Brewer.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		9E6C730C2C3D796D0056ADDC /* DownloadButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */; };
 		9E6C730E2C3DB16F0056ADDC /* UninstallButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */; };
 		9E6C73112C3DB5940056ADDC /* CaskDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C73102C3DB5940056ADDC /* CaskDetailView.swift */; };
-		9E6C73182C3E853E0056ADDC /* UpdateButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6C73172C3E853E0056ADDC /* UpdateButton.swift */; };
 		9E8CE5362C3C545600A39146 /* BrewerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8CE5352C3C545600A39146 /* BrewerApp.swift */; };
 		9E8CE5382C3C545600A39146 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8CE5372C3C545600A39146 /* ContentView.swift */; };
 		9E8CE53A2C3C545700A39146 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9E8CE5392C3C545700A39146 /* Assets.xcassets */; };
@@ -46,7 +45,6 @@
 		9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadButton.swift; sourceTree = "<group>"; };
 		9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UninstallButton.swift; sourceTree = "<group>"; };
 		9E6C73102C3DB5940056ADDC /* CaskDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaskDetailView.swift; sourceTree = "<group>"; };
-		9E6C73172C3E853E0056ADDC /* UpdateButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateButton.swift; sourceTree = "<group>"; };
 		9E8CE5322C3C545600A39146 /* Brewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Brewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9E8CE5352C3C545600A39146 /* BrewerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrewerApp.swift; sourceTree = "<group>"; };
 		9E8CE5372C3C545600A39146 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -90,7 +88,6 @@
 			isa = PBXGroup;
 			children = (
 				9E6C730B2C3D796D0056ADDC /* DownloadButton.swift */,
-				9E6C73172C3E853E0056ADDC /* UpdateButton.swift */,
 				9E6C730D2C3DB16F0056ADDC /* UninstallButton.swift */,
 			);
 			path = Components;
@@ -307,7 +304,6 @@
 				9E6C73072C3D5E570056ADDC /* SearchView.swift in Sources */,
 				9E6C730C2C3D796D0056ADDC /* DownloadButton.swift in Sources */,
 				9E8CE5382C3C545600A39146 /* ContentView.swift in Sources */,
-				9E6C73182C3E853E0056ADDC /* UpdateButton.swift in Sources */,
 				9E6C730E2C3DB16F0056ADDC /* UninstallButton.swift in Sources */,
 				9E8CE5622C3C5A6A00A39146 /* Homebrew.swift in Sources */,
 				9E6C73092C3D5E950056ADDC /* InstalledView.swift in Sources */,
@@ -473,24 +469,21 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Brewer/Brewer.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "0.1.2-beta";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Brewer/Preview Content\"";
 				DEVELOPMENT_TEAM = 96S93Z7LTG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = Brewer;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "0.1.2-beta";
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.cems.Brewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -504,24 +497,21 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Brewer/Brewer.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "0.1.2-beta";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Brewer/Preview Content\"";
 				DEVELOPMENT_TEAM = 96S93Z7LTG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = Brewer;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_LSUIElement = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = "0.1.2-beta";
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.cems.Brewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

Brewer.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:/Volumes/Data/Projects/Brewer/Brewer.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

Brewer/BrewerApp.swift

@@ -12,12 +12,8 @@ struct BrewerApp: App {
   @AppStorage("isUpToDate") var isUpToDate: Bool = true
   init() {
     do {
-			let res = try shell(
+      let res = try shell("/opt/homebrew/bin/brew outdated --greedy-latest -g | wc -l")
-				"/opt/homebrew/bin/brew outdated --greedy-latest -g | wc -l")
+      if let number = Int(res.trimmingCharacters(in: .whitespacesAndNewlines)), number > 0 {
-			if let number = Int(
-				res.trimmingCharacters(in: .whitespacesAndNewlines)), number > 0
-			{
-				print(number)
         isUpToDate = false
       }
     } catch {
@@ -26,24 +22,11 @@ struct BrewerApp: App {
   }
 
   var body: some Scene {
+    WindowGroup {
+      EmptyView()
+    }
     MenuBarExtra {
-			VStack(spacing: 0) {
+      ContentView().padding()
-				ContentView()
-					.padding()
-					.padding(.bottom, 0)
-				Button {
-					NSApplication.shared.terminate(self)
-				} label: {
-					Label("Quit", systemImage: "x")
-						.symbolRenderingMode(.palette)
-						.symbolVariant(.circle)
-						.symbolVariant(.fill)
-						.foregroundStyle(.white, .red)
-				}
-				.frame(maxWidth: .infinity, alignment: .trailing)
-				.padding()
-				.padding(.top, 0)
-			}
     } label: {
       if isUpToDate {
         Label("Brewer", systemImage: "sparkle.magnifyingglass")
@@ -54,9 +37,6 @@ struct BrewerApp: App {
       }
     }
     .menuBarExtraStyle(.window)
-		WindowGroup {
-			EmptyView()
-		}
   }
 
 }

Brewer/CaskDetailView.swift

@@ -29,8 +29,7 @@ struct CaskDetailView: View {
         }
         if cask.installed != nil {
           ToolbarItem(placement: .primaryAction) {
-						UninstallButton(
+            UninstallButton(name: cask.fullToken, brewListing: brewListing)
-							name: cask.fullToken, brewListing: brewListing)
           }
         }
       }

Brewer/Components/UpdateButton.swift

@@ -1,61 +0,0 @@
-//
-//  UpdateButton.swift
-//  Brewer
-//
-//  Created by Cédric MAS on 10/07/2024.
-//
-
-import SwiftUI
-
-struct UpdateButton: View {
-	let name: String
-	@State private var brew = Homebrew()
-	@State private var newInfo = Homebrew()
-
-	private var updated: String? {
-		if let cask = newInfo.data?.casks.first(where: { $0.fullToken == name }
-		), !cask.outdated {
-			return cask.version
-		}
-		if let formulae = newInfo.data?.formulae.first(where: {
-			$0.fullName == name
-		}), !formulae.outdated {
-			return formulae.versions.stable
-		}
-
-		return nil
-	}
-
-	var body: some View {
-		if let newVersion = updated {
-			Text("Updated: \(newVersion)")
-		} else if brew.isLoading {
-			ProgressView()
-				.controlSize(.small)
-		} else if brew.errorMessage != nil {
-			Image(systemName: "x")
-				.symbolRenderingMode(.palette)
-				.symbolVariant(.circle)
-				.symbolVariant(.fill)
-				.foregroundStyle(.white, .red)
-		} else {
-			Button {
-				Task {
-					await brew.update(name)
-					newInfo.getInfo(on: name)
-				}
-			} label: {
-				Label(
-					"Update",
-					systemImage:
-						"arrow.counterclockwise"
-				)
-				.symbolRenderingMode(.palette)
-				.symbolVariant(.circle)
-				.symbolVariant(.fill)
-				.foregroundStyle(
-					.white, .orange)
-			}
-		}
-	}
-}

Brewer/ContentView.swift

@@ -16,13 +16,11 @@ struct ContentView: View {
   @State private var segmentedSelection: SegementedSelection = .search
   var body: some View {
     NavigationStack {
-			VStack {
       Picker("", selection: $segmentedSelection) {
         ForEach(SegementedSelection.allCases, id: \.self) { sel in
           Text(sel.rawValue).tag(sel)
         }
       }.pickerStyle(.segmented)
-					.padding(.leading, -8)
       switch segmentedSelection {
       case .search:
         SearchView()
@@ -32,7 +30,6 @@ struct ContentView: View {
     }
   }
 }
-}
 
 #Preview {
   ContentView()

Brewer/InstalledView.swift

@@ -19,22 +19,25 @@ struct InstalledView: View {
             Section {
               ForEach(data.casks, id: \.fullToken) { cask in
                 NavigationLink {
-									CaskDetailView(
+                  CaskDetailView(cask: cask, brewListing: brew)
-										cask: cask, brewListing: brew)
                 } label: {
                   HStack {
                     Text(cask.name.first ?? cask.fullToken)
                     Spacer()
                     if cask.outdated {
-											UpdateButton(name: cask.fullToken)
+                      Button {
+
+                      } label: {
+                        Label("Update", systemImage: "arrow.counterclockwise.circle.fill")
+                          .symbolRenderingMode(.palette)
+                          .foregroundStyle(.white, .orange)
+                      }
                     } else {
                       Text(cask.version)
                     }
                   }
                   .contextMenu {
-										UninstallButton(
+                    UninstallButton(name: cask.fullToken, brewListing: brew)
-											name: cask.fullToken,
-											brewListing: brew)
                   }
                 }
               }
@@ -54,15 +57,19 @@ struct InstalledView: View {
                   Text(formulae.fullName)
                   Spacer()
                   if formulae.outdated {
-										UpdateButton(name: formulae.fullName)
+                    Button {
+
+                    } label: {
+                      Label("Update", systemImage: "arrow.counterclockwise.circle.fill")
+                        .symbolRenderingMode(.palette)
+                        .foregroundStyle(.white, .orange)
+                    }
                   } else {
                     Text(formulae.versions.stable)
                   }
                 }
                 .contextMenu {
-									UninstallButton(
+                  UninstallButton(name: formulae.fullName, brewListing: brew)
-										name: formulae.fullName,
-										brewListing: brew)
                 }
               }
             } header: {
@@ -75,18 +82,13 @@ struct InstalledView: View {
           }
         }
         .listStyle(.inset(alternatesRowBackgrounds: true))
-				let areOutdated =
+        let areOutdated = data.casks.map(\.outdated).count + data.formulae.map(\.outdated).count
-					data.casks.filter(\.outdated).count
+        let _ = UserDefaults.standard.set(!(areOutdated > 0), forKey: "isUpToDate")
-					+ data.formulae.filter(\.outdated).count
-				let _ = UserDefaults.standard.set(
-					!(areOutdated > 0), forKey: "isUpToDate")
         if areOutdated > 0 {
           Button {
 
           } label: {
-						Label(
+            Label("Update all", systemImage: "arrow.counterclockwise.circle.fill")
-							"Update all",
-							systemImage: "arrow.counterclockwise.circle.fill")
           }
           .buttonStyle(.borderedProminent)
           .tint(.orange)

Brewer/Model/Homebrew.swift

@@ -41,7 +41,7 @@ struct Cask: Codable {
   let url: String
   let version: String
   let installed: String?
-	var outdated: Bool
+  let outdated: Bool
 
   enum CodingKeys: String, CodingKey {
     case token, tap, name, desc, homepage, url, version, installed, outdated
@@ -111,11 +111,9 @@ class Homebrew {
     self.data = nil
     Task { [weak self] in
       do {
-				let res = try shell(
+        let res = try shell("/opt/homebrew/bin/brew info --json=v2 \(query)")
-					"/opt/homebrew/bin/brew info --json=v2 \(query)")
         if let data = res.data(using: .utf8) {
-					let output = try JSONDecoder().decode(
+          let output = try JSONDecoder().decode(InfoResponse.self, from: data)
-						InfoResponse.self, from: data)
           self?.data = output
         }
       } catch {
@@ -131,11 +129,9 @@ class Homebrew {
     self.errorMessage = nil
     Task { [weak self] in
       do {
-				let res = try shell(
+        let res = try shell("/opt/homebrew/bin/brew info --json=v2 --installed")
-					"/opt/homebrew/bin/brew info --json=v2 --installed")
         if let data = res.data(using: .utf8) {
-					let output = try JSONDecoder().decode(
+          let output = try JSONDecoder().decode(InfoResponse.self, from: data)
-						InfoResponse.self, from: data)
           self?.data = output
         }
       } catch {
@@ -152,9 +148,7 @@ class Homebrew {
     self.data = nil
     let task = Task { [weak self] in
       do {
-				let res = try shell(
+        let res = try shell("/opt/homebrew/bin/brew list -1 \(name) >/dev/null 2>&1; echo $?")
-					"/opt/homebrew/bin/brew list -1 \(name) >/dev/null 2>&1; echo $?"
-				)
           .trimmingCharacters(in: .whitespacesAndNewlines)
         self?.isLoading = false
         return res == "0"
@@ -178,9 +172,7 @@ class Homebrew {
     self.data = nil
     let task = Task { [weak self] in
       do {
-				try shell(
+        try shell("/opt/homebrew/bin/brew install \(isCask ? "--cask" : "") \(fullToken)")
-					"/opt/homebrew/bin/brew install \(isCask ? "--cask" : "") \(fullToken)"
-				)
       } catch {
         self?.errorMessage = error.localizedDescription
       }
@@ -191,7 +183,7 @@ class Homebrew {
     return switch await task.result {
     case .success(let success):
       success
-		case .failure:
+    case .failure(let fail):
       false
     }
   }
@@ -201,9 +193,9 @@ class Homebrew {
     self.data = nil
     let task = Task { [weak self] in
       do {
-				try shell(
+        let res =
-					"/opt/homebrew/bin/brew uninstall \(fullToken)"
+          try shell("/opt/homebrew/bin/brew uninstall \(fullToken); echo $?")
-				)
+          .trimmingCharacters(in: .whitespacesAndNewlines)
       } catch {
         self?.errorMessage = error.localizedDescription
       }
@@ -214,35 +206,9 @@ class Homebrew {
     return switch await task.result {
     case .success(let success):
       success
-		case .failure:
+    case .failure(let failure):
       false
     }
-	}
 
-	func update(_ name: String) async -> Bool {
-		self.isLoading = true
-		self.errorMessage = nil
-		self.data = nil
-		let task = Task { [weak self] in
-			do {
-				let res = try shell(
-					"/opt/homebrew/bin/brew upgrade \(name); echo $?"
-				)
-				.trimmingCharacters(in: .whitespacesAndNewlines)
-				self?.isLoading = false
-				return res == "0"
-			} catch {
-				self?.errorMessage = error.localizedDescription
-			}
-			self?.isLoading = false
-			return false
-		}
-
-		return switch await task.result {
-		case .success(let success):
-			success
-		case .failure:
-			false
-		}
   }
 }

Brewer/SearchView.swift

@@ -13,6 +13,8 @@ struct SearchView: View {
   var body: some View {
     VStack {
       TextField("Search", text: $query)
+        .padding()
+        .padding(.bottom, 0)
         .onSubmit {
           brew.getInfo(on: query)
         }
@@ -28,14 +30,11 @@ struct SearchView: View {
                   Text(cask.fullToken)
                   Spacer()
                   if cask.installed != nil {
-										Image(
+                    Image(systemName: "checkmark.circle.fill")
-											systemName: "checkmark.circle.fill"
-										)
                       .symbolRenderingMode(.palette)
                       .foregroundStyle(.white, .green)
                   } else {
-										DownloadButton(
+                    DownloadButton(name: cask.fullToken, isCask: true)
-											name: cask.fullToken, isCask: true)
                   }
                 }
               }

BrewerTests/BrewerTests.swift

@@ -6,7 +6,6 @@
 //
 
 import XCTest
-
 @testable import Brewer
 
 final class BrewerTests: XCTestCase {