Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Name the program that holds an installer open

Țugui Dragoș166125dc3868
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 847f4168..24ea46e5 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -118031,6 +118031,112 @@
}
}
},
+ "Not selected: it is open in %@ right now, which may still be using it." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nevybráno: tuto položku má právě teď otevřenou %@, takže ji možná stále používá."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nicht ausgewählt: Dieses Objekt ist gerade in %@ geöffnet und wird dort möglicherweise noch verwendet."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Sin seleccionar: ahora mismo está abierto en %@, y puede que aún se esté usando."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Non sélectionné : cet élément est ouvert en ce moment dans %@ et est peut-être encore utilisé."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Non selezionato: è aperto in %@ proprio ora, e potrebbe essere ancora in uso."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "未選択: 現在%@がこれを開いていて、まだ使用中の可能性があります。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "선택되지 않음: 지금 %@에서 열려 있으며, 해당 프로그램이 아직 사용하고 있을 수 있습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Niet geselecteerd: het is op dit moment geopend in %@ en wordt daar misschien nog gebruikt."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Nie zaznaczono: ta rzecz jest właśnie otwarta i może być jeszcze używana przez: %@."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Não selecionado: este item está aberto em %@ neste momento e pode ainda estar em uso."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Neselectat: acest articol este deschis chiar acum în %@ și poate fi încă în uz."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Не выбрано: сейчас этот объект открыт, и его, возможно, еще использует %@."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Inte markerad: %@ har det här öppet just nu och kanske fortfarande använder det."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Seçilmedi: %@ bunu şu anda açık tutuyor ve onu hâlâ kullanıyor olabilir."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Не вибрано: цей елемент саме зараз відкрито в %@, і його, можливо, ще використовують."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "未选择:“%@”现在已打开此项,可能仍在使用它。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "未選取:%@現在正打開此項目,而且可能仍在使用它。"
+ }
+ }
+ }
+ },
"Not selected: it is the wallpaper, which macOS keeps open while it is shown, so its download can’t be removed now." : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift b/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift
index 4f97fef4..77047af1 100644
--- a/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Space/Installers.swift
@@ -37,6 +37,8 @@ public struct InstallerItem: Sendable, Hashable, Identifiable {
public var heldBack: HoldBack?
/// What keeps it in step with the other devices, when it is held back as `inTheCloud`.
public var syncedBy: SyncKeeper? = nil
+ /// The programs that hold it open, when it is held back as `openInAProgram`.
+ public var openBy: [String] = []
/// The app a downloaded update is for, which has to quit before the update moves from under it.
public var updatesApp: UpdatedApp? = nil
@@ -294,6 +296,7 @@ public enum Installers {
items = items.map { item in
var item = item
if item.heldBack == .inTheCloud { item.syncedBy = syncKeeper(item.url) }
+ if item.heldBack == .openInAProgram { item.openBy = openFiles.holders(of: item.url) }
guard item.requiresPrivileges, item.heldBack?.cannotBeMoved != true, reach.isBeyond(item.url) else {
return item
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift
index f3695147..ad461dd8 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/InstallersTests.swift
@@ -828,6 +828,8 @@ struct InstallersTests {
let heldBack = Dictionary(uniqueKeysWithValues: scan.items.map { ($0.name, $0.heldBack) })
#expect(heldBack["Tool-1.dmg"] == .openInAProgram)
#expect(heldBack["Other-2.dmg"] == .some(nil))
+ #expect(scan.items.first { $0.name == "Tool-1.dmg" }?.openBy == [OpenFiles.name(of: getpid())])
+ #expect(scan.items.first { $0.name == "Other-2.dmg" }?.openBy == [])
}
@Test func findsMacOSInstallersAndDeviceFirmware() async throws {
@@ -886,6 +888,7 @@ struct InstallersTests {
#expect(scan.items(in: .firmware).map(\.name) == ["iPad.ipsw"])
#expect(scan.items(in: .firmware).first?.heldBack == .openInAProgram)
+ #expect(scan.items(in: .firmware).first?.openBy == [OpenFiles.name(of: getpid())])
}
@Test func aPlaceThatLeadsIntoAnotherListsWhatIsThereOnce() async throws {
diff --git a/Peel/Views/Installers/InstallerDetailView.swift b/Peel/Views/Installers/InstallerDetailView.swift
index 29eaf4ae..f123c35d 100644
--- a/Peel/Views/Installers/InstallerDetailView.swift
+++ b/Peel/Views/Installers/InstallerDetailView.swift
@@ -33,7 +33,7 @@ struct InstallerDetailView: View {
icon: .file(item.url),
detail: detail(for: item),
warning: item.heldBack.map {
- String(localized: $0.explanation(keptInStepBy: item.syncedBy))
+ String(localized: $0.explanation(keptInStepBy: item.syncedBy, openBy: item.openBy))
},
size: item.size ?? 0,
isMeasured: item.size != nil,
diff --git a/Peel/Views/Presentation.swift b/Peel/Views/Presentation.swift
index 78e78756..27138692 100644
--- a/Peel/Views/Presentation.swift
+++ b/Peel/Views/Presentation.swift
@@ -591,8 +591,11 @@ extension HoldBack {
}
}
- /// The explanation, naming the app that keeps the item in step and its marker when one does.
- func explanation(keptInStepBy keeper: SyncKeeper?) -> LocalizedStringResource {
+ /// The explanation, naming the app that keeps the item in step and its marker, or the programs that hold it open.
+ func explanation(keptInStepBy keeper: SyncKeeper?, openBy programs: [String] = []) -> LocalizedStringResource {
+ if self == .openInAProgram, !programs.isEmpty {
+ return "Not selected: it is open in \(programs.formatted(.list(type: .and))) right now, which may still be using it."
+ }
guard self == .inTheCloud, case .app(let app, let marker)? = keeper else { return explanation }
return "Left alone: this is in a folder \(app.name) syncs to your other devices (its marker is \(marker.abbreviatedPath)), and moving it to the Trash would also remove it from them."
}