Added NSCoding support

- Better relative path handling in WebDAV
- obsolete deprecated methods

.travis.yml

@@ -17,7 +17,7 @@ env:
     - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="NO"
 
     - DESTINATION="OS=10.1,name=Apple TV 1080p"    SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="NO"
-    - DESTINATION="OS=10.0,name=Apple TV 1080p"    SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="NO"
+    # - DESTINATION="OS=10.0,name=Apple TV 1080p"    SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="NO"
 
     - DESTINATION="arch=x86_64"                    SCHEME="$MACOS_FRAMEWORK_SCHEME"   SDK="$MACOS_SDK"   RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="NO"
 before_install:
@@ -50,7 +50,7 @@ script:
 
   # Run `pod lib lint` if specified
   - if [ $POD == "YES" ]; then
-      pod lib lint;
+      pod lib lint --quick;
     fi
 
 after_success:

FileProvider.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "FileProvider"
-  s.version      = "0.14.0"
+  s.version      = "0.14.5"
   s.summary      = "FileManager replacement for Local and Remote (WebDAV/Dropbox/OneDrive/SMB2) files on iOS and macOS."
 
   # This description is used to generate tags and improve search results.

FileProvider.xcodeproj/project.pbxproj

@@ -47,6 +47,9 @@
 		794C220E1D591A4B00EC49B8 /* SMB2QueryTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794C220D1D591A4B00EC49B8 /* SMB2QueryTypes.swift */; };
 		794C220F1D591A4B00EC49B8 /* SMB2QueryTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794C220D1D591A4B00EC49B8 /* SMB2QueryTypes.swift */; };
 		794C22101D591A4B00EC49B8 /* SMB2QueryTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794C220D1D591A4B00EC49B8 /* SMB2QueryTypes.swift */; };
+		796807551E7BF17E00BBB87B /* FileProviderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 796807541E7BF17E00BBB87B /* FileProviderExtensions.swift */; };
+		796807561E7BF17E00BBB87B /* FileProviderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 796807541E7BF17E00BBB87B /* FileProviderExtensions.swift */; };
+		796807571E7BF17E00BBB87B /* FileProviderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 796807541E7BF17E00BBB87B /* FileProviderExtensions.swift */; };
 		799396AA1D48C02300086753 /* DropboxFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799396931D48C02300086753 /* DropboxFileProvider.swift */; };
 		799396AB1D48C02300086753 /* DropboxFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799396931D48C02300086753 /* DropboxFileProvider.swift */; };
 		799396AC1D48C02300086753 /* DropboxFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799396931D48C02300086753 /* DropboxFileProvider.swift */; };
@@ -134,6 +137,7 @@
 		794C21FD1D58912A00EC49B8 /* DropboxHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DropboxHelper.swift; sourceTree = "<group>"; };
 		794C22091D5893F800EC49B8 /* SMB2Notification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SMB2Notification.swift; sourceTree = "<group>"; };
 		794C220D1D591A4B00EC49B8 /* SMB2QueryTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SMB2QueryTypes.swift; sourceTree = "<group>"; };
+		796807541E7BF17E00BBB87B /* FileProviderExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileProviderExtensions.swift; sourceTree = "<group>"; };
 		799396671D48B7F600086753 /* FileProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FileProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		799396751D48B80D00086753 /* FileProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FileProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		799396821D48B82700086753 /* FileProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FileProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -281,6 +285,7 @@
 				799396991D48C02300086753 /* SMBTypes */,
 				799396941D48C02300086753 /* FileProvider.h */,
 				799396951D48C02300086753 /* FileProvider.swift */,
+				796807541E7BF17E00BBB87B /* FileProviderExtensions.swift */,
 				79F5745A1DFDB10A00179ABF /* FileObject.swift */,
 				799396961D48C02300086753 /* LocalFileProvider.swift */,
 				792572401DF23BDA006A1526 /* LocalHelper.swift */,
@@ -475,6 +480,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				796807551E7BF17E00BBB87B /* FileProviderExtensions.swift in Sources */,
 				799396B31D48C02300086753 /* LocalFileProvider.swift in Sources */,
 				799396D41D48C02300086753 /* SMB2Tree.swift in Sources */,
 				7924B1A21D89DAE000589DB7 /* Options.swift in Sources */,
@@ -515,6 +521,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				796807561E7BF17E00BBB87B /* FileProviderExtensions.swift in Sources */,
 				799396B41D48C02300086753 /* LocalFileProvider.swift in Sources */,
 				799396D51D48C02300086753 /* SMB2Tree.swift in Sources */,
 				7924B1A31D89DAE000589DB7 /* Options.swift in Sources */,
@@ -555,6 +562,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				796807571E7BF17E00BBB87B /* FileProviderExtensions.swift in Sources */,
 				799396B51D48C02300086753 /* LocalFileProvider.swift in Sources */,
 				799396D61D48C02300086753 /* SMB2Tree.swift in Sources */,
 				7924B1A41D89DAE000589DB7 /* Options.swift in Sources */,
@@ -597,7 +605,7 @@
 		799396601D48B7BF00086753 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.14.0;
+				BUNDLE_VERSION_STRING = 0.14.5;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -627,7 +635,7 @@
 		799396611D48B7BF00086753 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.14.0;
+				BUNDLE_VERSION_STRING = 0.14.5;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -657,7 +665,6 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
-				BUNDLE_VERSION_STRING = 0.8.2;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -710,7 +717,6 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
-				BUNDLE_VERSION_STRING = 0.8.2;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;

FileProvider.xcodeproj/xcshareddata/xcschemes/FileProvider OSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

FileProvider.xcodeproj/xcshareddata/xcschemes/FileProvider iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -22,13 +22,13 @@
 
 This library provides implementaion of WebDav, Dropbox, OneDrive and SMB2 (incomplete) and local files.
 
-All functions are async calls and it wont block your main thread.
+All functions do async calls and it wont block your main thread.
 
 ## Features
 
-- [x] **LocalFileProvider** a wrapper around `FileManager` with some additions like searching and reading a portion of file.
-- [x] **CloudFileProvider** A wrapper around app's ubiquitous container to iCloud Drive in iOS 8+ API.
-- [x] **WebDAVFileProvider** WebDAV protocol is defacto file transmission standard, replaced FTP.
+- [x] **LocalFileProvider** a wrapper around `FileManager` with some additions like builtin coordinating, searching and reading a portion of file.
+- [x] **CloudFileProvider** A wrapper around app's ubiquitous container API of iCloud Drive.
+- [x] **WebDAVFileProvider** WebDAV protocol is defacto file transmission standard, used by many cloud services like Yandex.
 - [x] **DropboxFileProvider** A wrapper around Dropbox Web API.
     * For now it has limitation in uploading files up to 150MB.
 - [x] **OneDriveFileProvider** A wrapper around OneDrive REST API, works with `onedrive.com` and compatible (business) servers.
@@ -107,7 +107,7 @@ For LocalFileProvider if you want to deal with `Documents` folder
 let documentsProvider = LocalFileProvider()
 
 // Equals with:
-let documentsProvider = LocalFileProvider(directory: .documentDirectory, domainMask: = .userDomainMask)
+let documentsProvider = LocalFileProvider(for: .documentDirectory, in: .userDomainMask)
 
 // Equals with:
 let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
@@ -149,7 +149,7 @@ You can use `url(of:)` method if provider to get direct access url (local or rem
 
 For updating User interface please consider using delegate method instead of completion handlers. Delegate methods are guaranteed to run in main thread to avoid bugs.
 
-It's simply three method which indicated whether the operation failed, succeed and how much of operation has been done (suitable for uploading and downloading operations).
+There's simply three method which indicated whether the operation failed, succeed and how much of operation has been done (suitable for uploading and downloading operations).
 
 Your class should conforms `FileProviderDelegate` class:
 
@@ -202,7 +202,7 @@ You can also implement `FileOperationDelegate` protocol to control behaviour of
 
 `fileProvider(shouldProceedAfterError:, operation:)` will be called if an error occured during file operations. Return `true` if you want to continue operation on next files or `false` if you want stop operation further. Default value is false if you don't implement delegate.
 
-**Note: these methods will be called for files in a directory and its subfolders recursively.**
+**Note: In `LocalFileProvider`, these methods will be called for files in a directory and its subfolders recursively.**
 
 ### Directory contents and file attributes
 
@@ -304,7 +304,7 @@ documentsProvider.removeItem(path: "new.txt", completionHandler: nil)
 
 ### Fetching Contents of File
 
-There is two method for this purpose, one of them loads entire file into NSData and another can load a portion of file.
+There is two method for this purpose, one of them loads entire file into `Data` and another can load a portion of file.
 
 ```swift
 documentsProvider.contents(path: "old.txt", completionHandler: {
@@ -382,6 +382,10 @@ Creating/Copying/Deleting functions return a `OperationHandle` for remote operat
 
 It's not supported by native `(NS)FileManager` so `LocalFileProvider`, but this functionality will be added to future `PosixFileProvider` class.
 
+### File Coordination
+
+`LocalFileProvider` and its descendents has a `isCoordinating` property. By setting this, provider will use `NSFileCoordinating` class to do all file operations. It's mandatory for iCloud, while recommended when using shared container or anywhere that simultaneous operations on a file/folder is common.
+
 ### Monitoring File Changes
 
 You can monitor updates in some file system (Local and SMB2), there is three methods in supporting provider you can use to register a handler, to unregister and to check whether it's being monitored or not. It's useful to find out when new files added or removed from directory and update user interface. The handler will be dispatched to main threads to avoid UI bugs with a 0.25 sec delay.

Sources/CloudFileProvider.swift

@@ -81,6 +81,33 @@ open class CloudFileProvider: LocalFileProvider {
         try? fileManager.createDirectory(at: baseURL, withIntermediateDirectories: true)
     }
     
+    
+    public required convenience init?(coder aDecoder: NSCoder) {
+        guard let containerId = aDecoder.decodeObject(forKey: "containerId") as? String,
+            let scopeString = aDecoder.decodeObject(forKey: "scope") as? String,
+            let scope = UbiquitousScope(rawValue: scopeString) else {
+            return nil
+        }
+        self.init(containerId: containerId, scope: scope)
+        self.currentPath   = aDecoder.decodeObject(forKey: "currentPath") as? String ?? ""
+        self.isCoorinating = aDecoder.decodeBool(forKey: "isCoorinating")
+    }
+    
+    open override func encode(with aCoder: NSCoder) {
+        aCoder.encode(self.containerId, forKey: "containerId")
+        aCoder.encode(self.scope.rawValue, forKey: "scope")
+        aCoder.encode(self.currentPath, forKey: "currentPath")
+        aCoder.encode(self.isCoorinating, forKey: "isCoorinating")
+    }
+    
+    open override func copy(with zone: NSZone? = nil) -> Any {
+        let copy = CloudFileProvider(containerId: self.containerId, scope: self.scope)
+        copy?.currentPath = self.currentPath
+        copy?.delegate = self.delegate
+        copy?.fileOperationDelegate = self.fileOperationDelegate
+        return copy as Any
+    }
+    
     /**
      Returns an Array of `FileObject`s identifying the the directory entries via asynchronous completion handler.
      
@@ -226,7 +253,7 @@ open class CloudFileProvider: LocalFileProvider {
                 let newSub = cQuery.subpredicates.map { updateQueryKeys($0 as! NSPredicate) }
                 switch cQuery.compoundPredicateType {
                 case .and: return NSCompoundPredicate(andPredicateWithSubpredicates: newSub)
-                case .not: return NSCompoundPredicate(notPredicateWithSubpredicate: newSub[0])
+                case .not: return NSCompoundPredicate(notPredicateWithSubpredicate: newSub.first!)
                 case .or:  return NSCompoundPredicate(orPredicateWithSubpredicates: newSub)
                 }
             } else if let cQuery = queryComponent as? NSComparisonPredicate {
@@ -611,15 +638,6 @@ open class CloudFileProvider: LocalFileProvider {
         return monitors[path] != nil
     }
     
-    open override func copy(with zone: NSZone? = nil) -> Any {
-        let copy = CloudFileProvider(containerId: self.containerId)
-        copy?.currentPath = self.currentPath
-        copy?.delegate = self.delegate
-        copy?.fileOperationDelegate = self.fileOperationDelegate
-        copy?.isPathRelative = self.isPathRelative
-        return copy as Any
-    }
-    
     fileprivate func mapFileObject(attributes attribs: [String: Any]) -> FileObject? {
         guard let url = (attribs[NSMetadataItemURLKey] as? URL)?.standardizedFileURL, let name = attribs[NSMetadataItemFSNameKey] as? String else {
             return nil
@@ -798,7 +816,7 @@ open class CloudOperationHandle: OperationHandle {
         DispatchQueue.main.async {
             query.start()
         }
-        _ = group.wait(timeout: DispatchTime.now() + 30)
+        _ = group.wait(timeout: .now() + 30)
         return item
     }
 }

Sources/DropboxFileProvider.swift

@@ -18,7 +18,6 @@ import CoreGraphics
  */
 open class DropboxFileProvider: FileProviderBasicRemote {
     open class var type: String { return "DropBox" }
-    open let isPathRelative: Bool
     open let baseURL: URL?
     open var currentPath: String
     
@@ -53,6 +52,16 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         return _session!
     }
     
+    fileprivate var _longpollSession: URLSession?
+    internal var longpollSession: URLSession {
+        if _longpollSession == nil {
+            let config = URLSessionConfiguration.default
+            config.timeoutIntervalForRequest = 600
+            _longpollSession = URLSession(configuration: config, delegate: nil, delegateQueue: nil)
+        }
+        return _longpollSession!
+    }
+    
     /**
      Initializer for Dropbox provider with given client ID and Token.
      These parameters must be retrieved via [OAuth2 API of Dropbox](https://www.dropbox.com/developers/reference/oauth-guide).
@@ -65,7 +74,6 @@ open class DropboxFileProvider: FileProviderBasicRemote {
     */
     public init(credential: URLCredential?, cache: URLCache? = nil) {
         self.baseURL = nil
-        self.isPathRelative = true
         self.currentPath = ""
         self.useCache = false
         self.validatingCache = true
@@ -78,7 +86,34 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: .concurrent)
         operation_queue = OperationQueue()
         operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
-
+    }
+    
+    public required convenience init?(coder aDecoder: NSCoder) {
+        self.init(credential: aDecoder.decodeObject(forKey: "credential") as? URLCredential)
+        self.currentPath     = aDecoder.decodeObject(forKey: "currentPath") as? String ?? ""
+        self.useCache        = aDecoder.decodeBool(forKey: "useCache")
+        self.validatingCache = aDecoder.decodeBool(forKey: "validatingCache")
+    }
+    
+    public func encode(with aCoder: NSCoder) {
+        aCoder.encode(self.credential, forKey: "credential")
+        aCoder.encode(self.currentPath, forKey: "currentPath")
+        aCoder.encode(self.useCache, forKey: "useCache")
+        aCoder.encode(self.validatingCache, forKey: "validatingCache")
+    }
+    
+    public static var supportsSecureCoding: Bool {
+        return true
+    }
+    
+    open func copy(with zone: NSZone? = nil) -> Any {
+        let copy = DropboxFileProvider(credential: self.credential, cache: self.cache)
+        copy.currentPath = self.currentPath
+        copy.delegate = self.delegate
+        copy.fileOperationDelegate = self.fileOperationDelegate
+        copy.useCache = self.useCache
+        copy.validatingCache = self.validatingCache
+        return copy
     }
     
     deinit {
@@ -102,14 +137,14 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString]
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderDropboxError?
             var fileObject: DropboxFileObject?
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 serverError = code != nil ? FileProviderDropboxError(code: code!, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
-                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr), let file = DropboxFileObject(json: json) {
+                if let json = data?.deserializeJSON(), let file = DropboxFileObject(json: json) {
                     fileObject = file
                 }
             }
@@ -126,7 +161,7 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var totalSize: Int64 = -1
             var usedSize: Int64 = 0
-            if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr) {
+            if let json = data?.deserializeJSON() {
                 totalSize = ((json["allocation"] as? NSDictionary)?["allocated"] as? NSNumber)?.int64Value ?? -1
                 usedSize = (json["used"] as? NSNumber)?.int64Value ?? 0
             }
@@ -137,15 +172,29 @@ open class DropboxFileProvider: FileProviderBasicRemote {
     
     open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
         var foundFiles = [DropboxFileObject]()
-        guard let queryStr = self.findNameQuery(query, key: "name") as? String else { return }
-        search(path, query: queryStr, foundItem: { (file) in
-            if query.evaluate(with: file.mapPredicate()) {
-                foundFiles.append(file)
-                foundItemHandler?(file)
-            }
-        }, completionHandler: { (error) in
-            completionHandler(foundFiles, error)
-        })
+        if let queryStr = query.findValue(forKey: "name", operator: .beginsWith) as? String {
+            // Dropbox only support searching for file names begin with query in non-enterprise accounts.
+            // We will use it if there is a `name BEGINSWITH[c] "query"` in predicate, then filter to form final result.
+            search(path, query: queryStr, foundItem: { (file) in
+                if query.evaluate(with: file.mapPredicate()) {
+                    foundFiles.append(file)
+                    foundItemHandler?(file)
+                }
+            }, completionHandler: { (error) in
+                completionHandler(foundFiles, error)
+            })
+        } else {
+            // Dropbox doesn't support searching attributes natively. The workaround is to fallback to listing all files
+            // and filter it locally. It may have a network burden in case there is many files in Dropbox, so please use it concisely.
+            list(path, recursive: true, progressHandler: { (files, _, error) in
+                for file in files where query.evaluate(with: file.mapPredicate()) {
+                    foundItemHandler?(file)
+                }
+            }, completionHandler: { (files, _, error) in
+                let predicatedFiles = files.filter { query.evaluate(with: $0.mapPredicate()) }
+                completionHandler(predicatedFiles, error)
+            })
+        }
     }
     
     open func isReachable(completionHandler: @escaping (Bool) -> Void) {
@@ -210,7 +259,7 @@ extension DropboxFileProvider: FileProviderOperations {
         } else {
             requestDictionary["path"] = correctPath(sourcePath) as NSString?
         }
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderDropboxError?
             if let response = response as? HTTPURLResponse, response.statusCode >= 300, let code = FileProviderHTTPErrorCode(rawValue: response.statusCode) {
@@ -242,7 +291,7 @@ extension DropboxFileProvider: FileProviderOperations {
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         let requestDictionary: [String: AnyObject] = ["path": path as NSString]
-        let requestJson = dictionaryToJSON(requestDictionary) ?? ""
+        let requestJson = String(jsonDictionary: requestDictionary) ?? ""
         request.setValue(requestJson, forHTTPHeaderField: "Dropbox-API-Arg")
         let task = session.downloadTask(with: request, completionHandler: { (cacheURL, response, error) in
             guard let cacheURL = cacheURL, let httpResponse = response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
@@ -285,7 +334,7 @@ extension DropboxFileProvider: FileProviderReadWrite {
             request.setValue("bytes=\(offset)-", forHTTPHeaderField: "Range")
         }
         let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString]
-        request.setValue(dictionaryToJSON(requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
+        request.setValue(String(jsonDictionary: requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderDropboxError?
             if let httpResponse = response as? HTTPURLResponse , httpResponse.statusCode >= 300, let code = FileProviderHTTPErrorCode(rawValue: httpResponse.statusCode) {
@@ -326,16 +375,16 @@ extension DropboxFileProvider: FileProviderReadWrite {
 }
 
 extension DropboxFileProvider {
-    /// *DEPRECATED:* Use `publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?))` function instead.
-    @available(*, deprecated, renamed: "publicLink(to:completionHandler:)", message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
+    /// *OBSOLETED:* Use `publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?))` function instead.
+    @available(*, obsoleted: 1.0, renamed: "publicLink(to:completionHandler:)", message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
     open func temporaryLink(to path: String, completionHandler: @escaping ((_ link: URL?, _ attribute: DropboxFileObject?, _ error: Error?) -> Void)) {
         self.publicLink(to: path) { (url, file, _, error) in
             completionHandler(url, file, error)
         }
     }
     
-    /// *DEPRECATED:* Use `publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?))` function instead.
-    @available(*, deprecated, renamed: "publicLink(to:completionHandler:)", message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
+    /// *OBSOLETED:* Use `publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?))` function instead.
+    @available(*, obsoleted: 1.0, renamed: "publicLink(to:completionHandler:)", message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
     open func temporaryLink(to path: String, completionHandler: @escaping ((_ link: URL?, _ attribute: DropboxFileObject?, _ expiration: Date?, _ error: Error?) -> Void)) {
         self.publicLink(to: path) { (url, file, expiration, error) in
             completionHandler(url, file, expiration, error)
@@ -362,7 +411,7 @@ extension DropboxFileProvider {
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString]
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderDropboxError?
             var link: URL?
@@ -370,7 +419,7 @@ extension DropboxFileProvider {
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 serverError = code != nil ? FileProviderDropboxError(code: code!, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
-                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr) {
+                if let json = data?.deserializeJSON() {
                     if let linkStr = json["link"] as? String {
                         link = URL(string: linkStr)
                     }
@@ -408,7 +457,7 @@ extension DropboxFileProvider {
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         let requestDictionary: [String: AnyObject] = ["path": correctPath(toPath)! as NSString, "url" : remoteURL.absoluteString as NSString]
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderDropboxError?
             var jobId: String?
@@ -416,7 +465,7 @@ extension DropboxFileProvider {
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 serverError = code != nil ? FileProviderDropboxError(code: code!, path: toPath, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
-                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr) {
+                if let json = data?.deserializeJSON() {
                     jobId = json["async_job_id"] as? String
                     if let attribDic = json["metadata"] as? [String: AnyObject] {
                         fileObject = DropboxFileObject(json: attribDic)
@@ -443,7 +492,7 @@ extension DropboxFileProvider {
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         let requestDictionary: [String: AnyObject] = ["path": correctPath(toPath)! as NSString, "copy_reference" : reference as NSString]
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderDropboxError?
             if let response = response as? HTTPURLResponse {
@@ -508,17 +557,17 @@ extension DropboxFileProvider: ExtendedFileProvider {
         if let dimension = dimension {
             requestDictionary["size"] = "w\(Int(dimension.width))h\(Int(dimension.height))" as NSString
         }
-        request.setValue(dictionaryToJSON(requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
+        request.setValue(String(jsonDictionary: requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
         let task = self.session.dataTask(with: request, completionHandler: { (data, response, error) in
             var image: ImageClass? = nil
-            if let r = response as? HTTPURLResponse, let result = r.allHeaderFields["Dropbox-API-Result"] as? String, let jsonResult = jsonToDictionary(result) {
+            if let r = response as? HTTPURLResponse, let result = r.allHeaderFields["Dropbox-API-Result"] as? String, let jsonResult = result.deserializeJSON() {
                 if jsonResult["error"] != nil {
                     completionHandler(nil, self.throwError(path, code: URLError.cannotDecodeRawData as FoundationErrorEnum))
                 }
             }
             if let data = data {
-                if DropboxFileProvider.dataIsPDF(data) {
-                    image = DropboxFileProvider.convertToImage(pdfData: data)
+                if data.isPDF, let pageImage = DropboxFileProvider.convertToImage(pdfData: data) {
+                    image = pageImage
                 } else if let contentType = (response as? HTTPURLResponse)?.allHeaderFields["Content-Type"] as? String, contentType.contains("text/html") {
                      // TODO: Implement converting html returned type of get_preview to image
                 } else {
@@ -537,7 +586,7 @@ extension DropboxFileProvider: ExtendedFileProvider {
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString, "include_media_info": NSNumber(value: true)]
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderDropboxError?
             var dic = [String: Any]()
@@ -545,7 +594,7 @@ extension DropboxFileProvider: ExtendedFileProvider {
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 serverError = code != nil ? FileProviderDropboxError(code: code!, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
-                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr), let properties = json["media_info"] as? [String: Any] {
+                if let json = data?.deserializeJSON(), let properties = json["media_info"] as? [String: Any] {
                     (dic, keys) = self.mapMediaInfo(properties)
                 }
             }
@@ -555,14 +604,4 @@ extension DropboxFileProvider: ExtendedFileProvider {
     }
 }
 
-extension DropboxFileProvider: FileProvider {
-    open func copy(with zone: NSZone? = nil) -> Any {
-        let copy = DropboxFileProvider(credential: self.credential, cache: self.cache)
-        copy.currentPath = self.currentPath
-        copy.delegate = self.delegate
-        copy.fileOperationDelegate = self.fileOperationDelegate
-        copy.useCache = self.useCache
-        copy.validatingCache = self.validatingCache
-        return copy
-    }
-}
+extension DropboxFileProvider: FileProvider { }

Sources/DropboxHelper.swift

@@ -22,7 +22,7 @@ public final class DropboxFileObject: FileObject {
     }
     
     internal convenience init? (jsonStr: String) {
-        guard let json = jsonToDictionary(jsonStr) else { return nil }
+        guard let json = jsonStr.deserializeJSON() else { return nil }
         self.init(json: json)
     }
     
@@ -75,7 +75,7 @@ public final class DropboxFileObject: FileObject {
 
 // codebeat:disable[ARITY]
 internal extension DropboxFileProvider {
-    func list(_ path: String, cursor: String? = nil, prevContents: [DropboxFileObject] = [], recursive: Bool = false, completionHandler: @escaping ((_ contents: [FileObject], _ cursor: String?, _ error: Error?) -> Void)) {
+    func list(_ path: String, cursor: String? = nil, prevContents: [DropboxFileObject] = [], recursive: Bool = false, session: URLSession? = nil, progressHandler: ((_ contents: [FileObject], _ nextCursor: String?, _ error: Error?) -> Void)? = nil, completionHandler: @escaping ((_ contents: [FileObject], _ cursor: String?, _ error: Error?) -> Void)) {
         var requestDictionary = [String: AnyObject]()
         let url: URL
         if let cursor = cursor {
@@ -90,30 +90,32 @@ internal extension DropboxFileProvider {
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
-        let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
+        request.httpBody = Data(jsonDictionary: requestDictionary)
+        let task = (session ?? self.session).dataTask(with: request, completionHandler: { (data, response, error) in
             var responseError: FileProviderDropboxError?
-            var files = prevContents
+            var files = [DropboxFileObject]()
             if let code = (response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
                 responseError = FileProviderDropboxError(code: rCode, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8))
             }
-            if let data = data, let jsonStr = String(data: data, encoding: .utf8) {
-                let json = jsonToDictionary(jsonStr)
-                if let entries = json?["entries"] as? [AnyObject] , entries.count > 0 {
+            if let json = data?.deserializeJSON() {
+                if let entries = json["entries"] as? [AnyObject] , entries.count > 0 {
+                    files.reserveCapacity(entries.count)
                     for entry in entries {
                         if let entry = entry as? [String: AnyObject], let file = DropboxFileObject(json: entry) {
                             files.append(file)
                         }
                     }
-                    let ncursor = json?["cursor"] as? String
-                    let hasmore = (json?["has_more"] as? NSNumber)?.boolValue ?? false
+                    let ncursor = json["cursor"] as? String
+                    let hasmore = (json["has_more"] as? NSNumber)?.boolValue ?? false
                     if hasmore {
-                        self.list(path, cursor: ncursor, prevContents: files, completionHandler: completionHandler)
+                        progressHandler?(files, ncursor, responseError ?? error)
+                        self.list(path, cursor: ncursor, prevContents: prevContents + files, completionHandler: completionHandler)
                         return
                     }
                 }
             }
-            completionHandler(files, nil, responseError ?? error)
+            progressHandler?(files, nil, responseError ?? error)
+            completionHandler(prevContents + files, nil, responseError ?? error)
         })
         task.taskDescription = FileOperationType.fetch(path: path).json
         task.resume()
@@ -136,7 +138,7 @@ internal extension DropboxFileProvider {
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
-        request.setValue(dictionaryToJSON(requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
+        request.setValue(String(jsonDictionary: requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
         request.httpBody = data
         let task = session.uploadTask(with: request, from: data, completionHandler: { (data, response, error) in
             var responseError: FileProviderDropboxError?
@@ -169,7 +171,7 @@ internal extension DropboxFileProvider {
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
-        request.setValue(dictionaryToJSON(requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
+        request.setValue(String(jsonDictionary: requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
         let task = session.uploadTask(with: request, fromFile: localFile, completionHandler: { (data, response, error) in
             var responseError: FileProviderDropboxError?
             if let code = (response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
@@ -193,22 +195,21 @@ internal extension DropboxFileProvider {
         requestDictionary["query"] = query as NSString
         requestDictionary["start"] = start as NSNumber
         requestDictionary["max_results"] = maxResultPerPage as NSNumber
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var responseError: FileProviderDropboxError?
             if let code = (response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
                 responseError = FileProviderDropboxError(code: rCode, path: startPath, errorDescription: String(data: data ?? Data(), encoding: .utf8))
             }
-            if let data = data, let jsonStr = String(data: data, encoding: .utf8) {
-                let json = jsonToDictionary(jsonStr)
-                if let entries = json?["matches"] as? [AnyObject] , entries.count > 0 {
+            if let json = data?.deserializeJSON() {
+                if let entries = json["matches"] as? [AnyObject] , entries.count > 0 {
                     for entry in entries {
                         if let entry = entry as? [String: AnyObject], let file = DropboxFileObject(json: entry) {
                             foundItem(file)
                         }
                     }
-                    let rstart = json?["start"] as? Int
-                    let hasmore = (json?["more"] as? NSNumber)?.boolValue ?? false
+                    let rstart = json["start"] as? Int
+                    let hasmore = (json["more"] as? NSNumber)?.boolValue ?? false
                     if hasmore, let rstart = rstart {
                         self.search(startPath, query: query, start: rstart + entries.count, maxResultPerPage: maxResultPerPage, foundItem: foundItem, completionHandler: completionHandler)
                     } else {
@@ -251,7 +252,7 @@ internal extension DropboxFileProvider {
         }
         if let duration = json["duration"] as? UInt64 {
             keys.append("Duration")
-            dic["Duration"] = DropboxFileProvider.formatshort(interval: TimeInterval(duration))
+            dic["Duration"] = TimeInterval(duration).formatshort
         }
         return (dic, keys)
     }

Sources/ExtendedLocalFileProvider.swift

@@ -225,8 +225,7 @@ public struct LocalFileInformationGenerator {
     
     /// Thumbnail generator closure for portable document files files.
     static public var pdfThumbnail: (_ fileURL: URL) -> ImageClass? = { fileURL in
-        guard let data = try? Data(contentsOf: fileURL) else { return nil }
-        return LocalFileProvider.convertToImage(pdfData: data)
+        return LocalFileProvider.convertToImage(pdfURL: fileURL)
     }
     
     /// Thumbnail generator closure for office document files.
@@ -247,7 +246,7 @@ public struct LocalFileInformationGenerator {
         var keys = [String]()
         
         func add(key: String, value: Any?) {
-            if let value = value {
+            if let value = value, !((value as? String)?.isEmpty ?? false) {
                 keys.append(key)
                 dic[key] = value
             }
@@ -282,28 +281,25 @@ public struct LocalFileInformationGenerator {
         add(key: "Device model", value: tiffDict[kCGImagePropertyTIFFModel as String])
         add(key: "Lens model", value: exifDict[kCGImagePropertyExifLensModel as String])
         add(key: "Artist", value: tiffDict[kCGImagePropertyTIFFArtist as String] as? String)
-        if let cr = tiffDict[kCGImagePropertyTIFFCopyright as String] as? String , !cr.isEmpty {
-            add(key: "Copyright", value: cr)
-
-        }
-        if let date = tiffDict[kCGImagePropertyTIFFDateTime as String] as? String , !date.isEmpty {
-            add(key: "Date taken", value: date)
-        }
+        add(key: "Copyright", value: tiffDict[kCGImagePropertyTIFFCopyright as String] as? String)
+        add(key: "Date taken", value: tiffDict[kCGImagePropertyTIFFDateTime as String] as? String)
+        
         if let latitude = tiffDict[kCGImagePropertyGPSLatitude as String] as? NSNumber, let longitude = tiffDict[kCGImagePropertyGPSLongitude as String] as? NSNumber {
             add(key: "Location", value: "\(latitude), \(longitude)")
         }
+        add(key: "Altitude", value: tiffDict[kCGImagePropertyGPSAltitude as String] as? NSNumber)
+        add(key: "Area", value: tiffDict[kCGImagePropertyGPSAreaInformation as String])
+        
         add(key: "Color space", value: imageDict[kCGImagePropertyColorModel as String])
         add(key: "Focal length", value: exifDict[kCGImagePropertyExifFocalLength as String])
         add(key: "F number", value: exifDict[kCGImagePropertyExifFNumber as String])
         add(key: "Exposure program", value: exifDict[kCGImagePropertyExifExposureProgram as String])
         
         if let exp = exifDict[kCGImagePropertyExifExposureTime as String] as? NSNumber {
-            let expfrac = simplify(Int64(exp.doubleValue * 10_000_000_000_000), 10_000_000_000_000)
+            let expfrac = simplify(Int64(exp.doubleValue * 1_163_962_800_000), 1_163_962_800_000)
             add(key: "Exposure time", value: "\(expfrac.newTop)/\(expfrac.newBottom)")
         }
-        if let iso = exifDict[kCGImagePropertyExifISOSpeedRatings as String] as? NSArray , iso.count > 0 {
-            add(key: "ISO speed", value: iso[0])
-        }
+        add(key: "ISO speed", value: (exifDict[kCGImagePropertyExifISOSpeedRatings as String] as? [NSNumber])?.first)
         return (dic, keys)
     }
     
@@ -342,7 +338,7 @@ public struct LocalFileInformationGenerator {
                 }
             }
             if let ap = try? AVAudioPlayer(contentsOf: fileURL) {
-                add(key: "Duration", value: LocalFileProvider.formatshort(interval: ap.duration))
+                add(key: "Duration", value: ap.duration.formatshort)
                 add(key: "Bitrate", value: ap.settings[AVSampleRateKey] as? Int)
             }
         }
@@ -371,17 +367,17 @@ public struct LocalFileInformationGenerator {
         }
         let asset = AVURLAsset(url: fileURL, options: nil)
         let videoTracks = asset.tracks(withMediaType: AVMediaTypeVideo)
-        if videoTracks.count > 0 {
+        if let videoTrack = videoTracks.first {
             var bitrate: Float = 0
-            let width = Int(videoTracks[0].naturalSize.width)
-            let height = Int(videoTracks[0].naturalSize.height)
+            let width = Int(videoTrack.naturalSize.width)
+            let height = Int(videoTrack.naturalSize.height)
             add(key: "Dimensions", value: "\(width)x\(height)")
             var duration: Int64 = 0
             for track in videoTracks {
                 duration += track.timeRange.duration.timescale > 0 ? track.timeRange.duration.value / Int64(track.timeRange.duration.timescale) : 0
                 bitrate += track.estimatedDataRate
             }
-            add(key: "Duration", value: LocalFileProvider.formatshort(interval: TimeInterval(duration)))
+            add(key: "Duration", value: TimeInterval(duration).formatshort)
             add(key: "Video Bitrate", value: "\(Int(ceil(bitrate / 1000))) kbps")
         }
         let audioTracks = asset.tracks(withMediaType: AVMediaTypeAudio)
@@ -400,7 +396,7 @@ public struct LocalFileInformationGenerator {
         var keys = [String]()
         
         func add(key: String, value: Any?) {
-            if let value = value {
+            if let value = value, !((value as? String)?.isEmpty ?? false) {
                 keys.append(key)
                 dic[key] = value
             }
@@ -414,7 +410,8 @@ public struct LocalFileInformationGenerator {
             return nil
         }
         
-        func convertDate(_ date: String) -> Date? {
+        func convertDate(_ date: String?) -> Date? {
+            guard let date = date else { return nil }
             var dateStr = date
             if dateStr.hasPrefix("D:") {
                 dateStr = date.substring(from: date.characters.index(date.startIndex, offsetBy: 2))
@@ -431,16 +428,10 @@ public struct LocalFileInformationGenerator {
             return nil
         }
         
-        if let data = try? Data(contentsOf: fileURL), let provider = CGDataProvider(data: data as CFData), let reference = CGPDFDocument(provider), let dict = reference.info {
-            if let title = getKey("Title", from: dict), !title.isEmpty {
-                add(key: "Title", value: title)
-            }
-            if let author = getKey("Author", from: dict), !author.isEmpty {
-                add(key: "Author", value: author)
-            }
-            if let subject = getKey("Subject", from: dict), !subject.isEmpty {
-                add(key: "Subject", value: subject)
-            }
+        if let provider = CGDataProvider(url: fileURL as CFURL), let reference = CGPDFDocument(provider), let dict = reference.info {
+            add(key: "Title", value: getKey("Title", from: dict))
+            add(key: "Author", value: getKey("Author", from: dict))
+            add(key: "Subject", value: getKey("Subject", from: dict))
             var majorVersion: Int32 = 0
             var minorVersion: Int32 = 0
             reference.getVersion(majorVersion: &majorVersion, minorVersion: &minorVersion)
@@ -453,15 +444,9 @@ public struct LocalFileInformationGenerator {
                 let size = pageRef.getBoxRect(CGPDFBox.mediaBox).size
                 add(key: "Resolution", value: "\(Int(size.width))x\(Int(size.height))")
             }
-            if let creator = getKey("Creator", from: dict), !creator.isEmpty {
-                add(key: "Content creator", value: creator)
-            }
-            if let creationDateString = getKey("CreationDate", from: dict) {
-                add(key: "Creation date", value: convertDate(creationDateString))
-            }
-            if let modifiedDateString = getKey("ModDate", from: dict) {
-                add(key: "Modified date", value: convertDate(modifiedDateString))
-            }
+            add(key: "Content creator", value: getKey("Creator", from: dict))
+            add(key: "Creation date", value: convertDate(getKey("CreationDate", from: dict)))
+            add(key: "Modified date", value: convertDate(getKey("ModDate", from: dict)))
             add(key: "Security", value: reference.isEncrypted ? "Present" : "None")
             add(key: "Allows printing", value: reference.allowsPrinting ? "Yes" : "No")
             add(key: "Allows copying", value: reference.allowsCopying ? "Yes" : "No")

Sources/FPSStreamTask.swift

@@ -239,10 +239,10 @@ internal class FPSStreamTask: URLSessionTask, StreamDelegate {
             var timedOut: Bool = false
             dispatch_queue.async {
                 if timeout > 0 {
-                    self.dispatch_queue.asyncAfter(deadline: DispatchTime.now() + Double(Int64(timeout * 1_000_000_000)) / Double(NSEC_PER_SEC), execute: {
+                    self.dispatch_queue.asyncAfter(deadline: .now() + 1) {
                         timedOut = true
                         completionHandler(nil, inputStream.streamStatus == .atEnd, inputStream.streamError as NSError?)
-                    })
+                    }
                 }
                 while (self.dataReceived.length == 0 || self.dataReceived.length < minBytes) && !timedOut {
                     RunLoop.current.run(until: Date(timeIntervalSinceNow: 0.1));
@@ -277,10 +277,10 @@ internal class FPSStreamTask: URLSessionTask, StreamDelegate {
             var timedOut: Bool = false
             dispatch_queue.async {
                 if timeout > 0 {
-                    self.dispatch_queue.asyncAfter(deadline: DispatchTime.now() + Double(Int64(timeout * 1_000_000_000)) / Double(NSEC_PER_SEC), execute: {
+                    self.dispatch_queue.asyncAfter(deadline: .now() + 1) {
                         timedOut = true
                         completionHandler(self._error)
-                    })
+                    }
                 }
                 
                 self.dataToBeSent.append(data)

Sources/FileObject.swift

@@ -25,7 +25,7 @@ open class FileObject: Equatable {
     }
     
     /// url to access the resource, not supported by Dropbox provider
-    @available(*, deprecated, renamed: "url", message: "Use url.absoluteURL instead.")
+    @available(*, obsoleted: 1.0, renamed: "url", message: "Use url.absoluteURL instead.")
     open var absoluteURL: URL? {
         return url?.absoluteURL
     }
@@ -101,12 +101,6 @@ open class FileObject: Equatable {
         }
     }
     
-    /// **OBSOLETED:** Use `type` property instead.
-    @available(*, obsoleted: 1.0, renamed: "type", message: "Use type property instead.")
-    open var fileType: URLFileResourceType? {
-        return self.type
-    }
-    
     /// File is hidden either because begining with dot or filesystem flags
     /// Setting this value on a file begining with dot has no effect
     open internal(set) var isHidden: Bool {
@@ -157,7 +151,7 @@ open class FileObject: Equatable {
         return rhs.path == lhs.path && rhs.size == lhs.size && rhs.modifiedDate == lhs.modifiedDate
     }
     
-    internal  func mapPredicate() -> [String: Any] {
+    internal func mapPredicate() -> [String: Any] {
         let mapDict: [URLResourceKey: String] = [.fileURL: "url", .nameKey: "name", .pathKey: "path", .fileSizeKey: "filesize", .creationDateKey: "creationDate",
                                                  .contentModificationDateKey: "modifiedDate", .isHiddenKey: "isHidden", .isWritableKey: "isWritable", .serverDate: "serverDate", .entryTag: "entryTag", .mimeType: "mimeType"]
         let typeDict: [URLFileResourceType: String] = [.directory: "directory", .regular: "regular", .symbolicLink: "symbolicLink", .unknown: "unknown"]
@@ -175,6 +169,33 @@ open class FileObject: Equatable {
         result["type"] = typeDict[self.type ?? .unknown] ?? "unknown"
         return result
     }
+    
+    static public func convertPredicate(fromSpotlight query: NSPredicate) -> NSPredicate {
+        let mapDict: [String: URLResourceKey] = [NSMetadataItemURLKey: .fileURL, NSMetadataItemFSNameKey: .nameKey, NSMetadataItemPathKey: .pathKey,
+                                                 NSMetadataItemFSSizeKey: .fileSizeKey, NSMetadataItemFSCreationDateKey: .creationDateKey,
+                                                 NSMetadataItemFSContentChangeDateKey: .contentModificationDateKey, "kMDItemFSInvisible": .isHiddenKey, "kMDItemFSIsWriteable": .isWritableKey, "kMDItemKind": .mimeType]
+        
+        if let cQuery = query as? NSCompoundPredicate {
+            let newSub = cQuery.subpredicates.map { convertPredicate(fromSpotlight: $0 as! NSPredicate) }
+            switch cQuery.compoundPredicateType {
+            case .and: return NSCompoundPredicate(andPredicateWithSubpredicates: newSub)
+            case .not: return NSCompoundPredicate(notPredicateWithSubpredicate: newSub[0])
+            case .or:  return NSCompoundPredicate(orPredicateWithSubpredicates: newSub)
+            }
+        } else if let cQuery = query as? NSComparisonPredicate {
+            var newLeft = cQuery.leftExpression
+            var newRight = cQuery.rightExpression
+            if newLeft.expressionType == .keyPath, let newKey = mapDict[newLeft.keyPath] {
+                newLeft = NSExpression(forKeyPath: newKey.rawValue)
+            }
+            if newRight.expressionType == .keyPath, let newKey = mapDict[newRight.keyPath] {
+                newRight = NSExpression(forKeyPath: newKey.rawValue)
+            }
+            return NSComparisonPredicate(leftExpression: newLeft, rightExpression: newRight, modifier: cQuery.comparisonPredicateModifier, type: cQuery.predicateOperatorType, options: cQuery.options)
+        } else {
+            return query
+        }
+    }
 }
 
 internal func resolve(dateString: String) -> Date? {
@@ -264,7 +285,7 @@ public struct FileObjectSorting {
         self.isDirectoriesFirst = isDirectoriesFirst
     }
     
-    /// Sorts array of `FileObject`s by criterias set in properties
+    /// Sorts array of `FileObject`s by criterias set in attributes.
     public func sort(_ files: [FileObject]) -> [FileObject] {
         return files.sorted {
             if isDirectoriesFirst {
@@ -300,62 +321,3 @@ public struct FileObjectSorting {
         }
     }
 }
-
-extension Array where Element: FileObject {
-    /// Returns a sorted array of `FileObject`s by criterias set in properties.
-    public func sort(by type: FileObjectSorting.SortType, ascending: Bool = true, isDirectoriesFirst: Bool = false) -> [Element] {
-        let sorting = FileObjectSorting(type: type, ascending: ascending, isDirectoriesFirst: isDirectoriesFirst)
-        return sorting.sort(self) as! [Element]
-    }
-    
-    /// Sorts array of `FileObject`s by criterias set in properties
-    public mutating func sorted(by type: FileObjectSorting.SortType, ascending: Bool = true, isDirectoriesFirst: Bool = false) {
-        self = self.sort(by: type, ascending: ascending, isDirectoriesFirst: isDirectoriesFirst)
-    }
-}
-
-extension URLFileResourceType {
-    /// Returns corresponding `URLFileResourceType` of a `FileAttributeType` value
-    public init(fileTypeValue: FileAttributeType) {
-        switch fileTypeValue {
-        case FileAttributeType.typeCharacterSpecial: self = .characterSpecial
-        case FileAttributeType.typeDirectory: self = .directory
-        case FileAttributeType.typeBlockSpecial: self = .blockSpecial
-        case FileAttributeType.typeRegular: self = .regular
-        case FileAttributeType.typeSymbolicLink: self = .symbolicLink
-        case FileAttributeType.typeSocket: self = .socket
-        case FileAttributeType.typeUnknown: self = .unknown
-        default: self = .unknown
-        }
-    }
-}
-
-internal extension URLResourceKey {
-    static let fileURL = URLResourceKey(rawValue: "NSURLFileURLKey")
-    static let serverDate = URLResourceKey(rawValue: "NSURLServerDateKey")
-    static let entryTag = URLResourceKey(rawValue: "NSURLEntryTagKey")
-    static let mimeType = URLResourceKey(rawValue: "NSURLMIMETypeIdentifierKey")
-}
-
-internal extension URL {
-    var uw_scheme: String {
-        return self.scheme ?? ""
-    }
-}
-
-internal func jsonToDictionary(_ jsonString: String) -> [String: AnyObject]? {
-    guard let data = jsonString.data(using: .utf8) else {
-        return nil
-    }
-    if let dic = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions()) as? [String: AnyObject] {
-        return dic
-    }
-    return nil
-}
-
-internal func dictionaryToJSON(_ dictionary: [String: AnyObject]) -> String? {
-    if let data = try? JSONSerialization.data(withJSONObject: dictionary, options: JSONSerialization.WritingOptions()) {
-        return String(data: data, encoding: .utf8)
-    }
-    return nil
-}

Sources/FileProvider.swift

@@ -19,16 +19,13 @@ public typealias ImageClass = NSImage
 public typealias SimpleCompletionHandler = ((_ error: Error?) -> Void)?
 
 /// This protocol defines FileProvider neccesary functions and properties to connect and get contents list
-public protocol FileProviderBasic: class {
+public protocol FileProviderBasic: class, NSCoding, NSSecureCoding {
     /// An string to identify type of provider.
     static var type: String { get }
     
     /// An string to identify type of provider.
     var type: String { get }
     
-    /// The paths in arguments should resolved against base url.
-    var isPathRelative: Bool { get }
-    
     /// The url of which paths should resolve against.
     var baseURL: URL? { get }
     
@@ -93,12 +90,12 @@ public protocol FileProviderBasic: class {
     /**
      Search files inside directory using query asynchronously.
      
-     - Note: Query string is limited to file name, to search based on other file properties, use NSPredicate version.
+     - Note: Query string is limited to file name, to search based on other file attributes, use NSPredicate version.
      
      - Parameters:
        - path: location of directory to start search
        - recursive: Searching subdirectories of path
-       - query: Simple string that file name contains to be search, case-insensitive.
+       - query: Simple string that file name begins with to be search, case-insensitive.
        - foundItemHandler: Closure which is called when a file is found
        - completionHandler: Closure which will be called after finishing search. Returns an arry of `FileObject` or error if occured.
      */
@@ -116,6 +113,8 @@ public protocol FileProviderBasic: class {
      
      - Note: Don't pass Spotlight predicates to this method directly, use `FileProvider.convertSpotlightPredicateTo()` method to get usable predicate.
      
+     - Important: A file name criteria should be provided for Dropbox.
+     
      - Parameters:
        - path: location of directory to start search
        - recursive: Searching subdirectories of path
@@ -139,38 +138,10 @@ public protocol FileProviderBasic: class {
 
 extension FileProviderBasic {
     public func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
-        let predicate = NSPredicate(format: "name CONTAINS[c] %@", query)
+        let predicate = NSPredicate(format: "name BEGINSWITH[c] %@", query)
         self.searchFiles(path: path, recursive: recursive, query: predicate, foundItemHandler: foundItemHandler, completionHandler: completionHandler)
     }
     
-    /// Converts Spotlight search predicate to `FileProvider.searchFiles()` method usable predicate.
-    public func convertSpotlightPredicateTo(_ query: NSPredicate) -> NSPredicate {
-        let mapDict: [String: URLResourceKey] = [NSMetadataItemURLKey: .fileURL, NSMetadataItemFSNameKey: .nameKey, NSMetadataItemPathKey: .pathKey,
-                                                 NSMetadataItemFSSizeKey: .fileSizeKey, NSMetadataItemFSCreationDateKey: .creationDateKey,
-                                                 NSMetadataItemFSContentChangeDateKey: .contentModificationDateKey, "kMDItemFSInvisible": .isHiddenKey, "kMDItemFSIsWriteable": .isWritableKey, "kMDItemKind": .mimeType]
-        
-        if let cQuery = query as? NSCompoundPredicate {
-            let newSub = cQuery.subpredicates.map { convertSpotlightPredicateTo($0 as! NSPredicate) }
-            switch cQuery.compoundPredicateType {
-            case .and: return NSCompoundPredicate(andPredicateWithSubpredicates: newSub)
-            case .not: return NSCompoundPredicate(notPredicateWithSubpredicate: newSub[0])
-            case .or:  return NSCompoundPredicate(orPredicateWithSubpredicates: newSub)
-            }
-        } else if let cQuery = query as? NSComparisonPredicate {
-            var newLeft = cQuery.leftExpression
-            var newRight = cQuery.rightExpression
-            if newLeft.expressionType == .keyPath, let newKey = mapDict[newLeft.keyPath] {
-                newLeft = NSExpression(forKeyPath: newKey.rawValue)
-            }
-            if newRight.expressionType == .keyPath, let newKey = mapDict[newRight.keyPath] {
-                newRight = NSExpression(forKeyPath: newKey.rawValue)
-            }
-            return NSComparisonPredicate(leftExpression: newLeft, rightExpression: newRight, modifier: cQuery.comparisonPredicateModifier, type: cQuery.predicateOperatorType, options: cQuery.options)
-        } else {
-            return query
-        }
-    }
-    
     /// The maximum number of queued operations that can execute at the same time.
     ///
     /// The default value of this property is `OperationQueue.defaultMaxConcurrentOperationCount`.
@@ -183,25 +154,7 @@ extension FileProviderBasic {
         }
     }
     
-    internal func findNameQuery(_ query: NSPredicate, key: String?) -> Any? {
-        if let cQuery = query as? NSCompoundPredicate {
-            let find = cQuery.subpredicates.flatMap { findNameQuery($0 as! NSPredicate, key: key) }
-            if find.count > 0 {
-                return find[0]
-            }
-            return nil
-        } else if let cQuery = query as? NSComparisonPredicate {
-            if cQuery.leftExpression.expressionType == .keyPath, key == nil || cQuery.leftExpression.keyPath == key! {
-                return cQuery.rightExpression.constantValue
-            }
-            if cQuery.rightExpression.expressionType == .keyPath, key == nil || cQuery.rightExpression.keyPath == key! {
-                return cQuery.leftExpression.constantValue
-            }
-            return nil
-        } else {
-            return nil
-        }
-    }
+    
 }
 
 /// Checking equality of two file provider, regardless of current path queues and delegates.
@@ -210,10 +163,10 @@ public func ==(lhs: FileProviderBasic, rhs: FileProviderBasic) -> Bool {
     if type(of: lhs) != type(of: rhs) {
         return false
     }
-    return lhs.type == rhs.type && lhs.baseURL == rhs.baseURL && lhs.isPathRelative == rhs.isPathRelative && lhs.credential == rhs.credential
+    return lhs.type == rhs.type && lhs.baseURL == rhs.baseURL && lhs.credential == rhs.credential
 }
 
-/// Cancels all active underlying tasks
+/// Cancels all active underlying tasks when deallocating remote providers
 public var fileProviderCancelTasksOnInvalidating = true
 
 /// Extending `FileProviderBasic` for web-based file providers
@@ -263,7 +216,7 @@ internal extension FileProviderBasicRemote {
                     }
                     group.leave()
                 }).resume()
-                _ = group.wait(timeout: DispatchTime.now() + self.session.configuration.timeoutIntervalForRequest)
+                _ = group.wait(timeout: .now() + self.session.configuration.timeoutIntervalForRequest)
             }
             if validatedCache {
                 completionHandler(response.data, response.response, nil)
@@ -653,31 +606,16 @@ extension FileProviderBasic {
         return type(of: self).type
     }
     
-    /// path without heading and trailing slash
-    public var bareCurrentPath: String {
-        return currentPath.trimmingCharacters(in: pathTrimSet)
-    }
-    
-    func escaped(path: String) -> String {
-        return path.trimmingCharacters(in: pathTrimSet).addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
-    }
-    
-    /// **OBSOLETED:** Use `url(of:).absoluteURL` instead.
-    @available(*, obsoleted: 1.0, renamed: "url(of:)", message: "Use url(of:).absoluteURL instead.")
-    public func absoluteURL(_ path: String? = nil) -> URL {
-        return url(of: path).absoluteURL
-    }
+    /// **OBSOLETED** This property never worked as expected and is redundant as only supported by `LocalFileProvider`.
+    /// To simulate `false` value, assign `URL(fileURLWithPath: "/")` to `baseURL`.
+    @available(*, obsoleted: 1.0, message: "Redundant property, now is always true.")
+    var isPathRelative: Bool { return true }
     
     public func url(of path: String? = nil) -> URL {
-        var rpath: String
-        if let path = path {
-            rpath = path
-        } else {
-            rpath = self.currentPath
-        }
+        var rpath: String = path ?? self.currentPath
         rpath = rpath.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? rpath
         if let baseURL = baseURL {
-            if isPathRelative && rpath.hasPrefix("/") {
+            if rpath.hasPrefix("/") {
                 rpath.remove(at: rpath.startIndex)
             }
             return URL(string: rpath, relativeTo: baseURL) ?? baseURL
@@ -695,15 +633,17 @@ extension FileProviderBasic {
     /// - Returns: A `String` contains relative path of url against base url.
     public func relativePathOf(url: URL) -> String {
         // check if url derieved from current base url
-        if !url.relativePath.isEmpty, url.baseURL == self.baseURL {
-            return url.relativePath.removingPercentEncoding!
+        let relativePath = url.relativePath
+        if !relativePath.isEmpty, url.baseURL == self.baseURL {
+            return relativePath.removingPercentEncoding ?? relativePath
         }
         
         // resolve url string against baseurl
         guard let baseURL = self.baseURL?.standardizedFileURL else { return url.absoluteString }
         let standardPath = url.absoluteString.replacingOccurrences(of: "file:///private/var/", with: "file:///var/", options: .anchored)
         let standardBase = baseURL.absoluteString.replacingOccurrences(of: "file:///private/var/", with: "file:///var/", options: .anchored)
-        return standardPath.replacingOccurrences(of: standardBase, with: "/").removingPercentEncoding!
+        let standardRelativePath = standardPath.replacingOccurrences(of: standardBase, with: "/")
+        return standardRelativePath.removingPercentEncoding ?? standardRelativePath
     }
     
     internal func correctPath(_ path: String?) -> String? {
@@ -748,7 +688,7 @@ extension FileProviderBasic {
             }
             group.leave()
         }
-        _ = group.wait(timeout: DispatchTime.now() + 5)
+        _ = group.wait(timeout: .now() + 5)
         let finalFile = result + (!fileExt.isEmpty ? "." + fileExt : "")
         return (dirPath as NSString).appendingPathComponent(finalFile)
     }
@@ -835,96 +775,82 @@ extension ExtendedFileProvider {
         self.thumbnailOfFile(path: path, dimension: nil, completionHandler: completionHandler)
     }
     
-    internal static func formatshort(interval: TimeInterval) -> String {
-        var result = "0:00"
-        if interval < TimeInterval(Int32.max) {
-            result = ""
-            var time = DateComponents()
-            time.hour   = Int(interval / 3600)
-            time.minute = Int((interval.truncatingRemainder(dividingBy: 3600)) / 60)
-            time.second = Int(interval.truncatingRemainder(dividingBy: 60))
-            let formatter = NumberFormatter()
-            formatter.paddingCharacter = "0"
-            formatter.minimumIntegerDigits = 2
-            formatter.maximumFractionDigits = 0
-            let formatterFirst = NumberFormatter()
-            formatterFirst.maximumFractionDigits = 0
-            if time.hour! > 0 {
-                result = "\(formatterFirst.string(from: NSNumber(value: time.hour!))!):\(formatter.string(from: NSNumber(value: time.minute!))!):\(formatter.string(from: NSNumber(value: time.second!))!)"
-            } else {
-                result = "\(formatterFirst.string(from: NSNumber(value: time.minute!))!):\(formatter.string(from: NSNumber(value: time.second!))!)"
-            }
-        }
-        result = result.trimmingCharacters(in: CharacterSet(charactersIn: ": "))
-        return result
-    }
-    
-    internal static func dataIsPDF(_ data: Data) -> Bool {
-        return data.count > 4 && data.scanString(length: 4, encoding: .ascii) == "%PDF"
-    }
-    
     internal static func convertToImage(pdfData: Data?, page: Int = 1) -> ImageClass? {
         guard let pdfData = pdfData else { return nil }
         
         let cfPDFData: CFData = pdfData as CFData
         if let provider = CGDataProvider(data: cfPDFData), let reference = CGPDFDocument(provider), let pageRef = reference.page(at: page) {
-            let frame = pageRef.getBoxRect(CGPDFBox.mediaBox)
-            var size = frame.size
-            let rect = CGRect(x: 0, y: 0, width: size.width, height: size.height)
-            
-            #if os(macOS)
-                let ppp = Int(NSScreen.main()?.backingScaleFactor ?? 1) // fetch device is retina or not
-                
-                size.width  *= CGFloat(ppp)
-                size.height *= CGFloat(ppp)
-                
-                let rep = NSBitmapImageRep(bitmapDataPlanes: nil, pixelsWide: Int(size.width), pixelsHigh: Int(size.height),
-                    bitsPerSample: 8, samplesPerPixel: 4, hasAlpha: true, isPlanar: false, colorSpaceName: NSCalibratedRGBColorSpace,
-                    bytesPerRow: 0, bitsPerPixel: 0)
-                
-                guard let context = NSGraphicsContext(bitmapImageRep: rep!) else {
-                    return nil
-                }
-                
-                NSGraphicsContext.saveGraphicsState()
-                NSGraphicsContext.setCurrent(context)
-                
-                let transform = pageRef.getDrawingTransform(CGPDFBox.mediaBox, rect: rect, rotate: 0, preserveAspectRatio: true)
-                context.cgContext.concatenate(transform)
-                
-                context.cgContext.translateBy(x: 0, y: size.height)
-                context.cgContext.scaleBy(x: CGFloat(ppp), y: CGFloat(-ppp))
-                context.cgContext.drawPDFPage(pageRef)
-                
-                let resultingImage = NSImage(size: size)
-                resultingImage.addRepresentation(rep!)
-                return resultingImage
-            #else
-                let ppp = Int(UIScreen.main.scale) // fetch device is retina or not
-                guard let context = UIGraphicsGetCurrentContext() else {
-                    return nil
-                }
-                size.width  *= CGFloat(ppp)
-                size.height *= CGFloat(ppp)
-                UIGraphicsBeginImageContext(size)
-                
-                context.saveGState()
-                let transform = pageRef.getDrawingTransform(CGPDFBox.mediaBox, rect: rect, rotate: 0, preserveAspectRatio: true)
-                context.concatenate(transform)
-                
-                context.translateBy(x: 0, y: size.height)
-                context.scaleBy(x: CGFloat(ppp), y: CGFloat(-ppp))
-                context.drawPDFPage(pageRef)
-                
-                context.restoreGState()
-                let resultingImage = UIGraphicsGetImageFromCurrentImageContext()
-                UIGraphicsEndImageContext()
-                return resultingImage
-            #endif
+            return self.convertToImage(pdfPage: pageRef)
         }
         return nil
     }
     
+    internal static func convertToImage(pdfURL: URL, page: Int = 1) -> ImageClass? {
+        // To accelerate, supporting only local file URL
+        guard pdfURL.isFileURL else { return nil }
+        
+        if let reference = CGPDFDocument(pdfURL as CFURL), let pageRef = reference.page(at: page) {
+            return self.convertToImage(pdfPage: pageRef)
+        }
+        return nil
+    }
+    
+    private static func convertToImage(pdfPage: CGPDFPage) -> ImageClass? {
+        let frame = pdfPage.getBoxRect(CGPDFBox.mediaBox)
+        var size = frame.size
+        let rect = CGRect(x: 0, y: 0, width: size.width, height: size.height)
+        
+        #if os(macOS)
+            let ppp = Int(NSScreen.main()?.backingScaleFactor ?? 1) // fetch device is retina or not
+            
+            size.width  *= CGFloat(ppp)
+            size.height *= CGFloat(ppp)
+            
+            let rep = NSBitmapImageRep(bitmapDataPlanes: nil, pixelsWide: Int(size.width), pixelsHigh: Int(size.height),
+                                       bitsPerSample: 8, samplesPerPixel: 4, hasAlpha: true, isPlanar: false, colorSpaceName: NSCalibratedRGBColorSpace,
+                                       bytesPerRow: 0, bitsPerPixel: 0)
+            
+            guard let context = NSGraphicsContext(bitmapImageRep: rep!) else {
+                return nil
+            }
+            
+            NSGraphicsContext.saveGraphicsState()
+            NSGraphicsContext.setCurrent(context)
+            
+            let transform = pdfPage.getDrawingTransform(CGPDFBox.mediaBox, rect: rect, rotate: 0, preserveAspectRatio: true)
+            context.cgContext.concatenate(transform)
+            
+            context.cgContext.translateBy(x: 0, y: size.height)
+            context.cgContext.scaleBy(x: CGFloat(ppp), y: CGFloat(-ppp))
+            context.cgContext.drawPDFPage(pdfPage)
+            
+            let resultingImage = NSImage(size: size)
+            resultingImage.addRepresentation(rep!)
+            return resultingImage
+        #else
+            let ppp = Int(UIScreen.main.scale) // fetch device is retina or not
+            guard let context = UIGraphicsGetCurrentContext() else {
+                return nil
+            }
+            size.width  *= CGFloat(ppp)
+            size.height *= CGFloat(ppp)
+            UIGraphicsBeginImageContext(size)
+            
+            context.saveGState()
+            let transform = pdfPage.getDrawingTransform(CGPDFBox.mediaBox, rect: rect, rotate: 0, preserveAspectRatio: true)
+            context.concatenate(transform)
+            
+            context.translateBy(x: 0, y: size.height)
+            context.scaleBy(x: CGFloat(ppp), y: CGFloat(-ppp))
+            context.drawPDFPage(pdfPage)
+            
+            context.restoreGState()
+            let resultingImage = UIGraphicsGetImageFromCurrentImageContext()
+            UIGraphicsEndImageContext()
+            return resultingImage
+        #endif
+    }
+    
     internal static func scaleDown(image: ImageClass, toSize maxSize: CGSize) -> ImageClass {
         let height, width: CGFloat
         if image.size.width > image.size.height {
@@ -1006,11 +932,37 @@ public enum FileOperationType: CustomStringConvertible {
         return mirror.children.dropFirst().first?.value as? String
     }
     
+    init? (json: [String: AnyObject]) {
+        guard let type = json["type"] as? String, let source = json["source"] as? String else {
+            return nil
+        }
+        let dest = json["dest"] as? String
+        switch type {
+        case "Create":
+            self = .create(path: source)
+        case "Modify":
+            self = .modify(path: source)
+        case "Remove":
+            self = .remove(path: source)
+        case "Copy":
+            guard let dest = dest else { return nil }
+            self = .copy(source: source, destination: dest)
+        case "Move":
+            guard let dest = dest else { return nil }
+            self = .move(source: source, destination: dest)
+        case "Link":
+            guard let dest = dest else { return nil }
+            self = .link(link: source, target: dest)
+        default:
+            return nil
+        }
+    }
+    
     internal var json: String? {
         var dictionary: [String: AnyObject] = ["type": self.description as NSString]
         dictionary["source"] = source as NSString?
         dictionary["dest"] = destination as NSString?
-        return dictionaryToJSON(dictionary)
+        return String(jsonDictionary: dictionary)
     }
 }
 
@@ -1082,5 +1034,3 @@ public protocol FoundationErrorEnum {
     var rawValue: Int { get }
 }
 
-extension URLError.Code: FoundationErrorEnum {}
-extension CocoaError.Code: FoundationErrorEnum {}

Sources/FileProviderExtensions.swift

@@ -0,0 +1,182 @@
+//
+//  FileProviderExtensions.swift
+//  FileProvider
+//
+//  Created by Amir Abbas on 12/27/1395 AP.
+//
+//
+
+import Foundation
+
+extension Array where Element: FileObject {
+    /// Returns a sorted array of `FileObject`s by criterias set in attributes.
+    public func sort(by type: FileObjectSorting.SortType, ascending: Bool = true, isDirectoriesFirst: Bool = false) -> [Element] {
+        let sorting = FileObjectSorting(type: type, ascending: ascending, isDirectoriesFirst: isDirectoriesFirst)
+        return sorting.sort(self) as! [Element]
+    }
+    
+    /// Sorts array of `FileObject`s by criterias set in attributes.
+    public mutating func sorted(by type: FileObjectSorting.SortType, ascending: Bool = true, isDirectoriesFirst: Bool = false) {
+        self = self.sort(by: type, ascending: ascending, isDirectoriesFirst: isDirectoriesFirst)
+    }
+}
+
+extension URLFileResourceType {
+    /// Returns corresponding `URLFileResourceType` of a `FileAttributeType` value
+    public init(fileTypeValue: FileAttributeType) {
+        switch fileTypeValue {
+        case FileAttributeType.typeCharacterSpecial: self = .characterSpecial
+        case FileAttributeType.typeDirectory: self = .directory
+        case FileAttributeType.typeBlockSpecial: self = .blockSpecial
+        case FileAttributeType.typeRegular: self = .regular
+        case FileAttributeType.typeSymbolicLink: self = .symbolicLink
+        case FileAttributeType.typeSocket: self = .socket
+        case FileAttributeType.typeUnknown: self = .unknown
+        default: self = .unknown
+        }
+    }
+}
+
+internal extension URLResourceKey {
+    static let fileURL = URLResourceKey(rawValue: "NSURLFileURLKey")
+    static let serverDate = URLResourceKey(rawValue: "NSURLServerDateKey")
+    static let entryTag = URLResourceKey(rawValue: "NSURLEntryTagKey")
+    static let mimeType = URLResourceKey(rawValue: "NSURLMIMETypeIdentifierKey")
+}
+
+internal extension URL {
+    var uw_scheme: String {
+        return self.scheme ?? ""
+    }
+    
+    var fileIsDirectory: Bool {
+        return (try? self.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory ?? false
+    }
+    
+    var fileSize: Int64 {
+        return Int64((try? self.resourceValues(forKeys: [.fileSizeKey]))?.fileSize ?? -1)
+    }
+    
+    var fileExists: Bool {
+        return self.isFileURL && FileManager.default.fileExists(atPath: self.path)
+    }
+}
+
+internal extension Data {
+    internal var isPDF: Bool {
+        return self.count > 4 && self.scanString(length: 4, using: .ascii) == "%PDF"
+    }
+    
+    init? (jsonDictionary dictionary: [String: AnyObject]) {
+        guard let data = try? JSONSerialization.data(withJSONObject: dictionary, options: []) else {
+            return nil
+        }
+        self = data
+    }
+    
+    func deserializeJSON() -> [String: AnyObject]? {
+        if let dic = try? JSONSerialization.jsonObject(with: self, options: []) as? [String: AnyObject] {
+            return dic
+        }
+        return nil
+    }
+    
+    init<T>(value: T) {
+        var value = value
+        self = Data(buffer: UnsafeBufferPointer(start: &value, count: 1))
+    }
+    
+    func scanValue<T>() -> T? {
+        guard MemoryLayout<T>.size <= self.count else { return nil }
+        return self.withUnsafeBytes { $0.pointee }
+    }
+    
+    func scanValue<T>(start: Int) -> T? {
+        let length = MemoryLayout<T>.size
+        guard self.count >= start + length else { return nil }
+        return self.subdata(in: start..<start+length).withUnsafeBytes { $0.pointee }
+    }
+    
+    func scanString(start: Int = 0, length: Int, using encoding: String.Encoding = .utf8) -> String? {
+        guard self.count >= start + length else { return nil }
+        return String(data: self.subdata(in: start..<start+length), encoding: encoding)
+    }
+    
+    static func mapMemory<T, U>(from: T) -> U? {
+        guard MemoryLayout<T>.size >= MemoryLayout<U>.size else { return nil }
+        let data = Data(value: from)
+        return data.scanValue()
+    }
+}
+
+internal extension String {
+    init? (jsonDictionary: [String: AnyObject]) {
+        guard let data = Data(jsonDictionary: jsonDictionary) else {
+            return nil
+        }
+        self.init(data: data, encoding: .utf8)
+    }
+    
+    func deserializeJSON(using encoding: String.Encoding = .utf8) -> [String: AnyObject]? {
+        guard let data = self.data(using: encoding) else {
+            return nil
+        }
+        return data.deserializeJSON()
+    }
+}
+
+internal extension TimeInterval {
+    internal var formatshort: String {
+        var result = "0:00"
+        if self < TimeInterval(Int32.max) {
+            result = ""
+            var time = DateComponents()
+            time.hour   = Int(self / 3600)
+            time.minute = Int((self.truncatingRemainder(dividingBy: 3600)) / 60)
+            time.second = Int(self.truncatingRemainder(dividingBy: 60))
+            let formatter = NumberFormatter()
+            formatter.paddingCharacter = "0"
+            formatter.minimumIntegerDigits = 2
+            formatter.maximumFractionDigits = 0
+            let formatterFirst = NumberFormatter()
+            formatterFirst.maximumFractionDigits = 0
+            if time.hour! > 0 {
+                result = "\(formatterFirst.string(from: NSNumber(value: time.hour!))!):\(formatter.string(from: NSNumber(value: time.minute!))!):\(formatter.string(from: NSNumber(value: time.second!))!)"
+            } else {
+                result = "\(formatterFirst.string(from: NSNumber(value: time.minute!))!):\(formatter.string(from: NSNumber(value: time.second!))!)"
+            }
+        }
+        result = result.trimmingCharacters(in: CharacterSet(charactersIn: ": "))
+        return result
+    }
+}
+
+extension NSPredicate {
+    func findValue(forKey key: String?, operator op: NSComparisonPredicate.Operator? = nil) -> Any? {
+        let val = findAllValues(forKey: key).lazy.filter { (op == nil || $0.operator == op!) && !$0.not }
+        return val.first?.value
+    }
+    
+    func findAllValues(forKey key: String?) -> [(value: Any, operator: NSComparisonPredicate.Operator, not: Bool)] {
+        if let cQuery = self as? NSCompoundPredicate {
+            let find = cQuery.subpredicates.flatMap { ($0 as! NSPredicate).findAllValues(forKey: key) }
+            if cQuery.compoundPredicateType == .not {
+                return find.map { return ($0.value, $0.operator, !$0.not) }
+            }
+            return find
+        } else if let cQuery = self as? NSComparisonPredicate {
+            if cQuery.leftExpression.expressionType == .keyPath, key == nil || cQuery.leftExpression.keyPath == key!, let const = cQuery.rightExpression.constantValue {
+                return [(value: const, operator: cQuery.predicateOperatorType, false)]
+            }
+            if cQuery.rightExpression.expressionType == .keyPath, key == nil || cQuery.rightExpression.keyPath == key!, let const = cQuery.leftExpression.constantValue {
+                return [(value: const, operator: cQuery.predicateOperatorType, false)]
+            }
+            return []
+        } else {
+            return []
+        }
+    }
+}
+
+extension URLError.Code: FoundationErrorEnum {}
+extension CocoaError.Code: FoundationErrorEnum {}

Sources/LocalFileProvider.swift

@@ -16,7 +16,6 @@ import Foundation
  */
 open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndoable {
     open class var type: String { return "Local" }
-    open var isPathRelative: Bool
     open fileprivate(set) var baseURL: URL?
     open var currentPath: String
     open var dispatch_queue: DispatchQueue
@@ -48,10 +47,10 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
      default values are `directory: .documentDirectory, domainMask: .userDomainMask`.
      
      - Parameters:
-       - directory: The search path directory. The supported values are described in `FileManager.SearchPathDirectory`.
-       - domainMask: The file system domain to search. The value for this parameter is one or more of the constants described in `FileManager.SearchPathDomainMask`.
-    */
-    public convenience init (directory: FileManager.SearchPathDirectory = .documentDirectory, domainMask: FileManager.SearchPathDomainMask = .userDomainMask) {
+     - for: The search path directory. The supported values are described in `FileManager.SearchPathDirectory`.
+     - in: Base locations for directory to search. The value for this parameter is one or more of the constants described in `FileManager.SearchPathDomainMask`.
+     */
+    public convenience init (for directory: FileManager.SearchPathDirectory = .documentDirectory, in domainMask: FileManager.SearchPathDomainMask = .userDomainMask) {
         self.init(baseURL: FileManager.default.urls(for: directory, in: domainMask).first!)
     }
     
@@ -100,7 +99,6 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
             fatalError("Cannot initialize a Local provider from remote URL.")
         }
         self.baseURL = baseURL
-        self.isPathRelative = true
         self.currentPath = ""
         self.credential = nil
         self.isCoorinating = false
@@ -111,11 +109,39 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
         
         fileProviderManagerDelegate = LocalFileProviderManagerDelegate(provider: self)
         opFileManager.delegate = fileProviderManagerDelegate
-        
     }
     
-    /// **DEPRECATED:** No longer is in use and overriding this method has no effect anymore.
-    @available(*, deprecated, message: "Overriding this method has no effect anymore.")
+    public required convenience init?(coder aDecoder: NSCoder) {
+        guard let baseURL = aDecoder.decodeObject(forKey: "baseURL") as? URL else {
+            return nil
+        }
+        self.init(baseURL: baseURL)
+        self.currentPath   = aDecoder.decodeObject(of: NSString.self, forKey: "currentPath") as? String ?? ""
+        self.isCoorinating = aDecoder.decodeBool(forKey: "isCoorinating")
+    }
+    
+    open func encode(with aCoder: NSCoder) {
+        aCoder.encode(self.baseURL, forKey: "currentPath")
+        aCoder.encode(self.currentPath, forKey: "currentPath")
+        aCoder.encode(self.isCoorinating, forKey: "isCoorinating")
+    }
+    
+    public static var supportsSecureCoding: Bool {
+        return true
+    }
+    
+    public func copy(with zone: NSZone? = nil) -> Any {
+        let copy = LocalFileProvider(baseURL: self.baseURL!)
+        copy.currentPath = self.currentPath
+        copy.undoManager = self.undoManager
+        copy.isCoorinating = self.isCoorinating
+        copy.delegate = self.delegate
+        copy.fileOperationDelegate = self.fileOperationDelegate
+        return copy
+    }
+    
+    /// **OBSOLETED:** No longer is in use and overriding this method has no effect anymore.
+    @available(*, obsoleted: 1.0, message: "Overriding this method has no effect anymore.")
     open class func defaultBaseURL() -> URL {
         return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
     }
@@ -287,7 +313,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
                     if sourcePath.hasSuffix("/") {
                         try self.opFileManager.createDirectory(at: source, withIntermediateDirectories: true, attributes: [:])
                     } else {
-                        try data?.write(to: source, options: Data.WritingOptions.atomic)
+                        try data?.write(to: source, options: .atomic)
                     }
                 case .modify:
                     try data?.write(to: source, options: atomically ? [.atomic] : [])
@@ -476,7 +502,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
     open func registerNotifcation(path: String, eventHandler: @escaping (() -> Void)) {
         self.unregisterNotifcation(path: path)
         let dirurl = self.url(of: path)
-        let isdir = (try? dirurl.resourceValues(forKeys: [.isDirectoryKey]).isDirectory ?? false) ?? false
+        let isdir = (try? dirurl.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory ?? false
         if !isdir {
             return
         }
@@ -501,17 +527,6 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
     open func isRegisteredForNotification(path: String) -> Bool {
         return monitors.map( { self.relativePathOf(url: $0.url) } ).contains(path.trimmingCharacters(in: CharacterSet(charactersIn: "/")))
     }
-    
-    open func copy(with zone: NSZone? = nil) -> Any {
-        let copy = LocalFileProvider(baseURL: self.baseURL!)
-        copy.currentPath = self.currentPath
-        copy.isPathRelative = self.isPathRelative
-        copy.undoManager = self.undoManager
-        copy.isCoorinating = self.isCoorinating
-        copy.delegate = self.delegate
-        copy.fileOperationDelegate = self.fileOperationDelegate
-        return copy
-    }
 }
 
 public extension LocalFileProvider {
@@ -569,7 +584,7 @@ internal extension LocalFileProvider {
                 errorHandler?(error)
                 return
             }
-            completionHandler(intents[0].url)
+            completionHandler(intents.first!.url)
         }
     }
     
@@ -580,8 +595,8 @@ internal extension LocalFileProvider {
                 errorHandler?(error)
                 return
             }
-            let newSource: URL = intents[0].url
-            let newDest: URL? = intents.count > 1 ? intents[1].url : nil
+            guard let newSource: URL = intents.first?.url else { return }
+            let newDest: URL? = intents.dropFirst().first?.url
             if moving, let newDest = newDest {
                 coordinator.item(at: newSource, willMoveTo: newDest)
             }

Sources/LocalHelper.swift

@@ -21,15 +21,12 @@ public final class LocalFileObject: FileObject {
         if relativeURL != nil && rpath.hasPrefix("/") {
             rpath.remove(at: rpath.startIndex)
         }
-        if rpath.isEmpty {
-            fileURL = relativeURL
+        if #available(iOS 9.0, macOS 10.11, tvOS 9.0, *) {
+            fileURL = URL(fileURLWithPath: rpath, relativeTo: relativeURL)
         } else {
-            if #available(iOS 9.0, macOS 10.11, tvOS 9.0, *) {
-                fileURL = URL(fileURLWithPath: rpath, relativeTo: relativeURL)
-            } else {
-                fileURL = URL(string: rpath, relativeTo: relativeURL)
-            }
+            fileURL = URL(string: rpath.isEmpty ? "./" : rpath, relativeTo: relativeURL)
         }
+        
         if let fileURL = fileURL {
             self.init(fileWithURL: fileURL)
         } else {
@@ -96,18 +93,21 @@ internal final class LocalFolderMonitor {
     init(url: URL, handler: @escaping ()->Void) {
         self.url = url
         descriptor = open((url as NSURL).fileSystemRepresentation, O_EVTONLY)
-        source = DispatchSource.makeFileSystemObjectSource(fileDescriptor: descriptor, eventMask: DispatchSource.FileSystemEvent.write, queue: qq)
+        source = DispatchSource.makeFileSystemObjectSource(fileDescriptor: descriptor, eventMask: .write, queue: qq)
         // Folder monitoring is recursive and deep. Monitoring a root folder may be very costly
         // We have a 0.2 second delay to ensure we wont call handler 1000s times when there is
         // a huge file operation. This ensures app will work smoothly while this 250 milisec won't
         // affect user experince much
-        let main_handler: ()->Void = {
+        let main_handler: ()->Void = { [weak self] in
+            guard let `self` = self else { return }
             if Date().timeIntervalSinceReferenceDate < self.monitoredTime + 0.2 {
                 return
             }
             self.monitoredTime = Date().timeIntervalSinceReferenceDate
-            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.25, execute: {
+            self.source.suspend()
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: {
                 handler()
+                self.source.resume()
             })
         }
         source.setEventHandler(handler: main_handler)
@@ -296,18 +296,15 @@ open class LocalOperationHandle: OperationHandle {
         let fp = FileManager()
         let filesList = fp.enumerator(at: pathURL, includingPropertiesForKeys: keys, options: enumOpt, errorHandler: nil)
         while let fileURL = filesList?.nextObject() as? URL {
-            do {
-                let values = try fileURL.resourceValues(forKeys: [.isDirectoryKey, .fileSizeKey])
-                let isdir = values.isDirectory ?? false
-                let size = Int64(values.fileSize ?? 0)
-                if isdir {
-                    folders += 1
-                } else {
-                    files += 1
-                }
-                totalsize += size
-            } catch _ {
+            guard let values = try? fileURL.resourceValues(forKeys: [.isDirectoryKey, .fileSizeKey]) else { continue }
+            let isdir = values.isDirectory ?? false
+            let size = Int64(values.fileSize ?? 0)
+            if isdir {
+                folders += 1
+            } else {
+                files += 1
             }
+            totalsize += size
         }
         
         return (folders, files, totalsize)
@@ -326,17 +323,3 @@ class UndoBox: NSObject {
         self.undoOperation = undoOperation
     }
 }
-
-internal extension URL {
-    var fileIsDirectory: Bool {
-        return (try? self.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory ?? false
-    }
-    
-    var fileSize: Int64 {
-        return Int64((try? self.resourceValues(forKeys: [.fileSizeKey]))?.fileSize ?? -1)
-    }
-    
-    var fileExists: Bool {
-        return self.isFileURL && FileManager.default.fileExists(atPath: self.path)
-    }
-}

Sources/OneDriveFileProvide.swift

@@ -19,16 +19,10 @@ import CoreGraphics
  */
 open class OneDriveFileProvider: FileProviderBasicRemote {
     open class var type: String { return "OneDrive" }
-    open let isPathRelative: Bool
     open let baseURL: URL?
-    /// OneDrive server url, equals with unwrapped `baseURL`
-    open var serverURL: URL { return baseURL! }
     /// Drive name for user, default is `root`. Changing its value will effect on new operations.
     open var drive: String
     /// Generated storage url from server url and drive name
-    open var driveURL: URL {
-        return URL(string: "/drive/\(drive):/", relativeTo: baseURL)!
-    }
     open var currentPath: String
     
     open var dispatch_queue: DispatchQueue
@@ -77,7 +71,6 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         let baseURL = serverURL ?? URL(string: "https://api.onedrive.com/")!
         self.baseURL = baseURL.path.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")
         self.drive = drive
-        self.isPathRelative = true
         self.currentPath = ""
         self.useCache = false
         self.validatingCache = true
@@ -88,6 +81,38 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
     }
     
+    public required convenience init?(coder aDecoder: NSCoder) {
+        self.init(credential: aDecoder.decodeObject(forKey: "credential") as? URLCredential,
+                  serverURL: aDecoder.decodeObject(forKey: "baseURL") as? URL,
+                  drive: aDecoder.decodeObject(forKey: "drive") as? String ?? "root")
+        self.currentPath   = aDecoder.decodeObject(forKey: "currentPath") as? String ?? ""
+        self.useCache = aDecoder.decodeBool(forKey: "useCache")
+        self.validatingCache = aDecoder.decodeBool(forKey: "validatingCache")
+    }
+    
+    open func encode(with aCoder: NSCoder) {
+        aCoder.encode(self.credential, forKey: "credential")
+        aCoder.encode(self.baseURL, forKey: "baseURL")
+        aCoder.encode(self.drive, forKey: "drive")
+        aCoder.encode(self.currentPath, forKey: "currentPath")
+        aCoder.encode(self.useCache, forKey: "useCache")
+        aCoder.encode(self.validatingCache, forKey: "validatingCache")
+    }
+    
+    public static var supportsSecureCoding: Bool {
+        return true
+    }
+    
+    open func copy(with zone: NSZone? = nil) -> Any {
+        let copy = OneDriveFileProvider(credential: self.credential, serverURL: self.baseURL, drive: self.drive, cache: self.cache)
+        copy.currentPath = self.currentPath
+        copy.delegate = self.delegate
+        copy.fileOperationDelegate = self.fileOperationDelegate
+        copy.useCache = self.useCache
+        copy.validatingCache = self.validatingCache
+        return copy
+    }
+    
     deinit {
         if fileProviderCancelTasksOnInvalidating {
             _session?.invalidateAndCancel()
@@ -103,8 +128,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
     }
     
     open func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
-        let url = URL(string: escaped(path: path), relativeTo: driveURL)!
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: url(of: path))
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
@@ -113,7 +137,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 serverError = code != nil ? FileProviderOneDriveError(code: code!, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
-                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr), let file = OneDriveFileObject(baseURL: self.baseURL, drive: self.drive, json: json) {
+                if let json = data?.deserializeJSON(), let file = OneDriveFileObject(baseURL: self.baseURL, drive: self.drive, json: json) {
                     fileObject = file
                 }
             }
@@ -123,14 +147,13 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
     }
     
     open func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
-        let url = URL(string: "/drive/root", relativeTo: baseURL)!
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: url())
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var totalSize: Int64 = -1
             var usedSize: Int64 = 0
-            if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr) {
+            if let json = data?.deserializeJSON() {
                 totalSize = (json["total"] as? NSNumber)?.int64Value ?? -1
                 usedSize = (json["used"] as? NSNumber)?.int64Value ?? 0
             }
@@ -142,7 +165,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
     open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
         var foundFiles = [OneDriveFileObject]()
         var queryStr: String?
-        queryStr = self.findNameQuery(query, key: "name") as? String ?? self.findNameQuery(query, key: nil) as? String
+        queryStr = query.findValue(forKey: "name") as? String ?? query.findAllValues(forKey: nil).flatMap { $0.value as? String }.first
         guard let finalQueryStr = queryStr else { return }
         search(path, query: finalQueryStr, foundItem: { (file) in
             if query.evaluate(with: file.mapPredicate()) {
@@ -154,9 +177,34 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         })
     }
     
+    open func url(of path: String? = nil, modifier: String? = nil) -> URL {
+        var rpath: String
+        if let path = path {
+            rpath = path
+        } else {
+            rpath = self.currentPath
+        }
+        
+        if rpath.hasPrefix("/") {
+            rpath.remove(at: rpath.startIndex)
+        }
+        if rpath.isEmpty {
+            if let modifier = modifier {
+                return baseURL!.appendingPathComponent("drive/\(drive)/\(modifier)")
+            }
+            return baseURL!.appendingPathComponent("drive/\(drive)")
+        }
+        let driveURL = baseURL!.appendingPathComponent("drive/\(drive):/")
+        rpath = (rpath.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? rpath)
+        rpath = rpath.trimmingCharacters(in: pathTrimSet)
+        if let modifier = modifier {
+            rpath = rpath + ":/" + modifier
+        }
+        return URL(string: rpath, relativeTo: driveURL) ?? driveURL
+    }
+    
     open func isReachable(completionHandler: @escaping (Bool) -> Void) {
-        let url = URL(string: "/drive/root", relativeTo: baseURL)!
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: url())
         request.httpMethod = "HEAD"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
@@ -200,7 +248,7 @@ extension OneDriveFileProvider: FileProviderOperations {
         }
         guard let sourcePath = operation.source else { return nil }
         let destPath = operation.destination
-        var request = URLRequest(url: URL(string: sourcePath, relativeTo: driveURL)!)
+        var request = URLRequest(url: url(of: sourcePath))
         switch operation {
         case .create:
             request.httpMethod = "CREATE"
@@ -220,7 +268,7 @@ extension OneDriveFileProvider: FileProviderOperations {
             request.setValue("application/json", forHTTPHeaderField: "Content-Type")
             requestDictionary["parentReference"] = ("/drive/\(drive):" + dest.deletingLastPathComponent) as NSString
             requestDictionary["name"] = dest.lastPathComponent as NSString
-            request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+            request.httpBody = Data(jsonDictionary: requestDictionary)
         }
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderOneDriveError?
@@ -248,8 +296,7 @@ extension OneDriveFileProvider: FileProviderOperations {
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        let url = URL(string: escaped(path: path) + ":/content", relativeTo: driveURL)!
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: self.url(of: path, modifier: "content"))
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         let task = session.downloadTask(with: request, completionHandler: { (cacheURL, response, error) in
@@ -283,8 +330,7 @@ extension OneDriveFileProvider: FileProviderReadWrite {
         }
         
         let opType = FileOperationType.fetch(path: path)
-        let url =  URL(string: escaped(path: path) + ":/content", relativeTo: driveURL)!
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: self.url(of: path, modifier: "content"))
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         if length > 0 {
@@ -339,18 +385,17 @@ extension OneDriveFileProvider: FileProviderReadWrite {
          `error`: Error returned by OneDrive.
      */
     open func publicLink(to path: String, completionHandler: @escaping ((_ link: URL?, _ attribute: OneDriveFileObject?, _ expiration: Date?, _ error: Error?) -> Void)) {
-        let url =  URL(string: escaped(path: path) + ":/action.createLink", relativeTo: driveURL)!
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: self.url(of: path, modifier: "action.createLink"))
         request.httpMethod = "POST"
         let requestDictionary: [String: AnyObject] = ["type": "view" as NSString]
-        request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
+        request.httpBody = Data(jsonDictionary: requestDictionary)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var serverError: FileProviderOneDriveError?
             var link: URL?
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 serverError = code != nil ? FileProviderOneDriveError(code: code!, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
-                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr) {
+                if let json = data?.deserializeJSON() {
                     if let linkDic = json["link"] as? NSDictionary, let linkStr = linkDic["webUrl"] as? String {
                         link = URL(string: linkStr)
                     }
@@ -386,9 +431,9 @@ extension OneDriveFileProvider: ExtendedFileProvider {
     open func thumbnailOfFile(path: String, dimension: CGSize?, completionHandler: @escaping ((_ image: ImageClass?, _ error: Error?) -> Void)) {
         let url: URL
         if let dimension = dimension {
-            url = URL(string: escaped(path: path) + ":/thumbnails/0/=c\(dimension.width)x\(dimension.height)/content", relativeTo: driveURL)!
+            url = self.url(of: path, modifier: "thumbnails/0/=c\(dimension.width)x\(dimension.height)/content")
         } else {
-            url = URL(string: escaped(path: path) + ":/thumbnails/0/small/content", relativeTo: driveURL)!
+            url =  self.url(of: path, modifier: "thumbnails/0/small/content")
         }
         
         var request = URLRequest(url: url)
@@ -409,8 +454,7 @@ extension OneDriveFileProvider: ExtendedFileProvider {
     }
     
     open func propertiesOfFile(path: String, completionHandler: @escaping ((_ propertiesDictionary: [String : Any], _ keys: [String], _ error: Error?) -> Void)) {
-        let url = URL(string: escaped(path: path), relativeTo: driveURL)!
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: url(of: path))
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
@@ -420,7 +464,7 @@ extension OneDriveFileProvider: ExtendedFileProvider {
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 serverError = code != nil ? FileProviderOneDriveError(code: code!, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
-                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr) {
+                if let json = data?.deserializeJSON() {
                     (dic, keys) = self.mapMediaInfo(json)
                 }
             }
@@ -430,14 +474,4 @@ extension OneDriveFileProvider: ExtendedFileProvider {
     }
 }
 
-extension OneDriveFileProvider: FileProvider {
-    open func copy(with zone: NSZone? = nil) -> Any {
-        let copy = OneDriveFileProvider(credential: self.credential, serverURL: self.baseURL, drive: self.drive, cache: self.cache)
-        copy.currentPath = self.currentPath
-        copy.delegate = self.delegate
-        copy.fileOperationDelegate = self.fileOperationDelegate
-        copy.useCache = self.useCache
-        copy.validatingCache = self.validatingCache
-        return copy
-    }
-}
+extension OneDriveFileProvider: FileProvider { }

Sources/OneDriveHelper.swift

@@ -27,14 +27,16 @@ public final class OneDriveFileObject: FileObject {
     }
     
     internal convenience init? (baseURL: URL?, drive: String, jsonStr: String) {
-        guard let json = jsonToDictionary(jsonStr) else { return nil }
+        guard let json = jsonStr.deserializeJSON() else { return nil }
         self.init(baseURL: baseURL, drive: drive, json: json)
     }
     
     internal convenience init? (baseURL: URL?, drive: String, json: [String: AnyObject]) {
         guard let name = json["name"] as? String else { return nil }
         guard let path = (json["parentReference"] as? NSDictionary)?["path"] as? String else { return nil }
-        let lPath = path.replacingOccurrences(of: "/drive/\(drive):", with: "/", options: .anchored, range: nil)
+        var lPath = path.replacingOccurrences(of: "/drive/\(drive)", with: "/", options: .anchored, range: nil)
+        lPath = lPath.replacingOccurrences(of: "/:", with: "", options: .anchored)
+        lPath = lPath.replacingOccurrences(of: "//", with: "", options: .anchored)
         self.init(baseURL: baseURL, name: name, path: lPath)
         self.size = (json["size"] as? NSNumber)?.int64Value ?? -1
         self.modifiedDate = resolve(dateString: json["lastModifiedDateTime"] as? String ?? "")
@@ -79,13 +81,8 @@ public final class OneDriveFileObject: FileObject {
 
 // codebeat:disable[ARITY]
 internal extension OneDriveFileProvider {
-    func list(_ path: String, cursor: String? = nil, prevContents: [OneDriveFileObject] = [], completionHandler: @escaping ((_ contents: [FileObject], _ cursor: String?, _ error: Error?) -> Void)) {
-        let url: URL
-        if let cursor = cursor {
-            url = URL(string: cursor)!
-        } else {
-            url = URL(string: escaped(path: path), relativeTo: driveURL)!
-        }
+    func list(_ path: String, cursor: URL? = nil, prevContents: [OneDriveFileObject] = [], completionHandler: @escaping ((_ contents: [FileObject], _ cursor: String?, _ error: Error?) -> Void)) {
+        let url = cursor ?? self.url(of: path, modifier: "children")
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
@@ -95,15 +92,14 @@ internal extension OneDriveFileProvider {
             if let code = (response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
                 responseError = FileProviderOneDriveError(code: rCode, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8))
             }
-            if let data = data, let jsonStr = String(data: data, encoding: .utf8) {
-                let json = jsonToDictionary(jsonStr)
-                if let entries = json?["value"] as? [AnyObject] , entries.count > 0 {
+            if let json = data?.deserializeJSON() {
+                if let entries = json["value"] as? [AnyObject] , entries.count > 0 {
                     for entry in entries {
                         if let entry = entry as? [String: AnyObject], let file = OneDriveFileObject(baseURL: self.baseURL, drive: self.drive, json: entry) {
                             files.append(file)
                         }
                     }
-                    let ncursor = json?["@odata.nextLink"] as? String
+                    let ncursor: URL? = (json["@odata.nextLink"] as? String).flatMap { URL(string: $0) }
                     let hasmore = ncursor != nil
                     if hasmore {
                         self.list(path, cursor: ncursor, prevContents: files, completionHandler: completionHandler)
@@ -125,7 +121,7 @@ internal extension OneDriveFileProvider {
             return nil
         }
         let queryStr = overwrite ? "" : "?@name.conflictBehavior=fail"
-        let url = URL(string: escaped(path: targetPath) + ":/content" + queryStr, relativeTo: driveURL)!
+        let url = self.url(of: targetPath, modifier: "content\(queryStr)")
         var request = URLRequest(url: url)
         request.httpMethod = "PUT"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
@@ -137,7 +133,7 @@ internal extension OneDriveFileProvider {
                 responseError = FileProviderOneDriveError(code: rCode, path: targetPath, errorDescription: String(data: data ?? Data(), encoding: .utf8))
             }
             completionHandler?(responseError ?? error)
-            self.delegateNotify(.create(path: targetPath), error: responseError ?? error)
+            self.delegateNotify(operation, error: responseError ?? error)
         })
         task.taskDescription = operation.json
         task.resume()
@@ -153,7 +149,7 @@ internal extension OneDriveFileProvider {
             return nil
         }
         let queryStr = overwrite ? "" : "?@name.conflictBehavior=fail"
-        let url = URL(string: escaped(path: targetPath) + ":/content" + queryStr, relativeTo: driveURL)!
+        let url = self.url(of: targetPath, modifier: "content\(queryStr)")
         var request = URLRequest(url: url)
         request.httpMethod = "PUT"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
@@ -164,22 +160,17 @@ internal extension OneDriveFileProvider {
                 responseError = FileProviderOneDriveError(code: rCode, path: targetPath, errorDescription: String(data: data ?? Data(), encoding: .utf8))
             }
             completionHandler?(responseError ?? error)
-            self.delegateNotify(.create(path: targetPath), error: responseError ?? error)
+            self.delegateNotify(operation, error: responseError ?? error)
         })
         task.taskDescription = operation.json
         task.resume()
         return RemoteOperationHandle(operationType: operation, tasks: [task])
     }
     
-    func search(_ startPath: String = "", query: String, next: String? = nil, foundItem:@escaping ((_ file: OneDriveFileObject) -> Void), completionHandler: @escaping ((_ error: Error?) -> Void)) {
+    func search(_ startPath: String = "", query: String, next: URL? = nil, foundItem:@escaping ((_ file: OneDriveFileObject) -> Void), completionHandler: @escaping ((_ error: Error?) -> Void)) {
         let url: URL
-        if let next = next {
-            url = URL(string: next)!
-        } else if self.escaped(path: startPath) == "" {
-            url = URL(string: "/drive/\(drive)/view.search?q=\(query)", relativeTo: baseURL)!
-        } else {
-            url = URL(string: "\(escaped(path: startPath))/view.search?q=\(query)", relativeTo: driveURL)!
-        }
+        let q = query.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
+        url = next ?? self.url(of: startPath, modifier: "view.search?q=\(q)")
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
@@ -189,17 +180,15 @@ internal extension OneDriveFileProvider {
             if let code = (response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
                 responseError = FileProviderOneDriveError(code: rCode, path: startPath, errorDescription: String(data: data ?? Data(), encoding: .utf8))
             }
-            if let data = data, let jsonStr = String(data: data, encoding: .utf8) {
-                let json = jsonToDictionary(jsonStr)
-                if let entries = json?["value"] as? [AnyObject] , entries.count > 0 {
+            if let json = data?.deserializeJSON() {
+                if let entries = json["value"] as? [AnyObject] , entries.count > 0 {
                     for entry in entries {
                         if let entry = entry as? [String: AnyObject], let file = OneDriveFileObject(baseURL: self.baseURL, drive: self.drive, json: entry) {
                             foundItem(file)
                         }
                     }
-                    let next = json?["@odata.nextLink"] as? String
-                    let hasmore = next != nil
-                    if hasmore, let next = next {
+                    let next: URL? = (json["@odata.nextLink"] as? String).flatMap { URL(string: $0) }
+                    if let next = next {
                         self.search(startPath, query: query, next: next, foundItem: foundItem, completionHandler: completionHandler)
                     } else {
                         completionHandler(responseError ?? error)
@@ -256,7 +245,7 @@ internal extension OneDriveFileProvider {
             add(key: "Location", value: "\(latStr), \(longStr)")
         }
         if let parent = json["image"] as? [String: Any] ?? json["video"] as? [String: Any], let duration = parent["duration"] as? UInt64 {
-            add(key: "Duration", value: OneDriveFileProvider.formatshort(interval: TimeInterval(duration) / 1000))
+            add(key: "Duration", value: (TimeInterval(duration) / 1000).formatshort)
         }
         if let timeTakenStr = json["takenDateTime"] as? String, let timeTaken = resolve(dateString: timeTakenStr) {
             OneDriveFileProvider.dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"

Sources/RemoteSession.swift

@@ -77,18 +77,22 @@ extension FileProviderHTTPError {
     public var description: String {
         return code.description
     }
+    
+    public var localizedDescription: String {
+        return description
+    }
 }
 
 class SessionDelegate: NSObject, URLSessionDataDelegate, URLSessionDownloadDelegate {
     
-    weak var fileProvider: FileProvider?
+    weak var fileProvider: (FileProviderBasicRemote & FileProviderOperations)?
     var credential: URLCredential?
     
     var finishDownloadHandler: ((_ session: Foundation.URLSession, _ downloadTask: URLSessionDownloadTask, _ didFinishDownloadingToURL: URL) -> Void)?
     var didSendDataHandler: ((_ session: Foundation.URLSession, _ task: URLSessionTask, _ bytesSent: Int64, _ totalBytesSent: Int64, _ totalBytesExpectedToSend: Int64) -> Void)?
     var didReceivedData: ((_ session: Foundation.URLSession, _ downloadTask: URLSessionDownloadTask, _ bytesWritten: Int64, _ totalBytesWritten: Int64, _ totalBytesExpectedToWrite: Int64) -> Void)?
     
-    init(fileProvider: FileProvider, credential: URLCredential?) {
+    init(fileProvider: FileProviderBasicRemote & FileProviderOperations, credential: URLCredential?) {
         self.fileProvider = fileProvider
         self.credential = credential
     }
@@ -102,57 +106,44 @@ class SessionDelegate: NSObject, URLSessionDataDelegate, URLSessionDownloadDeleg
     func urlSession(_ session: URLSession, task: URLSessionTask, didSendBodyData bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) {
         self.didSendDataHandler?(session, task, bytesSent, totalBytesSent, totalBytesExpectedToSend)
         
-        guard let desc = task.taskDescription, let json = jsonToDictionary(desc) else {
-            return
-        }
-        guard let type = json["type"] as? String, let source = json["source"] as? String else {
-            return
-        }
-        let dest = json["dest"] as? String
-        let op : FileOperationType
-        switch type {
-        case "Create":
-            op = .create(path: source)
-        case "Copy":
-            guard let dest = dest else { return }
-            op = .copy(source: source, destination: dest)
-        case "Move":
-            guard let dest = dest else { return }
-            op = .move(source: source, destination: dest)
-        case "Modify":
-            op = .modify(path: source)
-        case "Remove":
-            op = .remove(path: source)
-        case "Link":
-            guard let dest = dest else { return }
-            op = .link(link: source, target: dest)
-        default:
+        guard let json = task.taskDescription?.deserializeJSON(),
+              let op = FileOperationType(json: json), let fileProvider = fileProvider else {
             return
         }
         
         let progress = Float(totalBytesSent) / Float(totalBytesExpectedToSend)
         
-        fileProvider?.delegate?.fileproviderProgress(fileProvider!, operation: op, progress: progress)
+        fileProvider.delegate?.fileproviderProgress(fileProvider, operation: op, progress: progress)
     }
     
     func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) {
         self.didReceivedData?(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
         
-        guard let desc = downloadTask.taskDescription, let json = jsonToDictionary(desc), let source = json["source"] as? String, let dest = json["dest"] as? String else {
+        guard let json = downloadTask.taskDescription?.deserializeJSON(),
+              let op = FileOperationType(json: json), let fileProvider = fileProvider else {
             return
         }
         
-        fileProvider?.delegate?.fileproviderProgress(fileProvider!, operation: .copy(source: source, destination: dest), progress: Float(totalBytesWritten) / Float(totalBytesExpectedToWrite))
+        fileProvider.delegate?.fileproviderProgress(fileProvider, operation: op, progress: Float(totalBytesWritten) / Float(totalBytesExpectedToWrite))
     }
     
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
-        let deposition: Foundation.URLSession.AuthChallengeDisposition = credential != nil ? .useCredential : .performDefaultHandling
-        completionHandler(deposition, credential)
+        authenticate(didReceive: challenge, completionHandler: completionHandler)
     }
     
     func urlSession(_ session: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
-        let deposition: Foundation.URLSession.AuthChallengeDisposition = credential != nil ? .useCredential : .performDefaultHandling
-        completionHandler(deposition, credential)
+        authenticate(didReceive: challenge, completionHandler: completionHandler)
+    }
+    
+    func authenticate(didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
+        switch (challenge.previousFailureCount, credential != nil) {
+        case (0...1, true):
+            completionHandler(.useCredential, credential)
+        case (0, false):
+            completionHandler(.useCredential, challenge.proposedCredential)
+        default:
+            completionHandler(.performDefaultHandling, nil)
+        }
     }
 }
 

Sources/SMBClient.swift

@@ -68,11 +68,8 @@ class SMB2ProtocolClient: FPSStreamTask {
         }
         let mId = messageId()
         let smbHeader = SMB2.Header(command: .TREE_CONNECT, creditRequestResponse: 123, messageId: mId, treeId: 0, sessionId: sessionId)
-        var share = ""
         let cmp = url.pathComponents
-        if cmp.count > 0 {
-            share = cmp[0]
-        }
+        let share = cmp.first ?? ""
         let tcHeader = SMB2.TreeConnectRequest.Header(flags: [])
         let msg = SMB2.TreeConnectRequest(header: tcHeader, host: host, share: share)
         let data = createSMB2Message(header: smbHeader, message: msg!)

Sources/SMBFileProvider.swift

@@ -10,7 +10,6 @@ import Foundation
 
 class SMBFileProvider: FileProvider, FileProviderMonitor {
     open class var type: String { return "SMB" }
-    open var isPathRelative: Bool = true
     open var baseURL: URL?
     open var currentPath: String = ""
     open var dispatch_queue: DispatchQueue
@@ -20,7 +19,7 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {
     
     public typealias FileObjectClass = FileObject
     
-    public init? (baseURL: URL, credential: URLCredential, afterInitialized: SimpleCompletionHandler) {
+    public init? (baseURL: URL, credential: URLCredential?) {
         guard baseURL.uw_scheme.lowercased() == "smb" else {
             return nil
         }
@@ -31,7 +30,26 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {
         
         self.credential = credential
     }
-        
+    
+    public required convenience init?(coder aDecoder: NSCoder) {
+        guard let baseURL = aDecoder.decodeObject(forKey: "baseURL") as? URL else {
+            return nil
+        }
+        self.init(baseURL: baseURL,
+                  credential: aDecoder.decodeObject(forKey: "credential") as? URLCredential)
+        self.currentPath   = aDecoder.decodeObject(forKey: "currentPath") as? String ?? ""
+    }
+    
+    open func encode(with aCoder: NSCoder) {
+        aCoder.encode(self.baseURL, forKey: "baseURL")
+        aCoder.encode(self.credential, forKey: "credential")
+        aCoder.encode(self.currentPath, forKey: "currentPath")
+    }
+    
+    public static var supportsSecureCoding: Bool {
+        return true
+    }
+    
     open func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObjectClass], _ error: Error?) -> Void)) {
         NotImplemented()
     }
@@ -117,7 +135,7 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {
     }
     
     open func copy(with zone: NSZone? = nil) -> Any {
-        let copy = SMBFileProvider(baseURL: self.baseURL!, credential: self.credential!, afterInitialized: { _ in })!
+        let copy = SMBFileProvider(baseURL: self.baseURL!, credential: self.credential!)!
         copy.currentPath = self.currentPath
         copy.delegate = self.delegate
         copy.fileOperationDelegate = self.fileOperationDelegate

Sources/SMBTypes/SMB2DataTypes.swift

@@ -66,32 +66,3 @@ struct SMBTime {
         return Date(timeIntervalSince1970: Double(self.time) / 10000000 - 11644473600)
     }
 }
-
-extension Data {
-    init<T>(value: T) {
-        var value = value
-        self = Data(buffer: UnsafeBufferPointer(start: &value, count: 1))
-    }
-    
-    func scanValue<T>() -> T? {
-        guard MemoryLayout<T>.size <= self.count else { return nil }
-        return self.withUnsafeBytes { $0.pointee }
-    }
-    
-    func scanValue<T>(start: Int) -> T? {
-        let length = MemoryLayout<T>.size
-        guard self.count >= start + length else { return nil }
-        return self.subdata(in: start..<start+length).withUnsafeBytes { $0.pointee }
-    }
-    
-    func scanString(start: Int = 0, length: Int, encoding: String.Encoding) -> String? {
-        guard self.count >= start + length else { return nil }
-        return String(data: self.subdata(in: start..<start+length), encoding: encoding)
-    }
-    
-    static func mapMemory<T, U>(from: T) -> U? {
-        guard MemoryLayout<T>.size >= MemoryLayout<U>.size else { return nil }
-        let data = Data(value: from)
-        return data.scanValue()
-    }
-}

Sources/SMBTypes/SMB2IOCtl.swift

@@ -243,7 +243,7 @@ extension SMB2 {
                     if data.count < offset + 48 {
                         return nil
                     }
-                    let datestring = data.scanString(start: offset, length: 48, encoding: .utf16)
+                    let datestring = data.scanString(start: offset, length: 48, using: .utf16)
                     if let datestring = datestring, let date = dateFormatter.date(from: datestring) {
                         snapshots.append(SMBTime(date: date))
                     }

Sources/SMBTypes/SMB2Notification.swift

@@ -92,7 +92,7 @@ extension SMB2 {
                 }
                 
                 let fileNameLen = Int(data.scanValue(start: offset + 8) as UInt32? ?? 0)
-                let fileName = data.scanString(start: offset + 12, length: fileNameLen, encoding: .utf16) ?? ""
+                let fileName = data.scanString(start: offset + 12, length: fileNameLen, using: .utf16) ?? ""
                 result.append((action: action, fileName: fileName))
                 
                 offset += Int(nextOffset)

Sources/SMBTypes/SMB2Query.swift

@@ -85,7 +85,7 @@ extension SMB2 {
                     return []
                 }
                 let headersize = MemoryLayout.size(ofValue: header)
-                let fileName = buffer.scanString(start: headersize, length: Int(header.fileNameLength), encoding: .utf16) ?? ""
+                let fileName = buffer.scanString(start: headersize, length: Int(header.fileNameLength), using: .utf16) ?? ""
                 result.append((header: header, fileName: fileName))
                 if header.nextEntryOffset == 0 {
                     break
@@ -216,12 +216,12 @@ extension SMB2 {
         var asAllInformation: (header: FileAllInformationHeader, name: String) {
             let header: FileAllInformationHeader = buffer.scanValue()!
             let headersize = MemoryLayout<FileAllInformationHeader>.size
-            let name = buffer.scanString(start: headersize, length: Int(header.nameLength), encoding: .utf16) ?? ""
+            let name = buffer.scanString(start: headersize, length: Int(header.nameLength), using: .utf16) ?? ""
             return (header, name)
         }
         
         var asAlternateNameInformation: String {
-            return buffer.scanString(start: 0, length: buffer.count, encoding: .utf16) ?? ""
+            return buffer.scanString(start: 0, length: buffer.count, using: .utf16) ?? ""
         }
         
         var asAttributeTagInformation: FileAttributeTagInformation {
@@ -280,14 +280,14 @@ extension SMB2 {
         var asStreamInformation: (header: FileStreamInformationHeader, name: String) {
             let header: FileStreamInformationHeader = buffer.scanValue()!
             let headersize = MemoryLayout<FileStreamInformationHeader>.size
-            let name = buffer.scanString(start: headersize, length: Int(header.streamNameLength), encoding: .utf16) ?? ""
+            let name = buffer.scanString(start: headersize, length: Int(header.streamNameLength), using: .utf16) ?? ""
             return (header, name)
         }
         
         var asFsVolumeInformation: (header: FileFsVolumeInformationHeader, name: String) {
             let header: FileFsVolumeInformationHeader = buffer.scanValue()!
             let headersize = MemoryLayout<FileFsVolumeInformationHeader>.size
-            let name = buffer.scanString(start: headersize, length: Int(header.labelLength), encoding: .utf16) ?? ""
+            let name = buffer.scanString(start: headersize, length: Int(header.labelLength), using: .utf16) ?? ""
             return (header, name)
         }
         
@@ -302,7 +302,7 @@ extension SMB2 {
         var asFsAttributeInformation: (header: FileFsAttributeInformationHeader, name: String) {
             let header: FileFsAttributeInformationHeader = buffer.scanValue()!
             let headersize = MemoryLayout<FileFsAttributeInformationHeader>.size
-            let name = buffer.scanString(start: headersize, length: Int(header.nameLength), encoding: .utf16) ?? ""
+            let name = buffer.scanString(start: headersize, length: Int(header.nameLength), using: .utf16) ?? ""
             return (header, name)
         }
         

Sources/WebDAVFileProvider.swift

@@ -21,7 +21,6 @@ import Foundation
 */
 open class WebDAVFileProvider: FileProviderBasicRemote {
     open class var type: String { return "WebDAV" }
-    open let isPathRelative: Bool
     open let baseURL: URL?
     open var currentPath: String
     
@@ -66,7 +65,6 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
             return nil
         }
         self.baseURL = baseURL.path.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")
-        self.isPathRelative = true
         self.currentPath = ""
         self.useCache = false
         self.validatingCache = true
@@ -77,6 +75,39 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
     }
     
+    public required convenience init?(coder aDecoder: NSCoder) {
+        guard let baseURL = aDecoder.decodeObject(forKey: "baseURL") as? URL else {
+            return nil
+        }
+        self.init(baseURL: baseURL,
+                  credential: aDecoder.decodeObject(forKey: "credential") as? URLCredential)
+        self.currentPath   = aDecoder.decodeObject(forKey: "currentPath") as? String ?? ""
+        self.useCache        = aDecoder.decodeBool(forKey: "useCache")
+        self.validatingCache = aDecoder.decodeBool(forKey: "validatingCache")
+    }
+    
+    open func encode(with aCoder: NSCoder) {
+        aCoder.encode(self.baseURL, forKey: "baseURL")
+        aCoder.encode(self.credential, forKey: "credential")
+        aCoder.encode(self.currentPath, forKey: "currentPath")
+        aCoder.encode(self.useCache, forKey: "isCoorinating")
+        aCoder.encode(self.validatingCache, forKey: "undoManager")
+    }
+    
+    public static var supportsSecureCoding: Bool {
+        return true
+    }
+    
+    open func copy(with zone: NSZone? = nil) -> Any {
+        let copy = WebDAVFileProvider(baseURL: self.baseURL!, credential: self.credential, cache: self.cache)!
+        copy.currentPath = self.currentPath
+        copy.delegate = self.delegate
+        copy.fileOperationDelegate = self.fileOperationDelegate
+        copy.useCache = self.useCache
+        copy.validatingCache = self.validatingCache
+        return copy
+    }
+    
     deinit {
         if fileProviderCancelTasksOnInvalidating {
             _session?.invalidateAndCancel()
@@ -465,17 +496,7 @@ extension WebDAVFileProvider: FileProviderReadWrite {
     // TODO: implements methods for lock mechanism
 }
 
-extension WebDAVFileProvider: FileProvider {
-    open func copy(with zone: NSZone? = nil) -> Any {
-        let copy = WebDAVFileProvider(baseURL: self.baseURL!, credential: self.credential, cache: self.cache)!
-        copy.currentPath = self.currentPath
-        copy.delegate = self.delegate
-        copy.fileOperationDelegate = self.fileOperationDelegate
-        copy.useCache = self.useCache
-        copy.validatingCache = self.validatingCache
-        return copy
-    }
-}
+extension WebDAVFileProvider: FileProvider { }
 
 // MARK: WEBDAV XML response implementation
 
@@ -526,8 +547,13 @@ struct DavResponse {
         guard let hrefString = node[hreftag].value else { return nil }
         
         // trying to figure out relative path out of href
-        let hrefAbsolute = URL(string: hrefString, relativeTo: baseURL)?.absoluteString ?? hrefString
-        let relativePath = hrefAbsolute.replacingOccurrences(of: baseURL?.absoluteString ?? "", with: "", options: .anchored, range: nil)
+        let hrefAbsolute = URL(string: hrefString, relativeTo: baseURL)?.absoluteURL
+        let relativePath: String
+        if hrefAbsolute?.host?.replacingOccurrences(of: "www.", with: "", options: .anchored) == baseURL?.host?.replacingOccurrences(of: "www.", with: "", options: .anchored) {
+            relativePath = hrefAbsolute?.path.replacingOccurrences(of: baseURL?.absoluteURL.path ?? "", with: "", options: .anchored, range: nil) ?? hrefString
+        } else {
+            relativePath = hrefAbsolute?.absoluteString.replacingOccurrences(of: baseURL?.absoluteString ?? "", with: "", options: .anchored, range: nil) ?? hrefString
+        }
         let hrefURL = URL(string: removeSlash(relativePath), relativeTo: baseURL) ?? baseURL
         
         guard let href = hrefURL?.standardized else { return nil }
@@ -566,24 +592,21 @@ struct DavResponse {
     }
     
     static func parse(xmlResponse: Data, baseURL: URL?) -> [DavResponse] {
+        guard let xml = try? AEXMLDocument(xml: xmlResponse) else { return [] }
         var result = [DavResponse]()
-        do {
-            let xml = try AEXMLDocument(xml: xmlResponse)
-            var rootnode = xml.root
-            var responsetag = "response"
-            for node in rootnode.all ?? [] where node.name.lowercased().hasSuffix("multistatus") {
-                rootnode = node
+        var rootnode = xml.root
+        var responsetag = "response"
+        for node in rootnode.all ?? [] where node.name.lowercased().hasSuffix("multistatus") {
+            rootnode = node
+        }
+        for node in rootnode.children where node.name.lowercased().hasSuffix("response") {
+            responsetag = node.name
+            break
+        }
+        for responseNode in rootnode[responsetag].all ?? [] {
+            if let davResponse = DavResponse(responseNode, baseURL: baseURL) {
+                result.append(davResponse)
             }
-            for node in rootnode.children where node.name.lowercased().hasSuffix("response") {
-                responsetag = node.name
-                break
-            }
-            for responseNode in rootnode[responsetag].all ?? [] {
-                if let davResponse = DavResponse(responseNode, baseURL: baseURL) {
-                    result.append(davResponse)
-                }
-            }
-        } catch _ {
         }
         return result
     }