cdricms/Brewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Formatting

Browse Source
This commit is contained in:
cdricms
2024-07-09 20:35:00 +02:00
parent 6b3b26e4bc
commit dc99548d07
11 changed files with 545 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Brewer/BrewerApp.swift
View File

@@ -12,8 +12,11 @@ struct BrewerApp: App {
@AppStorage("isUpToDate") var isUpToDate: Bool = true
init() {
do {
let res = try shell("/opt/homebrew/bin/brew outdated --greedy-latest -g | wc -l")
if let number = Int(res.trimmingCharacters(in: .whitespacesAndNewlines)), number > 0 {
let res = try shell(
"/opt/homebrew/bin/brew outdated --greedy-latest -g | wc -l")
if let number = Int(
res.trimmingCharacters(in: .whitespacesAndNewlines)), number > 0
{
isUpToDate = false
}
} catch {

3
Brewer/CaskDetailView.swift
View File

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

37
Brewer/InstalledView.swift
View File

@@ -19,7 +19,8 @@ struct InstalledView: View {
Section {
ForEach(data.casks, id: \.fullToken) { cask in
NavigationLink {
CaskDetailView(cask: cask, brewListing: brew)
CaskDetailView(
cask: cask, brewListing: brew)
} label: {
HStack {
Text(cask.name.first ?? cask.fullToken)
@@ -28,16 +29,23 @@ struct InstalledView: View {
Button {
} label: {
Label("Update", systemImage: "arrow.counterclockwise.circle.fill")
Label(
"Update",
systemImage:
"arrow.counterclockwise.circle.fill"
)
.symbolRenderingMode(.palette)
.foregroundStyle(.white, .orange)
.foregroundStyle(
.white, .orange)
}
} else {
Text(cask.version)
}
}
.contextMenu {
UninstallButton(name: cask.fullToken, brewListing: brew)
UninstallButton(
name: cask.fullToken,
brewListing: brew)
}
}
}
@@ -60,7 +68,11 @@ struct InstalledView: View {
Button {
} label: {
Label("Update", systemImage: "arrow.counterclockwise.circle.fill")
Label(
"Update",
systemImage:
"arrow.counterclockwise.circle.fill"
)
.symbolRenderingMode(.palette)
.foregroundStyle(.white, .orange)
}
@@ -69,7 +81,9 @@ struct InstalledView: View {
}
}
.contextMenu {
UninstallButton(name: formulae.fullName, brewListing: brew)
UninstallButton(
name: formulae.fullName,
brewListing: brew)
}
}
} header: {
@@ -82,13 +96,18 @@ struct InstalledView: View {
}
}
.listStyle(.inset(alternatesRowBackgrounds: true))
let areOutdated = data.casks.map(\.outdated).count + data.formulae.map(\.outdated).count
let _ = UserDefaults.standard.set(!(areOutdated > 0), forKey: "isUpToDate")
let areOutdated =
data.casks.map(\.outdated).count
+ data.formulae.map(\.outdated).count
let _ = UserDefaults.standard.set(
!(areOutdated > 0), forKey: "isUpToDate")
if areOutdated > 0 {
Button {
} label: {
Label("Update all", systemImage: "arrow.counterclockwise.circle.fill")
Label(
"Update all",
systemImage: "arrow.counterclockwise.circle.fill")
}
.buttonStyle(.borderedProminent)
.tint(.orange)

24
Brewer/Model/Homebrew.swift
View File

@@ -111,9 +111,11 @@ class Homebrew {
self.data = nil
Task { [weak self] in
do {
let res = try shell("/opt/homebrew/bin/brew info --json=v2 \(query)")
let res = try shell(
"/opt/homebrew/bin/brew info --json=v2 \(query)")
if let data = res.data(using: .utf8) {
let output = try JSONDecoder().decode(InfoResponse.self, from: data)
let output = try JSONDecoder().decode(
InfoResponse.self, from: data)
self?.data = output
}
} catch {
@@ -129,9 +131,11 @@ class Homebrew {
self.errorMessage = nil
Task { [weak self] in
do {
let res = try shell("/opt/homebrew/bin/brew info --json=v2 --installed")
let res = try shell(
"/opt/homebrew/bin/brew info --json=v2 --installed")
if let data = res.data(using: .utf8) {
let output = try JSONDecoder().decode(InfoResponse.self, from: data)
let output = try JSONDecoder().decode(
InfoResponse.self, from: data)
self?.data = output
}
} catch {
@@ -148,7 +152,9 @@ class Homebrew {
self.data = nil
let task = Task { [weak self] in
do {
let res = try shell("/opt/homebrew/bin/brew list -1 \(name) >/dev/null 2>&1; echo $?")
let res = try shell(
"/opt/homebrew/bin/brew list -1 \(name) >/dev/null 2>&1; echo $?"
)
.trimmingCharacters(in: .whitespacesAndNewlines)
self?.isLoading = false
return res == "0"
@@ -172,7 +178,9 @@ class Homebrew {
self.data = nil
let task = Task { [weak self] in
do {
try shell("/opt/homebrew/bin/brew install \(isCask ? "--cask" : "") \(fullToken)")
try shell(
"/opt/homebrew/bin/brew install \(isCask ? "--cask" : "") \(fullToken)"
)
} catch {
self?.errorMessage = error.localizedDescription
}
@@ -194,7 +202,9 @@ class Homebrew {
let task = Task { [weak self] in
do {
let res =
try shell("/opt/homebrew/bin/brew uninstall \(fullToken); echo $?")
try shell(
"/opt/homebrew/bin/brew uninstall \(fullToken); echo $?"
)
.trimmingCharacters(in: .whitespacesAndNewlines)
} catch {
self?.errorMessage = error.localizedDescription

7
Brewer/SearchView.swift
View File

@@ -30,11 +30,14 @@ struct SearchView: View {
Text(cask.fullToken)
Spacer()
if cask.installed != nil {
Image(systemName: "checkmark.circle.fill")
Image(
systemName: "checkmark.circle.fill"
)
.symbolRenderingMode(.palette)
.foregroundStyle(.white, .green)
} else {
DownloadButton(name: cask.fullToken, isCask: true)
DownloadButton(
name: cask.fullToken, isCask: true)
}
}
}

1
BrewerTests/BrewerTests.swift
View File

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