Merge branch 'itaiferber-pr-urls'

Author: phausler

Foundation/NSBundle.swift

@@ -50,11 +50,7 @@ open class Bundle: NSObject {
     }
 
     public convenience init?(url: URL) {
-        if let path = url.path {
-            self.init(path: path)
-        } else {
-            return nil
-        }
+        self.init(path: url.path)
     }
 
     public init(for aClass: AnyClass) { NSUnimplemented() }
@@ -70,7 +66,7 @@ open class Bundle: NSObject {
     }
 
     override open var description: String {
-        return "\(String(describing: Bundle.self)) <\(bundleURL.path!)> (\(isLoaded  ? "loaded" : "not yet loaded"))"
+        return "\(String(describing: Bundle.self)) <\(bundleURL.path)> (\(isLoaded  ? "loaded" : "not yet loaded"))"
     }
 
 
@@ -144,7 +140,7 @@ open class Bundle: NSObject {
     }
 
     open var bundlePath: String {
-        return bundleURL.path!
+        return bundleURL.path
     }
 
     open var resourcePath: String? {

Foundation/NSData.swift

@@ -336,7 +336,7 @@ extension NSData {
 
     public convenience init(contentsOf url: URL, options readOptionsMask: ReadingOptions) throws {
         if url.isFileURL {
-            try self.init(contentsOfFile: url.path!, options: readOptionsMask)
+            try self.init(contentsOfFile: url.path, options: readOptionsMask)
         } else {
             let session = URLSession(configuration: URLSessionConfiguration.defaultSessionConfiguration())
             let cond = NSCondition()
@@ -503,9 +503,7 @@ extension NSData {
 
     public func write(to url: URL, atomically: Bool) -> Bool {
         if url.isFileURL {
-            if let path = url.path {
-                return write(toFile: path, atomically: atomically)
-            }
+            return write(toFile: url.path, atomically: atomically)
         }
         return false
     }
@@ -519,12 +517,12 @@ extension NSData {
     ///
     ///      This method is invoked in a `try` expression and the caller is responsible for handling any errors in the `catch` clauses of a `do` statement, as described in [Error Handling](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/ErrorHandling.html#//apple_ref/doc/uid/TP40014097-CH42) in [The Swift Programming Language](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/index.html#//apple_ref/doc/uid/TP40014097) and [Error Handling](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/BuildingCocoaApps/AdoptingCocoaDesignPatterns.html#//apple_ref/doc/uid/TP40014216-CH7-ID10) in [Using Swift with Cocoa and Objective-C](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/BuildingCocoaApps/index.html#//apple_ref/doc/uid/TP40014216).
     public func write(to url: URL, options writeOptionsMask: WritingOptions = []) throws {
-        guard let path = url.path, url.isFileURL == true else {
+        guard url.isFileURL else {
             let userInfo = [NSLocalizedDescriptionKey : "The folder at “\(url)” does not exist or is not a file URL.", // NSLocalizedString() not yet available
-                            NSURLErrorKey             : url.absoluteString ?? ""] as Dictionary<String, Any>
+                            NSURLErrorKey             : url.absoluteString] as Dictionary<String, Any>
             throw NSError(domain: NSCocoaErrorDomain, code: 4, userInfo: userInfo)
         }
-        try write(toFile: path, options: writeOptionsMask)
+        try write(toFile: url.path, options: writeOptionsMask)
     }
 
     public func range(of searchData: Data, options mask: SearchOptions = [], in searchRange: NSRange) -> NSRange {

Foundation/NSFileHandle.swift

@@ -232,15 +232,12 @@ extension FileHandle {
     }
 
     internal static func _openFileDescriptorForURL(_ url : URL, flags: Int32, reading: Bool) throws -> Int32 {
-        if let path = url.path {
-            let fd = _CFOpenFile(path, flags)
-            if fd < 0 {
-                throw _NSErrorWithErrno(errno, reading: reading, url: url)
-            }
-            return fd
-        } else {
-            throw _NSErrorWithErrno(ENOENT, reading: reading, url: url)
+        let path = url.path
+        let fd = _CFOpenFile(path, flags)
+        if fd < 0 {
+            throw _NSErrorWithErrno(errno, reading: reading, url: url)
         }
+        return fd
     }
 
     public convenience init(forReadingFrom url: URL) throws {

Foundation/NSFileManager.swift

@@ -144,10 +144,7 @@ open class FileManager: NSObject {
         guard url.isFileURL else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileWriteUnsupportedSchemeError.rawValue, userInfo: [NSURLErrorKey : url])
         }
-        guard let path = url.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: nil)
-        }
-        try self.createDirectory(atPath: path, withIntermediateDirectories: createIntermediates, attributes: attributes)
+        try self.createDirectory(atPath: url.path, withIntermediateDirectories: createIntermediates, attributes: attributes)
     }
 
     /* createSymbolicLinkAtURL:withDestinationURL:error: returns YES if the symbolic link that point at 'destURL' was able to be created at the location specified by 'url'. 'destURL' is always resolved against its base URL, if it has one. If 'destURL' has no base URL and it's 'relativePath' is indeed a relative path, then a relative symlink will be created. If this method returns NO, the link was unable to be created and an NSError will be returned by reference in the 'error' parameter. This method does not traverse a terminal symlink.
@@ -159,13 +156,7 @@ open class FileManager: NSObject {
         guard destURL.scheme == nil || destURL.isFileURL else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileWriteUnsupportedSchemeError.rawValue, userInfo: [NSURLErrorKey : destURL])
         }
-        guard let path = url.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : url])
-        }
-        guard let destPath = destURL.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : destURL])
-        }
-        try self.createSymbolicLink(atPath: path, withDestinationPath: destPath)
+        try self.createSymbolicLink(atPath: url.path, withDestinationPath: destURL.path)
     }
 
     /* Instances of NSFileManager may now have delegates. Each instance has one delegate, and the delegate is not retained. In versions of Mac OS X prior to 10.5, the behavior of calling [[NSFileManager alloc] init] was undefined. In Mac OS X 10.5 "Leopard" and later, calling [[NSFileManager alloc] init] returns a new instance of an NSFileManager.
@@ -516,13 +507,7 @@ open class FileManager: NSObject {
         guard dstURL.isFileURL else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileWriteUnsupportedSchemeError.rawValue, userInfo: [NSURLErrorKey : dstURL])
         }
-        guard let srcPath = srcURL.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : srcURL])
-        }
-        guard let dstPath = dstURL.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : dstURL])
-        }
-        try copyItem(atPath: srcPath, toPath: dstPath)
+        try copyItem(atPath: srcURL.path, toPath: dstURL.path)
     }
 
     open func moveItem(at srcURL: URL, to dstURL: URL) throws {
@@ -532,13 +517,7 @@ open class FileManager: NSObject {
         guard dstURL.isFileURL else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileWriteUnsupportedSchemeError.rawValue, userInfo: [NSURLErrorKey : dstURL])
         }
-        guard let srcPath = srcURL.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : srcURL])
-        }
-        guard let dstPath = dstURL.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : dstURL])
-        }
-        try moveItem(atPath: srcPath, toPath: dstPath)
+        try moveItem(atPath: srcURL.path, toPath: dstURL.path)
     }
 
     open func linkItem(at srcURL: URL, to dstURL: URL) throws {
@@ -548,23 +527,14 @@ open class FileManager: NSObject {
         guard dstURL.isFileURL else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileWriteUnsupportedSchemeError.rawValue, userInfo: [NSURLErrorKey : dstURL])
         }
-        guard let srcPath = srcURL.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : srcURL])
-        }
-        guard let dstPath = dstURL.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : dstURL])
-        }
-        try linkItem(atPath: srcPath, toPath: dstPath)
+        try linkItem(atPath: srcURL.path, toPath: dstURL.path)
     }
 
     open func removeItem(at url: URL) throws {
         guard url.isFileURL else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileWriteUnsupportedSchemeError.rawValue, userInfo: [NSURLErrorKey : url])
         }
-        guard let path = url.path else {
-            throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileNoSuchFileError.rawValue, userInfo: [NSURLErrorKey : url])
-        }
-        try self.removeItem(atPath: path)
+        try self.removeItem(atPath: url.path)
     }
 
     /* Process working directory management. Despite the fact that these are instance methods on NSFileManager, these methods report and change (respectively) the working directory for the entire process. Developers are cautioned that doing so is fraught with peril.
@@ -890,7 +860,7 @@ extension FileManager {
             guard let url = o as? URL else {
                 return nil
             }
-            let path = url.path!.replacingOccurrences(of: baseURL.path!+"/", with: "")
+            let path = url.path.replacingOccurrences(of: baseURL.path+"/", with: "")
             return path
         }
 
@@ -910,22 +880,17 @@ extension FileManager {
             _options = options
             _errorHandler = errorHandler
 
-            if let path = _url.path {
-                if FileManager.default.fileExists(atPath: path) {
-                    let fsRep = FileManager.default.fileSystemRepresentation(withPath: path)
-                    let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 2)
-                    ps.initialize(to: UnsafeMutablePointer(mutating: fsRep))
-                    ps.advanced(by: 1).initialize(to: nil)
-                    _stream = fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
-                    ps.deinitialize(count: 2)
-                    ps.deallocate(capacity: 2)
-                } else {
-                    _rootError = _NSErrorWithErrno(ENOENT, reading: true, url: url)
-                }
+            if FileManager.default.fileExists(atPath: _url.path) {
+                let fsRep = FileManager.default.fileSystemRepresentation(withPath: _url.path)
+                let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 2)
+                ps.initialize(to: UnsafeMutablePointer(mutating: fsRep))
+                ps.advanced(by: 1).initialize(to: nil)
+                _stream = fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
+                ps.deinitialize(count: 2)
+                ps.deallocate(capacity: 2)
             } else {
                 _rootError = _NSErrorWithErrno(ENOENT, reading: true, url: url)
             }
-
         }
 
         deinit {

Foundation/NSPathUtilities.swift

@@ -377,26 +377,13 @@ public extension NSString {
         let url = URL(fileURLWithPath: path)
 
         let searchAllFilesInDirectory = _stringIsPathToDirectory(path)
-        let namePrefix = searchAllFilesInDirectory ? nil : url.lastPathComponent
-        let checkFileName = _getFileNamePredicate(namePrefix, caseSensetive: flag)
-        let checkExtension = _getExtensionPredicate(filterTypes, caseSensetive: flag)
-        
-        let resolvedURL: URL
-        let urlWhereToSearch: URL
-        if let url = url._resolveSymlinksInPath(excludeSystemDirs: false) {
-            resolvedURL = url
-        } else {
-            return 0
-        }
-        
+        let namePrefix = searchAllFilesInDirectory ? "" : url.lastPathComponent
+        let checkFileName = _getFileNamePredicate(namePrefix, caseSensitive: flag)
+        let checkExtension = _getExtensionPredicate(filterTypes, caseSensitive: flag)
 
-        do {
-            urlWhereToSearch = searchAllFilesInDirectory ? resolvedURL : try resolvedURL.deletingLastPathComponent()
-        } catch {
-            return 0
-        }
+        let resolvedURL: URL = url.resolvingSymlinksInPath()
+        let urlWhereToSearch: URL = searchAllFilesInDirectory ? resolvedURL : resolvedURL.deletingLastPathComponent()
 
-
         var matches = _getNamesAtURL(urlWhereToSearch, prependWith: "", namePredicate: checkFileName, typePredicate: checkExtension)
 
         if matches.count == 1 {
@@ -445,9 +432,9 @@ public extension NSString {
 
                 if matchByName && matchByExtension {
                     if prependWith.isEmpty {
-                        result.append(itemName!)
+                        result.append(itemName)
                     } else {
-                        result.append(prependWith._bridgeToObjectiveC().appendingPathComponent(itemName!))
+                        result.append(prependWith._bridgeToObjectiveC().appendingPathComponent(itemName))
                     }
                 }
             }
@@ -456,12 +443,12 @@ public extension NSString {
         return result
     }
 
-    internal func _getExtensionPredicate(_ extensions: [String]?, caseSensetive: Bool) -> _FileNamePredicate {
+    fileprivate func _getExtensionPredicate(_ extensions: [String]?, caseSensitive: Bool) -> _FileNamePredicate {
         guard let exts = extensions else {
             return { _ in true }
         }
 
-        if caseSensetive {
+        if caseSensitive {
             let set = Set(exts)
             return { $0 != nil && set.contains($0!) }
         } else {
@@ -470,15 +457,15 @@ public extension NSString {
         }
     }
 
-    internal func _getFileNamePredicate(_ prefix: String?, caseSensetive: Bool) -> _FileNamePredicate {
-        guard let thePrefix = prefix else {
+    fileprivate func _getFileNamePredicate(_ prefix: String, caseSensitive: Bool) -> _FileNamePredicate {
+        guard !prefix.isEmpty else {
             return { _ in true }
         }
 
-        if caseSensetive {
-            return { $0 != nil && $0!.hasPrefix(thePrefix) }
+        if caseSensitive {
+            return { $0 != nil && $0!.hasPrefix(prefix) }
         } else {
-            return { $0 != nil && $0!._bridgeToObjectiveC().range(of: thePrefix, options: .caseInsensitive).location == 0 }
+            return { $0 != nil && $0!._bridgeToObjectiveC().range(of: prefix, options: .caseInsensitive).location == 0 }
         }
     }
 

Foundation/NSStringAPI.swift

@@ -146,7 +146,7 @@ extension String {
   /// by concatenating them with a path separator between each pair.
   @available(*, unavailable, message: "Use fileURL(withPathComponents:) on URL instead.")
   public static func path(withComponents components: [String]) -> String {
-    return (NSURL.fileURLWithPathComponents(components)?.path)!
+    return (NSURL.fileURL(withPathComponents: components)?.path)!
   }
 
   //===--------------------------------------------------------------------===//