Implement NSURLDirectoryEnumerator for Windows #1966
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spevans
reviewed
Mar 4, 2019
pvieito
reviewed
Mar 4, 2019
Foundation/FileManager.swift
Outdated
| && file != ".." | ||
| && (_options.contains(.skipsHiddenFiles) | ||
| && (ffd.dwFileAttributes & DWORD(FILE_ATTRIBUTE_HIDDEN) == 0))) { | ||
| files.append(URL(fileReferenceLiteralResourceName: "\(directory.absoluteString)\\\(file)")) |
There was a problem hiding this comment.
Did you mean URL(fileURLWithPath:)?
spevans
reviewed
Mar 4, 2019
Foundation/FileManager.swift
Outdated
| internal class NSURLDirectoryEnumerator : DirectoryEnumerator { | ||
| internal typealias ErrorHandler = /* @escaping */ (URL, Error) -> Bool | ||
| #if os(Windows) | ||
| var _url : URL |
There was a problem hiding this comment.
Is _url needed? It doesnt look to be used outside of init() since it is also stored in _stack.
gmittert
force-pushed
the
ForestForTheTrees
branch
from
ffa6c31 to
7c6fb29
Compare
|
@swift-ci please test |
gmittert
force-pushed
the
ForestForTheTrees
branch
from
7c6fb29 to
3b9c7c2
Compare
|
Added a missing FindClose on the FindFirstFile handle. |
compnerd
requested changes
Mar 7, 2019
Foundation/FileManager.swift
Outdated
| override func nextObject() -> Any? { | ||
| let o = innerEnumerator.nextObject() | ||
| guard let url = o as? URL else { | ||
| return nil | ||
| } | ||
|
|
||
| #if os(Windows) | ||
| NSUnimplemented() | ||
| let path = url.path.replacingOccurrences(of: baseURL.path+"\\", with: "") |
There was a problem hiding this comment.
I really would prefer that we use PathRelativePathToW here instead.
Foundation/FileManager.swift
Outdated
| var _errorHandler : ((URL, Error) -> Bool)? | ||
| var _stack: [URL] | ||
| var _current: URL? | ||
| var _root_depth : Int |
There was a problem hiding this comment.
_rootDepth to follow the style please (or _depth if you so like).
gmittert
force-pushed
the
ForestForTheTrees
branch
from
3b9c7c2 to
6788430
Compare
compnerd
reviewed
Mar 11, 2019
gmittert
force-pushed
the
ForestForTheTrees
branch
from
6788430 to
aa88f36
Compare
compnerd
reviewed
Mar 12, 2019
gmittert
force-pushed
the
ForestForTheTrees
branch
from
aa88f36 to
f2d6ee1
Compare
|
Removed all the absolute strings and path concatting and used the path functions instead. |
compnerd
reviewed
Mar 13, 2019
gmittert
force-pushed
the
ForestForTheTrees
branch
from
f2d6ee1 to
e548967
Compare
compnerd
approved these changes
Mar 13, 2019
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uses
FindFirstFileWrepeatedly to enumerate the directories. The unix implementation via fts does a preorder traversal, though the order that the children are visited in seems random. The Windows implementation also shares this behaviour:FindNextFileisn't guaranteed to be alphabetical depending on the file system.