Remove @dynamicMember generally
This commit is contained in:
@@ -4,17 +4,17 @@ extension Path {
|
||||
//MARK: Common Directories
|
||||
|
||||
/// Returns a `Path` containing `FileManager.default.currentDirectoryPath`.
|
||||
public static var cwd: Path {
|
||||
return Path(string: FileManager.default.currentDirectoryPath)
|
||||
public static var cwd: DynamicPath {
|
||||
return .init(string: FileManager.default.currentDirectoryPath)
|
||||
}
|
||||
|
||||
/// Returns a `Path` representing the root path.
|
||||
public static var root: Path {
|
||||
return Path(string: "/")
|
||||
public static var root: DynamicPath {
|
||||
return .init(string: "/")
|
||||
}
|
||||
|
||||
/// Returns a `Path` representing the user’s home directory
|
||||
public static var home: Path {
|
||||
public static var home: DynamicPath {
|
||||
let string: String
|
||||
#if os(macOS)
|
||||
if #available(OSX 10.12, *) {
|
||||
@@ -25,30 +25,30 @@ extension Path {
|
||||
#else
|
||||
string = NSHomeDirectory()
|
||||
#endif
|
||||
return Path(string: string)
|
||||
return .init(string: string)
|
||||
}
|
||||
|
||||
/// Helper to allow search path and domain mask to be passed in.
|
||||
private static func path(for searchPath: FileManager.SearchPathDirectory) -> Path {
|
||||
private static func path(for searchPath: FileManager.SearchPathDirectory) -> DynamicPath {
|
||||
#if os(Linux)
|
||||
// the urls(for:in:) function is not implemented on Linux
|
||||
//TODO strictly we should first try to use the provided binary tool
|
||||
|
||||
let foo = { ProcessInfo.processInfo.environment[$0].flatMap(Path.init) ?? $1 }
|
||||
let foo = { ProcessInfo.processInfo.environment[$0].flatMap(Path.init).map(DynamicPath.init) ?? $1 }
|
||||
|
||||
switch searchPath {
|
||||
case .documentDirectory:
|
||||
return Path.home/"Documents"
|
||||
return Path.home.Documents
|
||||
case .applicationSupportDirectory:
|
||||
return foo("XDG_DATA_HOME", Path.home/".local/share")
|
||||
return foo("XDG_DATA_HOME", Path.home[dynamicMember: ".local/share"])
|
||||
case .cachesDirectory:
|
||||
return foo("XDG_CACHE_HOME", Path.home/".cache")
|
||||
return foo("XDG_CACHE_HOME", Path.home[dynamicMember: ".cache"])
|
||||
default:
|
||||
fatalError()
|
||||
}
|
||||
#else
|
||||
guard let pathString = FileManager.default.urls(for: searchPath, in: .userDomainMask).first?.path else { return defaultUrl(for: searchPath) }
|
||||
return Path(string: pathString)
|
||||
return DynamicPath(string: pathString)
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ extension Path {
|
||||
- Note: There is no standard location for documents on Linux, thus we return `~/Documents`.
|
||||
- Note: You should create a subdirectory before creating any files.
|
||||
*/
|
||||
public static var documents: Path {
|
||||
public static var documents: DynamicPath {
|
||||
return path(for: .documentDirectory)
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ extension Path {
|
||||
- Note: On Linux this is `XDG_CACHE_HOME`.
|
||||
- Note: You should create a subdirectory before creating any files.
|
||||
*/
|
||||
public static var caches: Path {
|
||||
public static var caches: DynamicPath {
|
||||
return path(for: .cachesDirectory)
|
||||
}
|
||||
|
||||
@@ -75,20 +75,20 @@ extension Path {
|
||||
- Note: On Linux is `XDG_DATA_HOME`.
|
||||
- Note: You should create a subdirectory before creating any files.
|
||||
*/
|
||||
public static var applicationSupport: Path {
|
||||
public static var applicationSupport: DynamicPath {
|
||||
return path(for: .applicationSupportDirectory)
|
||||
}
|
||||
}
|
||||
|
||||
#if !os(Linux)
|
||||
func defaultUrl(for searchPath: FileManager.SearchPathDirectory) -> Path {
|
||||
func defaultUrl(for searchPath: FileManager.SearchPathDirectory) -> DynamicPath {
|
||||
switch searchPath {
|
||||
case .documentDirectory:
|
||||
return Path.home/"Documents"
|
||||
return Path.home.Documents
|
||||
case .applicationSupportDirectory:
|
||||
return Path.home/"Library/Application Support"
|
||||
return Path.home.Library[dynamicMember: "Application Support"]
|
||||
case .cachesDirectory:
|
||||
return Path.home/"Library/Caches"
|
||||
return Path.home.Library.Caches
|
||||
default:
|
||||
fatalError()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user