standardized FileObject.path property

- FileObject.path now has heading slash in all scenarios
- fixes #27, WebDAV fileObject.path was not relative

.travis.yml

@@ -1,9 +1,16 @@
 language: objective-c
-osx_image: xcode8
+
+osx_image: xcode8.2
+
 xcode_project: FileProvider.xcodeproj
 env:
   global: 
-    - FRAMEWORK_NAME=FileProvider.framework
+    - PROJECTNAME="FileProvider"
+    - FRAMEWORK_NAME="FileProvider.framework"
+  matrix:
+    - SHCEME="FileProvider OSX" SDK="macosx" ACTION="build"
+    - SHCEME="FileProvider iOS" SDK="iphonesimulator" ACTION="build"
+    - SHCEME="FileProvider tvOS" SDK="appletvsimulator" ACTION="build"
 before_install:
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
   - brew update
@@ -11,17 +18,15 @@ before_install:
 script:
   - set pipefail
   - xcodebuild -version
-  - xcodebuild -project FileProvider.xcodeproj -scheme "FileProvider OSX" -sdk macosx | xcpretty
-  - xcodebuild -project FileProvider.xcodeproj -scheme "FileProvider iOS" -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
-  - xcodebuild -project FileProvider.xcodeproj -scheme "FileProvider tvOS" -sdk appletvsimulator ONLY_ACTIVE_ARCH=NO | xcpretty
-  - pod lib lint --quick
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - xcodebuild -project $PROJECT.xcodeproj -scheme "$SCHEME" -sdk $SDK $ACTION ONLY_ACTIVE_ARCH=NO | xcpretty
+#  - pod lib lint --quick
+# after_success:
+#   - bash <(curl -s https://codecov.io/bash)
 before_deploy:
   - carthage build --no-skip-current
-  - carthage archive FileProvider
+  - carthage archive $PROJECTNAME
 deploy:
-  file: FileProvider.framework.zip
+  file: $PROJECTNAME.framework.zip
   skip_cleanup: true
   on:
     tags: true

FileProvider.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "FileProvider"
-  s.version      = "0.11.0"
+  s.version      = "0.11.4"
   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

@@ -603,7 +603,7 @@
 		799396601D48B7BF00086753 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.11.0;
+				BUNDLE_VERSION_STRING = 0.11.4;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -633,7 +633,7 @@
 		799396611D48B7BF00086753 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.11.0;
+				BUNDLE_VERSION_STRING = 0.11.4;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;

README.md

@@ -3,17 +3,18 @@
 >This Swift library provide a swifty way to deal with local and remote files and directories in a unified way.
 
 [![Swift Version][swift-image]][swift-url]
+[![Platform](https://img.shields.io/badge/Platform-iOS%2C%20macOS%2C%20tvOS-lightgray.svg)](#)
 [![License][license-image]][license-url]
-[![Platform](https://img.shields.io/badge/Platform-iOS%2C%20macOS%2C%20tvOS-lightgray.svg)]()
+
+[![release badge][release-image]][release-url]
+[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/FileProvider.svg)](https://cocoapods.org/pods/FileProvider)
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?)](https://github.com/Carthage/Carthage)
 
 [![Build Status][travis-image]][travis-url]
-[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/FileProvider.svg)](https://cocoapods.org/pods/FileProvider)
 [![codebeat badge][codebeat-image]][codebeat-url]
 
 <!--- 
-
-[![codecov](https://codecov.io/gh/amosavian/FileProvider/branch/master/graph/badge.svg)](https://codecov.io/gh/amosavian/FileProvider)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) 
+[![codecov](https://codecov.io/gh/amosavian/FileProvider/branch/master/graph/badge.svg)](https://codecov.io/gh/amosavian/FileProvider) 
 ---> 
 
 This library provides implementaion of WebDav, Dropbox, OneDrive and SMB2 (incomplete) and local files.
@@ -30,7 +31,7 @@ Local and WebDAV providers are fully tested and can be used in production enviro
 * For now it has limitation in uploading files up to 150MB.
 - [x] **OneDriveFileProvider** A wrapper around OneDrive Web API, works with `onedrive.com` and compatible (business) servers.
 * For now it has limitation in uploading files up to 100MB.
-- [ ] **CloudFileProvider** A wrapper around app's ubiquitous container to iCloud Drive in iOS 8+ API.
+- [x] **CloudFileProvider** A wrapper around app's ubiquitous container to iCloud Drive in iOS 8+ API.
 - [ ] **SMBFileProvider** SMB2/3 introduced in 2006, which is a file and printer sharing protocol originated from Microsoft Windows and now is replacing AFP protocol on MacOS.
 * Data types and some basic functions are implemented but *main interface is not implemented yet!*
 *  SMB1/CIFS is depericated and very tricky to be implemented
@@ -112,14 +113,21 @@ let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDo
 let documentsProvider = LocalFileProvider(baseURL: documentsURL)
 ```
 
+Also for using group shared container:
+
+```swift
+let documentsProvider = LocalFileProvider(sharedContainerId: "group.yourcompany.appContainer")
+// Replace your group identifier with string above
+```
+
 You can't change the base url later. and all paths are related to this base url by default.
-<!---
+
 To initialize an iCloud Container provider use below code, This will automatically manager creating Documents folder in container:
 
 ```swift
 let documentsProvider = CloudFileProvider(containerId: nil)
 ```
---->
+
 
 For remote file providers authentication may be necessary:
 
@@ -404,4 +412,6 @@ Distributed under the MIT license. See `LICENSE` for more information.
 [codebeat-image]: https://codebeat.co/badges/7b359f48-78eb-4647-ab22-56262a827517
 [codebeat-url]: https://codebeat.co/projects/github-com-amosavian-fileprovider
 [travis-image]: https://img.shields.io/travis/amosavian/FileProvider/master.svg
-[travis-url]: https://travis-ci.org/amosavian/FileProvider
+[travis-url]: https://travis-ci.org/amosavian/FileProvider
+[release-url]: https://github.com/amosavian/FileProvider/releases
+[release-image]: https://img.shields.io/github/release/amosavian/FileProvider.svg

Sources/CloudFileProvider.swift

@@ -14,7 +14,7 @@ open class CloudFileProvider: LocalFileProvider {
         return "iCloudDrive"
     }
     
-    /// Actually is readonly
+    /// Actually is readonly, value is true
     override open var isCoorinating: Bool {
         get {
             return true
@@ -35,7 +35,7 @@ open class CloudFileProvider: LocalFileProvider {
             return nil
         }
         self.containerId = containerId
-        let baseURL = ubiquityURL.standardized.appendingPathComponent("Documents")
+        let baseURL = ubiquityURL.standardized.appendingPathComponent("Documents/")
         super.init(baseURL: baseURL)
         self.isCoorinating = true
         
@@ -51,7 +51,7 @@ open class CloudFileProvider: LocalFileProvider {
     
     open override func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
         dispatch_queue.async {
-            let pathURL = self.absoluteURL(path)
+            let pathURL = self.url(of: path)
             let query = NSMetadataQuery()
             query.predicate = NSPredicate(format: "%K BEGINSWITH %@", NSMetadataItemPathKey, pathURL.path)
             query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
@@ -96,7 +96,7 @@ open class CloudFileProvider: LocalFileProvider {
     
     open override func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
         dispatch_queue.async {
-            let pathURL = self.absoluteURL(path)
+            let pathURL = self.url(of: path)
             let query = NSMetadataQuery()
             query.predicate = NSPredicate(format: "%K LIKE %@", NSMetadataItemPathKey, pathURL.path)
             query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
@@ -171,7 +171,7 @@ open class CloudFileProvider: LocalFileProvider {
             
             do {
                 try self.opFileManager.copyItem(at: localFile, to: tmpFile)
-                let toUrl = self.absoluteURL(toPath)
+                let toUrl = self.url(of: toPath)
                 try self.opFileManager.setUbiquitous(true, itemAt: tmpFile, destinationURL: toUrl)
                 completionHandler?(nil)
                 DispatchQueue.main.async(execute: {
@@ -195,7 +195,7 @@ open class CloudFileProvider: LocalFileProvider {
         let opType = FileOperationType.copy(source: path, destination: toLocalURL.absoluteString)
         
         do {
-            try self.opFileManager.startDownloadingUbiquitousItem(at: self.absoluteURL(path))
+            try self.opFileManager.startDownloadingUbiquitousItem(at: self.url(of: path))
         } catch let e {
             completionHandler?(e)
             DispatchQueue.main.async(execute: {
@@ -228,7 +228,7 @@ open class CloudFileProvider: LocalFileProvider {
     
     open override func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
         dispatch_queue.async {
-            let pathURL = self.absoluteURL(path)
+            let pathURL = self.url(of: path)
             let query = NSMetadataQuery()
             query.predicate = NSPredicate(format: "(%K BEGINSWITH %@) && (%K LIKE %@)", NSMetadataItemPathKey, pathURL.path, NSMetadataItemFSNameKey, query)
             query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
@@ -302,7 +302,7 @@ open class CloudFileProvider: LocalFileProvider {
     //
     open override func registerNotifcation(path: String, eventHandler: @escaping (() -> Void)) {
         self.unregisterNotifcation(path: path)
-        let pathURL = self.absoluteURL(path)
+        let pathURL = self.url(of: path)
         let query = NSMetadataQuery()
         query.predicate = NSPredicate(format: "(%K BEGINSWITH %@)", NSMetadataItemPathKey, pathURL.path)
         query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
@@ -322,7 +322,7 @@ open class CloudFileProvider: LocalFileProvider {
     }
     
     open override func unregisterNotifcation(path: String) {
-        let key = absoluteURL(path)
+        let key = url(of: path)
         guard let (query, observer) = monitors[key] else {
             return
         }
@@ -333,7 +333,7 @@ open class CloudFileProvider: LocalFileProvider {
     }
     
     open override func isRegisteredForNotification(path: String) -> Bool {
-        return monitors[absoluteURL(path)] != nil
+        return monitors[url(of: path)] != nil
     }
     
     /// may return nil
@@ -352,8 +352,9 @@ open class CloudFileProvider: LocalFileProvider {
         }
         
         let path = self.relativePathOf(url: url)
-        
-        let file = FileObject(absoluteURL: url, name: name, path: path)
+        let rpath = path.hasPrefix("/") ? path.substring(from: path.index(after: path.startIndex)) : path
+        let relativeUrl = URL(string: rpath, relativeTo: self.baseURL)
+        let file = FileObject(url: relativeUrl ?? url, name: name, path: path)
         
         file.size = (attribs[NSMetadataItemFSSizeKey] as? NSNumber)?.int64Value ?? -1
         file.creationDate = attribs[NSMetadataItemFSCreationDateKey] as? Date
@@ -369,7 +370,7 @@ open class CloudFileProvider: LocalFileProvider {
     open func evictItem(path: String, completionHandler: SimpleCompletionHandler) {
         operation_queue.addOperation {
             do {
-                try self.opFileManager.evictUbiquitousItem(at: self.absoluteURL(path))
+                try self.opFileManager.evictUbiquitousItem(at: self.url(of: path))
                 completionHandler?(nil)
             } catch let e {
                 completionHandler?(e)
@@ -381,7 +382,7 @@ open class CloudFileProvider: LocalFileProvider {
         operation_queue.addOperation {
             do {
                 var expiration: NSDate?
-                let url = try self.opFileManager.url(forPublishingUbiquitousItemAt: self.absoluteURL(path), expiration: &expiration)
+                let url = try self.opFileManager.url(forPublishingUbiquitousItemAt: self.url(of: path), expiration: &expiration)
                 completionHandler(url, nil, expiration as Date?, nil)
             } catch let e {
                 completionHandler(nil, nil, nil, e)

Sources/DropboxFileProvider.swift

@@ -58,11 +58,11 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         self.credential = credential
         
         self.apiURL = URL(string: "https://api.dropboxapi.com/2/")!
-        self.contentURL = URL(string: "https://content.dropboxapi.com/2")!
+        self.contentURL = URL(string: "https://content.dropboxapi.com/2/")!
         
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(DropboxFileProvider.type)", attributes: DispatchQueue.Attributes.concurrent)
+        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: DispatchQueue.Attributes.concurrent)
         operation_queue = OperationQueue()
-        operation_queue.name = "FileProvider.\(DropboxFileProvider.type).Operation"
+        operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
 
     }
     
@@ -82,7 +82,7 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        let requestDictionary = ["path": correctPath(path)! as NSString]
+        let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString]
         request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var dbError: FileProviderDropboxError?
@@ -90,7 +90,7 @@ open class DropboxFileProvider: FileProviderBasicRemote {
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 dbError = 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 = self.mapToFileObject(json) {
+                if let data = data, let jsonStr = String(data: data, encoding: .utf8), let json = jsonToDictionary(jsonStr), let file = DropboxFileObject(json: json) {
                     fileObject = file
                 }
             }
@@ -205,8 +205,8 @@ extension DropboxFileProvider: FileProviderOperations {
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
-        let requestDictionary = ["path": path]
-        let requestJson = dictionaryToJSON(requestDictionary as [String : AnyObject]) ?? ""
+        let requestDictionary: [String: AnyObject] = ["path": path as NSString]
+        let requestJson = dictionaryToJSON(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 {
@@ -241,8 +241,8 @@ extension DropboxFileProvider: FileProviderReadWrite {
         } else if offset > 0 && length < 0 {
             request.setValue("bytes=\(offset)-", forHTTPHeaderField: "Range")
         }
-        let requestDictionary = ["path": correctPath(path)! as NSString]
-        request.setValue(dictionaryToJSON(requestDictionary as [String : AnyObject]), forHTTPHeaderField: "Dropbox-API-Arg")
+        let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString]
+        request.setValue(dictionaryToJSON(requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var dbError: FileProviderDropboxError?
             if let httpResponse = response as? HTTPURLResponse , httpResponse.statusCode >= 300, let code = FileProviderHTTPErrorCode(rawValue: httpResponse.statusCode) {
@@ -305,7 +305,7 @@ extension DropboxFileProvider {
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        let requestDictionary = ["path": correctPath(path)! as NSString]
+        let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString]
         request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var dbError: FileProviderDropboxError?
@@ -319,7 +319,7 @@ extension DropboxFileProvider {
                         link = URL(string: linkStr)
                     }
                     if let attribDic = json["metadata"] as? [String: AnyObject] {
-                        fileObject = self.mapToFileObject(attribDic)
+                        fileObject = DropboxFileObject(json: attribDic)
                     }
                 }
             }
@@ -330,13 +330,13 @@ extension DropboxFileProvider {
         task.resume()
     }
     
-    open func copyItem(path: String, toRemoteURL destURL: URL, completionHandler: @escaping ((_ jobId: String?, _ attribute: DropboxFileObject?, _ error: Error?) -> Void)) {
+    open func copyItem(remoteURL: URL, to toPath: String, completionHandler: @escaping ((_ jobId: String?, _ attribute: DropboxFileObject?, _ error: Error?) -> Void)) {
         let url = URL(string: "files/save_url", relativeTo: apiURL)!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        let requestDictionary = ["path": correctPath(path)! as NSString, "url" : destURL.absoluteString as NSString]
+        let requestDictionary: [String: AnyObject] = ["path": correctPath(toPath)! as NSString, "url" : remoteURL.absoluteString as NSString]
         request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var dbError: FileProviderDropboxError?
@@ -344,11 +344,11 @@ extension DropboxFileProvider {
             var fileObject: DropboxFileObject?
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
-                dbError = code != nil ? FileProviderDropboxError(code: code!, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
+                dbError = 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) {
                     jobId = json["async_job_id"] as? String
                     if let attribDic = json["metadata"] as? [String: AnyObject] {
-                        fileObject = self.mapToFileObject(attribDic)
+                        fileObject = DropboxFileObject(json: attribDic)
                     }
                 }
             }
@@ -356,6 +356,25 @@ extension DropboxFileProvider {
         })
         task.resume()
     }
+    
+    open func copyItem(reference: String, to toPath: String, completionHandler:SimpleCompletionHandler) {
+        let url = URL(string: "files/save_url", relativeTo: apiURL)!
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+        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)
+        let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
+            var dbError: FileProviderDropboxError?
+            if let response = response as? HTTPURLResponse {
+                let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
+                dbError = code != nil ? FileProviderDropboxError(code: code!, path: toPath, errorDescription: String(data: data ?? Data(), encoding: .utf8)) : nil
+            }
+            completionHandler?(dbError ?? error)
+        })
+        task.resume()
+    }
 }
 
 extension DropboxFileProvider: ExtendedFileProvider {
@@ -405,7 +424,7 @@ extension DropboxFileProvider: ExtendedFileProvider {
         }
         var request = URLRequest(url: url)
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
-        var requestDictionary = ["path": path as NSString]
+        var requestDictionary: [String: AnyObject] = ["path": path as NSString]
         requestDictionary["format"] = "jpeg" as NSString
         if let dimension = dimension {
             requestDictionary["size"] = "w\(Int(dimension.width))h\(Int(dimension.height))" as NSString
@@ -438,7 +457,7 @@ extension DropboxFileProvider: ExtendedFileProvider {
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        let requestDictionary = ["path": correctPath(path)! as NSString, "include_media_info": NSNumber(value: true)]
+        let requestDictionary: [String: AnyObject] = ["path": correctPath(path)! as NSString, "include_media_info": NSNumber(value: true)]
         request.httpBody = dictionaryToJSON(requestDictionary)?.data(using: .utf8)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             var dbError: FileProviderDropboxError?

Sources/DropboxHelper.swift

@@ -20,7 +20,25 @@ public struct FileProviderDropboxError: Error, CustomStringConvertible {
 
 public final class DropboxFileObject: FileObject {
     internal init(name: String, path: String) {
-        super.init(absoluteURL: URL(string: path), name: name, path: path)
+        super.init(url: URL(string: path) ?? URL(string: "/")!, name: name, path: path)
+    }
+    
+    internal convenience init? (jsonStr: String) {
+        guard let json = jsonToDictionary(jsonStr) else { return nil }
+        self.init(json: json)
+    }
+    
+    internal convenience init? (json: [String: AnyObject]) {
+        guard let name = json["name"] as? String else { return nil }
+        guard let path = json["path_display"] as? String else { return nil }
+        self.init(name: name, path: path)
+        self.size = (json["size"] as? NSNumber)?.int64Value ?? -1
+        self.serverTime = resolve(dateString: json["server_modified"] as? String ?? "")
+        self.modifiedDate = resolve(dateString: json["client_modified"] as? String ?? "")
+        self.type = (json[".tag"] as? String) == "folder" ? .directory : .regular
+        self.isReadOnly = (json["sharing_info"]?["read_only"] as? NSNumber)?.boolValue ?? false
+        self.id = json["id"] as? String
+        self.rev = json["rev"] as? String
     }
     
     open internal(set) var serverTime: Date? {
@@ -79,7 +97,7 @@ internal extension DropboxFileProvider {
                 let json = jsonToDictionary(jsonStr)
                 if let entries = json?["entries"] as? [AnyObject] , entries.count > 0 {
                     for entry in entries {
-                        if let entry = entry as? [String: AnyObject], let file = self.mapToFileObject(entry) {
+                        if let entry = entry as? [String: AnyObject], let file = DropboxFileObject(json: entry) {
                             files.append(file)
                         }
                     }
@@ -104,17 +122,17 @@ internal extension DropboxFileProvider {
             self.delegateNotify(.create(path: targetPath), error: error)
             return nil
         }
-        var requestDictionary = [String: Any]()
+        var requestDictionary = [String: AnyObject]()
         let url: URL
         url = URL(string: "files/upload", relativeTo: contentURL)!
         requestDictionary["path"] = correctPath(targetPath) as NSString?
         requestDictionary["mode"] = (overwrite ? "overwrite" : "add") as NSString
-        requestDictionary["client_modified"] = string(from:modifiedDate)
+        requestDictionary["client_modified"] = rfc3339utc(of: modifiedDate) as NSString
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
-        request.setValue(dictionaryToJSON(requestDictionary as [String : AnyObject]), forHTTPHeaderField: "Dropbox-API-Arg")
+        request.setValue(dictionaryToJSON(requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
         request.httpBody = data
         let task = session.uploadTask(with: request, from: data, completionHandler: { (data, response, error) in
             var responseError: FileProviderDropboxError?
@@ -137,17 +155,17 @@ internal extension DropboxFileProvider {
             self.delegateNotify(.create(path: targetPath), error: error)
             return nil
         }
-        var requestDictionary = [String: Any]()
+        var requestDictionary = [String: AnyObject]()
         let url: URL
         url = URL(string: "files/upload", relativeTo: contentURL)!
         requestDictionary["path"] = correctPath(targetPath) as NSString?
         requestDictionary["mode"] = (overwrite ? "overwrite" : "add") as NSString
-        requestDictionary["client_modified"] = string(from:modifiedDate)
+        requestDictionary["client_modified"] = rfc3339utc(of: modifiedDate) as NSString
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
         request.setValue("application/octet-stream", forHTTPHeaderField: "Content-Type")
-        request.setValue(dictionaryToJSON(requestDictionary as [String : AnyObject]), forHTTPHeaderField: "Dropbox-API-Arg")
+        request.setValue(dictionaryToJSON(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) {
@@ -181,7 +199,7 @@ internal extension DropboxFileProvider {
                 let json = jsonToDictionary(jsonStr)
                 if let entries = json?["matches"] as? [AnyObject] , entries.count > 0 {
                     for entry in entries {
-                        if let entry = entry as? [String: AnyObject], let file = self.mapToFileObject(entry) {
+                        if let entry = entry as? [String: AnyObject], let file = DropboxFileObject(json: entry) {
                             foundItem(file)
                         }
                     }
@@ -203,25 +221,6 @@ internal extension DropboxFileProvider {
 // codebeat:enable[ARITY]
 
 internal extension DropboxFileProvider {
-    func mapToFileObject(_ jsonStr: String) -> DropboxFileObject? {
-        guard let json = jsonToDictionary(jsonStr) else { return nil }
-        return self.mapToFileObject(json)
-    }
-    
-    func mapToFileObject(_ json: [String: AnyObject]) -> DropboxFileObject? {
-        guard let name = json["name"] as? String else { return nil }
-        guard let path = json["path_display"] as? String else { return nil }
-        let fileObject = DropboxFileObject(name: name, path: path)
-        fileObject.size = (json["size"] as? NSNumber)?.int64Value ?? -1
-        fileObject.serverTime = resolve(dateString: json["server_modified"] as? String ?? "")
-        fileObject.modifiedDate = resolve(dateString: json["client_modified"] as? String ?? "")
-        fileObject.type = (json[".tag"] as? String) == "folder" ? .directory : .regular
-        fileObject.isReadOnly = (json["sharing_info"]?["read_only"] as? NSNumber)?.boolValue ?? false
-        fileObject.id = json["id"] as? String
-        fileObject.rev = json["rev"] as? String
-        return fileObject
-    }
-    
     static let dateFormatter = DateFormatter()
     static let decimalFormatter = NumberFormatter()
     
@@ -241,7 +240,7 @@ internal extension DropboxFileProvider {
             let longStr = DropboxFileProvider.decimalFormatter.string(from: NSNumber(value: longitude))
             dic["Location"] = "\(latStr), \(longStr)"
         }
-        if let timeTakenStr = json["time_taken"] as? String, let timeTaken = self.resolve(dateString: timeTakenStr) {
+        if let timeTakenStr = json["time_taken"] as? String, let timeTaken = resolve(dateString: timeTakenStr) {
             keys.append("Date taken")
             DropboxFileProvider.dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
             dic["Date taken"] = DropboxFileProvider.dateFormatter.string(from: timeTaken)

Sources/ExtendedLocalFileProvider.swift

@@ -64,7 +64,7 @@ extension LocalFileProvider: ExtendedFileProvider {
         (dispatch_queue).async {
             var thumbnailImage: ImageClass? = nil
             // Check cache
-            let fileURL = self.absoluteURL(path)
+            let fileURL = self.url(of: path)
             // Create Thumbnail and cache
             switch fileURL.pathExtension.lowercased() {
             case LocalFileInformationGenerator.videoThumbnailExtensions:
@@ -117,7 +117,7 @@ extension LocalFileProvider: ExtendedFileProvider {
             var dic = [String: Any]()
             var keys = [String]()
             if let getterMethod = getter {
-                (dic, keys) = getterMethod(self.absoluteURL(path))
+                (dic, keys) = getterMethod(self.url(of: path))
             }
             
             completionHandler(dic, keys, nil)

Sources/FileObject.swift

@@ -16,20 +16,25 @@ open class FileObject {
         self.allValues = allValues
     }
     
-    internal init(absoluteURL: URL? = nil, name: String, path: String) {
+    internal init(url: URL, name: String, path: String) {
         self.allValues = [String: Any]()
-        self.absoluteURL = absoluteURL
+        self.url = url
         self.name = name
         self.path = path
     }
     
     /// url to access the resource, not supported by Dropbox provider
-    open internal(set) var absoluteURL: URL? {
+    @available(*, deprecated, message: "Use FileObject.url.absoluteURL instead.")
+    open var absoluteURL: URL? {
+        return url?.absoluteURL
+    }
+    
+    open internal(set) var url: URL? {
         get {
-            return allValues["NSURLAbsoluteURLKey"] as? URL
+            return allValues["NSURLFileURLKey"] as? URL
         }
         set {
-            allValues["NSURLAbsoluteURLKey"] = newValue
+            allValues["NSURLFileURLKey"] = newValue
         }
     }
     
@@ -135,6 +140,37 @@ open class FileObject {
     }
 }
 
+internal func resolve(dateString: String) -> Date? {
+    let dateFor: DateFormatter = DateFormatter()
+    dateFor.locale = Locale(identifier: "en_US")
+    dateFor.dateFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ"
+    if let rfc3339 = dateFor.date(from: dateString) {
+        return rfc3339
+    }
+    dateFor.dateFormat = "EEE',' dd' 'MMM' 'yyyy HH':'mm':'ss z"
+    if let rfc1123 = dateFor.date(from: dateString) {
+        return rfc1123
+    }
+    dateFor.dateFormat = "EEEE',' dd'-'MMM'-'yy HH':'mm':'ss z"
+    if let rfc850 = dateFor.date(from: dateString) {
+        return rfc850
+    }
+    dateFor.dateFormat = "EEE MMM d HH':'mm':'ss yyyy"
+    if let asctime = dateFor.date(from: dateString) {
+        return asctime
+    }
+    
+    return nil
+}
+
+internal func rfc3339utc(of date:Date) -> String {
+    let fm = DateFormatter()
+    fm.dateFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"
+    fm.timeZone = TimeZone(identifier:"UTC")
+    fm.locale = Locale(identifier:"en_US_POSIX")
+    return fm.string(from:date)
+}
+
 /// Sorting FileObject array by given criteria, **not thread-safe**
 public struct FileObjectSorting {
     

Sources/FileProvider.swift

@@ -207,6 +207,7 @@ extension FileProviderBasic {
         return path.trimmingCharacters(in: pathTrimSet).addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
     }
     
+    @available(*, deprecated, message: "Use FileProvider.url(of:).absoluteURL instead.")
     public func absoluteURL(_ path: String? = nil) -> URL {
         return url(of: path).absoluteURL
     }
@@ -230,6 +231,10 @@ extension FileProviderBasic {
     }
     
     public func relativePathOf(url: URL) -> String {
+        if url.baseURL == self.baseURL {
+            return url.relativePath.removingPercentEncoding!
+        }
+        
         guard let baseURL = self.baseURL else { return url.absoluteString }
         return url.standardizedFileURL.absoluteString.replacingOccurrences(of: baseURL.absoluteString, with: "/").removingPercentEncoding!
     }
@@ -264,7 +269,7 @@ extension FileProviderBasic {
             }
             var i = number ?? 2
             let similiar = contents.map {
-                $0.absoluteURL?.lastPathComponent ?? $0.name
+                $0.url?.lastPathComponent ?? $0.name
             }.filter {
                 $0.hasPrefix(result)
             }
@@ -280,7 +285,7 @@ extension FileProviderBasic {
     }
     
     internal func throwError(_ path: String, code: FoundationErrorEnum) -> NSError {
-        let fileURL = self.absoluteURL(path)
+        let fileURL = self.url(of: path)
         let domain: String
         switch code {
         case is URLError:
@@ -291,40 +296,9 @@ extension FileProviderBasic {
         return NSError(domain: domain, code: code.rawValue, userInfo: [NSURLErrorFailingURLErrorKey: fileURL, NSURLErrorFailingURLStringErrorKey: fileURL.absoluteString])
     }
     
-    internal func NotImplemented() {
-        assert(false, "method not implemented")
+    internal func NotImplemented(_ fn: String = #function, file: StaticString = #file) {
+        assert(false, "\(fn) method is not yet implemented. \(file)")
     }
-    
-    internal func resolve(dateString: String) -> Date? {
-        let dateFor: DateFormatter = DateFormatter()
-        dateFor.locale = Locale(identifier: "en_US")
-        dateFor.dateFormat = "EEE',' dd' 'MMM' 'yyyy HH':'mm':'ss zzz"
-        if let rfc1123 = dateFor.date(from: dateString) {
-            return rfc1123
-        }
-        dateFor.dateFormat = "EEEE',' dd'-'MMM'-'yy HH':'mm':'ss z"
-        if let rfc850 = dateFor.date(from: dateString) {
-            return rfc850
-        }
-        dateFor.dateFormat = "EEE MMM d HH':'mm':'ss yyyy"
-        if let asctime = dateFor.date(from: dateString) {
-            return asctime
-        }
-        dateFor.dateFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ssz"
-        if let isotime = dateFor.date(from: dateString) {
-            return isotime
-        }
-        return nil
-    }
-    
-    public func string(from date:Date) -> String {
-        let fm = DateFormatter()
-        fm.dateFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"
-        fm.timeZone = TimeZone(identifier:"UTC")
-        fm.locale = Locale(identifier:"en_US_POSIX")
-        return fm.string(from:date)
-    }
-    
 }
 
 public protocol ExtendedFileProvider: FileProviderBasic {

Sources/LocalFileProvider.swift

@@ -64,9 +64,9 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
         self.credential = nil
         self.isCoorinating = false
         
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(LocalFileProvider.type)", attributes: DispatchQueue.Attributes.concurrent)
+        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: DispatchQueue.Attributes.concurrent)
         operation_queue = OperationQueue()
-        operation_queue.name = "FileProvider.\(LocalFileProvider.type).Operation"
+        operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
         
         fileProviderManagerDelegate = LocalFileProviderManagerDelegate(provider: self)
         opFileManager.delegate = fileProviderManagerDelegate
@@ -81,7 +81,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     open func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
         dispatch_queue.async {
             do {
-                let contents = try self.fileManager.contentsOfDirectory(at: self.absoluteURL(path), includingPropertiesForKeys: [.nameKey, .fileSizeKey, .fileAllocatedSizeKey, .creationDateKey, .contentModificationDateKey, .isHiddenKey, .volumeIsReadOnlyKey], options: .skipsSubdirectoryDescendants)
+                let contents = try self.fileManager.contentsOfDirectory(at: self.url(of: path), includingPropertiesForKeys: [.nameKey, .fileSizeKey, .fileAllocatedSizeKey, .creationDateKey, .contentModificationDateKey, .isHiddenKey, .volumeIsReadOnlyKey], options: .skipsSubdirectoryDescendants)
                 let filesAttributes = contents.flatMap({ (fileURL) -> LocalFileObject? in
                     let path = self.relativePathOf(url: fileURL)
                     return LocalFileObject(fileWithPath: path, relativeTo: self.baseURL)
@@ -111,7 +111,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     @discardableResult
     open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
         let opType = FileOperationType.create(path: (atPath as NSString).appendingPathComponent(folderName) + "/")
-        let url = self.absoluteURL(atPath).appendingPathComponent(folderName)
+        let url = self.url(of: atPath).appendingPathComponent(folderName)
         
         let operationHandler: (URL) -> Void = { url in
             do {
@@ -148,7 +148,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     @discardableResult
     open func create(file fileName: String, at atPath: String, contents data: Data?, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
         let opType = FileOperationType.create(path: (atPath as NSString).appendingPathComponent(fileName))
-        let url = self.absoluteURL(atPath).appendingPathComponent(fileName, isDirectory: false)
+        let url = self.url(of: atPath).appendingPathComponent(fileName, isDirectory: false)
         
         let operationHandler: (URL) -> Void = { url in
             let success = self.opFileManager.createFile(atPath: url.path, contents: data, attributes: nil)
@@ -185,8 +185,8 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     @discardableResult
     open func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
         let opType = FileOperationType.move(source: path, destination: toPath)
-        let sourceUrl = self.absoluteURL(path)
-        let destUrl = self.absoluteURL(toPath)
+        let sourceUrl = self.url(of: path)
+        let destUrl = self.url(of: toPath)
         
         let sourceIntent = NSFileAccessIntent.writingIntent(with: sourceUrl, options: .forDeleting)
         let destIntent = NSFileAccessIntent.writingIntent(with: destUrl, options: .forReplacing)
@@ -230,8 +230,8 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     @discardableResult
     open func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
         let opType = FileOperationType.copy(source: path, destination: toPath)
-        let sourceUrl = self.absoluteURL(path)
-        let destUrl = self.absoluteURL(toPath)
+        let sourceUrl = self.url(of: path)
+        let destUrl = self.url(of: toPath)
         
         let sourceIntent = NSFileAccessIntent.readingIntent(with: sourceUrl, options: .withoutChanges)
         let destIntent = NSFileAccessIntent.writingIntent(with: destUrl, options: .forDeleting)
@@ -274,7 +274,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     @discardableResult
     open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
         let opType = FileOperationType.remove(path: path)
-        let url = self.absoluteURL(path)
+        let url = self.url(of: path)
         
         let operationHandler: (URL) -> Void = { url in
             do {
@@ -318,7 +318,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
         let opType = FileOperationType.copy(source: localFile.absoluteString, destination: toPath)
         operation_queue.addOperation {
             do {
-                try self.opFileManager.copyItem(at: localFile, to: self.absoluteURL(toPath))
+                try self.opFileManager.copyItem(at: localFile, to: self.url(of: toPath))
                 completionHandler?(nil)
                 DispatchQueue.main.async {
                     self.delegate?.fileproviderSucceed(self, operation: opType)
@@ -338,7 +338,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
         let opType = FileOperationType.copy(source: path, destination: toLocalURL.absoluteString)
         operation_queue.addOperation {
             do {
-                try self.opFileManager.copyItem(at: self.absoluteURL(path), to: toLocalURL)
+                try self.opFileManager.copyItem(at: self.url(of: path), to: toLocalURL)
                 completionHandler?(nil)
                 DispatchQueue.main.async {
                     self.delegate?.fileproviderSucceed(self, operation: opType)
@@ -356,7 +356,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     @discardableResult
     open func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
         let opType = FileOperationType.fetch(path: path)
-        let url = self.absoluteURL(path)
+        let url = self.url(of: path)
         
         let operationHandler: (URL) -> Void = { url in
             let data = self.fileManager.contents(atPath: url.path)
@@ -387,7 +387,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
         }
         
         let opType = FileOperationType.fetch(path: path)
-        let url = self.absoluteURL(path)
+        let url = self.url(of: path)
         
         let operationHandler: (URL) -> Void = { url in
             guard self.fileManager.fileExists(atPath: url.path) && !url.fileIsDirectory else {
@@ -426,7 +426,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     @discardableResult
     open func writeContents(path: String, contents data: Data, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
         let opType = FileOperationType.modify(path: path)
-        let url = self.absoluteURL(path)
+        let url = self.url(of: path)
         var options: Data.WritingOptions = []
         if atomically {
             options.insert(.atomic)
@@ -469,7 +469,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     
     open func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
         dispatch_queue.async { 
-            let iterator = self.fileManager.enumerator(at: self.absoluteURL(path), includingPropertiesForKeys: nil, options: recursive ? [] : [.skipsSubdirectoryDescendants, .skipsPackageDescendants]) { (url, e) -> Bool in
+            let iterator = self.fileManager.enumerator(at: self.url(of: path), includingPropertiesForKeys: nil, options: recursive ? [] : [.skipsSubdirectoryDescendants, .skipsPackageDescendants]) { (url, e) -> Bool in
                 completionHandler([], e)
                 return true
             }
@@ -491,12 +491,12 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     
     open func registerNotifcation(path: String, eventHandler: @escaping (() -> Void)) {
         self.unregisterNotifcation(path: path)
-        let absurl = self.absoluteURL(path)
-        let isdir = (try? absurl.resourceValues(forKeys: [.isDirectoryKey]).isDirectory ?? false) ?? false
+        let dirurl = self.url(of: path)
+        let isdir = (try? dirurl.resourceValues(forKeys: [.isDirectoryKey]).isDirectory ?? false) ?? false
         if !isdir {
             return
         }
-        let monitor = LocalFolderMonitor(url: absurl) {
+        let monitor = LocalFolderMonitor(url: dirurl) {
             eventHandler()
         }
         monitor.start()
@@ -532,7 +532,7 @@ public extension LocalFileProvider {
     public func create(symbolicLink path: String, withDestinationPath destPath: String, completionHandler: SimpleCompletionHandler) {
         operation_queue.addOperation {
             do {
-                try self.opFileManager.createSymbolicLink(at: self.absoluteURL(path), withDestinationURL: self.absoluteURL(destPath))
+                try self.opFileManager.createSymbolicLink(at: self.url(of: path), withDestinationURL: self.url(of: destPath))
                 completionHandler?(nil)
                 DispatchQueue.main.async {
                     self.delegate?.fileproviderSucceed(self, operation: .link(link: path, target: destPath))
@@ -549,7 +549,7 @@ public extension LocalFileProvider {
     public func destination(ofSymbolicLink path: String, completionHandler: @escaping (_ url: URL?, _ error: Error?) -> Void) {
         dispatch_queue.async {
             do {
-                let destPath = try self.opFileManager.destinationOfSymbolicLink(atPath: self.absoluteURL(path).path)
+                let destPath = try self.opFileManager.destinationOfSymbolicLink(atPath: self.url(of: path).path)
                 let destUrl = URL(fileURLWithPath: destPath)
                 completionHandler(destUrl, nil)
             } catch let e{

Sources/LocalHelper.swift

@@ -9,32 +9,38 @@
 import Foundation
 
 public final class LocalFileObject: FileObject {
-    internal init(absoluteURL: URL, name: String, path: String) {
-        super.init(absoluteURL: absoluteURL, name: name, path: path)
+    internal override init(url: URL, name: String, path: String) {
+        super.init(url: url, name: name, path: path)
     }
     
     public convenience init? (fileWithPath path: String, relativeTo relativeURL: URL?) {
-        let fileURL: URL
-        if let relativeURL = relativeURL {
-            fileURL = relativeURL.appendingPathComponent(path)
-        } else {
-            fileURL = URL(fileURLWithPath: path)
+        var fileURL: URL?
+        var rpath = path.replacingOccurrences(of: relativeURL?.absoluteString  ?? "", with: "", options: .anchored)
+        if path.hasPrefix("/") {
+            rpath.remove(at: rpath.startIndex)
         }
-        do {
-            let values = try fileURL.resourceValues(forKeys: [.nameKey, .fileSizeKey, .fileAllocatedSizeKey, .creationDateKey, .contentModificationDateKey, .fileResourceTypeKey, .isHiddenKey, .isWritableKey])
-            self.init(absoluteURL: fileURL, name: values.name ?? fileURL.lastPathComponent, path: path)
-            for (key, value) in values.allValues {
-                self.allValues[key.rawValue] = value
+        if rpath.isEmpty {
+            fileURL = 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)
             }
-        } catch {
+        }
+        if let fileURL = fileURL {
+            self.init(fileWithURL: fileURL)
+        } else {
             return nil
         }
     }
     
     public convenience init?(fileWithURL fileURL: URL) {
         do {
-            let values = try fileURL.resourceValues(forKeys: [.nameKey, .fileSizeKey, .fileAllocatedSizeKey, .creationDateKey, .contentModificationDateKey, .fileResourceTypeKey, .isHiddenKey, .isWritableKey, .typeIdentifierKey])
-            self.init(absoluteURL: fileURL, name: values.name ?? fileURL.lastPathComponent, path: fileURL.path)
+            let values = try fileURL.resourceValues(forKeys: [.nameKey, .fileSizeKey, .fileAllocatedSizeKey, .creationDateKey, .contentModificationDateKey, .fileResourceTypeKey, .isHiddenKey, .isWritableKey, .typeIdentifierKey, .generationIdentifierKey])
+            let path = fileURL.relativePath.hasPrefix("/") ? fileURL.relativePath : "/" + fileURL.relativePath
+            
+            self.init(url: fileURL, name: values.name ?? fileURL.lastPathComponent, path: path)
             for (key, value) in values.allValues {
                 self.allValues[key.rawValue] = value
             }
@@ -51,6 +57,14 @@ public final class LocalFileObject: FileObject {
             allValues[URLResourceKey.fileAllocatedSizeKey.rawValue] = Int(exactly: newValue) ?? Int.max
         }
     }
+    
+    open var rev: String? {
+        get {
+            let data = allValues[URLResourceKey.generationIdentifierKey.rawValue] as? Data
+            return data?.map { String(format: "%02hhx", $0) }.joined()
+        }
+    }
+
 }
 
 internal class LocalFolderMonitor {

Sources/OneDriveFileProvide.swift

@@ -53,7 +53,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
     }
     
     public init? (credential: URLCredential?, serverURL: URL? = nil, drive: String = "root", cache: URLCache? = nil) {
-        self.baseURL = serverURL ?? URL(string: "https://api.onedrive.com")
+        self.baseURL = (serverURL ?? URL(string: "https://api.onedrive.com/")!).appendingPathComponent("")
         self.drive = drive
         self.isPathRelative = true
         self.currentPath = ""
@@ -61,9 +61,9 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         self.validatingCache = true
         self.cache = cache
         self.credential = credential
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(OneDriveFileProvider.type)", attributes: DispatchQueue.Attributes.concurrent)
+        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: DispatchQueue.Attributes.concurrent)
         operation_queue = OperationQueue()
-        operation_queue.name = "FileProvider.\(DropboxFileProvider.type).Operation"
+        operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
     }
     
     deinit {
@@ -87,7 +87,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
             if let response = response as? HTTPURLResponse {
                 let code = FileProviderHTTPErrorCode(rawValue: response.statusCode)
                 dbError = 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 = self.mapToFileObject(json) {
+                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) {
                     fileObject = file
                 }
             }

Sources/OneDriveHelper.swift

@@ -19,10 +19,32 @@ public struct FileProviderOneDriveError: Error, CustomStringConvertible {
 }
 
 public final class OneDriveFileObject: FileObject {
-    internal init(name: String, path: String) {
-        super.init(absoluteURL: URL(string: path), name: name, path: path)
+    internal init(baseURL: URL?, name: String, path: String) {
+        var rpath = path
+        if path.hasPrefix("/") {
+            rpath.remove(at: rpath.startIndex)
+        }
+        let url = URL(string: rpath, relativeTo: baseURL) ?? URL(string: path)!
+        super.init(url: url, name: name, path: path)
     }
     
+    internal convenience init? (baseURL: URL?, drive: String, jsonStr: String) {
+        guard let json = jsonToDictionary(jsonStr) 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)
+        self.init(baseURL: baseURL, name: name, path: lPath)
+        self.size = (json["size"] as? NSNumber)?.int64Value ?? -1
+        self.modifiedDate = resolve(dateString: json["lastModifiedDateTime"] as? String ?? "")
+        self.creationDate = resolve(dateString: json["createdDateTime"] as? String ?? "")
+        self.type = (json["folder"] as? String) != nil ? .directory : .regular
+        self.id = json["id"] as? String
+        self.entryTag = json["eTag"] as? String
+    }
     
     open internal(set) var id: String? {
         get {
@@ -74,7 +96,7 @@ internal extension OneDriveFileProvider {
                 let json = jsonToDictionary(jsonStr)
                 if let entries = json?["value"] as? [AnyObject] , entries.count > 0 {
                     for entry in entries {
-                        if let entry = entry as? [String: AnyObject], let file = self.mapToFileObject(entry) {
+                        if let entry = entry as? [String: AnyObject], let file = OneDriveFileObject(baseURL: self.baseURL, drive: self.drive, json: entry) {
                             files.append(file)
                         }
                     }
@@ -168,7 +190,7 @@ internal extension OneDriveFileProvider {
                 let json = jsonToDictionary(jsonStr)
                 if let entries = json?["value"] as? [AnyObject] , entries.count > 0 {
                     for entry in entries {
-                        if let entry = entry as? [String: AnyObject], let file = self.mapToFileObject(entry) {
+                        if let entry = entry as? [String: AnyObject], let file = OneDriveFileObject(baseURL: self.baseURL, drive: self.drive, json: entry) {
                             foundItem(file)
                         }
                     }
@@ -190,28 +212,6 @@ internal extension OneDriveFileProvider {
 // codebeat:enable[ARITY]
 
 internal extension OneDriveFileProvider {
-    func mapToFileObject(_ jsonStr: String) -> OneDriveFileObject? {
-        guard let json = jsonToDictionary(jsonStr) else { return nil }
-        return self.mapToFileObject(json)
-    }
-    
-    func mapToFileObject(_ json: [String: AnyObject]) -> OneDriveFileObject? {
-        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)
-        let fileObject = OneDriveFileObject(name: name, path: lPath)
-        if let webURL = json["webUrl"] as? String, let absolluteURL = URL(string: webURL) {
-            fileObject.absoluteURL = absolluteURL
-        }
-        fileObject.size = (json["size"] as? NSNumber)?.int64Value ?? -1
-        fileObject.modifiedDate = resolve(dateString: json["lastModifiedDateTime"] as? String ?? "")
-        fileObject.creationDate = resolve(dateString: json["createdDateTime"] as? String ?? "")
-        fileObject.type = (json["folder"] as? String) != nil ? .directory : .regular
-        fileObject.id = json["id"] as? String
-        fileObject.entryTag = json["eTag"] as? String
-        return fileObject
-    }
-    
     static let dateFormatter = DateFormatter()
     static let decimalFormatter = NumberFormatter()
     
@@ -252,7 +252,7 @@ internal extension OneDriveFileProvider {
             keys.append("Duration")
             dic["Duration"] = OneDriveFileProvider.formatshort(interval: TimeInterval(duration) / 1000)
         }
-        if let timeTakenStr = json["takenDateTime"] as? String, let timeTaken = self.resolve(dateString: timeTakenStr) {
+        if let timeTakenStr = json["takenDateTime"] as? String, let timeTaken = resolve(dateString: timeTakenStr) {
             keys.append("Date taken")
             OneDriveFileProvider.dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
             dic["Date taken"] = OneDriveFileProvider.dateFormatter.string(from: timeTaken)

Sources/SMBFileProvider.swift

@@ -25,10 +25,10 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {
         guard baseURL.uw_scheme.lowercased() == "smb" else {
             return nil
         }
-        self.baseURL = baseURL
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(SMBFileProvider.type)", attributes: DispatchQueue.Attributes.concurrent)
+        self.baseURL = baseURL.appendingPathComponent("")
+        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: DispatchQueue.Attributes.concurrent)
         operation_queue = OperationQueue()
-        operation_queue.name = "FileProvider.\(SMBFileProvider.type).Operation"
+        operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
         
         self.credential = credential
     }

Sources/WebDAVFileProvider.swift

@@ -8,30 +8,6 @@
 
 import Foundation
 
-public final class WebDavFileObject: FileObject {
-    internal init(absoluteURL: URL, name: String, path: String) {
-        super.init(absoluteURL: absoluteURL, name: name, path: path)
-    }
-    
-    open internal(set) var contentType: String {
-        get {
-            return allValues["NSURLContentTypeKey"] as? String ?? ""
-        }
-        set {
-            allValues["NSURLContentTypeKey"] = newValue
-        }
-    }
-    
-    open internal(set) var entryTag: String? {
-        get {
-            return allValues["NSURLEntryTagKey"] as? String
-        }
-        set {
-            allValues["NSURLEntryTagKey"] = newValue
-        }
-    }
-}
-
 /// Because this class uses NSURLSession, it's necessary to disable App Transport Security
 /// in case of using this class with unencrypted HTTP connection.
 
@@ -73,16 +49,16 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         if  !["http", "https"].contains(baseURL.uw_scheme.lowercased()) {
             return nil
         }
-        self.baseURL = baseURL
+        self.baseURL = baseURL.appendingPathComponent("")
         self.isPathRelative = true
         self.currentPath = ""
         self.useCache = false
         self.validatingCache = true
         self.cache = cache
         self.credential = credential
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(WebDAVFileProvider.type)", attributes: DispatchQueue.Attributes.concurrent)
+        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: DispatchQueue.Attributes.concurrent)
         operation_queue = OperationQueue()
-        operation_queue.name = "FileProvider.\(DropboxFileProvider.type).Operation"
+        operation_queue.name = "FileProvider.\(type(of: self).type).Operation"
     }
     
     deinit {
@@ -91,7 +67,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
     
     open func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
         let opType = FileOperationType.fetch(path: path)
-        let url = absoluteURL(path)
+        let url = self.url(of: path).appendingPathComponent("")
         var request = URLRequest(url: url)
         request.httpMethod = "PROPFIND"
         request.setValue("1", forHTTPHeaderField: "Depth")
@@ -105,12 +81,12 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
             }
             var fileObjects = [WebDavFileObject]()
             if let data = data {
-                let xresponse = self.parseXMLResponse(data)
-                for attr in xresponse {
+                let xresponse = DavResponse.parse(xmlResponse: data, baseURL: self.baseURL)
+                for attr in xresponse where attr.href != url {
                     if attr.href.path == url.path {
                         continue
                     }
-                    fileObjects.append(self.mapToFileObject(attr))
+                    fileObjects.append(WebDavFileObject(attr))
                 }
             }
             completionHandler(fileObjects, responseError ?? error)
@@ -118,7 +94,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
     }
     
     open func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
-        let url = absoluteURL(path)
+        let url = self.url(of: path)
         var request = URLRequest(url: url)
         request.httpMethod = "PROPFIND"
         request.setValue("1", forHTTPHeaderField: "Depth")
@@ -131,9 +107,9 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
                 responseError = FileProviderWebDavError(code: rCode, url: url)
             }
             if let data = data {
-                let xresponse = self.parseXMLResponse(data)
+                let xresponse = DavResponse.parse(xmlResponse: data, baseURL: self.baseURL)
                 if let attr = xresponse.first {
-                    completionHandler(self.mapToFileObject(attr), responseError ?? error)
+                    completionHandler(WebDavFileObject(attr), responseError ?? error)
                     return
                 }
             }
@@ -158,7 +134,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
             var totalSize: Int64 = -1
             var usedSize: Int64 = 0
             if let data = data {
-                let xresponse = self.parseXMLResponse(data)
+                let xresponse = DavResponse.parse(xmlResponse: data, baseURL: self.baseURL)
                 if let attr = xresponse.first {
                     totalSize = Int64(attr.prop["quota-available-bytes"] ?? "") ?? -1
                     usedSize = Int64(attr.prop["quota-used-bytes"] ?? "") ?? 0
@@ -178,7 +154,7 @@ extension WebDAVFileProvider: FileProviderOperations {
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        let url = absoluteURL((atPath as NSString).appendingPathComponent(folderName) + "/")
+        let url = self.url(of: atPath).appendingPathComponent(folderName, isDirectory: true)
         var request = URLRequest(url: url)
         request.httpMethod = "MKCOL"
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
@@ -200,7 +176,7 @@ extension WebDAVFileProvider: FileProviderOperations {
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        let url = absoluteURL(path).appendingPathComponent(fileName)
+        let url = self.url(of: path).appendingPathComponent(fileName)
         var request = URLRequest(url: url)
         request.httpMethod = "PUT"
         let task = session.uploadTask(with: request, from: data, completionHandler: { (data, response, error) in
@@ -244,10 +220,10 @@ extension WebDAVFileProvider: FileProviderOperations {
     }
     
     func doOperation(operation opType: FileOperationType, overwrite: Bool? = nil, completionHandler: SimpleCompletionHandler) -> OperationHandle?  {
-        let sourceURL = absoluteURL(opType.source!)
+        let sourceURL = self.url(of:opType.source!)
         var request = URLRequest(url: sourceURL)
         if let dest = opType.destination {
-            request.setValue(absoluteURL(dest).absoluteString, forHTTPHeaderField: "Destination")
+            request.setValue(url(of:dest).absoluteString, forHTTPHeaderField: "Destination")
         }
         switch opType {
         case .copy:
@@ -270,7 +246,7 @@ extension WebDAVFileProvider: FileProviderOperations {
                     responseError = FileProviderWebDavError(code: code, url: sourceURL)
                 }
                 if code == .multiStatus, let data = data {
-                    let xresponses = self.parseXMLResponse(data)
+                    let xresponses = DavResponse.parse(xmlResponse: data, baseURL: self.baseURL)
                     for xresponse in xresponses where (xresponse.status ?? 0) >= 300 {
                         completionHandler?(FileProviderWebDavError(code: code, url: sourceURL))
                     }
@@ -294,7 +270,7 @@ extension WebDAVFileProvider: FileProviderOperations {
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        let url = absoluteURL(toPath)
+        let url = self.url(of:toPath)
         var request = URLRequest(url: url)
         request.httpMethod = "PUT"
         let task = session.uploadTask(with: request, fromFile: localFile, completionHandler: { (data, response, error) in
@@ -316,7 +292,7 @@ extension WebDAVFileProvider: FileProviderOperations {
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        let url = absoluteURL(path)
+        let url = self.url(of:path)
         let request = URLRequest(url: url)
         let task = session.downloadTask(with: request, completionHandler: { (sourceFileURL, response, error) in
             var responseError: FileProviderWebDavError?
@@ -344,7 +320,7 @@ extension WebDAVFileProvider: FileProviderReadWrite {
     @discardableResult
     public func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
         let opType = FileOperationType.fetch(path: path)
-        let url = absoluteURL(path)
+        let url = self.url(of: path)
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
         if length > 0 {
@@ -370,7 +346,7 @@ extension WebDAVFileProvider: FileProviderReadWrite {
             return nil
         }
         // FIXME: lock destination before writing process
-        let url = atomically ? absoluteURL(path).appendingPathExtension("tmp") : absoluteURL(path)
+        let url = atomically ? self.url(of: path).appendingPathExtension("tmp") : self.url(of: path)
         var request = URLRequest(url: url)
         request.httpMethod = "PUT"
         if !overwrite {
@@ -379,7 +355,7 @@ extension WebDAVFileProvider: FileProviderReadWrite {
         let task = session.uploadTask(with: request, from: data, completionHandler: { (data, response, error) in
             var responseError: FileProviderWebDavError?
             if let code = (response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
-                responseError = FileProviderWebDavError(code: rCode, url: self.absoluteURL(path))
+                responseError = FileProviderWebDavError(code: rCode, url: self.url(of: path))
             }
             defer {
                 self.delegateNotify(opType, error: responseError ?? error)
@@ -398,7 +374,7 @@ extension WebDAVFileProvider: FileProviderReadWrite {
     }
     
     public func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
-        let url = absoluteURL(path)
+        let url = self.url(of: path)
         var request = URLRequest(url: url)
         request.httpMethod = "PROPFIND"
         //request.setValue("1", forHTTPHeaderField: "Depth")
@@ -411,14 +387,14 @@ extension WebDAVFileProvider: FileProviderReadWrite {
                 responseError = FileProviderWebDavError(code: rCode, url: url)
             }
             if let data = data {
-                let xresponse = self.parseXMLResponse(data)
+                let xresponse = DavResponse.parse(xmlResponse: data, baseURL: self.baseURL)
                 var fileObjects = [WebDavFileObject]()
                 for attr in xresponse {
                     let path = attr.href.path
                     if !((path as NSString).lastPathComponent.contains(query)) {
                         continue
                     }
-                    let fileObject = self.mapToFileObject(attr)
+                    let fileObject = WebDavFileObject(attr)
                     fileObjects.append(fileObject)
                     foundItemHandler?(fileObject)
                 }
@@ -458,37 +434,34 @@ extension WebDAVFileProvider: FileProvider {
 // MARK: WEBDAV XML response implementation
 
 internal extension WebDAVFileProvider {
-    struct DavResponse {
-        let href: URL
-        let hrefString: String
-        let status: Int?
-        let prop: [String: String]
+    fileprivate func delegateNotify(_ operation: FileOperationType, error: Error?) {
+        DispatchQueue.main.async(execute: {
+            if error == nil {
+                self.delegate?.fileproviderSucceed(self, operation: operation)
+            } else {
+                self.delegate?.fileproviderFailed(self, operation: operation)
+            }
+        })
     }
+}
+
+struct DavResponse {
+    let href: URL
+    let hrefString: String
+    let status: Int?
+    let prop: [String: String]
     
-    fileprivate func parseXMLResponse(_ response: Data) -> [DavResponse] {
-        var result = [DavResponse]()
-        do {
-            let xml = try AEXMLDocument(xml: response)
-            var rootnode = xml.root
-            var responsetag = "response"
-            for node in rootnode.all ?? [] where node.name.lowercased().hasSuffix("multistatus") {
-                rootnode = node
+    init? (_ node: AEXMLElement, baseURL: URL?) {
+        
+        func removeSlash(_ str: String) -> String {
+            if str.hasPrefix("/") {
+                return str.substring(from: str.index(after: str.startIndex))
+            } else {
+                return str
             }
-            for node in rootnode.children where node.name.lowercased().hasSuffix("response") {
-                responsetag = node.name
-                break
-            }
-            for responseNode in rootnode[responsetag].all ?? [] {
-                if let davResponse = mapNodeToDavResponse(responseNode) {
-                    result.append(davResponse)
-                }
-            }
-        } catch _ { 
         }
-        return result
-    }
-    
-    fileprivate func mapNodeToDavResponse(_ node: AEXMLElement) -> DavResponse? {
+        
+        // find node names with namespace
         var hreftag = "href"
         var statustag = "status"
         var propstattag = "propstat"
@@ -503,63 +476,107 @@ internal extension WebDAVFileProvider {
                 propstattag = node.name
             }
         }
-        let href = node[hreftag].value
-        if let href = href, let hrefURL = URL(string: href) {
-            var status: Int?
-            let statusDesc = (node[statustag].string).components(separatedBy: " ")
-            if statusDesc.count > 2 {
-                status = Int(statusDesc[1])
+        
+        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 hrefURL = URL(string: removeSlash(relativePath), relativeTo: baseURL) ?? baseURL
+        
+        guard let href = hrefURL?.standardized else { return nil }
+        
+        // reading status and properties
+        var status: Int?
+        let statusDesc = (node[statustag].string).components(separatedBy: " ")
+        if statusDesc.count > 2 {
+            status = Int(statusDesc[1])
+        }
+        var propDic = [String: String]()
+        let propStatNode = node[propstattag]
+        for node in propStatNode.children where node.name.lowercased().hasSuffix("status"){
+            statustag = node.name
+            break
+        }
+        let statusDesc2 = (propStatNode[statustag].string).components(separatedBy: " ")
+        if statusDesc2.count > 2 {
+            status = Int(statusDesc2[1])
+        }
+        var proptag = "prop"
+        for tnode in propStatNode.children where tnode.name.lowercased().hasSuffix("prop") {
+            proptag = tnode.name
+            break
+        }
+        for propItemNode in propStatNode[proptag].children {
+            propDic[propItemNode.name.components(separatedBy: ":").last!.lowercased()] = propItemNode.value
+            if propItemNode.name.hasSuffix("resourcetype") && propItemNode.xml.contains("collection") {
+                propDic["getcontenttype"] = "httpd/unix-directory"
             }
-            var propDic = [String: String]()
-            let propStatNode = node[propstattag]
-            for node in propStatNode.children where node.name.lowercased().hasSuffix("status"){
-                statustag = node.name
+        }
+        self.href = href
+        self.hrefString = hrefString
+        self.status = status
+        self.prop = propDic
+    }
+    
+    static func parse(xmlResponse: Data, baseURL: URL?) -> [DavResponse] {
+        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
+            }
+            for node in rootnode.children where node.name.lowercased().hasSuffix("response") {
+                responsetag = node.name
                 break
             }
-            let statusDesc2 = (propStatNode[statustag].string).components(separatedBy: " ")
-            if statusDesc2.count > 2 {
-                status = Int(statusDesc2[1])
-            }
-            var proptag = "prop"
-            for tnode in propStatNode.children where tnode.name.lowercased().hasSuffix("prop") {
-                proptag = tnode.name
-                break
-            }
-            for propItemNode in propStatNode[proptag].children {
-                propDic[propItemNode.name.components(separatedBy: ":").last!.lowercased()] = propItemNode.value
-                if propItemNode.name.hasSuffix("resourcetype") && propItemNode.xml.contains("collection") {
-                    propDic["getcontenttype"] = "httpd/unix-directory"
+            for responseNode in rootnode[responsetag].all ?? [] {
+                if let davResponse = DavResponse(responseNode, baseURL: baseURL) {
+                    result.append(davResponse)
                 }
             }
-            return DavResponse(href: hrefURL, hrefString: href, status: status, prop: propDic)
+        } catch _ {
         }
-        return nil
+        return result
     }
-    
-    fileprivate func mapToFileObject(_ davResponse: DavResponse) -> WebDavFileObject {
-        var href = davResponse.href
-        if href.baseURL == nil {
-            href = absoluteURL(href.path)
-        }
+}
+
+public final class WebDavFileObject: FileObject {
+    internal init(_ davResponse: DavResponse) {
+        let href = davResponse.href
         let name = davResponse.prop["displayname"] ?? (davResponse.hrefString.removingPercentEncoding! as NSString).lastPathComponent
-        let fileObject = WebDavFileObject(absoluteURL: href, name: name, path: href.path)
-        fileObject.size = Int64(davResponse.prop["getcontentlength"] ?? "-1") ?? NSURLSessionTransferSizeUnknown
-        fileObject.creationDate = self.resolve(dateString: davResponse.prop["creationdate"] ?? "")
-        fileObject.modifiedDate = self.resolve(dateString: davResponse.prop["getlastmodified"] ?? "")
-        fileObject.contentType = davResponse.prop["getcontenttype"] ?? "octet/stream"
-        fileObject.type = fileObject.contentType == "httpd/unix-directory" ? .directory : .regular
-        fileObject.entryTag = davResponse.prop["getetag"]
-        return fileObject
+        let relativePath = href.relativePath
+        let path = relativePath.hasPrefix("/") ? relativePath : ("/" + relativePath)
+        super.init(url: href, name: name, path: path)
+        self.size = Int64(davResponse.prop["getcontentlength"] ?? "-1") ?? NSURLSessionTransferSizeUnknown
+        self.creationDate = resolve(dateString: davResponse.prop["creationdate"] ?? "")
+        self.modifiedDate = resolve(dateString: davResponse.prop["getlastmodified"] ?? "")
+        self.contentType = davResponse.prop["getcontenttype"] ?? "octet/stream"
+        self.isHidden = (Int(davResponse.prop["ishidden"] ?? "0") ?? 0) > 0
+        self.type = self.contentType == "httpd/unix-directory" ? .directory : .regular
+        self.entryTag = davResponse.prop["getetag"]
     }
     
-    fileprivate func delegateNotify(_ operation: FileOperationType, error: Error?) {
-        DispatchQueue.main.async(execute: {
-            if error == nil {
-                self.delegate?.fileproviderSucceed(self, operation: operation)
-            } else {
-                self.delegate?.fileproviderFailed(self, operation: operation)
-            }
-        })
+    /// MIME type of the file
+    open internal(set) var contentType: String {
+        get {
+            return allValues["NSURLContentTypeKey"] as? String ?? ""
+        }
+        set {
+            allValues["NSURLContentTypeKey"] = newValue
+        }
+    }
+    
+    /// HTTP E-Tag, can be used to mark changed files
+    open internal(set) var entryTag: String? {
+        get {
+            return allValues["NSURLEntryTagKey"] as? String
+        }
+        set {
+            allValues["NSURLEntryTagKey"] = newValue
+        }
     }
 }