1
0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00

🐛 Fix unsafe usage of try for path handling

This commit is contained in:
2023-03-23 18:01:13 +01:00
parent 4e095a5ae5
commit ff2c2c9b69

View File

@ -14,14 +14,18 @@ class ValetDomainScanner: DomainScanner {
func resolveSiteCount(paths: [String]) -> Int {
return paths.map { path in
do {
let entries = try FileSystem
.getShallowContentsOfDirectory(path)
let entries = try! FileSystem
.getShallowContentsOfDirectory(path)
return entries
.map { self.isSite($0, forPath: path) }
.filter { $0 == true}
.count
return entries
.map { self.isSite($0, forPath: path) }
.filter { $0 == true}
.count
} catch {
Log.err("Unexpected error getting contents of \(path): \(error).")
return 0
}
}.reduce(0, +)
}
@ -30,13 +34,17 @@ class ValetDomainScanner: DomainScanner {
var sites: [ValetSite] = []
paths.forEach { path in
let entries = try! FileSystem
.getShallowContentsOfDirectory(path)
do {
let entries = try FileSystem
.getShallowContentsOfDirectory(path)
return entries.forEach {
if let site = self.resolveSite(path: "\(path)/\($0)") {
sites.append(site)
return entries.forEach {
if let site = self.resolveSite(path: "\(path)/\($0)") {
sites.append(site)
}
}
} catch {
Log.err("Unexpected error getting contents of \(path): \(error).")
}
}