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.

Read the folder after a project's .git file when dating its last change

Țugui Dragoș1f6e9cb8299a
diff --git a/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift b/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift
index e5fd1f3a..e0e6f4a1 100644
--- a/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Developer/ProjectArtifacts.swift
@@ -1162,7 +1162,10 @@ public enum ProjectArtifacts {
let name = url.lastPathComponent
let relative = String(key(of: url).dropFirst(base.count + 1))
if artifacts.contains(name) || artifacts.contains(relative) || passedByForActivity.contains(name) {
- enumerator.skipDescendants()
+ // After a file, as a submodule's `.git` is, `skipDescendants()` would skip the next folder instead.
+ if (try? url.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == true {
+ enumerator.skipDescendants()
+ }
continue
}
samples += 1
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift
index 4968dc44..013b2bd1 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/ProjectArtifactsTests.swift
@@ -1274,6 +1274,27 @@ struct ProjectArtifactsTests {
#expect(!artifact.isRecommended)
}
+ /// A submodule's or a worktree's `.git` is a file, and the folder read after it is still read.
+ @Test func readsTheFolderAfterAGitFile() throws {
+ let directory = try TemporaryDirectory()
+ try directory.file("Project/package.json", bytes: 16)
+ try directory.file("Project/node_modules/dep/index.js", bytes: 16)
+ try directory.file("Project/.git", contents: Data("gitdir: ../.git/modules/project\n".utf8))
+ for folder in ["app", "lib", "docs", "tests", "src"] {
+ try directory.file("Project/\(folder)/file.txt", bytes: 16)
+ }
+ try age(directory.url, days: 60)
+ let edited = directory.url.appending(path: "Project/src/file.txt").path(percentEncoded: false)
+ try FileManager.default.setAttributes([.modificationDate: Date.now], ofItemAtPath: edited)
+
+ let activity = ProjectArtifacts.lastActivity(
+ in: directory.url.appending(path: "Project", directoryHint: .isDirectory), ignoring: ["node_modules"]
+ )
+
+ #expect(try #require(activity.date).timeIntervalSinceNow > -60)
+ #expect(activity.isCertain)
+ }
+
/// A quiet project of a few thousand files is read to the end, so what a build left deep inside it is suggested.
@Test func readsAQuietProjectOfThousandsOfFilesToTheEnd() async throws {
let directory = try TemporaryDirectory()