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.

Say "or a folder in it" of a folder Duplicates leaves inside the Library

Țugui Dragoș1fe215d363e8
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 03f5a49b..67bf363f 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -80043,320 +80043,320 @@
}
}
},
- "It is the folder where the Music app keeps its media." : {
+ "It is the folder where the Music app keeps its media, or a folder in it." : {
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Je to složka, ve které aplikace Hudba uchovává svá média."
+ "value" : "Je to složka, ve které aplikace Hudba uchovává svá média, nebo složka v ní."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dies ist der Ordner, in dem die App „Musik“ ihre Medien aufbewahrt."
+ "value" : "Dies ist der Ordner, in dem die App „Musik“ ihre Medien aufbewahrt, oder ein Ordner darin."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Es la carpeta donde la app Música guarda su contenido."
+ "value" : "Es la carpeta donde la app Música guarda su contenido, o una carpeta dentro de ella."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "C’est le dossier où l’app Musique conserve ses fichiers multimédias."
+ "value" : "C’est le dossier où l’app Musique conserve ses fichiers multimédias, ou un dossier qu’il contient."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
- "value" : "È la cartella in cui l’app Musica conserva i suoi file multimediali."
+ "value" : "È la cartella in cui l’app Musica conserva i suoi file multimediali, oppure una cartella al suo interno."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "ミュージックアプリがメディアを保管するフォルダです。"
+ "value" : "ミュージックアプリがメディアを保管するフォルダ、またはその中にあるフォルダです。"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "음악 앱이 미디어를 보관하는 폴더입니다."
+ "value" : "음악 앱이 미디어를 보관하는 폴더이거나 그 안에 있는 폴더입니다."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Het is de map waarin de app Muziek zijn media bewaart."
+ "value" : "Het is de map waarin de app Muziek zijn media bewaart, of een map daarin."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "To folder, w którym aplikacja Muzyka przechowuje swoje multimedia."
+ "value" : "To folder, w którym aplikacja Muzyka przechowuje swoje multimedia, albo folder wewnątrz niego."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
- "value" : "É a pasta de mídia do app Música."
+ "value" : "É a pasta de mídia do app Música, ou uma pasta dentro dela."
}
},
"ro" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Este dosarul în care aplicația Muzică își păstrează conținutul multimedia."
+ "value" : "Este dosarul în care aplicația Muzică își păstrează conținutul multimedia, ori un dosar din acesta."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Это папка, в которой приложение «Музыка» хранит свои медиафайлы."
+ "value" : "Это папка, в которой приложение «Музыка» хранит свои медиафайлы, или папка внутри нее."
}
},
"sv" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Det är mappen där appen Musik sparar sina medier."
+ "value" : "Det är mappen där appen Musik sparar sina medier, eller en mapp i den."
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Bu, Müzik uygulamasının ortam dosyalarını tuttuğu klasör."
+ "value" : "Bu, Müzik uygulamasının ortam dosyalarını tuttuğu klasör ya da içindeki bir klasör."
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Це папка, у якій програма «Музика» зберігає свій медіавміст."
+ "value" : "Це папка, у якій програма «Музика» зберігає свій медіавміст, або папка всередині неї."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "它是“音乐”App存放媒体的文件夹。"
+ "value" : "它是“音乐”App存放媒体的文件夹或其子文件夹。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "這是「音樂」App存放媒體的檔案夾。"
+ "value" : "這是「音樂」App存放媒體的檔案夾,或其中的檔案夾。"
}
}
}
},
- "It is the folder where the TV app keeps its media." : {
+ "It is the folder where the TV app keeps its media, or a folder in it." : {
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Je to složka, ve které aplikace TV uchovává svá média."
+ "value" : "Je to složka, ve které aplikace TV uchovává svá média, nebo složka v ní."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dies ist der Ordner, in dem die App „TV“ ihre Medien aufbewahrt."
+ "value" : "Dies ist der Ordner, in dem die App „TV“ ihre Medien aufbewahrt, oder ein Ordner darin."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Es la carpeta donde la app TV guarda su contenido."
+ "value" : "Es la carpeta donde la app TV guarda su contenido, o una carpeta dentro de ella."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "C’est le dossier où l’app TV conserve ses fichiers multimédias."
+ "value" : "C’est le dossier où l’app TV conserve ses fichiers multimédias, ou un dossier qu’il contient."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
- "value" : "È la cartella in cui l’app TV conserva i suoi file multimediali."
+ "value" : "È la cartella in cui l’app TV conserva i suoi file multimediali, oppure una cartella al suo interno."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "TVアプリがメディアを保管するフォルダです。"
+ "value" : "TVアプリがメディアを保管するフォルダ、またはその中にあるフォルダです。"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "TV 앱이 미디어를 보관하는 폴더입니다."
+ "value" : "TV 앱이 미디어를 보관하는 폴더이거나 그 안에 있는 폴더입니다."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Het is de map waarin de app TV zijn media bewaart."
+ "value" : "Het is de map waarin de app TV zijn media bewaart, of een map daarin."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "To folder, w którym aplikacja TV przechowuje swoje multimedia."
+ "value" : "To folder, w którym aplikacja TV przechowuje swoje multimedia, albo folder wewnątrz niego."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
- "value" : "É a pasta de mídia do app TV."
+ "value" : "É a pasta de mídia do app TV, ou uma pasta dentro dela."
}
},
"ro" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Este dosarul în care aplicația TV își păstrează conținutul multimedia."
+ "value" : "Este dosarul în care aplicația TV își păstrează conținutul multimedia, ori un dosar din acesta."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Это папка, в которой приложение «TV» хранит свои медиафайлы."
+ "value" : "Это папка, в которой приложение «TV» хранит свои медиафайлы, или папка внутри нее."
}
},
"sv" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Det är mappen där appen TV sparar sina medier."
+ "value" : "Det är mappen där appen TV sparar sina medier, eller en mapp i den."
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Bu, TV uygulamasının ortam dosyalarını tuttuğu klasör."
+ "value" : "Bu, TV uygulamasının ortam dosyalarını tuttuğu klasör ya da içindeki bir klasör."
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Це папка, у якій програма «TV» зберігає свій медіавміст."
+ "value" : "Це папка, у якій програма «TV» зберігає свій медіавміст, або папка всередині неї."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "它是“TV”App存放媒体的文件夹。"
+ "value" : "它是“TV”App存放媒体的文件夹或其子文件夹。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "這是「TV」App存放媒體的檔案夾。"
+ "value" : "這是「TV」App存放媒體的檔案夾,或其中的檔案夾。"
}
}
}
},
- "It is your Library, where apps keep their data." : {
+ "It is your Library, or a folder in it, where apps keep their data." : {
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Je to vaše Knihovna, kde si aplikace ukládají svá data."
+ "value" : "Je to vaše Knihovna, kde si aplikace ukládají svá data, nebo složka v ní."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Dies ist deine Library, in der Apps ihre Daten speichern."
+ "value" : "Dies ist deine Library, in der Apps ihre Daten speichern, oder ein Ordner darin."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Es tu carpeta Biblioteca, donde las apps guardan sus datos."
+ "value" : "Es tu carpeta Biblioteca, o una carpeta dentro de ella, donde las apps guardan sus datos."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "C’est votre Bibliothèque, où les apps conservent leurs données."
+ "value" : "C’est votre Bibliothèque, où les apps conservent leurs données, ou un dossier qu’elle contient."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
- "value" : "È la tua cartella Libreria, dove le app conservano i loro dati."
+ "value" : "È la tua cartella Libreria, oppure una cartella al suo interno, dove le app conservano i loro dati."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "アプリがデータを保管するユーザライブラリです。"
+ "value" : "アプリがデータを保管するユーザライブラリ、またはその中にあるフォルダです。"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "앱이 데이터를 보관하는 라이브러리 폴더입니다."
+ "value" : "앱이 데이터를 보관하는 라이브러리 폴더이거나 그 안에 있는 폴더입니다."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Het is je bibliotheekmap, waarin apps hun gegevens bewaren."
+ "value" : "Het is je bibliotheekmap, waarin apps hun gegevens bewaren, of een map daarin."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "To Twój folder Biblioteki, w którym aplikacje przechowują swoje dane."
+ "value" : "To Twój folder Biblioteki, w którym aplikacje przechowują swoje dane, albo folder wewnątrz niego."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
- "value" : "É a sua pasta Biblioteca, onde os apps guardam os dados deles."
+ "value" : "É a sua pasta Biblioteca, ou uma pasta dentro dela, onde os apps guardam os dados deles."
}
},
"ro" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Este dosarul dvs. Bibliotecă, unde aplicațiile își păstrează datele."
+ "value" : "Este dosarul dvs. Bibliotecă, ori un dosar din acesta, unde aplicațiile își păstrează datele."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Это Ваша папка «Библиотека», в которой приложения хранят свои данные."
+ "value" : "Это Ваша папка «Библиотека», в которой приложения хранят свои данные, или папка внутри нее."
}
},
"sv" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Det är din biblioteksmapp, där appar sparar sina data."
+ "value" : "Det är din biblioteksmapp, eller en mapp i den, där appar sparar sina data."
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Bu, uygulamaların verilerini tuttuğu Kitaplık klasörünüz."
+ "value" : "Bu, uygulamaların verilerini tuttuğu Kitaplık klasörünüz ya da içindeki bir klasör."
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Це ваша папка «Бібліотека», у якій програми зберігають свої дані."
+ "value" : "Це ваша папка «Бібліотека», у якій програми зберігають свої дані, або папка всередині неї."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "它是你的“资源库”文件夹,App会将它们的数据保存在其中。"
+ "value" : "它是你的“资源库”文件夹或其子文件夹,App会将它们的数据保存在其中。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "這是你的「資源庫」檔案夾,App會在其中存放資料。"
+ "value" : "這是你的「資源庫」檔案夾或其中的檔案夾,App會在「資源庫」中存放資料。"
}
}
}
diff --git a/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift b/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
index 390e2cf0..f8a0f0ec 100644
--- a/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
+++ b/Packages/PeelCore/Sources/PeelCommandLine/Support/Output.swift
@@ -487,9 +487,9 @@ extension DuplicateFinder.Refusal {
var summary: String {
switch self {
case .protected: "Peel protects what is there, and never moves it"
- case .library: "it is your Library, where apps keep their data"
- case .mediaFolder(.music): "it is the folder where the Music app keeps its media"
- case .mediaFolder(.tv): "it is the folder where the TV app keeps its media"
+ case .library: "it is your Library, or a folder in it, where apps keep their data"
+ case .mediaFolder(.music): "it is the folder where the Music app keeps its media, or a folder in it"
+ case .mediaFolder(.tv): "it is the folder where the TV app keeps its media, or a folder in it"
case .readOnlyDisk: "it is on a disk that can only be read, so nothing there could move to the Trash"
case .inAPackage: "it is an app or another package, or inside one, and what is inside belongs to it"
case .outsideTheHome: "it is outside your home folder, /Users/Shared, and the disks in /Volumes"
diff --git a/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift b/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift
index 114642cd..6dfa5c4d 100644
--- a/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Duplicates/DuplicateFinder.swift
@@ -60,9 +60,9 @@ public struct DuplicateFinder: Sendable {
public enum Refusal: Sendable, Hashable {
/// A place Peel protects, or a folder inside one, such as a photo library or a keychain.
case protected
- /// The home's Library, where apps keep their data.
+ /// The home's Library, or a folder in it, where apps keep their data.
case library
- /// The folder where the Music or TV app keeps its media.
+ /// The folder where the Music or TV app keeps its media, or a folder in it.
case mediaFolder(MediaApp)
/// An app or another package, or a folder inside one: what is inside belongs to it.
case inAPackage
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
index e18b1af6..168b2c57 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/FileCommandTests.swift
@@ -810,14 +810,16 @@ struct FileCommandTests {
@Test func refusesEachFolderItCantScanWithItsReason() throws {
let finder = "/System/Library/CoreServices/Finder.app"
+ let caches = FileManager.default.homeDirectoryForCurrentUser.appending(path: "Library/Caches")
let error = #expect(throws: (any Error).self) {
- try PeelCommand.parseAsRoot(["duplicates", "/Applications", finder])
+ try PeelCommand.parseAsRoot(["duplicates", "/Applications", finder, caches.path(percentEncoded: false)])
}
let message = PeelCommand.fullMessage(for: try #require(error), columns: 300)
#expect(message.contains("/Applications: it is outside your home folder, /Users/Shared, and the disks in /Volumes"))
#expect(message.contains("\(finder): it is an app or another package, or inside one, and what is inside belongs to it"))
+ #expect(message.contains("Library/Caches: it is your Library, or a folder in it, where apps keep their data"))
}
@Test func saysWhenAnOrphanGroupWasModifiedAndWhyItMatters() {
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift
index b27dbe62..e8742679 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift
@@ -476,8 +476,8 @@ struct CatalogChecker {
]
/// The sentences that name an app of macOS, each with the app whose own name it carries.
static let appNames: [(key: String, app: String)] = [
- ("It is the folder where the Music app keeps its media.", "/System/Applications/Music.app"),
- ("It is the folder where the TV app keeps its media.", "/System/Applications/TV.app"),
+ ("It is the folder where the Music app keeps its media, or a folder in it.", "/System/Applications/Music.app"),
+ ("It is the folder where the TV app keeps its media, or a folder in it.", "/System/Applications/TV.app"),
]
/// The items Peel puts in menus SwiftUI builds, each with SwiftUI's key. Their words are SwiftUI's, whatever
/// the English says: in Polish, About Peel reads "Peel…".
diff --git a/Peel/Views/Presentation.swift b/Peel/Views/Presentation.swift
index f9d75fa8..bcd81087 100644
--- a/Peel/Views/Presentation.swift
+++ b/Peel/Views/Presentation.swift
@@ -426,9 +426,9 @@ extension DuplicateFinder.Refusal {
var explanation: String {
switch self {
case .protected: String(localized: "Peel protects what is there, and never moves it.")
- case .library: String(localized: "It is your Library, where apps keep their data.")
- case .mediaFolder(.music): String(localized: "It is the folder where the Music app keeps its media.")
- case .mediaFolder(.tv): String(localized: "It is the folder where the TV app keeps its media.")
+ case .library: String(localized: "It is your Library, or a folder in it, where apps keep their data.")
+ case .mediaFolder(.music): String(localized: "It is the folder where the Music app keeps its media, or a folder in it.")
+ case .mediaFolder(.tv): String(localized: "It is the folder where the TV app keeps its media, or a folder in it.")
case .readOnlyDisk: String(localized: "It is on a disk that can only be read, so nothing there could move to the Trash.")
case .inAPackage: String(localized: "It is an app or another package, or inside one, and what is inside belongs to it.")
case .outsideTheHome: String(localized: "It is outside your home folder, /Users/Shared, and the disks in /Volumes.")