Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Path.Finder use case when a hidden file and a regular subdirectory are in the same level #90

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix Path.Finder use case when a hidden file and a regular subdirectory are in the same level #90

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a423a4b
Add failing test for hidden files alongside regular directories
natanrolnik Sep 5, 2023
061cec0
Fix Path.Finder use case when a hidden file and a regular subdirector…
natanrolnik Sep 5, 2023
a955594
Fix Swift 5.0 compilation
natanrolnik Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Sources/Path+ls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public extension Path {
class Finder {
fileprivate init(path: Path) {
self.path = path
self.enumerator = FileManager.default.enumerator(atPath: path.string)
self.enumerator = FileManager.default.enumerator(at: path.url, includingPropertiesForKeys: [.isDirectoryKey])
}

/// The `path` find operations operate on.
Expand Down Expand Up @@ -42,8 +42,8 @@ extension Path.Finder: Sequence, IteratorProtocol {
guard let enumerator = enumerator else {
return nil
}
while let relativePath = enumerator.nextObject() as? String {
let path = self.path/relativePath
while let url = enumerator.nextObject() as? URL {
guard let path = Path(url: url) else { continue }

#if !os(Linux) || swift(>=5.0)
if enumerator.level > depth.upperBound {
Expand All @@ -55,7 +55,9 @@ extension Path.Finder: Sequence, IteratorProtocol {
}

if !hidden, path.basename().hasPrefix(".") {
enumerator.skipDescendants()
if url.isDirectory {
enumerator.skipDescendants()
}
continue
}
#endif
Expand Down Expand Up @@ -217,3 +219,9 @@ public enum ListDirectoryOptions {
/// Lists hidden files also
case a
}

private extension URL {
var isDirectory: Bool {
(try? resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == true
mxcl marked this conversation as resolved.
Show resolved Hide resolved
}
}
25 changes: 25 additions & 0 deletions Tests/PathTests/PathTests+ls().swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,31 @@ extension PathTests {
#endif
}
}

func testFindHiddenFileAlongsideDirectory() throws {
try Path.mktemp { tmpdir in
let dotFoo = try tmpdir.join(".foo.txt").touch()
let tmpDotA = try tmpdir.join(".a").mkdir()
let tmpDotAFoo = try tmpdir.join(".a").join("foo.txt").touch()
let tmpB = try tmpdir.b.mkdir()
let tmpBFoo = try tmpB.join("foo.txt").touch()
let dotBar = try tmpB.join(".bar.txt").touch()
let tmpC = try tmpdir.b.c.mkdir()
let bar = try tmpC.join("bar.txt").touch()

XCTAssertEqual(
Set(tmpdir.find().hidden(true)),
Set([dotFoo,tmpDotA,tmpDotAFoo,tmpB,tmpBFoo,tmpC,dotBar,bar]),
relativeTo: tmpdir)

#if !os(Linux) || swift(>=5)
XCTAssertEqual(
Set(tmpdir.find().hidden(false)),
Set([tmpB,tmpBFoo,tmpC,bar]),
relativeTo: tmpdir)
#endif
}
}

func testFindExtension() throws {
try Path.mktemp { tmpdir in
Expand Down
Loading