Macintosh-SW
/
SwresTools
mirror of https://github.com/ItsElaineTime/SwresTools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix an issue where the `~` in paths were not being expanded to the home directory. This behavior is not implemented by URL.

This commit is contained in:
Paul Knight 2017-03-15 11:07:41 -07:00
parent 9fe52300a3
commit 2ed7d6a01c
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Extras/URLExtras.swift Normal file
View File

@ -0,0 +1,14 @@
//
// URLExtras.swift
// SwresTools
//
import Foundation
extension URL {
init(fileURLWithPathExpandingTilde filePath: String) {
let nsStringFilePath = filePath as NSString
let expandedFilePath = nsStringFilePath.expandingTildeInPath
self.init(fileURLWithPath: expandedFilePath)
}
}

6
SwresExplode/SwresExplode.swift
View File

@ -75,7 +75,7 @@ func taskForArguments() -> ExplodeTask {
case UnicodeScalar("d"):
task.dumpResources = true
case UnicodeScalar("o"):
task.outputFolder = URL(fileURLWithPath: String(cString: optarg))
task.outputFolder = URL(fileURLWithPathExpandingTilde: String(cString: optarg))
case UnicodeScalar("f"):
task.overwriteExistingFiles = true
case UnicodeScalar("c"):
@ -101,8 +101,8 @@ func taskForArguments() -> ExplodeTask {
}
let inputPathBytes = CommandLine.unsafeArgv[Int(optind)]!
let inputPath = String(cString:inputPathBytes)
task.inputURL = URL(fileURLWithPath: inputPath)
let inputPath = String(cString: inputPathBytes)
task.inputURL = URL(fileURLWithPathExpandingTilde: inputPath)
return task
}

2
SwresFUSE/SwresFuse.swift
View File

@ -110,7 +110,7 @@ func taskForArguments() -> FuseTask {
switch key {
case .fuse_opt_key_nonopt:
if taskPointer.pointee.inputURL == nil {
taskPointer.pointee.inputURL = URL(fileURLWithPath: option)
taskPointer.pointee.inputURL = URL(fileURLWithPathExpandingTilde: option)
return 0
}
return 1

6
SwresTools.xcodeproj/project.pbxproj
View File

@ -57,6 +57,8 @@
CA9007CF1D8DBCAF00B7D2BD /* ResourceForkReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9007CE1D8DBCAF00B7D2BD /* ResourceForkReader.swift */; };
CA9007D11D8DBD1900B7D2BD /* FourCharCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9007D01D8DBD1900B7D2BD /* FourCharCode.swift */; };
CA9007D51D8DF9C400B7D2BD /* Resource.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9007D41D8DF9C400B7D2BD /* Resource.swift */; };
CA9E43111E79B96300DE98D2 /* URLExtras.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9E43101E79B96300DE98D2 /* URLExtras.swift */; };
CA9E43121E79B96300DE98D2 /* URLExtras.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9E43101E79B96300DE98D2 /* URLExtras.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -126,6 +128,7 @@
CA9007CE1D8DBCAF00B7D2BD /* ResourceForkReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResourceForkReader.swift; sourceTree = "<group>"; };
CA9007D01D8DBD1900B7D2BD /* FourCharCode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FourCharCode.swift; sourceTree = "<group>"; };
CA9007D41D8DF9C400B7D2BD /* Resource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Resource.swift; sourceTree = "<group>"; };
CA9E43101E79B96300DE98D2 /* URLExtras.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = URLExtras.swift; path = Extras/URLExtras.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -202,6 +205,7 @@
CA4150E41DAF4401005F689D /* SequenceExtras.swift */,
CA4150E81DAF4401005F689D /* StrideExtras.swift */,
CA4150E91DAF4401005F689D /* StringExtras.swift */,
CA9E43101E79B96300DE98D2 /* URLExtras.swift */,
);
name = Extras;
sourceTree = "<group>";
@ -346,6 +350,7 @@
CA4EB2D31DB8057100A775DF /* StringExtras.swift in Sources */,
CA5AA8EC1DB44814001866EB /* main.swift in Sources */,
CA4EB2E11DB9ECCB00A775DF /* FilesystemNode.swift in Sources */,
CA9E43121E79B96300DE98D2 /* URLExtras.swift in Sources */,
CA4EB2CE1DB8057100A775DF /* SequenceExtras.swift in Sources */,
CA4EB2CF1DB8057100A775DF /* DictionaryExtras.swift in Sources */,
CA584C971DB491DF00E36C26 /* SwresFuse.swift in Sources */,
@ -370,6 +375,7 @@
CA9007CF1D8DBCAF00B7D2BD /* ResourceForkReader.swift in Sources */,
CA9007D11D8DBD1900B7D2BD /* FourCharCode.swift in Sources */,
CA2B20FF1DA57DAB00A14B92 /* TranslatorManager.swift in Sources */,
CA9E43111E79B96300DE98D2 /* URLExtras.swift in Sources */,
CA4150EB1DAF4401005F689D /* DictionaryExtras.swift in Sources */,
CA4150EF1DAF4401005F689D /* StringExtras.swift in Sources */,
CA4150EC1DAF4401005F689D /* ErrorExtras.swift in Sources */,