Merge pull request #14 from SwiftDocOrg/mattt/fix-dot-swift-directories

mattt · web-flow · commit aea7f9087257 · 2020-02-06T10:05:50.000-08:00
Ensure enumerated paths are readable files with .swift file extension
diff --git a/Sources/swift-api-inventory/main.swift b/Sources/swift-api-inventory/main.swift
@@ -23,7 +23,12 @@ command(
                 let directory = URL(fileURLWithPath: path)
                 guard let directoryEnumerator = fileManager.enumerator(at: directory, includingPropertiesForKeys: nil) else { continue }
                 for case let url as URL in directoryEnumerator {
-                    guard url.pathExtension == "swift" else { continue }
+                    var isDirectory: ObjCBool = false
+                    guard url.pathExtension == "swift",
+                        fileManager.isReadableFile(atPath: url.path),
+                        fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory),
+                        isDirectory.boolValue == false
+                    else { continue }
                     sourceFiles.append(try SourceFile(file: url, relativeTo: directory))
                 }
             }
diff --git a/Sources/swift-dcov/main.swift b/Sources/swift-dcov/main.swift
@@ -22,7 +22,12 @@ command(
                 let directory = URL(fileURLWithPath: path)
                 guard let directoryEnumerator = fileManager.enumerator(at: directory, includingPropertiesForKeys: nil) else { continue }
                 for case let url as URL in directoryEnumerator {
-                    guard url.pathExtension == "swift" else { continue }
+                    var isDirectory: ObjCBool = false
+                    guard url.pathExtension == "swift",
+                        fileManager.isReadableFile(atPath: url.path),
+                        fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory),
+                        isDirectory.boolValue == false
+                    else { continue }
                     sourceFiles.append(try SourceFile(file: url, relativeTo: directory))
                 }
             }
diff --git a/Sources/swift-doc/main.swift b/Sources/swift-doc/main.swift
@@ -28,7 +28,12 @@ command(
                 let directory = URL(fileURLWithPath: path)
                 guard let directoryEnumerator = fileManager.enumerator(at: directory, includingPropertiesForKeys: nil) else { continue }
                 for case let url as URL in directoryEnumerator {
-                    guard url.pathExtension == "swift" else { continue }
+                    var isDirectory: ObjCBool = false
+                    guard url.pathExtension == "swift",
+                        fileManager.isReadableFile(atPath: url.path),
+                        fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory),
+                        isDirectory.boolValue == false
+                    else { continue }
                     sourceFiles.append(try SourceFile(file: url, relativeTo: directory))
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,12 @@ command(`
`23`	`23`	`let directory = URL(fileURLWithPath: path)`
`24`	`24`	`guard let directoryEnumerator = fileManager.enumerator(at: directory, includingPropertiesForKeys: nil) else { continue }`
`25`	`25`	`for case let url as URL in directoryEnumerator {`
`26`		`- guard url.pathExtension == "swift" else { continue }`
	`26`	`+ var isDirectory: ObjCBool = false`
	`27`	`+ guard url.pathExtension == "swift",`
	`28`	`+ fileManager.isReadableFile(atPath: url.path),`
	`29`	`+ fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory),`
	`30`	`+ isDirectory.boolValue == false`
	`31`	`+ else { continue }`
`27`	`32`	`sourceFiles.append(try SourceFile(file: url, relativeTo: directory))`
`28`	`33`	`}`
`29`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,12 @@ command(`
`22`	`22`	`let directory = URL(fileURLWithPath: path)`
`23`	`23`	`guard let directoryEnumerator = fileManager.enumerator(at: directory, includingPropertiesForKeys: nil) else { continue }`
`24`	`24`	`for case let url as URL in directoryEnumerator {`
`25`		`- guard url.pathExtension == "swift" else { continue }`
	`25`	`+ var isDirectory: ObjCBool = false`
	`26`	`+ guard url.pathExtension == "swift",`
	`27`	`+ fileManager.isReadableFile(atPath: url.path),`
	`28`	`+ fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory),`
	`29`	`+ isDirectory.boolValue == false`
	`30`	`+ else { continue }`
`26`	`31`	`sourceFiles.append(try SourceFile(file: url, relativeTo: directory))`
`27`	`32`	`}`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,12 @@ command(`
`28`	`28`	`let directory = URL(fileURLWithPath: path)`
`29`	`29`	`guard let directoryEnumerator = fileManager.enumerator(at: directory, includingPropertiesForKeys: nil) else { continue }`
`30`	`30`	`for case let url as URL in directoryEnumerator {`
`31`		`- guard url.pathExtension == "swift" else { continue }`
	`31`	`+ var isDirectory: ObjCBool = false`
	`32`	`+ guard url.pathExtension == "swift",`
	`33`	`+ fileManager.isReadableFile(atPath: url.path),`
	`34`	`+ fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory),`
	`35`	`+ isDirectory.boolValue == false`
	`36`	`+ else { continue }`
`32`	`37`	`sourceFiles.append(try SourceFile(file: url, relativeTo: directory))`
`33`	`38`	`}`
`34`	`39`	`}`