Refactored Dropbox, WebDAV & OneDrive to HTTPFileProvider

- FileOperationType.source is not optional anymore
- critical bugfix: KVO exception crash on task completion

FilesProvider.podspec

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

FilesProvider.xcodeproj/project.pbxproj

@@ -50,6 +50,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 */; };
+		7958155A1F478ED9003344DD /* HTTPFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 795815591F478ED9003344DD /* HTTPFileProvider.swift */; };
+		7958155B1F478ED9003344DD /* HTTPFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 795815591F478ED9003344DD /* HTTPFileProvider.swift */; };
+		7958155C1F478ED9003344DD /* HTTPFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 795815591F478ED9003344DD /* HTTPFileProvider.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 */; };
@@ -144,6 +147,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>"; };
+		795815591F478ED9003344DD /* HTTPFileProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPFileProvider.swift; sourceTree = "<group>"; };
 		796807541E7BF17E00BBB87B /* FileProviderExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileProviderExtensions.swift; sourceTree = "<group>"; };
 		798654321E8874BC002FA550 /* FTPHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTPHelper.swift; sourceTree = "<group>"; };
 		799396671D48B7F600086753 /* FilesProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FilesProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -299,17 +303,18 @@
 				792572401DF23BDA006A1526 /* LocalHelper.swift */,
 				79480FF51E3ABDD0007E7275 /* CloudFileProvider.swift */,
 				79BD638B1E2CC2300035128C /* ExtendedLocalFileProvider.swift */,
+				7924B1A81D89F79200589DB7 /* FPSStreamTask.swift */,
 				7902C0851D61B56D00564440 /* RemoteSession.swift */,
+				795815591F478ED9003344DD /* HTTPFileProvider.swift */,
 				799396931D48C02300086753 /* DropboxFileProvider.swift */,
 				794C21FD1D58912A00EC49B8 /* DropboxHelper.swift */,
-				7936BC111E880F5700A6C81C /* FTPFileProvider.swift */,
-				798654321E8874BC002FA550 /* FTPHelper.swift */,
 				79BD63C31E2D17880035128C /* OneDriveFileProvider.swift */,
 				79BD63C41E2D17880035128C /* OneDriveHelper.swift */,
-				7924B1A81D89F79200589DB7 /* FPSStreamTask.swift */,
+				799396A61D48C02300086753 /* WebDAVFileProvider.swift */,
+				7936BC111E880F5700A6C81C /* FTPFileProvider.swift */,
+				798654321E8874BC002FA550 /* FTPHelper.swift */,
 				799396971D48C02300086753 /* SMBClient.swift */,
 				799396981D48C02300086753 /* SMBFileProvider.swift */,
-				799396A61D48C02300086753 /* WebDAVFileProvider.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -502,6 +507,7 @@
 				7924B1991D89DAE000589DB7 /* Element.swift in Sources */,
 				799396C81D48C02300086753 /* SMB2IOCtl.swift in Sources */,
 				799396D71D48C02300086753 /* SMB2Types.swift in Sources */,
+				7958155A1F478ED9003344DD /* HTTPFileProvider.swift in Sources */,
 				798654331E8874BC002FA550 /* FTPHelper.swift in Sources */,
 				7924B1B21D89FCDA00589DB7 /* FPSStreamTask.swift in Sources */,
 				799396C51D48C02300086753 /* SMB2FileOperation.swift in Sources */,
@@ -545,6 +551,7 @@
 				7924B1B01D89F7DE00589DB7 /* FPSStreamTask.swift in Sources */,
 				7924B19A1D89DAE000589DB7 /* Element.swift in Sources */,
 				799396C91D48C02300086753 /* SMB2IOCtl.swift in Sources */,
+				7958155B1F478ED9003344DD /* HTTPFileProvider.swift in Sources */,
 				79F4678B1E8B80F200C91A85 /* FTPHelper.swift in Sources */,
 				799396D81D48C02300086753 /* SMB2Types.swift in Sources */,
 				799396C61D48C02300086753 /* SMB2FileOperation.swift in Sources */,
@@ -588,6 +595,7 @@
 				7924B1B11D89F7DF00589DB7 /* FPSStreamTask.swift in Sources */,
 				7924B19B1D89DAE000589DB7 /* Element.swift in Sources */,
 				799396CA1D48C02300086753 /* SMB2IOCtl.swift in Sources */,
+				7958155C1F478ED9003344DD /* HTTPFileProvider.swift in Sources */,
 				79F4678C1E8B80F200C91A85 /* FTPHelper.swift in Sources */,
 				799396D91D48C02300086753 /* SMB2Types.swift in Sources */,
 				799396C71D48C02300086753 /* SMB2FileOperation.swift in Sources */,
@@ -621,7 +629,7 @@
 		799396601D48B7BF00086753 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.18.1;
+				BUNDLE_VERSION_STRING = 0.20.0;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -653,7 +661,7 @@
 		799396611D48B7BF00086753 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.18.1;
+				BUNDLE_VERSION_STRING = 0.20.0;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;

README.md

@@ -356,6 +356,12 @@ documentsProvider.copyItem(path: "/download/image.jpg", toLocalURL: fileURL, ove
 * It's safe only to assume these methods **won't** handle directories to upload/download recursively. If you need, you can list directories, create directories on target and copy files using these methods.
 * FTP provider allows developer to either use apple implemented `URLSessionDownloadTask` or custom implemented method based on stream task via `useAppleImplementation` property. FTP protocol is not supported by background session.
 
+### Operation Progress
+
+Creating/Copying/Deleting/Searching functions return a `(NS)Progress`. It provides operation type, progress and a `.cancel()` method which allows you to cancel operation in midst. You can check `cancellable` property to check either you can cancel operation via this object or not.
+
+- **Note:** Progress reporting is not supported by native `(NS)FileManager` so `LocalFileProvider`.
+
 ### Undo Operations
 
 Providers conform to `FileProviderUndoable` can perform undo for **some** operations like moving/renaming, copying and creating (file or folder). **Now, only `LocalFileProvider` supports this feature.** To implement:
@@ -399,12 +405,6 @@ class ViewController: UIViewController
 }
 ```
 
-### Operation Handle
-
-Creating/Copying/Deleting functions return a `OperationHandle` for remote operations. It provides operation type, progress and a `.cancel()` method which allows you to cancel operation in midst.
-
-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.

Sources/CloudFileProvider.swift

@@ -52,7 +52,7 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
      - Parameter scope: Use `.documents` (default) to put documents that the user is allowed to access inside a Documents subdirectory. Otherwise use `.data` to store user-related data files that your app needs to share but that are not files you want the user to manipulate directly.
     */
     public init? (containerId: String?, scope: UbiquitousScope = .documents) {
-        assert(!CloudFileProvider.asserting || !Thread.isMainThread, "LocalFileProvider.init(containerId:) is not recommended to be executed on Main Thread.")
+        assert(!(CloudFileProvider.asserting && Thread.isMainThread), "CloudFileProvider.init(containerId:) is not recommended to be executed on Main Thread.")
         guard FileManager.default.ubiquityIdentityToken != nil else {
             return nil
         }
@@ -243,13 +243,13 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
      - Note: For now only it's limited to file names. `query` parameter may take `NSPredicate` format in near future.
      
      - Parameters:
-     - path: location of directory to start search
-     - recursive: Searching subdirectories of path
-     - query: Simple string of file name to be search (for now).
-     - 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.
+         - path: location of directory to start search
+         - recursive: Searching subdirectories of path
+         - query: Simple string of file name to be search (for now).
+         - 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.
      */
-    open override func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
+    open override func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
         
         let mapDict: [String: String] = ["url": NSMetadataItemURLKey, "name": NSMetadataItemFSNameKey, "path": NSMetadataItemPathKey, "filesize": NSMetadataItemFSSizeKey, "modifiedDate": NSMetadataItemFSContentChangeDateKey, "creationDate": NSMetadataItemFSCreationDateKey, "contentType": NSMetadataItemContentTypeKey]
         
@@ -282,14 +282,21 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
             }
         }
         
+        let progress = Progress(parent: nil, userInfo: nil)
+        
         dispatch_queue.async {
             let pathURL = self.url(of: path)
+            progress.setUserInfoObject(pathURL, forKey: .fileURLKey)
             let mdquery = NSMetadataQuery()
             mdquery.predicate = NSPredicate(format: "(%K BEGINSWITH %@) && (\(updateQueryKeys(query).predicateFormat))", NSMetadataItemPathKey, pathURL.path)
             mdquery.searchScopes = [self.scope.rawValue]
             
             var lastReportedCount = 0
             
+            progress.cancellationHandler = { [weak mdquery] in
+                mdquery?.stop()
+            }
+            
             if let foundItemHandler = foundItemHandler {
                 var updateObserver: NSObjectProtocol?
                 
@@ -314,6 +321,7 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
                         }
                     }
                     lastReportedCount = mdquery.resultCount
+                    progress.totalUnitCount = Int64(lastReportedCount)
                     
                     mdquery.enableUpdates()
                 })
@@ -346,12 +354,14 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
                         contents.append(file)
                     }
                 }
+                progress.completedUnitCount = Int64(contents.count)
                 self.dispatch_queue.async {
                     completionHandler(contents, nil)
                 }
             })
             
             DispatchQueue.main.async {
+                progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
                 if !mdquery.start() {
                     self.dispatch_queue.async {
                         completionHandler([], self.throwError(path, code: CocoaError.fileReadNoPermission))
@@ -359,6 +369,8 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
                 }
             }
         }
+        
+        return progress
     }
     
     open override func isReachable(completionHandler: @escaping (Bool) -> Void) {
@@ -375,10 +387,10 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - folder: Directory name.
        - at: Parent path of new directory.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
+     - Returns: A `Progress` object to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
      */
     @discardableResult
-    open override func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open override func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         return super.create(folder: folderName, at: atPath, completionHandler: completionHandler)
     }
     
@@ -392,10 +404,10 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - to: destination path of file or directory, including file/directory name.
        - overwrite: Destination file should be overwritten if file is already exists. **Default** is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
+     - Returns: A `Progress` object to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
      */
     @discardableResult
-    open override func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open override func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> Progress? {
         return super.moveItem(path: path, to: toPath, overwrite: overwrite, completionHandler: completionHandler)
     }
     
@@ -409,10 +421,10 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - to: destination path of file or directory, including file/directory name.
        - overwrite: Destination file should be overwritten if file is already exists. **Default** is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
+     - Returns: A `Progress` object to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
      */
     @discardableResult
-    open override func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open override func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> Progress? {
         return super.copyItem(path: path, to: toPath, overwrite: overwrite, completionHandler: completionHandler)
     }
     
@@ -426,11 +438,10 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
      - Parameters:
        - path: file or directory path.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
-     
+     - Returns: A `Progress` object to get progress or cancel progress. Doesn't work on `CloudFileProvider`.
      */
     @discardableResult
-    open override func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open override func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         return super.removeItem(path: path, completionHandler: completionHandler)
     }
     
@@ -443,13 +454,19 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - to: destination path of file, including file/directory name.
        - overwrite: Destination file should be overwritten if file is already exists. **Default** is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress.
+     - Returns: A `Progress` object to get progress or cancel progress.
      */
     @discardableResult
-    open override func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open override func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         // TODO: Make use of overwrite parameter
         let opType = FileOperationType.copy(source: localFile.absoluteString, destination: toPath)
-        let operationHandle =  CloudOperationHandle(operationType: opType, baseURL: self.baseURL)
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.isCancellable = false
+        progress.setUserInfoObject(localFile, forKey: .fileURLKey)
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        monitorFile(path: toPath, opType: opType, progress: progress)
         operation_queue.addOperation {
             let tempFolder: URL
             if #available(iOS 10.0, macOS 10.12, tvOS 10.0, *) {
@@ -477,7 +494,7 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
                 })
             }
         }
-        return operationHandle
+        return progress
     }
     
     /**
@@ -488,12 +505,18 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - path: original file or directory path.
        - toLocalURL: destination local url of file, including file/directory name.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress.
+     - Returns: A `Progress` object to get progress or cancel progress.
      */
     @discardableResult
-    open override func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open override func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.copy(source: path, destination: toLocalURL.absoluteString)
-        
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.isCancellable = false
+        progress.setUserInfoObject(self.url(of: path), forKey: .fileURLKey)
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        monitorFile(path: path, opType: opType, progress: progress)
         do {
             try self.opFileManager.startDownloadingUbiquitousItem(at: self.url(of: path))
         } catch let e {
@@ -503,8 +526,8 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
             })
             return nil
         }
-        let handle = super.copyItem(path: path, toLocalURL: toLocalURL, completionHandler: completionHandler)
-        return handle
+        let _ = super.copyItem(path: path, toLocalURL: toLocalURL, completionHandler: completionHandler)
+        return progress
     }
     
     /**
@@ -516,11 +539,19 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - completionHandler: a closure with result of file contents or error.
          `contents`: contents of file in a `Data` object.
          `error`: Error returned by system.
-     - Returns: An `OperationHandle` to get progress or cancel progress.
+     - Returns: A `Progress` object to get progress or cancel progress.
      */
     @discardableResult
-    open override func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        return super.contents(path: path, completionHandler: completionHandler)
+    open override func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
+        let operation = FileOperationType.fetch(path: path)
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(operation, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(self.url(of: path), forKey: .fileURLKey)
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        monitorFile(path: path, opType: operation, progress: progress)
+        _ = super.contents(path: path, completionHandler: completionHandler)
+        return progress
     }
     
     /**
@@ -534,11 +565,19 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - completionHandler: a closure with result of file contents or error.
          `contents`: contents of file in a `Data` object.
          `error`: Error returned by system.
-     - Returns: An `OperationHandle` to get progress or cancel progress.
+     - Returns: A `Progress` object to get progress or cancel progress.
      */
     @discardableResult
-    open override func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        return super.contents(path: path, offset: offset, length: length, completionHandler: completionHandler)
+    open override func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
+        let operation = FileOperationType.fetch(path: path)
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(operation, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(self.url(of: path), forKey: .fileURLKey)
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        monitorFile(path: path, opType: operation, progress: progress)
+        _ = super.contents(path: path, offset: offset, length: length, completionHandler: completionHandler)
+        return progress
     }
     
     /**
@@ -550,11 +589,19 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        - overwrite: Destination file should be overwritten if file is already exists. Default is `false`.
        - atomically: data will be written to a temporary file before writing to final location. Default is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: A `Progress` object to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    open override func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        return super.writeContents(path: path, contents: data, atomically: atomically, overwrite: overwrite, completionHandler: completionHandler)
+    open override func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let operation = FileOperationType.fetch(path: path)
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(operation, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(self.url(of: path), forKey: .fileURLKey)
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        monitorFile(path: path, opType: operation, progress: progress)
+        _ = super.writeContents(path: path, contents: data, atomically: atomically, overwrite: overwrite, completionHandler: completionHandler)
+        return progress
     }
     
     fileprivate var monitors = [String: (NSMetadataQuery, NSObjectProtocol)]()
@@ -639,32 +686,40 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
         return file
     }
     
-    func monitorFile(path: String, opType: FileOperationType) {
+    fileprivate func monitorFile(path: String, opType: FileOperationType, progress: Progress?) {
         dispatch_queue.async {
             let pathURL = self.url(of: path)
+            let size = pathURL.fileSize
+            progress?.totalUnitCount = size > 0 ? size : 0
             let query = NSMetadataQuery()
             query.predicate = NSPredicate(format: "%K LIKE %@", NSMetadataItemPathKey, pathURL.path)
             query.valueListAttributes = [NSMetadataItemURLKey, NSMetadataItemFSNameKey, NSMetadataItemPathKey, NSMetadataUbiquitousItemPercentDownloadedKey, NSMetadataUbiquitousItemPercentUploadedKey, NSMetadataItemFSSizeKey]
             query.searchScopes = [self.scope.rawValue]
             var updateObserver: NSObjectProtocol?
-            updateObserver = NotificationCenter.default.addObserver(forName: .NSMetadataQueryDidFinishGathering, object: query, queue: nil, using: { (notification) in
+            updateObserver = NotificationCenter.default.addObserver(forName: .NSMetadataQueryDidUpdate, object: query, queue: nil, using: { (notification) in
                 query.disableUpdates()
                 
                 guard let item = (query.results as? [NSMetadataItem])?.first else {
                     return
                 }
                 
+                if progress?.totalUnitCount == 0, let size = item.value(forAttribute: NSMetadataItemFSSizeKey) as? Int64 {
+                    progress?.totalUnitCount = size
+                }
                 let downloaded = item.value(forAttribute: NSMetadataUbiquitousItemPercentDownloadedKey) as? Double ?? 0
                 let uploaded = item.value(forAttribute: NSMetadataUbiquitousItemPercentUploadedKey) as? Double ?? 0
                 if (downloaded == 0 || downloaded == 100) && (uploaded > 0 && uploaded < 100) {
+                    progress?.completedUnitCount = Int64(uploaded / 100 * Double(progress?.totalUnitCount ?? 0))
                     DispatchQueue.main.async {
                         self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(uploaded / 100))
                     }
                 } else if (uploaded == 0 || uploaded == 100) && (downloaded > 0 && downloaded < 100) {
+                    progress?.completedUnitCount = Int64(downloaded / 100 * Double(progress?.totalUnitCount ?? 0))
                     DispatchQueue.main.async {
                         self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(downloaded / 100))
                     }
                 } else if uploaded == 100 || downloaded == 100 {
+                    progress?.completedUnitCount = progress?.totalUnitCount ?? 0
                     query.stop()
                     NotificationCenter.default.removeObserver(updateObserver!)
                     DispatchQueue.main.async {
@@ -676,25 +731,12 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
             })
             
             DispatchQueue.main.async {
+                progress?.setUserInfoObject(Date(), forKey: .startingTimeKey)
                 query.start()
             }
         }
     }
     
-    /// Removes local copy of file, but spares cloud copy/
-    /// - Parameter path: Path of file or directory to be remoed from local
-    /// - Parameter completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-    open func evictItem(path: String, completionHandler: SimpleCompletionHandler) {
-        operation_queue.addOperation {
-            do {
-                try self.opFileManager.evictUbiquitousItem(at: self.url(of: path))
-                completionHandler?(nil)
-            } catch let e {
-                completionHandler?(e)
-            }
-        }
-    }
-    
     open func publicLink(to path: String, completionHandler: @escaping ((_ link: URL?, _ attribute: FileObject?, _ expiration: Date?, _ error: Error?) -> Void)) {
         operation_queue.addOperation {
             do {
@@ -712,6 +754,38 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
     }
 }
 
+extension CloudFileProvider {
+    
+    /// Removes local copy of file, but spares cloud copy.
+    /// - Parameter path: Path of file or directory to be removed from local
+    /// - Parameter completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
+    open func evictItem(path: String, completionHandler: SimpleCompletionHandler) {
+        operation_queue.addOperation {
+            do {
+                try self.opFileManager.evictUbiquitousItem(at: self.url(of: path))
+                completionHandler?(nil)
+            } catch let e {
+                completionHandler?(e)
+            }
+        }
+    }
+    
+    /// Returns current version of file on this device and all versions of files in user devices.
+    /// - Parameter path: Path of file or directory.
+    /// - Parameter completionHandler: Retrieve current version on this device and all versions available. `currentVersion` will be nil if file doesn't exist. If an error parameter was provided, a presentable `Error` will be returned.
+    func versionsOfItem(path: String, completionHandler: @escaping ((_ currentVersion: NSFileVersion?, _ versions: [NSFileVersion], _ error: Error?) -> Void)) {
+        NotImplemented()
+    }
+    
+    /// Resolves conflicts by selecting a version.
+    /// - Parameter path: Path of file or directory.
+    /// - Parameter version: Version than will be choose as main version. `nil` value indicates current version on this device will be selected.
+    /// - Parameter completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
+    func selectVersionOfItem(path: String, version: NSFileVersion? = nil, completionHandler: SimpleCompletionHandler) {
+        NotImplemented()
+    }
+}
+
 /// Scope of iCloud, wrapper for NSMetadataQueryUbiquitous...Scope constants
 public enum UbiquitousScope: RawRepresentable {
     /// Search all files not in the Documents directories of the app’s iCloud container directories.
@@ -745,92 +819,36 @@ public enum UbiquitousScope: RawRepresentable {
     }
 }
 
-/// Get progress of CloudFileProvider operations
-open class CloudOperationHandle: OperationHandle {
-    /// Url of file which operation is doing on
-    public let baseURL: URL?
-    /// Type of operation
-    public let operationType: FileOperationType
+/*
+func getMetadataItem(url: URL) -> NSMetadataItem? {
+    let query = NSMetadataQuery()
+    query.predicate = NSPredicate(format: "(%K LIKE %@)", NSMetadataItemPathKey, url.path)
+    query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope, NSMetadataQueryUbiquitousDataScope]
     
-    init (operationType: FileOperationType, baseURL: URL?) {
-        self.baseURL = baseURL
-        self.operationType = operationType
-    }
+    var item: NSMetadataItem?
     
-    private var sourceURL: URL? {
-        guard let source = operationType.source, let baseURL = baseURL else { return nil }
-        return source.hasPrefix("file://") ? URL(fileURLWithPath: source) : baseURL.appendingPathComponent(source)
-    }
-    
-    private var destURL: URL? {
-        guard let dest = operationType.destination, let baseURL = baseURL else { return nil }
-        return dest.hasPrefix("file://") ? URL(fileURLWithPath: dest) : baseURL.appendingPathComponent(dest)
-    }
-    
-    open var bytesSoFar: Int64 {
-        assert(!Thread.isMainThread, "Don't run \(#function) method on main thread")
-        
-        guard let url = destURL ?? sourceURL, let item = CloudOperationHandle.getMetadataItem(url: url) else { return 0 }
-        let downloaded = item.value(forAttribute: NSMetadataUbiquitousItemPercentDownloadedKey) as? Double ?? 0
-        let uploaded = item.value(forAttribute: NSMetadataUbiquitousItemPercentUploadedKey) as? Double ?? 0
-        guard let size = item.value(forAttribute: NSMetadataItemFSSizeKey) as? Int64 else { return -1 }
-        if (downloaded == 0 || downloaded == 100) && (uploaded > 0 && uploaded < 100) {
-            return Int64(uploaded * (Double(size) / 100))
-        } else if (uploaded == 0 || uploaded == 100) && (downloaded > 0 && downloaded < 100) {
-            return Int64(downloaded * (Double(size) / 100))
-        } else if uploaded == 100 || downloaded == 100 {
-            return size
+    let group = DispatchGroup()
+    group.enter()
+    var finishObserver: NSObjectProtocol?
+    finishObserver = NotificationCenter.default.addObserver(forName: .NSMetadataQueryDidFinishGathering, object: query, queue: nil, using: { (notification) in
+        defer {
+            query.stop()
+            group.leave()
+            NotificationCenter.default.removeObserver(finishObserver!)
         }
-        return 0
-    }
-    
-    open var totalBytes: Int64 {
-        assert(!Thread.isMainThread, "Don't run \(#function) method on main thread")
-        guard let url = destURL ?? sourceURL, let item = CloudOperationHandle.getMetadataItem(url: url) else { return -1 }
-        return item.value(forAttribute: NSMetadataItemFSSizeKey) as? Int64 ?? -1
-    }
-    
-    open var inProgress: Bool {
-        guard let url = destURL ?? sourceURL, let item = CloudOperationHandle.getMetadataItem(url: url) else { return false }
-        let downloadStatus = item.value(forAttribute: NSMetadataUbiquitousItemDownloadingStatusKey) as? String ?? NSMetadataUbiquitousItemDownloadingStatusNotDownloaded
-        let isUploading = item.value(forAttribute: NSMetadataUbiquitousItemIsUploadingKey) as? Bool ?? false
-        return downloadStatus == NSMetadataUbiquitousItemDownloadingStatusCurrent || isUploading
-    }
-    
-    /// Not usable in local provider
-    open func cancel() -> Bool {
-        return false
-    }
-    
-    fileprivate static func getMetadataItem(url: URL) -> NSMetadataItem? {
-        let query = NSMetadataQuery()
-        query.predicate = NSPredicate(format: "(%K LIKE %@)", NSMetadataItemPathKey, url.path)
-        query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope, NSMetadataQueryUbiquitousDataScope]
         
-        var item: NSMetadataItem?
-        
-        let group = DispatchGroup()
-        group.enter()
-        var finishObserver: NSObjectProtocol?
-        finishObserver = NotificationCenter.default.addObserver(forName: .NSMetadataQueryDidFinishGathering, object: query, queue: nil, using: { (notification) in
-            defer {
-                query.stop()
-                group.leave()
-                NotificationCenter.default.removeObserver(finishObserver!)
-            }
-            
-            if query.resultCount > 0 {
-                item = query.result(at: 0) as? NSMetadataItem
-            }
-            
-            query.disableUpdates()
-            
-        })
-        
-        DispatchQueue.main.async {
-            query.start()
+        if query.resultCount > 0 {
+            item = query.result(at: 0) as? NSMetadataItem
         }
-        _ = group.wait(timeout: .now() + 30)
-        return item
+        
+        query.disableUpdates()
+        
+    })
+    
+    DispatchQueue.main.async {
+        query.start()
     }
+    _ = group.wait(timeout: .now() + 30)
+    return item
 }
+*/

Sources/DropboxFileProvider.swift

@@ -16,70 +16,14 @@ import CoreGraphics
  
  - Note: Uploading files and data are limited to 150MB, for now.
  */
-open class DropboxFileProvider: FileProviderBasicRemote {
-    open class var type: String { return "Dropbox" }
-    open let baseURL: URL?
-    open var currentPath: String
+open class DropboxFileProvider: HTTPFileProvider {
+    override open class var type: String { return "Dropbox" }
     
     /// Dropbox RPC API URL, which is equal with [https://api.dropboxapi.com/2/](https://api.dropboxapi.com/2/)
     open let apiURL: URL
     /// Dropbox contents download/upload API URL, which is equal with [https://content.dropboxapi.com/2/](https://content.dropboxapi.com/2/)
     open let contentURL: URL
     
-    open var dispatch_queue: DispatchQueue
-    open var operation_queue: OperationQueue {
-        willSet {
-            assert(_session == nil, "It's not effective to change dispatch_queue property after session is initialized.")
-        }
-    }
-    
-    open weak var delegate: FileProviderDelegate?
-    open var credential: URLCredential? {
-        didSet {
-            sessionDelegate?.credential = self.credential
-        }
-    }
-    open private(set) var cache: URLCache?
-    public var useCache: Bool
-    public var validatingCache: Bool
-   
-    fileprivate var _session: URLSession?
-    fileprivate var sessionDelegate: SessionDelegate?
-    public var session: URLSession {
-        get {
-            if _session == nil {
-                self.sessionDelegate = SessionDelegate(fileProvider: self)
-                let config = URLSessionConfiguration.default
-                config.urlCache = cache
-                config.requestCachePolicy = .returnCacheDataElseLoad
-                _session = URLSession(configuration: config, delegate: sessionDelegate as URLSessionDelegate?, delegateQueue: self.operation_queue)
-                _session!.sessionDescription = UUID().uuidString
-                initEmptySessionHandler(_session!.sessionDescription!)
-            }
-            return _session!
-        }
-        
-        set {
-            assert(newValue.delegate is SessionDelegate, "session instances should have a SessionDelegate instance as delegate.")
-            _session = newValue
-            if session.sessionDescription?.isEmpty ?? true {
-                _session?.sessionDescription = UUID().uuidString
-            }
-            self.sessionDelegate = newValue.delegate as? SessionDelegate
-            initEmptySessionHandler(_session!.sessionDescription!)
-        }
-    }
-    
-    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).
@@ -91,24 +35,9 @@ open class DropboxFileProvider: FileProviderBasicRemote {
      - Parameter cache: A URLCache to cache downloaded files and contents.
     */
     public init(credential: URLCredential?, cache: URLCache? = nil) {
-        self.baseURL = nil
-        self.currentPath = ""
-        self.useCache = false
-        self.validatingCache = true
-        self.cache = cache
-        self.credential = credential
-        
         self.apiURL = URL(string: "https://api.dropboxapi.com/2/")!
         self.contentURL = URL(string: "https://content.dropboxapi.com/2/")!
-        
-        #if swift(>=3.1)
-        let queueLabel = "FileProvider.\(Swift.type(of: self).type)"
-        #else
-        let queueLabel = "FileProvider.\(type(of: self).type)"
-        #endif
-        dispatch_queue = DispatchQueue(label: queueLabel, attributes: .concurrent)
-        operation_queue = OperationQueue()
-        operation_queue.name = "\(queueLabel).Operation"
+        super.init(baseURL: nil, credential: credential, cache: cache)
     }
     
     public required convenience init?(coder aDecoder: NSCoder) {
@@ -118,18 +47,7 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         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 {
+    override 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
@@ -139,26 +57,14 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         return copy
     }
     
-    deinit {
-        if let sessionuuid = _session?.sessionDescription {
-            removeSessionHandler(for: sessionuuid)
-        }
-        
-        if fileProviderCancelTasksOnInvalidating {
-            _session?.invalidateAndCancel()
-        } else {
-            _session?.finishTasksAndInvalidate()
-        }
-        
-    }
-    
-    open func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
-        list(path) { (contents, cursor, error) in
+    open override func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
+        let progress = Progress(parent: nil, userInfo: nil)
+        list(path, progress: progress) { (contents, cursor, error) in
             completionHandler(contents, error)
         }
     }
     
-    open func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
+    open override func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
         let url = URL(string: "files/get_metadata", relativeTo: apiURL)!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
@@ -181,7 +87,7 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         task.resume()
     }
     
-    open func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
+    open override func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
         let url = URL(string: "users/get_space_usage", relativeTo: apiURL)!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
@@ -198,12 +104,13 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         task.resume()
     }
     
-    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
+    open override func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
+        let progress = Progress(parent: nil, userInfo: nil)
         var foundFiles = [DropboxFileObject]()
         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
+            search(path, query: queryStr, progress: progress, foundItem: { (file) in
                 if query.evaluate(with: file.mapPredicate()) {
                     foundFiles.append(file)
                     foundItemHandler?(file)
@@ -214,7 +121,7 @@ open class DropboxFileProvider: FileProviderBasicRemote {
         } 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
+            list(path, recursive: true, progress: progress, progressHandler: { (files, _, error) in
                 for file in files where query.evaluate(with: file.mapPredicate()) {
                     foundItemHandler?(file)
                 }
@@ -223,41 +130,60 @@ open class DropboxFileProvider: FileProviderBasicRemote {
                 completionHandler(predicatedFiles, error)
             })
         }
+        return progress
     }
     
-    open func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    open override func isReachable(completionHandler: @escaping (Bool) -> Void) {
         self.storageProperties { total, _ in
             completionHandler(total > 0)
         }
     }
     
-    open weak var fileOperationDelegate: FileOperationDelegate?
-}
-
-extension DropboxFileProvider: FileProviderOperations {
-    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let path = (atPath as NSString).appendingPathComponent(folderName) + "/"
-        return doOperation(.create(path: path), completionHandler: completionHandler)
-    }
-    
-    open func moveItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        return doOperation(.move(source: path, destination: toPath), completionHandler: completionHandler)
-    }
-    
-    open func copyItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        return doOperation(.copy(source: path, destination: toPath), completionHandler: completionHandler)
-    }
-    
-    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        return doOperation(.remove(path: path), completionHandler: completionHandler)
-    }
-    
-    fileprivate func doOperation(_ operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: operation) ?? true == true else {
-            return nil
+    override func request(for operation: FileOperationType, overwrite: Bool, attributes: [URLResourceKey : Any]) -> URLRequest {
+        // content operations
+        var request: URLRequest
+        switch operation {
+        case .copy(source: let source, destination: let dest) where dest.lowercased().hasPrefix("file://"):
+            let url = URL(string: "files/download", relativeTo: contentURL)!
+            request = URLRequest(url: url)
+            request.set(httpAuthentication: credential, with: .oAuth2)
+            request.set(dropboxArgKey: ["path": correctPath(source)! as NSString])
+        case .fetch(let path):
+            let url = URL(string: "files/download", relativeTo: contentURL)!
+            request = URLRequest(url: url)
+            request.set(httpAuthentication: credential, with: .oAuth2)
+            request.set(dropboxArgKey: ["path": correctPath(path)! as NSString])
+        case .copy(source: let source, destination: let dest) where source.lowercased().hasPrefix("file://"):
+            var requestDictionary = [String: AnyObject]()
+            let url: URL = URL(string: "files/upload", relativeTo: contentURL)!
+            requestDictionary["path"] = correctPath(dest) as NSString?
+            requestDictionary["mode"] = (overwrite ? "overwrite" : "add") as NSString
+            requestDictionary["client_modified"] = (attributes[.contentModificationDateKey] as? Date)?.rfc3339utc() as NSString?
+            request = URLRequest(url: url)
+            request.httpMethod = "POST"
+            request.set(httpAuthentication: credential, with: .oAuth2)
+            request.set(contentType: .stream)
+            request.set(dropboxArgKey: requestDictionary)
+        case .modify(let path):
+            var requestDictionary = [String: AnyObject]()
+            let url: URL = URL(string: "files/upload", relativeTo: contentURL)!
+            requestDictionary["path"] = correctPath(path) as NSString?
+            requestDictionary["mode"] = (overwrite ? "overwrite" : "add") as NSString
+            requestDictionary["client_modified"] = (attributes[.contentModificationDateKey] as? Date)?.rfc3339utc() as NSString?
+            request = URLRequest(url: url)
+            request.httpMethod = "POST"
+            request.set(httpAuthentication: credential, with: .oAuth2)
+            request.set(contentType: .stream)
+            request.set(dropboxArgKey: requestDictionary)
+        default: // modify, link, fetch
+            return self.apiRequest(for: operation)
         }
+        return request
+    }
+    
+    func apiRequest(for operation: FileOperationType) -> URLRequest {
         let url: String
-        guard let sourcePath = operation.source else { return nil }
+        let sourcePath = operation.source
         let destPath = operation.destination
         switch operation {
         case .create:
@@ -269,7 +195,7 @@ extension DropboxFileProvider: FileProviderOperations {
         case .remove:
             url = "files/delete"
         default: // modify, link, fetch
-            return nil
+            fatalError("Unimplemented operation \(operation.description) in \(#file)")
         }
         var request = URLRequest(url: URL(string: url, relativeTo: apiURL)!)
         request.httpMethod = "POST"
@@ -283,115 +209,27 @@ extension DropboxFileProvider: FileProviderOperations {
             requestDictionary["path"] = correctPath(sourcePath) as NSString?
         }
         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) {
-                 serverError = FileProviderDropboxError(code: code, path: sourcePath, errorDescription: String(data: data ?? Data(), encoding: .utf8))
-            }
-            completionHandler?(serverError ?? error)
-            self.delegateNotify(operation, error: serverError ?? error)
-        })
-        task.taskDescription = operation.json
-        task.resume()
-        return RemoteOperationHandle(operationType: operation, tasks: [task])
+        return request
     }
     
-    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        // check file is not a folder
-        guard (try? localFile.resourceValues(forKeys: [.fileResourceTypeKey]))?.fileResourceType ?? .unknown == .regular else {
-            dispatch_queue.async {
-                completionHandler?(self.throwError(localFile.path, code: URLError.fileIsDirectory))
-            }
+    override func serverError(with code: FileProviderHTTPErrorCode, path: String?, data: Data?) -> FileProviderHTTPError {
+        return FileProviderDropboxError(code: code, path: path ?? "", errorDescription: data.flatMap({ String(data: $0, encoding: .utf8) }))
+    }
+    
+    override func upload_simple(_ targetPath: String, request: URLRequest, data: Data?, localFile: URL?, operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let size = data?.count ?? Int((try? localFile?.resourceValues(forKeys: [.fileSizeKey]))??.fileSize ?? -1)
+        if size > 150 * 1024 * 1024 {
+            let error = FileProviderDropboxError(code: .payloadTooLarge, path: targetPath, errorDescription: nil)
+            completionHandler?(error)
+            self.delegateNotify(operation, error: error)
             return nil
         }
         
-        let opType = FileOperationType.copy(source: localFile.absoluteString, destination: toPath)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        return upload_simple(toPath, localFile: localFile, overwrite: overwrite, operation: opType, completionHandler: completionHandler)
-    }
-    
-    open func copyItem(path: String, toLocalURL destURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.copy(source: path, destination: destURL.absoluteString)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        let url = URL(string: "files/download", relativeTo: contentURL)!
-        var request = URLRequest(url: url)
-        request.set(httpAuthentication: credential, with: .oAuth2)
-        request.set(dropboxArgKey: ["path": path as NSString])
-        let task = session.downloadTask(with: request)
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = completionHandler
-        downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
-            guard let httpResponse = task.response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
-                let code = FileProviderHTTPErrorCode(rawValue: (task.response as? HTTPURLResponse)?.statusCode ?? -1)
-                let errorData : Data? = nil //Data(contentsOf:cacheURL) // TODO: Figure out how to get error response data for the error description
-                let serverError : FileProviderDropboxError? = code != nil ? FileProviderDropboxError(code: code!, path: path, errorDescription: String(data: errorData ?? Data(), encoding: .utf8)) : nil
-                completionHandler?(serverError)
-                return
-            }
-            do {
-                try FileManager.default.moveItem(at: tempURL, to: destURL)
-                completionHandler?(nil)
-            } catch let e {
-                completionHandler?(e)
-            }
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
+        return super.upload_simple(targetPath, request: request, data: data, localFile: localFile, operation: operation, completionHandler: completionHandler)
     }
 }
 
-extension DropboxFileProvider: FileProviderReadWrite {
-    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        if length == 0 || offset < 0 {
-            dispatch_queue.async {
-                completionHandler(Data(), nil)
-            }
-            return nil
-        }
-        
-        let opType = FileOperationType.fetch(path: path)
-        let url = URL(string: "files/download", relativeTo: contentURL)!
-        var request = URLRequest(url: url)
-        request.set(httpAuthentication: credential, with: .oAuth2)
-        request.set(rangeWithOffset: offset, length: length)
-        request.set(dropboxArgKey: ["path": correctPath(path)! as NSString])
-        let task = session.downloadTask(with: request)
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { error in
-            completionHandler(nil, error)
-        }
-        downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
-            guard let httpResponse = task.response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
-                let code = FileProviderHTTPErrorCode(rawValue: (task.response as? HTTPURLResponse)?.statusCode ?? -1)
-                let errorData : Data? = nil //Data(contentsOf:cacheURL) // TODO: Figure out how to get error response data for the error description
-                let serverError : FileProviderDropboxError? = code != nil ? FileProviderDropboxError(code: code!, path: path, errorDescription: String(data: errorData ?? Data(), encoding: .utf8)) : nil
-                completionHandler(nil, serverError)
-                return
-            }
-            do {
-                let data = try Data(contentsOf: tempURL)
-                completionHandler(data, nil)
-            } catch let e {
-                completionHandler(nil, e)
-            }
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
-    }
-    
-    public func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.modify(path: path)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        // FIXME: remove 150MB restriction
-        return upload_simple(path, data: data ?? Data(), overwrite: overwrite, operation: opType, completionHandler: completionHandler)
-    }
-    
+extension DropboxFileProvider {
     /*
     fileprivate func registerNotifcation(path: String, eventHandler: (() -> Void)) {
         /* There is two ways to monitor folders changing in Dropbox. Either using webooks
@@ -624,5 +462,3 @@ extension DropboxFileProvider: ExtendedFileProvider {
         task.resume()
     }
 }
-
-extension DropboxFileProvider: FileProvider { }

Sources/DropboxHelper.swift

@@ -71,7 +71,11 @@ public final class DropboxFileObject: FileObject {
 
 // codebeat:disable[ARITY]
 internal extension DropboxFileProvider {
-    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)) {
+    
+    
+    func list(_ path: String, cursor: String? = nil, prevContents: [DropboxFileObject] = [], recursive: Bool = false, session: URLSession? = nil, progress: Progress, progressHandler: ((_ contents: [FileObject], _ nextCursor: String?, _ error: Error?) -> Void)? = nil, completionHandler: @escaping ((_ contents: [FileObject], _ cursor: String?, _ error: Error?) -> Void)) {
+        if progress.isCancelled { return }
+        
         var requestDictionary = [String: AnyObject]()
         let url: URL
         if let cursor = cursor {
@@ -99,13 +103,14 @@ internal extension DropboxFileProvider {
                     for entry in entries {
                         if let entry = entry as? [String: AnyObject], let file = DropboxFileObject(json: entry) {
                             files.append(file)
+                            progress.totalUnitCount = Int64(files.count)
                         }
                     }
                     let ncursor = json["cursor"] as? String
                     let hasmore = (json["has_more"] as? NSNumber)?.boolValue ?? false
-                    if hasmore {
+                    if hasmore && !progress.isCancelled {
                         progressHandler?(files, ncursor, responseError ?? error)
-                        self.list(path, cursor: ncursor, prevContents: prevContents + files, completionHandler: completionHandler)
+                        self.list(path, cursor: ncursor, prevContents: prevContents + files, progress: progress, completionHandler: completionHandler)
                         return
                     }
                 }
@@ -113,53 +118,17 @@ internal extension DropboxFileProvider {
             progressHandler?(files, nil, responseError ?? error)
             completionHandler(prevContents + files, nil, responseError ?? error)
         })
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
         task.taskDescription = FileOperationType.fetch(path: path).json
         task.resume()
     }
     
-    func upload_simple(_ targetPath: String, data: Data? = nil, localFile: URL? = nil, modifiedDate: Date = Date(), overwrite: Bool, operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let size = data?.count ?? Int((try? localFile?.resourceValues(forKeys: [.fileSizeKey]))??.fileSize ?? -1)
-        if size > 150 * 1024 * 1024 {
-            let error = FileProviderDropboxError(code: .payloadTooLarge, path: targetPath, errorDescription: nil)
-            completionHandler?(error)
-            self.delegateNotify(.create(path: targetPath), error: error)
-            return nil
-        }
-        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"] = modifiedDate.rfc3339utc() as NSString
-        var request = URLRequest(url: url)
-        request.httpMethod = "POST"
-        request.set(httpAuthentication: credential, with: .oAuth2)
-        request.set(contentType: .stream)
-        request.set(dropboxArgKey: requestDictionary)
-        let task: URLSessionUploadTask
-        if let data = data {
-            task = session.uploadTask(with: request, from: data)
-        } else if let localFile = localFile {
-            task = session.uploadTask(with: request, fromFile: localFile)
-        } else {
-            return nil
-        }
+    func search(_ startPath: String = "", query: String, start: Int = 0, maxResultPerPage: Int = 25, maxResults: Int = -1, progress: Progress, foundItem:@escaping ((_ file: DropboxFileObject) -> Void), completionHandler: @escaping ((_ error: Error?) -> Void)) {
+        if progress.isCancelled { return }
         
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { [weak self] error in
-            var responseError: FileProviderDropboxError?
-            if let code = (task.response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
-                // We can't fetch server result from delegate!
-                responseError = FileProviderDropboxError(code: rCode, path: targetPath, errorDescription: nil)
-            }
-            completionHandler?(responseError ?? error)
-            self?.delegateNotify(.create(path: targetPath), error: responseError ?? error)
-        }
-        task.taskDescription = operation.json
-        task.resume()
-        return RemoteOperationHandle(operationType: operation, tasks: [task])
-    }
-    
-    func search(_ startPath: String = "", query: String, start: Int = 0, maxResultPerPage: Int = 25, maxResults: Int = -1, foundItem:@escaping ((_ file: DropboxFileObject) -> Void), completionHandler: @escaping ((_ error: Error?) -> Void)) {
         let url = URL(string: "files/search", relativeTo: apiURL)!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
@@ -180,12 +149,13 @@ internal extension DropboxFileProvider {
                     for entry in entries {
                         if let entry = entry as? [String: AnyObject], let file = DropboxFileObject(json: entry) {
                             foundItem(file)
+                            progress.completedUnitCount += 1
                         }
                     }
                     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)
+                    if hasmore && !progress.isCancelled, let rstart = rstart {
+                        self.search(startPath, query: query, start: rstart + entries.count, maxResultPerPage: maxResultPerPage, progress: progress, foundItem: foundItem, completionHandler: completionHandler)
                     } else {
                         completionHandler(responseError ?? error)
                     }
@@ -193,7 +163,11 @@ internal extension DropboxFileProvider {
                 }
             }
             completionHandler(responseError ?? error)
-        }) 
+        })
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
         task.resume()
     }
 }
@@ -230,14 +204,4 @@ internal extension DropboxFileProvider {
         }
         return (dic, keys)
     }
-    
-    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)
-            }
-        })
-    }
 }

Sources/FPSStreamTask.swift

@@ -26,7 +26,7 @@ public class FileProviderStreamTask: URLSessionTask, StreamDelegate {
     fileprivate var _taskDescription: String?
     
     /// Force using `URLSessionStreamTask` for iOS 9 and later
-    public var useURLSession = true
+    public let useURLSession: Bool
     @available(iOS 9.0, OSX 10.11, *)
     fileprivate static var streamTasks = [Int: URLSessionStreamTask]()
     
@@ -121,8 +121,31 @@ public class FileProviderStreamTask: URLSessionTask, StreamDelegate {
         }
     }
     
-    fileprivate var _countOfBytesSent: Int64 = 0
-    fileprivate var _countOfBytesRecieved: Int64 = 0
+    fileprivate var _countOfBytesSent: Int64 = 0 {
+        willSet {
+            for observer in observers where observer.keyPath == "countOfBytesSent" {
+                observer.observer.observeValue(forKeyPath: observer.keyPath, of: self, change: [.oldKey: _countOfBytesSent, .oldKey: newValue], context: observer.context)
+            }
+        }
+        didSet {
+            for observer in observers where observer.keyPath == "countOfBytesSent" {
+                observer.observer.observeValue(forKeyPath: observer.keyPath, of: self, change: [.oldKey: oldValue, .oldKey: _countOfBytesSent], context: observer.context)
+            }
+        }
+    }
+    
+    fileprivate var _countOfBytesRecieved: Int64 = 0 {
+        willSet {
+            for observer in observers where observer.keyPath == "countOfBytesRecieved" {
+                observer.observer.observeValue(forKeyPath: observer.keyPath, of: self, change: [.oldKey: _countOfBytesRecieved, .oldKey: newValue], context: observer.context)
+            }
+        }
+        didSet {
+            for observer in observers where observer.keyPath == "countOfBytesRecieved" {
+                observer.observer.observeValue(forKeyPath: observer.keyPath, of: self, change: [.oldKey: oldValue, .oldKey: _countOfBytesRecieved], context: observer.context)
+            }
+        }
+    }
     
     /**
      * The number of bytes that the task has sent to the server in the request body.
@@ -133,7 +156,7 @@ public class FileProviderStreamTask: URLSessionTask, StreamDelegate {
      * `urlSession(_:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:)` delegate method.
     */
     override open var countOfBytesSent: Int64 {
-        if #available(iOS 9.0, OSX 10.11, *) {
+        if #available(iOS 9.0, macOS 10.11, *) {
             if self.useURLSession {
                 return _underlyingTask!.countOfBytesSent
             }
@@ -192,6 +215,49 @@ public class FileProviderStreamTask: URLSessionTask, StreamDelegate {
         return Int64(dataReceived.count)
     }
     
+    var observers: [(keyPath: String, observer: NSObject, context: UnsafeMutableRawPointer?)] = []
+    
+    public override func addObserver(_ observer: NSObject, forKeyPath keyPath: String, options: NSKeyValueObservingOptions = [], context: UnsafeMutableRawPointer?) {
+        if #available(iOS 9.0, macOS 10.11, *) {
+            if self.useURLSession {
+                self._underlyingTask?.addObserver(observer, forKeyPath: keyPath, options: options, context: context)
+                return
+            }
+        }
+        
+        switch keyPath {
+        case #keyPath(countOfBytesSent):
+            fallthrough
+        case #keyPath(countOfBytesReceived):
+            fallthrough
+        case #keyPath(countOfBytesExpectedToSend):
+            fallthrough
+        case #keyPath(countOfBytesExpectedToReceive):
+            observers.append((keyPath: keyPath, observer: observer, context: context))
+        default:
+            break
+        }
+        super.addObserver(observer, forKeyPath: keyPath, options: options, context: context)
+    }
+    
+    public override func removeObserver(_ observer: NSObject, forKeyPath keyPath: String) {
+        var newObservers: [(keyPath: String, observer: NSObject, context: UnsafeMutableRawPointer?)] = []
+        for observer in observers where observer.keyPath != keyPath {
+            newObservers.append(observer)
+        }
+        self.observers = newObservers
+        super.removeObserver(observer, forKeyPath: keyPath)
+    }
+    
+    public override func removeObserver(_ observer: NSObject, forKeyPath keyPath: String, context: UnsafeMutableRawPointer?) {
+        var newObservers: [(keyPath: String, observer: NSObject, context: UnsafeMutableRawPointer?)] = []
+        for observer in observers where observer.keyPath != keyPath || observer.context != context {
+            newObservers.append(observer)
+        }
+        self.observers = newObservers
+        super.removeObserver(observer, forKeyPath: keyPath, context: context)
+    }
+    
     override public init() {
         fatalError("Use NSURLSession.fpstreamTask() method")
     }
@@ -199,10 +265,11 @@ public class FileProviderStreamTask: URLSessionTask, StreamDelegate {
     fileprivate var host: (hostname: String, port: Int)?
     fileprivate var service: NetService?
     
-    internal init(session: URLSession, host: String, port: Int) {
+    internal init(session: URLSession, host: String, port: Int, useURLSession: Bool = true) {
         self._underlyingSession = session
+        self.useURLSession = useURLSession
         if #available(iOS 9.0, OSX 10.11, *) {
-            if self.useURLSession {
+            if useURLSession {
                 let task = session.streamTask(withHostName: host, port: port)
                 self._taskIdentifier = task.taskIdentifier
                 FileProviderStreamTask.streamTasks[_taskIdentifier] = task
@@ -218,10 +285,11 @@ public class FileProviderStreamTask: URLSessionTask, StreamDelegate {
         self.operation_queue.maxConcurrentOperationCount = 1
     }
     
-    internal init(session: URLSession, netService: NetService) {
+    internal init(session: URLSession, netService: NetService, useURLSession: Bool = true) {
         self._underlyingSession = session
+        self.useURLSession = useURLSession
         if #available(iOS 9.0, OSX 10.11, *) {
-            if self.useURLSession {
+            if useURLSession {
                 let task = session.streamTask(with: netService)
                 self._taskIdentifier = task.taskIdentifier
                 FileProviderStreamTask.streamTasks[_taskIdentifier] = task

Sources/FTPFileProvider.swift

@@ -279,12 +279,14 @@ open class FTPFileProvider: FileProviderBasicRemote {
         }
     }
     
-    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
-        self.recursiveList(path: path, useMLST: true, foundItemsHandler: { items in
+    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
+        let progress = Progress(parent: nil, userInfo: nil)
+        _ = self.recursiveList(path: path, useMLST: true, foundItemsHandler: { items in
             if let foundItemHandler = foundItemHandler {
                 for item in items where query.evaluate(with: item.mapPredicate()) {
                     foundItemHandler(item)
                 }
+                progress.totalUnitCount = Int64(items.count)
             }
         }, completionHandler: {files, error in
             if let error = error {
@@ -295,6 +297,7 @@ open class FTPFileProvider: FileProviderBasicRemote {
             let foundFiles = files.filter { query.evaluate(with: $0.mapPredicate()) }
             completionHandler(foundFiles, nil)
         })
+        return progress
     }
     
     public func url(of path: String?) -> URL {
@@ -330,28 +333,28 @@ open class FTPFileProvider: FileProviderBasicRemote {
 }
 
 extension FTPFileProvider: FileProviderOperations {
-    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         let path = (atPath as NSString).appendingPathComponent(folderName) + "/"
         return doOperation(.create(path: path), completionHandler: completionHandler)
     }
     
-    open func moveItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func moveItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         return doOperation(.move(source: path, destination: toPath), completionHandler: completionHandler)
     }
     
-    open func copyItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         return doOperation(.copy(source: path, destination: toPath), completionHandler: completionHandler)
     }
     
-    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         return doOperation(.remove(path: path), completionHandler: completionHandler)
     }
     
-    fileprivate func doOperation(_ opType: FileOperationType, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    fileprivate func doOperation(_ opType: FileOperationType, completionHandler: SimpleCompletionHandler) -> Progress? {
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        guard let sourcePath = opType.source else { return nil }
+        let sourcePath = opType.source
         let destPath = opType.destination
         
         let command: String
@@ -369,7 +372,10 @@ extension FTPFileProvider: FileProviderOperations {
         default: // modify, fetch
             return nil
         }
-        let operationHandle = RemoteOperationHandle(operationType: opType, tasks: [])
+        let progress = Progress(totalUnitCount: 1)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
         
         let task = session.fpstreamTask(withHostName: baseURL!.host!, port: baseURL!.port!)
         self.ftpLogin(task) { (error) in
@@ -412,13 +418,12 @@ extension FTPFileProvider: FileProviderOperations {
                     case .modify:
                         errorCode = URLError.cannotWriteToFile
                     case .copy:
-                        let opHandle = self.fallbackCopy(opType, completionHandler: completionHandler) as? RemoteOperationHandle
-                        operationHandle.tasks = opHandle?.tasks ?? []
+                        self.fallbackCopy(opType, progress: progress, completionHandler: completionHandler)
                         return
                     case .move:
                         errorCode = URLError.cannotMoveFile
                     case .remove:
-                        self.fallbackRemove(opType, on: task, completionHandler: completionHandler)
+                        self.fallbackRemove(opType, progress: progress, on: task, completionHandler: completionHandler)
                         return
                     case .link:
                         errorCode = URLError.cannotWriteToFile
@@ -426,31 +431,37 @@ extension FTPFileProvider: FileProviderOperations {
                         errorCode = URLError.cannotOpenFile
                     }
                     let error = self.throwError(sourcePath, code: errorCode)
+                    progress.cancel()
                     self.dispatch_queue.async {
                         completionHandler?(error)
-                        self.delegateNotify(opType, error: error)
                     }
+                    self.delegateNotify(opType, error: error)
                     return
                 }
                 
+                progress.completedUnitCount = progress.totalUnitCount
                 self.dispatch_queue.async {
                     completionHandler?(nil)
-                    self.delegateNotify(opType, error: nil)
                 }
+                self.delegateNotify(opType, error: nil)
             })
         }
         
-        operationHandle.add(task: task)
-        return operationHandle
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
+        return progress
     }
     
-    private func fallbackCopy(_ opType: FileOperationType, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        guard let sourcePath = opType.source else { return nil }
-        guard let destPath = opType.destination else { return nil }
+    private func fallbackCopy(_ opType: FileOperationType, progress: Progress, completionHandler: SimpleCompletionHandler) {
+        let sourcePath = opType.source
+        guard let destPath = opType.destination else { return }
         
         let localURL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(UUID().uuidString).appendingPathExtension("tmp")
-        let operationHandle = RemoteOperationHandle(operationType: opType, tasks: [])
-        let firstOp = self.copyItem(path: sourcePath, toLocalURL: localURL, completionHandler: { (error) in
+        
+        progress.becomeCurrent(withPendingUnitCount: 1)
+        _ = self.copyItem(path: sourcePath, toLocalURL: localURL) { (error) in
             if let error = error {
                 self.dispatch_queue.async {
                     completionHandler?(error)
@@ -459,39 +470,42 @@ extension FTPFileProvider: FileProviderOperations {
                 return
             }
             
-            let secondOp = self.copyItem(localFile: localURL, to: destPath, completionHandler: { error in
+            progress.becomeCurrent(withPendingUnitCount: 1)
+            _ = self.copyItem(localFile: localURL, to: destPath) { error in
                 completionHandler?(nil)
                 self.delegateNotify(opType, error: nil)
-            }) as? RemoteOperationHandle
-            operationHandle.tasks = secondOp?.tasks ?? []
-        }) as? RemoteOperationHandle
-        operationHandle.tasks = firstOp?.tasks ?? []
-        return operationHandle
+            }
+            progress.resignCurrent()
+        }
+        progress.resignCurrent()
+        return
     }
     
-    private func fallbackRemove(_ opType: FileOperationType, on task: FileProviderStreamTask, completionHandler: SimpleCompletionHandler) {
-        guard let sourcePath = opType.source else { return }
+    private func fallbackRemove(_ opType: FileOperationType, progress: Progress, on task: FileProviderStreamTask, completionHandler: SimpleCompletionHandler) {
+        let sourcePath = opType.source
         
         self.execute(command: "SITE RMDIR \(ftpPath(sourcePath))", on: task) { (response, error) in
             if let error = error {
+                progress.cancel()
                 self.dispatch_queue.async {
                     completionHandler?(error)
-                    self.delegateNotify(opType, error: error)
                 }
+                self.delegateNotify(opType, error: error)
                 return
             }
             
             guard let response = response else {
+                progress.cancel()
                 let error = self.throwError(sourcePath, code: URLError.badServerResponse)
                 self.dispatch_queue.async {
                     completionHandler?(error)
-                    self.delegateNotify(opType, error: error)
                 }
+                self.delegateNotify(opType, error: error)
                 return
             }
             
             if response.hasPrefix("50") {
-                self.fallbackRecursiveRemove(opType, on: task, completionHandler: completionHandler)
+                self.fallbackRecursiveRemove(opType, progress: progress, on: task, completionHandler: completionHandler)
                 return
             }
             
@@ -501,15 +515,15 @@ extension FTPFileProvider: FileProviderOperations {
             }
             self.dispatch_queue.async {
                 completionHandler?(error)
-                self.delegateNotify(opType, error: error)
             }
+            self.delegateNotify(opType, error: error)
         }
     }
     
-    private func fallbackRecursiveRemove(_ opType: FileOperationType, on task: FileProviderStreamTask, completionHandler: SimpleCompletionHandler) {
-        guard let sourcePath = opType.source else { return }
+    private func fallbackRecursiveRemove(_ opType: FileOperationType, progress: Progress, on task: FileProviderStreamTask, completionHandler: SimpleCompletionHandler) {
+        let sourcePath = opType.source
         
-        self.recursiveList(path: sourcePath, useMLST: true, completionHandler: { (contents, error) in
+        _ = self.recursiveList(path: sourcePath, useMLST: true, completionHandler: { (contents, error) in
             if let error = error {
                 self.dispatch_queue.async {
                     completionHandler?(error)
@@ -518,6 +532,8 @@ extension FTPFileProvider: FileProviderOperations {
                 return
             }
             
+            let recursiveProgress = Progress(parent: progress, userInfo: nil)
+            recursiveProgress.totalUnitCount = Int64(contents.count)
             let sortedContents = contents.sorted(by: {
                 $0.path.localizedStandardCompare($1.path) == .orderedDescending
             })
@@ -528,6 +544,7 @@ extension FTPFileProvider: FileProviderOperations {
             command += "RMD \(self.ftpPath(sourcePath))"
             
             self.execute(command: command, on: task, completionHandler: { (response, error) in
+                recursiveProgress.completedUnitCount += 1
                 self.dispatch_queue.async {
                     completionHandler?(error)
                     self.delegateNotify(opType, error: error)
@@ -537,7 +554,7 @@ extension FTPFileProvider: FileProviderOperations {
         })
     }
     
-    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         // check file is not a folder
         guard (try? localFile.resourceValues(forKeys: [.fileResourceTypeKey]))?.fileResourceType ?? .unknown == .regular else {
             dispatch_queue.async {
@@ -550,7 +567,11 @@ extension FTPFileProvider: FileProviderOperations {
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        let operation = RemoteOperationHandle(operationType: opType, tasks: [])
+        
+        let progress = Progress(totalUnitCount: 0)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
         
         let task = session.fpstreamTask(withHostName: baseURL!.host!, port: baseURL!.port!)
         self.ftpLogin(task) { (error) in
@@ -562,13 +583,21 @@ extension FTPFileProvider: FileProviderOperations {
                 return
             }
             
-            self.ftpStore(task, filePath: self.ftpPath(toPath), fromData: nil, fromFile: localFile, onTask: {
-                operation.add(task: $0)
+            self.ftpStore(task, filePath: self.ftpPath(toPath), fromData: nil, fromFile: localFile, onTask: { task in
+                weak var weakTask = task
+                progress.cancellationHandler = {
+                    weakTask?.cancel()
+                }
+                progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
             }, onProgress: { bytesSent, totalSent, expectedBytes in
+                progress.completedUnitCount = totalSent
                 DispatchQueue.main.async {
-                    self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(Double(totalSent) / Double(expectedBytes)))
+                    self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(progress.fractionCompleted))
                 }
             }, completionHandler: { (error) in
+                if error != nil {
+                    progress.cancel()
+                }
                 self.ftpQuit(task)
                 self.dispatch_queue.async {
                     completionHandler?(error)
@@ -577,15 +606,18 @@ extension FTPFileProvider: FileProviderOperations {
             })
         }
         
-        return operation
+        return progress
     }
     
-    open func copyItem(path: String, toLocalURL destURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(path: String, toLocalURL destURL: URL, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.copy(source: path, destination: destURL.absoluteString)
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
-        let operation = RemoteOperationHandle(operationType: opType, tasks: [])
+        var progress = Progress(totalUnitCount: 0)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
         
         if self.useAppleImplementation {
             self.attributesOfItem(path: path, completionHandler: { (file, error) in
@@ -606,6 +638,8 @@ extension FTPFileProvider: FileProviderOperations {
                     return
                 }
                 
+                progress.totalUnitCount = file?.size ?? 0
+                
                 let task = self.session.downloadTask(with: self.url(of: path))
                 completionHandlersForTasks[self.session.sessionDescription!]?[task.taskIdentifier] = completionHandler
                 downloadCompletionHandlersForTasks[self.session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
@@ -616,8 +650,13 @@ extension FTPFileProvider: FileProviderOperations {
                         completionHandler?(e)
                     }
                 }
-                operation.add(task: task)
                 task.taskDescription = opType.json
+                task.addObserver(self.sessionDelegate!, forKeyPath: #keyPath(URLSessionTask.countOfBytesReceived), options: .new, context: &progress)
+                task.addObserver(self.sessionDelegate!, forKeyPath: #keyPath(URLSessionTask.countOfBytesExpectedToReceive), options: .new, context: &progress)
+                progress.cancellationHandler = { [weak task] in
+                    task?.cancel()
+                }
+                progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
                 task.resume()
             })
         } else {
@@ -630,13 +669,21 @@ extension FTPFileProvider: FileProviderOperations {
                     return
                 }
                 
-                self.ftpRetrieveFile(task, filePath: self.ftpPath(path), onTask: {
-                    operation.add(task: $0)
+                self.ftpRetrieveFile(task, filePath: self.ftpPath(path), onTask: { task in
+                    weak var weakTask = task
+                    progress.cancellationHandler = {
+                        weakTask?.cancel()
+                    }
+                    progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
                 }, onProgress: { recevied, totalReceived, totalSize in
-                    let progress = Double(totalReceived) / Double(totalSize)
-                    self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(progress))
+                    progress.totalUnitCount = totalSize
+                    progress.completedUnitCount = totalReceived
+                    DispatchQueue.main.async {
+                        self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(progress.fractionCompleted))
+                    }
                 }) { (tmpurl, error) in
                     if let error = error {
+                        progress.cancel()
                         self.dispatch_queue.async {
                             completionHandler?(error)
                             self.delegateNotify(opType, error: error)
@@ -654,20 +701,28 @@ extension FTPFileProvider: FileProviderOperations {
                 }
             }
         }
-        return operation
+        return progress
     }
 }
 
 extension FTPFileProvider: FileProviderReadWrite {
-    open func contents(path: String, completionHandler: @escaping ((Data?, Error?) -> Void)) -> OperationHandle? {
+    open func contents(path: String, completionHandler: @escaping ((Data?, Error?) -> Void)) -> Progress? {
         let opType = FileOperationType.fetch(path: path)
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
         
         if self.useAppleImplementation {
+            var progress = Progress(totalUnitCount: 0)
+            progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+            progress.kind = .file
+            progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+            
             let task = session.downloadTask(with: url(of: path))
             completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { error in
+                if error != nil {
+                    progress.cancel()
+                }
                 completionHandler(nil, error)
             }
             downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
@@ -679,14 +734,20 @@ extension FTPFileProvider: FileProviderReadWrite {
                 }
             }
             task.taskDescription = opType.json
+            task.addObserver(sessionDelegate!, forKeyPath: #keyPath(URLSessionTask.countOfBytesReceived), options: .new, context: &progress)
+            task.addObserver(sessionDelegate!, forKeyPath: #keyPath(URLSessionTask.countOfBytesExpectedToReceive), options: .new, context: &progress)
+            progress.cancellationHandler = { [weak task] in
+                task?.cancel()
+            }
+            progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
             task.resume()
-            return RemoteOperationHandle(operationType: opType, tasks: [task])
+            return progress
         } else {
             return self.contents(path: path, offset: 0, length: -1, completionHandler: completionHandler)
         }
     }
     
-    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
+    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
         let opType = FileOperationType.fetch(path: path)
         if length == 0 || offset < 0 {
             dispatch_queue.async {
@@ -695,7 +756,10 @@ extension FTPFileProvider: FileProviderReadWrite {
             }
             return nil
         }
-        let operation = RemoteOperationHandle(operationType: opType, tasks: [])
+        let progress = Progress(totalUnitCount: 0)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
         
         let task = session.fpstreamTask(withHostName: baseURL!.host!, port: baseURL!.port!)
         self.ftpLogin(task) { (error) in
@@ -706,13 +770,21 @@ extension FTPFileProvider: FileProviderReadWrite {
                 return
             }
             
-            self.ftpRetrieveData(task, filePath: self.ftpPath(path), from: offset, length: length, onTask: {
-                operation.add(task: $0)
+            self.ftpRetrieveData(task, filePath: self.ftpPath(path), from: offset, length: length, onTask: { task in
+                weak var weakTask = task
+                progress.cancellationHandler = {
+                    weakTask?.cancel()
+                }
+                progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
             }, onProgress: { recevied, totalReceived, totalSize in
-                let progress = Double(totalReceived) / Double(totalSize)
-                self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(progress))
+                progress.totalUnitCount = totalSize
+                progress.completedUnitCount = totalReceived
+                DispatchQueue.main.async {
+                    self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(progress.fractionCompleted))
+                }
             }) { (data, error) in
                 if let error = error {
+                    progress.cancel()
                     self.dispatch_queue.async {
                         completionHandler(nil, error)
                         self.delegateNotify(opType, error: error)
@@ -729,16 +801,20 @@ extension FTPFileProvider: FileProviderReadWrite {
             }
         }
         
-        return operation
+        return progress
     }
     
-    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.modify(path: path)
         guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
             return nil
         }
         
-        let operation = RemoteOperationHandle(operationType: opType, tasks: [])
+        let progress = Progress(totalUnitCount: Int64(data?.count ?? 0))
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        
         let task = session.fpstreamTask(withHostName: baseURL!.host!, port: baseURL!.port!)
         self.ftpLogin(task) { (error) in
             if let error = error {
@@ -750,13 +826,21 @@ extension FTPFileProvider: FileProviderReadWrite {
             }
             
             let storeHandler = {
-                self.ftpStore(task, filePath: self.ftpPath(path), fromData: data ?? Data(), fromFile: nil, onTask: {
-                    operation.add(task: $0)
+                self.ftpStore(task, filePath: self.ftpPath(path), fromData: data ?? Data(), fromFile: nil, onTask: { task in
+                    weak var weakTask = task
+                    progress.cancellationHandler = {
+                        weakTask?.cancel()
+                    }
+                    progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
                 }, onProgress: { bytesSent, totalSent, expectedBytes in
+                    progress.completedUnitCount = totalSent
                     DispatchQueue.main.async {
-                        self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(Double(totalSent) / Double(expectedBytes)))
+                        self.delegate?.fileproviderProgress(self, operation: opType, progress: Float(progress.fractionCompleted))
                     }
                 }, completionHandler: { (error) in
+                    if error != nil {
+                        progress.cancel()
+                    }
                     self.ftpQuit(task)
                     self.dispatch_queue.async {
                         completionHandler?(error)
@@ -776,7 +860,7 @@ extension FTPFileProvider: FileProviderReadWrite {
             }
         }
         
-        return operation
+        return progress
     }
 }
 

Sources/FTPHelper.swift

@@ -399,8 +399,9 @@ internal extension FTPFileProvider {
         }
     }
     
-    func recursiveList(path: String, useMLST: Bool, foundItemsHandler: ((_ contents: [FileObject]) -> Void)? = nil, completionHandler: @escaping (_ contents: [FileObject], _ error: Error?) -> Void) {
-        let queue = DispatchQueue(label: "test")
+    func recursiveList(path: String, useMLST: Bool, foundItemsHandler: ((_ contents: [FileObject]) -> Void)? = nil, completionHandler: @escaping (_ contents: [FileObject], _ error: Error?) -> Void) -> Progress? {
+        let progress = Progress(totalUnitCount: 0)
+        let queue = DispatchQueue(label: "\(self.type).recursiveList")
         queue.async {
             let group = DispatchGroup()
             var result = [FileObject]()
@@ -415,12 +416,14 @@ internal extension FTPFileProvider {
                 }
                 
                 result.append(contentsOf: files)
+                progress.completedUnitCount = Int64(files.count)
                 foundItemsHandler?(files)
                 
                 let directories: [FileObject] = files.filter { $0.isDirectory }
+                progress.becomeCurrent(withPendingUnitCount: Int64(directories.count))
                 for dir in directories {
                     group.enter()
-                    self.recursiveList(path: dir.path, useMLST: useMLST, foundItemsHandler: foundItemsHandler, completionHandler: { (contents, error) in
+                    _=self.recursiveList(path: dir.path, useMLST: useMLST, foundItemsHandler: foundItemsHandler, completionHandler: { (contents, error) in
                         success = success && (error == nil)
                         if let error = error {
                             completionHandler([], error)
@@ -430,9 +433,11 @@ internal extension FTPFileProvider {
                         
                         foundItemsHandler?(files)
                         result.append(contentsOf: contents)
+                        
                         group.leave()
                     })
                 }
+                progress.resignCurrent()
                 group.leave()
             })
             group.wait()
@@ -443,6 +448,7 @@ internal extension FTPFileProvider {
                 }
             }
         }
+        return progress
     }
     
     func ftpRetrieveData(_ task: FileProviderStreamTask, filePath: String, from position: Int64 = 0, length: Int = -1, onTask: ((_ task: FileProviderStreamTask) -> Void)?, onProgress: ((_ bytesReceived: Int64, _ totalReceived: Int64, _ expectedBytes: Int64) -> Void)?, completionHandler: @escaping (_ data: Data?, _ error: Error?) -> Void) {

Sources/FileProvider.swift

@@ -99,7 +99,8 @@ public protocol FileProviderBasic: class, NSSecureCoding {
        - 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.
      */
-    func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void))
+    @discardableResult
+    func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress?
     
     /**
      Search files inside directory using query asynchronously.
@@ -121,8 +122,10 @@ public protocol FileProviderBasic: class, NSSecureCoding {
        - query: An `NSPredicate` object with keys like `FileObject` members, except `size` which becomes `filesize`.
        - 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.
+     - Returns: An `Progress` to get progress or cancel progress.
      */
-    func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void))
+    @discardableResult
+    func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress?
     
     /**
      Returns an independent url to access the file. Some providers like `Dropbox` due to their nature.
@@ -146,9 +149,9 @@ public protocol FileProviderBasic: class, NSSecureCoding {
 }
 
 extension FileProviderBasic {
-    public func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
+    public func searchFiles(path: String, recursive: Bool, query: String, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
         let predicate = NSPredicate(format: "name BEGINSWITH[c] %@", query)
-        self.searchFiles(path: path, recursive: recursive, query: predicate, foundItemHandler: foundItemHandler, completionHandler: completionHandler)
+        return self.searchFiles(path: path, recursive: recursive, query: predicate, foundItemHandler: foundItemHandler, completionHandler: completionHandler)
     }
     
     /// The maximum number of queued operations that can execute at the same time.
@@ -162,8 +165,6 @@ extension FileProviderBasic {
             operation_queue.maxConcurrentOperationCount = newValue
         }
     }
-    
-    
 }
 
 /// Checking equality of two file provider, regardless of current path queues and delegates.
@@ -241,7 +242,7 @@ internal extension FileProviderBasicRemote {
         return false
     }
     
-    func runDataTask(with request: URLRequest, operationHandle: RemoteOperationHandle? = nil, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Swift.Void) {
+    func runDataTask(with request: URLRequest, operation: FileOperationType? = nil, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Swift.Void) {
         let useCache = self.useCache
         let validatingCache = self.validatingCache
         dispatch_queue.async {
@@ -251,8 +252,7 @@ internal extension FileProviderBasicRemote {
                 }
             }
             let task = self.session.dataTask(with: request, completionHandler: completionHandler)
-            task.taskDescription = operationHandle?.operationType.json
-            operationHandle?.add(task: task)
+            task.taskDescription = operation?.json
             task.resume()
         }
     }
@@ -271,10 +271,10 @@ public protocol FileProviderOperations: FileProviderBasic {
        - folder: Directory name.
        - at: Parent path of new directory.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func create(folder: String, at: String, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func create(folder: String, at: String, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Moves a file or directory from `path` to designated path asynchronously.
@@ -285,10 +285,10 @@ public protocol FileProviderOperations: FileProviderBasic {
        - path: original file or directory path.
        - to: destination path of file or directory, including file/directory name.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func moveItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func moveItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Moves a file or directory from `path` to designated path asynchronously.
@@ -300,10 +300,10 @@ public protocol FileProviderOperations: FileProviderBasic {
        - to: destination path of file or directory, including file/directory name.
        - overwrite: Destination file should be overwritten if file is already exists. **Default** is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func moveItem(path: String, to: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func moveItem(path: String, to: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Copies a file or directory from `path` to designated path asynchronously.
@@ -314,10 +314,10 @@ public protocol FileProviderOperations: FileProviderBasic {
        - path: original file or directory path.
        - to: destination path of file or directory, including file/directory name.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func copyItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func copyItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Copies a file or directory from `path` to designated path asynchronously.
@@ -329,10 +329,10 @@ public protocol FileProviderOperations: FileProviderBasic {
        - to: destination path of file or directory, including file/directory name.
        - overwrite: Destination file should be overwritten if file is already exists. **Default** is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func copyItem(path: String, to: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func copyItem(path: String, to: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Removes the file or directory at the specified path.
@@ -340,11 +340,11 @@ public protocol FileProviderOperations: FileProviderBasic {
      - Parameters:
        - path: file or directory path.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      
      */
     @discardableResult
-    func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Uploads a file from local file url to designated path asynchronously.
@@ -356,10 +356,10 @@ public protocol FileProviderOperations: FileProviderBasic {
        - localFile: a file url to file.
        - to: destination path of file, including file/directory name.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress.
+     - Returns: An `Progress` to get progress or cancel progress.
      */
     @discardableResult
-    func copyItem(localFile: URL, to: String, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func copyItem(localFile: URL, to: String, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Uploads a file from local file url to designated path asynchronously.
@@ -372,10 +372,10 @@ public protocol FileProviderOperations: FileProviderBasic {
        - to: destination path of file, including file/directory name.
        - overwrite: Destination file should be overwritten if file is already exists. **Default** is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress.
+     - Returns: An `Progress` to get progress or cancel progress.
      */
     @discardableResult
-    func copyItem(localFile: URL, to: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func copyItem(localFile: URL, to: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Download a file from `path` to designated local file url asynchronously.
@@ -387,33 +387,33 @@ public protocol FileProviderOperations: FileProviderBasic {
        - path: original file or directory path.
        - toLocalURL: destination local url of file, including file/directory name.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> Progress?
 }
 
 public extension FileProviderOperations {
     /// *DEPRECATED:* Use Use FileProviderReadWrite.writeContents(path:, data:, completionHandler:) method instead.
     @available(*, deprecated, message: "Use FileProviderReadWrite.writeContents(path:, data:, completionHandler:) method instead.")
     @discardableResult
-    public func create(file: String, at: String, contents data: Data?, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    public func create(file: String, at: String, contents data: Data?, completionHandler: SimpleCompletionHandler) -> Progress? {
         let path = (at as NSString).appendingPathComponent(file)
         return (self as? FileProviderReadWrite)?.writeContents(path: path, contents: data, completionHandler: completionHandler)
     }
     
     @discardableResult
-    public func moveItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    public func moveItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         return self.moveItem(path: path, to: to, overwrite: false, completionHandler: completionHandler)
     }
     
     @discardableResult
-    public func copyItem(localFile: URL, to: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    public func copyItem(localFile: URL, to: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         return self.copyItem(localFile: localFile, to: to, overwrite: false, completionHandler: completionHandler)
     }
     
     @discardableResult
-    public func copyItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    public func copyItem(path: String, to: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         return self.copyItem(path: path, to: to, overwrite: false, completionHandler: completionHandler)
     }
 }
@@ -429,10 +429,10 @@ public protocol FileProviderReadWrite: FileProviderBasic {
        - completionHandler: a closure with result of file contents or error.
          - `contents`: contents of file in a `Data` object.
          - `error`: Error returned by system.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
     */
     @discardableResult
-    func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle?
+    func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress?
     
     /**
      Retreives a `Data` object with a portion contents of the file asynchronously vis contents argument of completion handler.
@@ -445,10 +445,10 @@ public protocol FileProviderReadWrite: FileProviderBasic {
        - completionHandler: a closure with result of file contents or error.
          - `contents`: contents of file in a `Data` object.
          - `error`: Error returned by system.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle?
+    func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress?
     
     /**
      Write the contents of the `Data` to a location asynchronously.
@@ -459,10 +459,10 @@ public protocol FileProviderReadWrite: FileProviderBasic {
        - path: Path of target file.
        - contents: Data to be written into file, pass nil to create empty file.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func writeContents(path: String, contents: Data?, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func writeContents(path: String, contents: Data?, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Write the contents of the `Data` to a location asynchronously.
@@ -473,10 +473,10 @@ public protocol FileProviderReadWrite: FileProviderBasic {
        - contents: Data to be written into file, pass nil to create empty file.
        - atomically: data will be written to a temporary file before writing to final location. Default is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func writeContents(path: String, contents: Data?, atomically: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func writeContents(path: String, contents: Data?, atomically: Bool, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Write the contents of the `Data` to a location asynchronously.
@@ -487,10 +487,10 @@ public protocol FileProviderReadWrite: FileProviderBasic {
        - contents: Data to be written into file, pass nil to create empty file.
        - overwrite: Destination file should be overwritten if file is already exists. Default is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func writeContents(path: String, contents: Data?, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func writeContents(path: String, contents: Data?, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress?
     
     /**
      Write the contents of the `Data` to a location asynchronously.
@@ -501,30 +501,30 @@ public protocol FileProviderReadWrite: FileProviderBasic {
        - overwrite: Destination file should be overwritten if file is already exists. Default is `false`.
        - atomically: data will be written to a temporary file before writing to final location. Default is `false`.
        - completionHandler: If an error parameter was provided, a presentable `Error` will be returned.
-     - Returns: An `OperationHandle` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
+     - Returns: An `Progress` to get progress or cancel progress. Doesn't work on `LocalFileProvider`.
      */
     @discardableResult
-    func writeContents(path: String, contents: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle?
+    func writeContents(path: String, contents: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress?
 }
 
 extension FileProviderReadWrite {
     @discardableResult
-    public func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle?{
+    public func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
         return self.contents(path: path, offset: 0, length: -1, completionHandler: completionHandler)
     }
     
     @discardableResult
-    public func writeContents(path: String, contents: Data?, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    public func writeContents(path: String, contents: Data?, completionHandler: SimpleCompletionHandler) -> Progress? {
         return self.writeContents(path: path, contents: contents, atomically: false, overwrite: false, completionHandler: completionHandler)
     }
     
     @discardableResult
-    public func writeContents(path: String, contents: Data?, atomically: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    public func writeContents(path: String, contents: Data?, atomically: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         return self.writeContents(path: path, contents: contents, atomically: atomically, overwrite: false, completionHandler: completionHandler)
     }
     
     @discardableResult
-    public func writeContents(path: String, contents: Data?, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    public func writeContents(path: String, contents: Data?, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         return self.writeContents(path: path, contents: contents, atomically: false, overwrite: overwrite, completionHandler: completionHandler)
     }
 }
@@ -570,7 +570,7 @@ public protocol FileProvideUndoable: FileProviderOperations {
     var undoManager: UndoManager? { get set }
     
     /// UndoManager supports undoing this file operation
-    func canUndo(handle: OperationHandle) -> Bool
+    func canUndo(handle: Progress) -> Bool
     /// UndoManager supports undoing this operation
     func canUndo(operation: FileOperationType) -> Bool
 }
@@ -580,8 +580,11 @@ public extension FileProvideUndoable {
         return undoOperation(for: operation) != nil
     }
     
-    public func canUndo(handle: OperationHandle) -> Bool {
-        return canUndo(operation: handle.operationType)
+    public func canUndo(handle: Progress) -> Bool {
+        if let operationType = handle.userInfo[.fileProvderOperationTypeKey] as? FileOperationType {
+            return canUndo(operation: operationType)
+        }
+        return false
     }
     
     internal func undoOperation(for operation: FileOperationType) -> FileOperationType? {
@@ -953,10 +956,10 @@ public enum FileOperationType: CustomStringConvertible {
     }
     
     /// Path of subjecting file.
-    public var source: String? {
-        guard let reflect = Mirror(reflecting: self).children.first?.value else { return nil }
+    public var source: String {
+        let reflect = Mirror(reflecting: self).children.first!.value
         let mirror = Mirror(reflecting: reflect)
-        return reflect as? String ?? mirror.children.first?.value as? String
+        return reflect as? String ?? mirror.children.first?.value as! String
     }
     
     /// Path of subjecting file.
@@ -1008,6 +1011,7 @@ public enum FileOperationType: CustomStringConvertible {
 }
 
 /// Allows to get progress or cancel an in-progress operation, useful for remote providers
+@available(*, obsoleted: 1.0, message: "Use Progress class class instead.")
 public protocol OperationHandle {
     /// Operation supposed to be done on files. Contains file paths as associated value.
     var operationType: FileOperationType { get }
@@ -1028,14 +1032,6 @@ public protocol OperationHandle {
     func cancel() -> Bool
 }
 
-public extension OperationHandle {
-    public var progress: Float {
-        let bytesSoFar = self.bytesSoFar
-        let totalBytes = self.totalBytes
-        return totalBytes > 0 ? Float(Double(bytesSoFar) / Double(totalBytes)) : Float.nan
-    }
-}
-
 /// Delegate methods for reporting provider's operation result and progress, when it's ready to update
 /// user interface.
 /// All methods are called in main thread to avoids UI bugs.

Sources/FileProviderExtensions.swift

@@ -50,6 +50,13 @@ public extension URLResourceKey {
     public static let isEncryptedKey = URLResourceKey(rawValue: "NSURLIsEncryptedKey")
 }
 
+public extension ProgressUserInfoKey {
+    /// **FileProvider** returns associated `FileProviderOperationType`
+    public static let fileProvderOperationTypeKey = ProgressUserInfoKey("FilesProviderOperationTypeKey")
+    /// **FileProvider** returns start date/time of operation
+    public static let startingTimeKey = ProgressUserInfoKey("NSProgressStartingTimeKey")
+}
+
 internal extension URL {
     var uw_scheme: String {
         return self.scheme ?? ""
@@ -113,10 +120,28 @@ internal extension URLRequest {
         self.setValue(contentType.rawValue, forHTTPHeaderField: "Content-Type")
     }
     
-    mutating func set(dropboxArgKey requestDictionary: [String: AnyObject]) {
-        if let requestJson = String(jsonDictionary: requestDictionary) {
-            self.setValue(requestJson, forHTTPHeaderField: "Dropbox-API-Arg")
+    private func asciiEscape(string:String) -> String {
+        var res = ""
+        for char in string.unicodeScalars {
+            let substring = String(char)
+            if substring.canBeConverted(to: .ascii) {
+                res.append(substring)
+            } else {
+                res = res.appendingFormat("\\u%04x", char.value)
+            }
         }
+        return res
+    }
+    
+    mutating func set(dropboxArgKey requestDictionary: [String: AnyObject]) {
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: requestDictionary, options: []) else {
+            return
+        }
+        guard var jsonString = String(data: jsonData, encoding: .utf8) else { return }
+        jsonString = self.asciiEscape(string: jsonString)
+        jsonString = jsonString.replacingOccurrences(of: "\\/", with: "/")
+        
+        self.setValue(jsonString, forHTTPHeaderField: "Dropbox-API-Arg")
     }
 }
 

Sources/HTTPFileProvider.swift

@@ -0,0 +1,393 @@
+//
+//  HTTPFileProvider.swift
+//  FilesProvider
+//
+//  Created by Amir Abbas Mousavian.
+//  Copyright © 2017 Mousavian. Distributed under MIT license.
+//
+
+import Foundation
+
+/**
+ Allows accessing to Dropbox stored files. This provider doesn't cache or save files internally, however you can
+ set `useCache` and `cache` properties to use Foundation `NSURLCache` system.
+ 
+ - Note: Uploading files and data are limited to 150MB, for now.
+ */
+open class HTTPFileProvider: FileProviderBasicRemote, FileProviderOperations, FileProviderReadWrite {
+    open class var type: String { fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.") }
+    open let baseURL: URL?
+    open var currentPath: String
+    
+    open var dispatch_queue: DispatchQueue
+    open var operation_queue: OperationQueue {
+        willSet {
+            assert(_session == nil, "It's not effective to change dispatch_queue property after session is initialized.")
+        }
+    }
+    
+    open weak var delegate: FileProviderDelegate?
+    open var credential: URLCredential? {
+        didSet {
+            sessionDelegate?.credential = self.credential
+        }
+    }
+    open private(set) var cache: URLCache?
+    public var useCache: Bool
+    public var validatingCache: Bool
+    
+    fileprivate var _session: URLSession?
+    internal fileprivate(set) var sessionDelegate: SessionDelegate?
+    public var session: URLSession {
+        get {
+            if _session == nil {
+                self.sessionDelegate = SessionDelegate(fileProvider: self)
+                let config = URLSessionConfiguration.default
+                config.urlCache = cache
+                config.requestCachePolicy = .returnCacheDataElseLoad
+                _session = URLSession(configuration: config, delegate: sessionDelegate as URLSessionDelegate?, delegateQueue: self.operation_queue)
+                _session!.sessionDescription = UUID().uuidString
+                initEmptySessionHandler(_session!.sessionDescription!)
+            }
+            return _session!
+        }
+        
+        set {
+            assert(newValue.delegate is SessionDelegate, "session instances should have a SessionDelegate instance as delegate.")
+            _session = newValue
+            if session.sessionDescription?.isEmpty ?? true {
+                _session?.sessionDescription = UUID().uuidString
+            }
+            self.sessionDelegate = newValue.delegate as? SessionDelegate
+            initEmptySessionHandler(_session!.sessionDescription!)
+        }
+    }
+    
+    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!
+    }
+    
+    public init(baseURL: URL?, credential: URLCredential?, cache: URLCache?) {
+        self.baseURL = baseURL
+        self.currentPath = ""
+        self.useCache = false
+        self.validatingCache = true
+        self.cache = cache
+        self.credential = credential
+        
+        #if swift(>=3.1)
+            let queueLabel = "FileProvider.\(Swift.type(of: self).type)"
+        #else
+            let queueLabel = "FileProvider.\(type(of: self).type)"
+        #endif
+        dispatch_queue = DispatchQueue(label: queueLabel, attributes: .concurrent)
+        operation_queue = OperationQueue()
+        operation_queue.name = "\(queueLabel).Operation"
+    }
+    
+    public required convenience init?(coder aDecoder: NSCoder) {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    public 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: "useCache")
+        aCoder.encode(self.validatingCache, forKey: "validatingCache")
+    }
+    
+    public static var supportsSecureCoding: Bool {
+        return true
+    }
+    
+    open func copy(with zone: NSZone? = nil) -> Any {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    deinit {
+        if let sessionuuid = _session?.sessionDescription {
+            removeSessionHandler(for: sessionuuid)
+        }
+        
+        if fileProviderCancelTasksOnInvalidating {
+            _session?.invalidateAndCancel()
+        } else {
+            _session?.finishTasksAndInvalidate()
+        }
+    }
+    
+    open func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    open func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    open func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    open func isReachable(completionHandler: @escaping (Bool) -> Void) {
+        self.storageProperties { total, _ in
+            completionHandler(total > 0)
+        }
+    }
+    
+    open weak var fileOperationDelegate: FileOperationDelegate?
+    
+    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let path = (atPath as NSString).appendingPathComponent(folderName) + "/"
+        return doOperation(.create(path: path), completionHandler: completionHandler)
+    }
+    
+    open func moveItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
+        return doOperation(.move(source: path, destination: toPath), completionHandler: completionHandler)
+    }
+    
+    open func copyItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
+        return doOperation(.copy(source: path, destination: toPath), completionHandler: completionHandler)
+    }
+    
+    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> Progress? {
+        return doOperation(.remove(path: path), completionHandler: completionHandler)
+    }
+    
+    internal func request(for operation: FileOperationType, overwrite: Bool = false, attributes: [URLResourceKey: Any] = [:]) -> URLRequest {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    internal func serverError(with code: FileProviderHTTPErrorCode, path: String?, data: Data?) -> FileProviderHTTPError {
+        fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
+    }
+    
+    internal func multiStatusHandler(source: String, data: Data, completionHandler: SimpleCompletionHandler) -> Void {
+        // WebDAV will override this function
+    }
+    
+    fileprivate func doOperation(_ operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> Progress? {
+        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: operation) ?? true == true else {
+            return nil
+        }
+        
+        let progress = Progress(totalUnitCount: 1)
+        progress.setUserInfoObject(operation, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        
+        let request = self.request(for: operation)
+        
+        let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
+            var serverError: FileProviderHTTPError?
+            if let response = response as? HTTPURLResponse, response.statusCode >= 300, let code = FileProviderHTTPErrorCode(rawValue: response.statusCode) {
+                serverError = self.serverError(with: code, path: operation.source, data: data)
+            }
+            
+            if let response = response as? HTTPURLResponse, FileProviderHTTPErrorCode(rawValue: response.statusCode) == .multiStatus, let data = data {
+                self.multiStatusHandler(source: operation.source, data: data, completionHandler: completionHandler)
+            }
+            
+            if serverError == nil && error == nil {
+                progress.completedUnitCount = 1
+            } else {
+                progress.cancel()
+            }
+            completionHandler?(serverError ?? error)
+            self.delegateNotify(operation, error: serverError ?? error)
+        })
+        task.taskDescription = operation.json
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
+        task.resume()
+        return progress
+    }
+    
+    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
+        // check file is not a folder
+        guard (try? localFile.resourceValues(forKeys: [.fileResourceTypeKey]))?.fileResourceType ?? .unknown == .regular else {
+            dispatch_queue.async {
+                completionHandler?(self.throwError(localFile.path, code: URLError.fileIsDirectory))
+            }
+            return nil
+        }
+        
+        let operation = FileOperationType.copy(source: localFile.absoluteString, destination: toPath)
+        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: operation) ?? true == true else {
+            return nil
+        }
+        let request = self.request(for: operation, overwrite: overwrite)
+        return upload_simple(toPath, request: request, localFile: localFile, operation: operation, completionHandler: completionHandler)
+    }
+    
+    open func copyItem(path: String, toLocalURL destURL: URL, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let operation = FileOperationType.copy(source: path, destination: destURL.absoluteString)
+        let request = self.request(for: operation)
+        return self.download_simple(path: path, request: request, operation: operation, completionHandler: { [weak self] (tempURL, error) in
+            if let error = error {
+                completionHandler?(error)
+                self?.delegateNotify(operation, error: error)
+                return
+            }
+            
+            guard let tempURL = tempURL else {
+                completionHandler?(error)
+                self?.delegateNotify(operation, error: error)
+                return
+            }
+            
+            do {
+                try FileManager.default.moveItem(at: tempURL, to: destURL)
+                completionHandler?(nil)
+                self?.delegateNotify(operation, error: nil)
+            } catch let e {
+                completionHandler?(e)
+                self?.delegateNotify(operation, error: e)
+            }
+        })
+    }
+    
+    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
+        if length == 0 || offset < 0 {
+            dispatch_queue.async {
+                completionHandler(Data(), nil)
+            }
+            return nil
+        }
+        
+        let operation = FileOperationType.fetch(path: path)
+        var request = self.request(for: operation)
+        request.set(rangeWithOffset: offset, length: length)
+        return self.download_simple(path: path, request: request, operation: operation, completionHandler: { (tempURL, error) in
+            if let error = error {
+                completionHandler(nil, error)
+                return
+            }
+            
+            guard let tempURL = tempURL else {
+                completionHandler(nil, error)
+                return
+            }
+            
+            do {
+                let data = try Data(contentsOf: tempURL)
+                completionHandler(data, nil)
+            } catch let e {
+                completionHandler(nil, e)
+            }
+        })
+    }
+    
+    public func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let operation = FileOperationType.modify(path: path)
+        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: operation) ?? true == true else {
+            return nil
+        }
+        let request = self.request(for: operation, overwrite: overwrite, attributes: [.contentModificationDateKey: Date()])
+        return upload_simple(path, request: request, data: data ?? Data(), operation: operation, completionHandler: completionHandler)
+    }
+
+    internal func upload_simple(_ targetPath: String, request: URLRequest, data: Data? = nil, localFile: URL? = nil, operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let size = data?.count ?? Int((try? localFile?.resourceValues(forKeys: [.fileSizeKey]))??.fileSize ?? -1)
+        
+        var progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(operation, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        progress.totalUnitCount = Int64(size)
+        
+        let task: URLSessionUploadTask
+        if let data = data {
+            task = session.uploadTask(with: request, from: data)
+        } else if let localFile = localFile {
+            task = session.uploadTask(with: request, fromFile: localFile)
+        } else {
+            return nil
+        }
+        
+        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { [weak self] error in
+            var responseError: FileProviderHTTPError?
+            if let code = (task.response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
+                // We can't fetch server result from delegate!
+                responseError = self?.serverError(with: rCode, path: targetPath, data: nil)
+            }
+            if !(responseError == nil && error == nil) {
+                progress.cancel()
+            }
+            completionHandler?(responseError ?? error)
+            self?.delegateNotify(operation, error: responseError ?? error)
+        }
+        task.taskDescription = operation.json
+        task.addObserver(sessionDelegate!, forKeyPath: #keyPath(URLSessionTask.countOfBytesSent), options: .new, context: &progress)
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
+        task.resume()
+        return progress
+    }
+    
+    internal func download_simple(path: String, request: URLRequest, operation: FileOperationType, completionHandler: @escaping ((_ tempURL: URL?, _ error: Error?) -> Void)) -> Progress? {
+        var progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(operation, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.setUserInfoObject(Progress.FileOperationKind.downloading, forKey: .fileOperationKindKey)
+        
+        let task = session.downloadTask(with: request)
+        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { error in
+            if error != nil {
+                progress.cancel()
+            }
+            completionHandler(nil, error)
+        }
+        downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
+            guard let httpResponse = task.response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
+                let code = FileProviderHTTPErrorCode(rawValue: (task.response as? HTTPURLResponse)?.statusCode ?? -1)
+                let errorData : Data? = nil //Data(contentsOf:cacheURL) // TODO: Figure out how to get error response data for the error description
+                let serverError : FileProviderHTTPError? = code != nil ? self.serverError(with: code!, path: path, data: errorData) : nil
+                if serverError != nil {
+                    progress.cancel()
+                }
+                completionHandler(nil, serverError)
+                return
+            }
+            
+            completionHandler(tempURL, nil)
+        }
+        task.taskDescription = operation.json
+        task.addObserver(sessionDelegate!, forKeyPath: #keyPath(URLSessionTask.countOfBytesReceived), options: .new, context: &progress)
+        task.addObserver(sessionDelegate!, forKeyPath: #keyPath(URLSessionTask.countOfBytesExpectedToReceive), options: .new, context: &progress)
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
+        task.resume()
+        return progress
+    }
+}
+
+extension HTTPFileProvider {
+    internal 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)
+            }
+        })
+    }
+}
+
+extension HTTPFileProvider: FileProvider { }

Sources/LocalFileProvider.swift

@@ -173,22 +173,32 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
         completionHandler(totalSize, totalSize - freeSize)
     }
     
-    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
+    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(self.url(of: path), forKey: .fileURLKey)
+        
         dispatch_queue.async {
+            progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
             let iterator = self.fileManager.enumerator(at: self.url(of: path), includingPropertiesForKeys: nil, options: recursive ? [] : [.skipsSubdirectoryDescendants, .skipsPackageDescendants]) { (url, e) -> Bool in
                 completionHandler([], e)
                 return true
             }
             var result = [LocalFileObject]()
             while let fileURL = iterator?.nextObject() as? URL {
+                if progress.isCancelled {
+                    break
+                }
                 let path = self.relativePathOf(url: fileURL)
                 if let fileObject = LocalFileObject(fileWithPath: path, relativeTo: self.baseURL), query.evaluate(with: fileObject.mapPredicate()) {
                     result.append(fileObject)
+                    progress.completedUnitCount = Int64(result.count)
                     foundItemHandler?(fileObject)
                 }
             }
             completionHandler(result, nil)
         }
+        
+        return progress
     }
     
     open func isReachable(completionHandler: @escaping (Bool) -> Void) {
@@ -200,13 +210,13 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
     open weak var fileOperationDelegate : FileOperationDelegate?
     
     @discardableResult
-    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.create(path: (atPath as NSString).appendingPathComponent(folderName) + "/")
         return self.doOperation(opType, completionHandler: completionHandler)
     }
     
     @discardableResult
-    open func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.move(source: path, destination: toPath)
 
         if !overwrite && self.fileManager.fileExists(atPath: self.url(of: toPath).path) {
@@ -218,7 +228,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
     }
     
     @discardableResult
-    open func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.copy(source: path, destination: toPath)
         
         if !overwrite && self.fileManager.fileExists(atPath: self.url(of: toPath).path) {
@@ -232,13 +242,13 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
     }
     
     @discardableResult
-    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.remove(path: path)
         return self.doOperation(opType, completionHandler: completionHandler)
     }
     
     @discardableResult
-    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         if !overwrite && self.fileManager.fileExists(atPath: self.url(of: toPath).path) {
             self.dispatch_queue.async {
                 completionHandler?(self.throwError(toPath, code: CocoaError.fileWriteFileExists as FoundationErrorEnum))
@@ -250,7 +260,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
     }
     
     @discardableResult
-    open func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> Progress? {
         let opType = FileOperationType.copy(source: path, destination: toLocalURL.absoluteString)
         return self.doOperation(opType, completionHandler: completionHandler)
     }
@@ -263,9 +273,12 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
     }
     
     @discardableResult
-    fileprivate func doOperation(_ opType: FileOperationType, data: Data? = nil, atomically: Bool = false, forUploading: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let localOperationHandle = LocalOperationHandle(operationType: opType, baseURL: self.baseURL)
-
+    fileprivate func doOperation(_ opType: FileOperationType, data: Data? = nil, atomically: Bool = false, forUploading: Bool = false, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.isCancellable = false
+        progress.setUserInfoObject(Progress.FileOperationKind.receiving, forKey: .fileOperationKindKey)
         func urlofpath(path: String) -> URL {
             if path.hasPrefix("file://") {
                 let removedSchemePath = path.replacingOccurrences(of: "file://", with: "", options: .anchored)
@@ -276,9 +289,10 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
             }
         }
         
-        guard let sourcePath = opType.source else { return nil }
+        let sourcePath = opType.source
         let destPath = opType.destination
         let source: URL = urlofpath(path: sourcePath)
+        progress.setUserInfoObject(source, forKey: .fileURLKey)
         
         let dest: URL?
         if let destPath = destPath {
@@ -299,23 +313,31 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
         
         let operationHandler: (URL, URL?) -> Void = { source, dest in
             do {
-                localOperationHandle.inProgress = true
+                progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
                 switch opType {
                 case .create:
                     if sourcePath.hasSuffix("/") {
+                        progress.totalUnitCount = 1
                         try self.opFileManager.createDirectory(at: source, withIntermediateDirectories: true, attributes: [:])
                     } else {
+                        progress.totalUnitCount = Int64(data?.count ?? 0)
                         try data?.write(to: source, options: .atomic)
                     }
                 case .modify:
+                    progress.totalUnitCount = Int64(data?.count ?? 0)
                     try data?.write(to: source, options: atomically ? [.atomic] : [])
                 case .copy:
                     guard let dest = dest else { return }
+                    progress.setUserInfoObject(Progress.FileOperationKind.copying, forKey: .fileOperationKindKey)
+                    progress.totalUnitCount = abs(source.fileSize)
                     try self.opFileManager.copyItem(at: source, to: dest)
                 case .move:
+                    progress.setUserInfoObject(Progress.FileOperationKind.copying, forKey: .fileOperationKindKey)
                     guard let dest = dest else { return }
+                    progress.totalUnitCount = abs(source.fileSize)
                     try self.opFileManager.moveItem(at: source, to: dest)
                 case.remove:
+                    progress.totalUnitCount = abs(source.fileSize)
                     try self.opFileManager.removeItem(at: source)
                 default:
                     return
@@ -324,7 +346,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
                     source.stopAccessingSecurityScopedResource()
                 }
 
-                localOperationHandle.inProgress = false
+                progress.completedUnitCount = progress.totalUnitCount
                 self.dispatch_queue.async {
                     completionHandler?(nil)
                 }
@@ -335,6 +357,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
                 if successfulSecurityScopedResourceAccess {
                     source.stopAccessingSecurityScopedResource()
                 }
+                progress.cancel()
                 self.dispatch_queue.async {
                     completionHandler?(e)
                 }
@@ -376,24 +399,32 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
                 operationHandler(source, dest)
             }
         }
-        return localOperationHandle
+        return progress
     }
     
     @discardableResult
-    open func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
+    open func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
         let opType = FileOperationType.fetch(path: path)
-        let localOperationHandle = LocalOperationHandle(operationType: opType, baseURL: self.baseURL)
         let url = self.url(of: path)
-
+        
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.isCancellable = false
+        progress.setUserInfoObject(Progress.FileOperationKind.receiving, forKey: .fileOperationKindKey)
+        progress.setUserInfoObject(url, forKey: .fileURLKey)
+        progress.totalUnitCount = url.fileSize
+        
         let operationHandler: (URL) -> Void = { url in
+            progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
             do {
-                localOperationHandle.inProgress = true
                 let data = try Data(contentsOf: url)
-                localOperationHandle.inProgress = false
+                progress.completedUnitCount = progress.totalUnitCount
                 self.dispatch_queue.async {
                     completionHandler(data, nil)
                 }
             } catch let e {
+                progress.cancel()
                 self.dispatch_queue.async {
                     completionHandler(nil, e)
                 }
@@ -416,11 +447,11 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
             }
         }
 
-        return localOperationHandle
+        return progress
     }
     
     @discardableResult
-    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
+    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
         if length == 0 || offset < 0 {
             dispatch_queue.async {
                 completionHandler(Data(), nil)
@@ -433,9 +464,15 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
         }
 
         let opType = FileOperationType.fetch(path: path)
-        let localOperationHandle = LocalOperationHandle(operationType: opType, baseURL: self.baseURL)
         let url = self.url(of: path)
         
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(opType, forKey: .fileProvderOperationTypeKey)
+        progress.kind = .file
+        progress.isCancellable = false
+        progress.setUserInfoObject(url, forKey: .fileURLKey)
+        progress.setUserInfoObject(Progress.FileOperationKind.receiving, forKey: .fileOperationKindKey)
+        
         let operationHandler: (URL) -> Void = { url in
             guard let handle = FileHandle(forReadingAtPath: url.path) else {
                 self.dispatch_queue.async {
@@ -448,18 +485,19 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
                 handle.closeFile()
             }
 
-            localOperationHandle.inProgress = true
             let size = LocalFileObject(fileWithURL: url)?.size ?? -1
+            progress.totalUnitCount = size
             guard size > offset else {
-                localOperationHandle.inProgress = false
+                progress.cancel()
                 self.dispatch_queue.async {
                     completionHandler(nil, self.throwError(path, code: CocoaError.fileReadTooLarge as FoundationErrorEnum))
                 }
                 return
             }
+            progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
             handle.seek(toFileOffset: UInt64(offset))
             guard Int64(handle.offsetInFile) == offset else {
-                localOperationHandle.inProgress = false
+                progress.cancel()
                 self.dispatch_queue.async {
                     completionHandler(nil, self.throwError(path, code: CocoaError.fileReadTooLarge as FoundationErrorEnum))
                 }
@@ -467,7 +505,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
             }
             
             let data = handle.readData(ofLength: length)
-            localOperationHandle.inProgress = false
+            progress.completedUnitCount = progress.totalUnitCount
             self.dispatch_queue.async {
                 completionHandler(data, nil)
             }
@@ -487,11 +525,11 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
             }
         }
         
-        return localOperationHandle
+        return progress
     }
     
     @discardableResult
-    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         let fileExists = fileManager.fileExists(atPath: url(of: path).path)
         let opType: FileOperationType = fileExists ? .modify(path: path) : .create(path: path)
         return self.doOperation(opType, data: data ?? Data(), atomically: atomically, completionHandler: completionHandler)

Sources/LocalHelper.swift

@@ -19,7 +19,7 @@ public final class LocalFileObject: FileObject {
         var fileURL: URL?
         var rpath = path.replacingOccurrences(of: relativeURL?.path ?? "", with: "", options: .anchored)
         if relativeURL != nil && rpath.hasPrefix("/") {
-            rpath.remove(at: rpath.startIndex)
+            _=rpath.characters.removeFirst()
         }
         if #available(iOS 9.0, macOS 10.11, tvOS 9.0, *) {
             fileURL = URL(fileURLWithPath: rpath, relativeTo: relativeURL)
@@ -217,104 +217,6 @@ internal class LocalFileProviderManagerDelegate: NSObject, FileManagerDelegate {
     }
 }
 
-/// - Note: Local operation handling is limited. Please don't use as much as possible.
-open class LocalOperationHandle: OperationHandle {
-    /// Url of file which operation is doing on
-    public let baseURL: URL
-    /// Type of operation
-    public let operationType: FileOperationType
-    
-    init (operationType: FileOperationType, baseURL: URL?) {
-        self.baseURL = baseURL ?? URL(fileURLWithPath: "/")
-        self.operationType = operationType
-        inProgress = false
-    }
-    
-    private var sourceURL: URL? {
-        guard let source = operationType.source else { return nil }
-        return source.hasPrefix("file://") ? URL(fileURLWithPath: source) : baseURL.appendingPathComponent(source)
-    }
-    
-    private var destURL: URL? {
-        guard let dest = operationType.destination else { return nil }
-        return dest.hasPrefix("file://") ? URL(fileURLWithPath: dest) : baseURL.appendingPathComponent(dest)
-    }
-    
-    /// Caution: may put pressure on CPU, may have latency
-    open var bytesSoFar: Int64 {
-        assert(!Thread.isMainThread, "Don't run \(#function) method on main thread")
-        switch operationType {
-        case .modify:
-            guard let url = sourceURL, url.isFileURL else { return 0 }
-            if url.fileIsDirectory {
-                return iterateDirectory(url, deep: true).totalsize
-            } else {
-                return url.fileSize
-            }
-        case .copy, .move:
-            guard let url = destURL, url.isFileURL else { return 0 }
-            if url.fileIsDirectory {
-                return iterateDirectory(url, deep: true).totalsize
-            } else {
-                return url.fileSize
-            }
-        default:
-            return 0
-        }
-        
-    }
-    
-    /// Caution: may put pressure on CPU, may have latency
-    open var totalBytes: Int64 {
-        assert(!Thread.isMainThread, "Don't run \(#function) method on main thread")
-        switch operationType {
-        case .copy, .move:
-            guard let url = sourceURL, url.isFileURL else { return 0 }
-            if url.fileIsDirectory {
-                return iterateDirectory(url, deep: true).totalsize
-            } else {
-                return url.fileSize
-            }
-        default:
-            return 0
-        }
-    }
-    
-    /// Not usable in local provider
-    open var inProgress: Bool
-
-
-    /// Not usable in local provider
-    open func cancel() -> Bool{
-        return false
-    }
-    
-    func iterateDirectory(_ pathURL: URL, deep: Bool) -> (folders: Int, files: Int, totalsize: Int64) {
-        var folders = 0
-        var files = 0
-        var totalsize: Int64 = 0
-        let keys: [URLResourceKey] = [.isDirectoryKey, .fileSizeKey]
-        let enumOpt: FileManager.DirectoryEnumerationOptions = !deep ? [.skipsSubdirectoryDescendants, .skipsPackageDescendants] : []
-        
-        let fp = FileManager()
-        let filesList = fp.enumerator(at: pathURL, includingPropertiesForKeys: keys, options: enumOpt, errorHandler: nil)
-        while let fileURL = filesList?.nextObject() as? URL {
-            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)
-        
-    }
-}
-
 class UndoBox: NSObject {
     weak var provider: FileProvideUndoable?
     let operation: FileOperationType

Sources/OneDriveFileProvider.swift

@@ -17,59 +17,10 @@ import CoreGraphics
  
  - Note: Uploading files and data are limited to 100MB, for now.
  */
-open class OneDriveFileProvider: FileProviderBasicRemote {
-    open class var type: String { return "OneDrive" }
-    open let baseURL: URL?
+open class OneDriveFileProvider: HTTPFileProvider {
+    override open class var type: String { return "OneDrive" }
     /// 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 currentPath: String
-    
-    open var dispatch_queue: DispatchQueue
-    open var operation_queue: OperationQueue {
-        willSet {
-            assert(_session == nil, "It's not effective to change dispatch_queue property after session is initialized.")
-        }
-    }
-    
-    open weak var delegate: FileProviderDelegate?
-    open var credential: URLCredential? {
-        didSet {
-            sessionDelegate?.credential = self.credential
-        }
-    }
-    open private(set) var cache: URLCache?
-    public var useCache: Bool
-    public var validatingCache: Bool
-   
-    fileprivate var _session: URLSession?
-    fileprivate var sessionDelegate: SessionDelegate?
-    public var session: URLSession {
-        get {
-            if _session == nil {
-                self.sessionDelegate = SessionDelegate(fileProvider: self)
-                let queue = OperationQueue()
-                //queue.underlyingQueue = dispatch_queue
-                let config = URLSessionConfiguration.default
-                config.urlCache = cache
-                config.requestCachePolicy = .returnCacheDataElseLoad
-                _session = URLSession(configuration: config, delegate: sessionDelegate as URLSessionDelegate?, delegateQueue: queue)
-                _session?.sessionDescription = UUID().uuidString
-                initEmptySessionHandler(_session!.sessionDescription!)
-            }
-            return _session!
-        }
-        
-        set {
-            assert(newValue.delegate is SessionDelegate, "session instances should have a SessionDelegate instance as delegate.")
-            _session = newValue
-            if session.sessionDescription?.isEmpty ?? true {
-                _session?.sessionDescription = UUID().uuidString
-            }
-            self.sessionDelegate = newValue.delegate as? SessionDelegate
-            initEmptySessionHandler(_session!.sessionDescription!)
-        }
-    }
     
     /**
      Initializer for Onedrive provider with given client ID and Token.
@@ -87,22 +38,9 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
      */
     public init(credential: URLCredential?, serverURL: URL? = nil, drive: String = "root", cache: URLCache? = nil) {
         let baseURL = serverURL?.absoluteURL ?? URL(string: "https://api.onedrive.com/")!
-        self.baseURL = baseURL.absoluteString.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")
+        let refinedBaseURL = baseURL.absoluteString.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")
         self.drive = drive
-        self.currentPath = ""
-        self.useCache = false
-        self.validatingCache = true
-        self.cache = cache
-        self.credential = credential
-        
-        #if swift(>=3.1)
-        let queueLabel = "FileProvider.\(Swift.type(of: self).type)"
-        #else
-        let queueLabel = "FileProvider.\(type(of: self).type)"
-        #endif
-        dispatch_queue = DispatchQueue(label: queueLabel, attributes: .concurrent)
-        operation_queue = OperationQueue()
-        operation_queue.name = "\(queueLabel).Operation"
+        super.init(baseURL: refinedBaseURL, credential: credential, cache: cache)
     }
     
     public required convenience init?(coder aDecoder: NSCoder) {
@@ -114,20 +52,12 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         self.validatingCache = aDecoder.decodeBool(forKey: "validatingCache")
     }
     
-    open func encode(with aCoder: NSCoder) {
-        aCoder.encode(self.credential, forKey: "credential")
-        aCoder.encode(self.baseURL, forKey: "baseURL")
+    open override func encode(with aCoder: NSCoder) {
+        super.encode(with: aCoder)
         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 {
+    open override 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
@@ -137,25 +67,13 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         return copy
     }
     
-    deinit {
-        if let sessionuuid = _session?.sessionDescription {
-            removeSessionHandler(for: sessionuuid)
-        }
-        
-        if fileProviderCancelTasksOnInvalidating {
-            _session?.invalidateAndCancel()
-        } else {
-            _session?.finishTasksAndInvalidate()
-        }
-    }
-    
-    open func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
+    open override func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
         list(path) { (contents, cursor, error) in
             completionHandler(contents, error)
         }
     }
     
-    open func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
+    open override func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
         var request = URLRequest(url: url(of: path))
         request.httpMethod = "GET"
         request.set(httpAuthentication: credential, with: .oAuth2)
@@ -174,7 +92,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         task.resume()
     }
     
-    open func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
+    open override func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
         var request = URLRequest(url: url())
         request.httpMethod = "GET"
         request.set(httpAuthentication: credential, with: .oAuth2)
@@ -190,12 +108,14 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         task.resume()
     }
     
-    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
+    open override func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
         var foundFiles = [OneDriveFileObject]()
         var queryStr: 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
+        guard let finalQueryStr = queryStr else { return nil }
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(url(of: path), forKey: .fileURLKey)
+        search(path, query: finalQueryStr, progress: progress, foundItem: { (file) in
             if query.evaluate(with: file.mapPredicate()) {
                 foundFiles.append(file)
                 foundItemHandler?(file)
@@ -203,6 +123,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         }, completionHandler: { (error) in
             completionHandler(foundFiles, error)
         })
+        return progress
     }
     
     open func url(of path: String? = nil, modifier: String? = nil) -> URL {
@@ -213,25 +134,27 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
             rpath = self.currentPath
         }
         
+        let driveURL = baseURL!.appendingPathComponent("drive/\(drive):/")
+        
         if rpath.hasPrefix("/") {
-            rpath.remove(at: rpath.startIndex)
+            _=rpath.characters.removeFirst()
         }
         if rpath.isEmpty {
             if let modifier = modifier {
-                return baseURL!.appendingPathComponent("drive/\(drive)/\(modifier)")
+                return driveURL.appendingPathComponent(modifier)
             }
-            return baseURL!.appendingPathComponent("drive/\(drive)")
+            return driveURL
         }
-        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
+        
+        return  driveURL.appendingPathComponent(rpath)
     }
     
-    open func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    open override func isReachable(completionHandler: @escaping (Bool) -> Void) {
         var request = URLRequest(url: url())
         request.httpMethod = "HEAD"
         request.set(httpAuthentication: credential, with: .oAuth2)
@@ -242,163 +165,71 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
         task.resume()
     }
     
-    open weak var fileOperationDelegate: FileOperationDelegate?
-}
-
-extension OneDriveFileProvider: FileProviderOperations {
-    
-    
-    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let path = (atPath as NSString).appendingPathComponent(folderName) + "/"
-        return doOperation(.create(path: path), completionHandler: completionHandler)
-    }
-    
-    open func moveItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        return doOperation(.move(source: path, destination: toPath), completionHandler: completionHandler)
-    }
-    
-    open func copyItem(path: String, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        return doOperation(.copy(source: path, destination: toPath), completionHandler: completionHandler)
-    }
-    
-    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        return doOperation(.remove(path: path), completionHandler: completionHandler)
-    }
-    
-    fileprivate func doOperation(_ operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: operation) ?? true == true else {
-            return nil
-        }
-        guard let sourcePath = operation.source else { return nil }
-        let destPath = operation.destination
-        var request = URLRequest(url: url(of: sourcePath))
+    override func request(for operation: FileOperationType, overwrite: Bool = false, attributes: [URLResourceKey : Any] = [:]) -> URLRequest {
+        let method: String
+        let url: URL
         switch operation {
-        case .create:
-            request.httpMethod = "CREATE"
-        case .copy:
-            request.httpMethod = "POST"
-        case .move:
-            request.httpMethod = "PATCH"
-        case .remove:
-            request.httpMethod = "DELETE"
-        default: // modify, link, fetch
-            return nil
+        case .fetch(path: let path):
+            method = "GET"
+            url = self.url(of: path, modifier: "content")
+        case .modify(path: let path):
+            method = "PUT"
+            let queryStr = overwrite ? "" : "?@name.conflictBehavior=fail"
+            url = self.url(of: path, modifier: "content\(queryStr)")
+        case .create(path: let path):
+            method = "CREATE"
+            url = self.url(of: path)
+        case .copy(let source, let dest) where !source.hasPrefix("file://") && !dest.hasPrefix("file://"):
+            method = "POST"
+            url = self.url(of: source)
+        case .copy(let source, let dest) where source.hasPrefix("file://"):
+            method = "PUT"
+            let queryStr = overwrite ? "" : "?@name.conflictBehavior=fail"
+            url = self.url(of: dest, modifier: "content\(queryStr)")
+        case .copy(let source, let dest) where dest.hasPrefix("file://"):
+            method = "GET"
+            url = self.url(of: source, modifier: "content")
+        case .move(source: let source, destination: _):
+            method = "PATCH"
+            url = self.url(of: source)
+        case .remove(path: let path):
+            method = "DELETE"
+            url = self.url(of: path)
+        default: // link
+            fatalError("Unimplemented operation \(operation.description) in \(#file)")
         }
-        
+        var request = URLRequest(url: url)
+        request.httpMethod = method
         request.set(httpAuthentication: credential, with: .oAuth2)
-        var requestDictionary = [String: AnyObject]()
-        if let dest = correctPath(destPath) as NSString? {
+        if let dest = correctPath(operation.destination) as NSString?, !dest.hasPrefix("file://") {
             request.set(contentType: .json)
+            var requestDictionary = [String: AnyObject]()
             requestDictionary["parentReference"] = ("/drive/\(drive):" + dest.deletingLastPathComponent) as NSString
             requestDictionary["name"] = dest.lastPathComponent as NSString
             request.httpBody = Data(jsonDictionary: requestDictionary)
         }
-        let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
-            var serverError: FileProviderOneDriveError?
-            if let response = response as? HTTPURLResponse, response.statusCode >= 300, let code = FileProviderHTTPErrorCode(rawValue: response.statusCode) {
-                 serverError = FileProviderOneDriveError(code: code, path: sourcePath, errorDescription: String(data: data ?? Data(), encoding: .utf8))
-            }
-            completionHandler?(serverError ?? error)
-            self.delegateNotify(operation, error: serverError ?? error)
-        })
-        task.taskDescription = operation.json
-        task.resume()
-        return RemoteOperationHandle(operationType: operation, tasks: [task])
+        
+        return request
     }
     
-    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        // check file is not a folder
-        guard (try? localFile.resourceValues(forKeys: [.fileResourceTypeKey]))?.fileResourceType ?? .unknown == .regular else {
-            dispatch_queue.async {
-                completionHandler?(self.throwError(localFile.path, code: URLError.fileIsDirectory))
-            }
+    override func serverError(with code: FileProviderHTTPErrorCode, path: String?, data: Data?) -> FileProviderHTTPError {
+        return FileProviderOneDriveError(code: code, path: path ?? "", errorDescription:  data.flatMap({ String(data: $0, encoding: .utf8) }))
+    }
+    
+    override func upload_simple(_ targetPath: String, request: URLRequest, data: Data?, localFile: URL?, operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> Progress? {
+        let size = data?.count ?? Int((try? localFile?.resourceValues(forKeys: [.fileSizeKey]))??.fileSize ?? -1)
+        if size > 100 * 1024 * 1024 {
+            let error = FileProviderOneDriveError(code: .payloadTooLarge, path: targetPath, errorDescription: nil)
+            completionHandler?(error)
+            self.delegateNotify(operation, error: error)
             return nil
         }
         
-        let opType = FileOperationType.copy(source: localFile.absoluteString, destination: toPath)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        return upload_simple(toPath, localFile: localFile, overwrite: overwrite, operation: opType, completionHandler: completionHandler)
-    }
-    
-    open func copyItem(path: String, toLocalURL destURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.copy(source: path, destination: destURL.absoluteString)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        var request = URLRequest(url: self.url(of: path, modifier: "content"))
-        request.set(httpAuthentication: credential, with: .oAuth2)
-        let task = session.downloadTask(with: request)
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = completionHandler
-        downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
-            guard let httpResponse = task.response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
-                let code = FileProviderHTTPErrorCode(rawValue: (task.response as? HTTPURLResponse)?.statusCode ?? -1)
-                let errorData : Data? = nil //Data(contentsOf: cacheURL) // TODO: Figure out how to get error response data for the error description
-                let serverError : FileProviderOneDriveError? = code != nil ? FileProviderOneDriveError(code: code!, path: path, errorDescription: String(data: errorData ?? Data(), encoding: .utf8)) : nil
-                completionHandler?(serverError)
-                return
-            }
-            do {
-                try FileManager.default.moveItem(at: tempURL, to: destURL)
-                completionHandler?(nil)
-            } catch let e {
-                completionHandler?(e)
-            }
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
+        return super.upload_simple(targetPath, request: request, data: data, localFile: localFile, operation: operation, completionHandler: completionHandler)
     }
 }
 
-extension OneDriveFileProvider: FileProviderReadWrite {
-    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        if length == 0 || offset < 0 {
-            dispatch_queue.async {
-                completionHandler(Data(), nil)
-            }
-            return nil
-        }
-        
-        let opType = FileOperationType.fetch(path: path)
-        var request = URLRequest(url: self.url(of: path, modifier: "content"))
-        request.httpMethod = "GET"
-        request.set(httpAuthentication: credential, with: .oAuth2)
-        request.set(rangeWithOffset: offset, length: length)
-        let task = session.downloadTask(with: request)
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { error in
-            completionHandler(nil, error)
-        }
-        downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
-            guard let httpResponse = task.response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
-                let code = FileProviderHTTPErrorCode(rawValue: (task.response as? HTTPURLResponse)?.statusCode ?? -1)
-                let errorData : Data? = nil //Data(contentsOf: cacheURL) // TODO: Figure out how to get error response data for the error description
-                let serverError : FileProviderOneDriveError? = code != nil ? FileProviderOneDriveError(code: code!, path: path, errorDescription: String(data: errorData ?? Data(), encoding: .utf8)) : nil
-                completionHandler(nil, serverError)
-                return
-            }
-            do {
-                let data = try Data(contentsOf: tempURL)
-                completionHandler(data, nil)
-            } catch let e {
-                completionHandler(nil, e)
-            }
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
-    }
-    
-    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.modify(path: path)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        // FIXME: remove 150MB restriction
-        return upload_simple(path, data: data ?? Data(), overwrite: overwrite, operation: opType, completionHandler: completionHandler)
-    }
-    
+extension OneDriveFileProvider {
     fileprivate func registerNotifcation(path: String, eventHandler: (() -> Void)) {
         /* There is two ways to monitor folders changing in OneDrive. Either using webooks
          * which means you have to implement a server to translate it to push notifications
@@ -503,5 +334,3 @@ extension OneDriveFileProvider: ExtendedFileProvider {
         task.resume()
     }
 }
-
-extension OneDriveFileProvider: FileProvider { }

Sources/OneDriveHelper.swift

@@ -18,12 +18,13 @@ public struct FileProviderOneDriveError: FileProviderHTTPError {
 /// Containts path, url and attributes of a OneDrive file or resource.
 public final class OneDriveFileObject: FileObject {
     internal init(baseURL: URL?, name: String, path: String) {
-        var rpath = path.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? path
+        var rpath = (URL(string:path)?.appendingPathComponent(name).absoluteString)!
         if rpath.hasPrefix("/") {
-            rpath.remove(at: rpath.startIndex)
+            _=rpath.characters.removeFirst()
         }
         let url = URL(string: rpath, relativeTo: baseURL) ?? URL(string: rpath)!
-        super.init(url: url, name: name, path: path)
+        
+        super.init(url: url, name: name, path: rpath.removingPercentEncoding ?? path)
     }
     
     internal convenience init? (baseURL: URL?, drive: String, jsonStr: String) {
@@ -34,14 +35,14 @@ public final class OneDriveFileObject: FileObject {
     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 }
-        var 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 = Date(rfcString: json["lastModifiedDateTime"] as? String ?? "")
         self.creationDate = Date(rfcString: json["createdDateTime"] as? String ?? "")
-        self.type = (json["folder"] as? String) != nil ? .directory : .regular
+        self.type = json["folder"] != nil ? .directory : .regular
         self.id = json["id"] as? String
         self.entryTag = json["eTag"] as? String
     }
@@ -113,44 +114,11 @@ internal extension OneDriveFileProvider {
         task.resume()
     }
     
-    func upload_simple(_ targetPath: String, data: Data? = nil , localFile: URL? = nil, modifiedDate: Date = Date(), overwrite: Bool, operation: FileOperationType, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let size = data?.count ?? (try? localFile?.resourceValues(forKeys: [.fileSizeKey]))??.fileSize ?? -1
-        if size > 100 * 1024 * 1024 {
-            let error = FileProviderOneDriveError(code: .payloadTooLarge, path: targetPath, errorDescription: nil)
-            completionHandler?(error)
-            self.delegateNotify(.create(path: targetPath), error: error)
-            return nil
-        }
-        let queryStr = overwrite ? "" : "?@name.conflictBehavior=fail"
-        let url = self.url(of: targetPath, modifier: "content\(queryStr)")
-        var request = URLRequest(url: url)
-        request.httpMethod = "PUT"
-        request.set(httpAuthentication: credential, with: .oAuth2)
-        request.set(contentType: .stream)
-        let task: URLSessionUploadTask
-        if let data = data {
-            task = session.uploadTask(with: request, from: data)
-        } else if  let localFile = localFile {
-            task = session.uploadTask(with: request, fromFile: localFile)
-        } else {
-            return nil
+    func search(_ startPath: String = "", query: String, next: URL? = nil, progress: Progress, foundItem: @escaping ((_ file: OneDriveFileObject) -> Void), completionHandler: @escaping ((_ error: Error?) -> Void)) {
+        if progress.isCancelled {
+            return
         }
         
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { [weak self] error in
-            var responseError: FileProviderOneDriveError?
-            if let code = (task.response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
-                // We can't fetch server result from delegate!
-                responseError = FileProviderOneDriveError(code: rCode, path: targetPath, errorDescription: nil)
-            }
-            completionHandler?(responseError ?? error)
-            self?.delegateNotify(.create(path: targetPath), error: responseError ?? error)
-        }
-        task.taskDescription = operation.json
-        task.resume()
-        return RemoteOperationHandle(operationType: operation, tasks: [task])
-    }
-    
-    func search(_ startPath: String = "", query: String, next: URL? = nil, foundItem:@escaping ((_ file: OneDriveFileObject) -> Void), completionHandler: @escaping ((_ error: Error?) -> Void)) {
         let url: URL
         let q = query.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!
         url = next ?? self.url(of: startPath, modifier: "view.search?q=\(q)")
@@ -171,8 +139,8 @@ internal extension OneDriveFileProvider {
                         }
                     }
                     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)
+                    if !progress.isCancelled, let next = next {
+                        self.search(startPath, query: query, next: next, progress: progress, foundItem: foundItem, completionHandler: completionHandler)
                     } else {
                         completionHandler(responseError ?? error)
                     }
@@ -180,7 +148,11 @@ internal extension OneDriveFileProvider {
                 }
             }
             completionHandler(responseError ?? error)
-        }) 
+        })
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
         task.resume()
     }
 }
@@ -258,14 +230,4 @@ internal extension OneDriveFileProvider {
         
         return (dic, keys)
     }
-    
-    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)
-            }
-        })
-    }
 }

Sources/RemoteSession.swift

@@ -8,67 +8,6 @@
 
 import Foundation
 
-/// Allows to get progress or cancel an in-progress operation, for remote, `URLSession` based providers.
-/// This class keeps strong reference to tasks.
-open class RemoteOperationHandle: OperationHandle {
-    
-    internal var tasks: [URLSessionTask]
-    
-    open private(set) var operationType: FileOperationType
-    
-    init(operationType: FileOperationType, tasks: [URLSessionTask]) {
-        self.operationType = operationType
-        self.tasks = tasks
-    }
-    
-    internal func add(task: URLSessionTask) {
-        tasks.append(task)
-    }
-    
-    internal func reape() {
-        self.tasks = tasks.filter { $0.state != .completed }
-    }
-    
-    open var bytesSoFar: Int64 {
-        return tasks.reduce(0) {
-            switch $1 {
-            case let task as URLSessionUploadTask:
-                return $0 + task.countOfBytesSent
-            case let task as FileProviderStreamTask:
-                return $0 + task.countOfBytesSent + task.countOfBytesReceived
-            default:
-                return $0 + $1.countOfBytesReceived
-            }
-        }
-    }
-    
-    open var totalBytes: Int64 {
-        return tasks.reduce(0) {
-            switch $1 {
-            case let task as URLSessionUploadTask:
-                return $0 + task.countOfBytesExpectedToSend
-            case let task as FileProviderStreamTask:
-                return $0 + task.countOfBytesExpectedToSend + task.countOfBytesExpectedToReceive
-            default:
-                return $0 + $1.countOfBytesExpectedToReceive
-            }
-        }
-    }
-    
-    open func cancel() -> Bool {
-        var canceled = false
-        for taskbox in tasks {
-            taskbox.cancel()
-            canceled = true
-        }
-        return canceled
-    }
-    
-    open var inProgress: Bool {
-        return tasks.reduce(false) { $0 || $1.state == .running }
-    }
-}
-
 /// A protocol defines properties for errors returned by HTTP/S based providers.
 /// Including Dropbox, OneDrive and WebDAV.
 public protocol FileProviderHTTPError: Error, CustomStringConvertible {
@@ -140,8 +79,51 @@ final public class SessionDelegate: NSObject, URLSessionDataDelegate, URLSession
         self.credential = fileProvider.credential
     }
     
+    open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        if let progress = context?.load(as: Progress.self), let newVal = change?[.newKey] as? Int64 {
+            switch keyPath ?? "" {
+            case #keyPath(URLSessionTask.countOfBytesReceived):
+                progress.completedUnitCount = newVal
+                if let startTime = progress.userInfo[ProgressUserInfoKey.startingTimeKey] as? Date, let task = object as? URLSessionTask {
+                    let elapsed = Date().timeIntervalSince(startTime)
+                    let throughput = Double(newVal) / elapsed
+                    progress.setUserInfoObject(NSNumber(value: throughput), forKey: .throughputKey)
+                    if task.countOfBytesExpectedToReceive > 0 {
+                        let remain = task.countOfBytesExpectedToReceive - task.countOfBytesReceived
+                        let estimatedTimeRemaining = Double(remain) / elapsed
+                        progress.setUserInfoObject(NSNumber(value: estimatedTimeRemaining), forKey: .estimatedTimeRemainingKey)
+                    }
+                }
+            case #keyPath(URLSessionTask.countOfBytesSent):
+                progress.completedUnitCount = newVal
+                if let startTime = progress.userInfo[ProgressUserInfoKey.startingTimeKey] as? Date, let task = object as? URLSessionTask {
+                    let elapsed = Date().timeIntervalSince(startTime)
+                    let throughput = Double(newVal) / elapsed
+                    progress.setUserInfoObject(NSNumber(value: throughput), forKey: .throughputKey)
+                    if task.countOfBytesExpectedToSend > 0 {
+                        let remain = task.countOfBytesExpectedToSend - task.countOfBytesSent
+                        let estimatedTimeRemaining = Double(remain) / elapsed
+                        progress.setUserInfoObject(NSNumber(value: estimatedTimeRemaining), forKey: .estimatedTimeRemainingKey)
+                    }
+                }
+            case #keyPath(URLSessionTask.countOfBytesExpectedToReceive), #keyPath(URLSessionTask.countOfBytesExpectedToSend):
+                progress.totalUnitCount = newVal
+            default:
+                super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
+            }
+        }
+    }
+    
     // codebeat:disable[ARITY]
     public func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
+        if task is URLSessionDownloadTask {
+            task.removeObserver(self, forKeyPath: #keyPath(URLSessionTask.countOfBytesReceived))
+            task.removeObserver(self, forKeyPath: #keyPath(URLSessionTask.countOfBytesExpectedToReceive))
+        }
+        if task is URLSessionUploadTask {
+            task.removeObserver(self, forKeyPath: #keyPath(URLSessionTask.countOfBytesSent))
+            //task.removeObserver(self, forKeyPath: #keyPath(URLSessionTask.countOfBytesExpectedToSend))
+        }
         if !(error == nil && task is URLSessionDownloadTask) {
             let completionHandler = completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] ?? nil
             completionHandler?(error)
@@ -197,8 +179,11 @@ final public class SessionDelegate: NSObject, URLSessionDataDelegate, URLSession
         switch op {
         case .create(path: let path):
             if path.hasSuffix("/") { return }
+            break
         case .modify:
             break
+        case .copy(source: let source, destination: _) where source.hasPrefix("file://"):
+            break
         default:
             return
         }
@@ -213,6 +198,8 @@ final public class SessionDelegate: NSObject, URLSessionDataDelegate, URLSession
     public func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) {
         self.didReceivedData?(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
         
+        if totalBytesExpectedToWrite == NSURLSessionTransferSizeUnknown { return }
+        
         guard let json = downloadTask.taskDescription?.deserializeJSON(),
               let op = FileOperationType(json: json), let fileProvider = fileProvider else {
             return

Sources/SMBFileProvider.swift

@@ -74,53 +74,54 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {
     
     open weak var fileOperationDelegate: FileOperationDelegate?
     
-    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func copyItem(path: String, toLocalURL: URL, completionHandler: SimpleCompletionHandler) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
+    open func contents(path: String, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
+    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
+    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> Progress? {
         NotImplemented()
         return nil
     }
     
-    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler:((FileObjectClass) -> Void)?, completionHandler: @escaping ((_ files: [FileObjectClass], _ error: Error?) -> Void)) {
+    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler:((FileObjectClass) -> Void)?, completionHandler: @escaping ((_ files: [FileObjectClass], _ error: Error?) -> Void)) -> Progress? {
         NotImplemented()
+        return nil
     }
     
     open func registerNotifcation(path: String, eventHandler: @escaping (() -> Void)) {

Sources/WebDAVFileProvider.swift

@@ -20,57 +20,9 @@ import CoreGraphics
      in case of using this class with unencrypted HTTP connection.
      [Read this to know how](http://iosdevtips.co/post/121756573323/ios-9-xcode-7-http-connect-server-error).
 */
-open class WebDAVFileProvider: FileProviderBasicRemote {
-    open class var type: String { return "WebDAV" }
-    open let baseURL: URL?
-    open var currentPath: String
-    
-    open var dispatch_queue: DispatchQueue
-    open var operation_queue: OperationQueue {
-        willSet {
-            assert(_session == nil, "It's not effective to change dispatch_queue property after session is initialized.")
-        }
-    }
-    
-    public weak var delegate: FileProviderDelegate?
+open class WebDAVFileProvider: HTTPFileProvider {
+    override open class var type: String { return "WebDAV" }
     public var credentialType: HTTPAuthenticationType = .digest
-    open var credential: URLCredential? {
-        didSet {
-            sessionDelegate?.credential = credential
-        }
-    }
-    open private(set) var cache: URLCache?
-    public var useCache: Bool
-    public var validatingCache: Bool
-    
-    fileprivate var _session: URLSession?
-    fileprivate var sessionDelegate: SessionDelegate?
-    public var session: URLSession {
-        get {
-            if _session == nil {
-                self.sessionDelegate = SessionDelegate(fileProvider: self)
-                let queue = OperationQueue()
-                //queue.underlyingQueue = dispatch_queue
-                let config = URLSessionConfiguration.default
-                config.urlCache = cache
-                config.requestCachePolicy = .returnCacheDataElseLoad
-                _session = URLSession(configuration: config, delegate: sessionDelegate as URLSessionDownloadDelegate?, delegateQueue: queue)
-                _session?.sessionDescription = UUID().uuidString
-                initEmptySessionHandler(_session!.sessionDescription!)
-            }
-            return _session!
-        }
-        
-        set {
-            assert(newValue.delegate is SessionDelegate, "session instances should have a SessionDelegate instance as delegate.")
-            _session = newValue
-            if session.sessionDescription?.isEmpty ?? true {
-                _session?.sessionDescription = UUID().uuidString
-            }
-            self.sessionDelegate = newValue.delegate as? SessionDelegate
-            initEmptySessionHandler(_session!.sessionDescription!)
-        }
-    }
     
     /**
      Initializes WebDAV provider.
@@ -84,21 +36,8 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         if  !["http", "https"].contains(baseURL.uw_scheme.lowercased()) {
             return nil
         }
-        self.baseURL = (baseURL.absoluteString.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")).absoluteURL
-        self.currentPath = ""
-        self.useCache = false
-        self.validatingCache = true
-        self.cache = cache
-        self.credential = credential
-        
-        #if swift(>=3.1)
-        let queueLabel = "FileProvider.\(Swift.type(of: self).type)"
-        #else
-        let queueLabel = "FileProvider.\(type(of: self).type)"
-        #endif
-        dispatch_queue = DispatchQueue(label: queueLabel, attributes: .concurrent)
-        operation_queue = OperationQueue()
-        operation_queue.name = "\(queueLabel).Operation"
+        let refinedBaseURL = (baseURL.absoluteString.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")).absoluteURL
+        super.init(baseURL: refinedBaseURL, credential: credential, cache: cache)
     }
     
     public required convenience init?(coder aDecoder: NSCoder) {
@@ -112,19 +51,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         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: "useCache")
-        aCoder.encode(self.validatingCache, forKey: "validatingCache")
-    }
-    
-    public static var supportsSecureCoding: Bool {
-        return true
-    }
-    
-    open func copy(with zone: NSZone? = nil) -> Any {
+    override 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
@@ -134,19 +61,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         return copy
     }
     
-    deinit {
-        if let sessionuuid = _session?.sessionDescription {
-            removeSessionHandler(for: sessionuuid)
-        }
-        
-        if fileProviderCancelTasksOnInvalidating {
-            _session?.invalidateAndCancel()
-        } else {
-            _session?.finishTasksAndInvalidate()
-        }
-    }
-    
-    open func contentsOfDirectory(path: String, completionHandler: @escaping (([FileObject], Error?) -> Void)) {
+    override open func contentsOfDirectory(path: String, completionHandler: @escaping (([FileObject], Error?) -> Void)) {
         self.contentsOfDirectory(path: path, including: [], completionHandler: completionHandler)
     }
     
@@ -171,7 +86,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         request.set(contentType: .xml)
         request.httpBody = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n\(WebDavFileObject.propString(including))\n</D:propfind>".data(using: .utf8)
         request.setValue(String(request.httpBody!.count), forHTTPHeaderField: "Content-Length")
-        runDataTask(with: request, operationHandle: RemoteOperationHandle(operationType: opType, tasks: []), completionHandler: { (data, response, error) in
+        runDataTask(with: request, operation: opType, 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, path: path, errorDescription: String(data: data ?? Data(), encoding: .utf8), url: url)
@@ -190,7 +105,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         })
     }
     
-    open func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
+    override open func attributesOfItem(path: String, completionHandler: @escaping ((_ attributes: FileObject?, _ error: Error?) -> Void)) {
         self.attributesOfItem(path: path, including: [], completionHandler: completionHandler)
     }
     
@@ -230,7 +145,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         })
     }
     
-    open func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
+    override open func storageProperties(completionHandler: @escaping ((_ total: Int64, _ used: Int64) -> Void)) {
         // Not all WebDAV clients implements RFC2518 which allows geting storage quota.
         // In this case you won't get error. totalSize is NSURLSessionTransferSizeUnknown
         // and used space is zero.
@@ -258,7 +173,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         })
     }
     
-    open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) {
+    override open func searchFiles(path: String, recursive: Bool, query: NSPredicate, foundItemHandler: ((FileObject) -> Void)?, completionHandler: @escaping ((_ files: [FileObject], _ error: Error?) -> Void)) -> Progress? {
         let url = self.url(of: path)
         var request = URLRequest(url: url)
         request.httpMethod = "PROPFIND"
@@ -266,7 +181,9 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         request.set(httpAuthentication: credential, with: credentialType)
         request.set(contentType: .xml)
         request.httpBody = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/></D:propfind>".data(using: .utf8)
-        runDataTask(with: request, completionHandler: { (data, response, error) in
+        let progress = Progress(parent: nil, userInfo: nil)
+        progress.setUserInfoObject(url, forKey: .fileURLKey)
+        let task = session.dataTask(with: request) { (data, response, error) in
             // FIXME: paginating results
             var responseError: FileProviderWebDavError?
             if let code = (response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
@@ -282,16 +199,23 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
                     }
                     
                     fileObjects.append(fileObject)
+                    progress.completedUnitCount = Int64(fileObjects.count)
                     foundItemHandler?(fileObject)
                 }
                 completionHandler(fileObjects, responseError ?? error)
                 return
             }
             completionHandler([], responseError ?? error)
-        })
+        }
+        progress.cancellationHandler = { [weak task] in
+            task?.cancel()
+        }
+        progress.setUserInfoObject(Date(), forKey: .startingTimeKey)
+        task.resume()
+        return progress
     }
     
-    open func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    override open func isReachable(completionHandler: @escaping (Bool) -> Void) {
         var request = URLRequest(url: baseURL!)
         request.httpMethod = "PROPFIND"
         request.setValue("0", forHTTPHeaderField: "Depth")
@@ -305,244 +229,72 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
         })
     }
     
-    open weak var fileOperationDelegate: FileOperationDelegate?
-}
-
-extension WebDAVFileProvider: FileProviderOperations {
-    @discardableResult
-    open func create(folder folderName: String, at atPath: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.create(path: (atPath as NSString).appendingPathComponent(folderName) + "/")
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        let url = self.url(of: atPath).appendingPathComponent(folderName, isDirectory: true)
-        var request = URLRequest(url: url)
-        request.httpMethod = "MKCOL"
-        request.set(httpAuthentication: credential, with: credentialType)
-        let task = session.dataTask(with: request, 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, path: url.relativePath, errorDescription: String(data: data ?? Data(), encoding: .utf8), url: url)
+    override func request(for operation: FileOperationType, overwrite: Bool = true, attributes: [URLResourceKey: Any] = [:]) -> URLRequest {
+        let method: String
+        let url: URL
+        let sourceURL = self.url(of: operation.source)
+        
+        switch operation {
+        case .fetch:
+            method = "GET"
+            url = sourceURL
+        case .create:
+            if sourceURL.absoluteString.hasSuffix("/") {
+                method = "MKCOL"
+                url = sourceURL
+            } else {
+                fallthrough
+            }
+        case .modify:
+            method = "PUT"
+            url = sourceURL
+            break
+        case .copy(let source, let dest):
+            if source.hasPrefix("file://") {
+                method = "PUT"
+                url = self.url(of: dest)
+            } else if dest.hasPrefix("file://") {
+                method = "GET"
+                url = sourceURL
+            } else {
+                method = "COPY"
+                url = sourceURL
             }
-            completionHandler?(responseError ?? error)
-            self.delegateNotify(opType, error: responseError ?? error)
-        })
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
-    }
-    
-    @discardableResult
-    open func moveItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.move(source: path, destination: toPath)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        return self.doOperation(operation: opType, overwrite: overwrite, completionHandler: completionHandler)
-    }
-    
-    @discardableResult
-    open func copyItem(path: String, to toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.copy(source: path, destination: toPath)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        return self.doOperation(operation: opType, overwrite: overwrite, completionHandler: completionHandler)
-    }
-    
-    @discardableResult
-    open func removeItem(path: String, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.remove(path: path)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        return self.doOperation(operation: opType, completionHandler: completionHandler)
-    }
-    
-    fileprivate func doOperation(operation opType: FileOperationType, overwrite: Bool? = nil, completionHandler: SimpleCompletionHandler) -> OperationHandle?  {
-        let source = opType.source!
-        let sourceURL = self.url(of: source)
-        var request = URLRequest(url: sourceURL)
-        if let dest = opType.destination {
-            request.setValue(url(of:dest).absoluteString, forHTTPHeaderField: "Destination")
-        }
-        switch opType {
-        case .copy:
-            request.httpMethod = "COPY"
         case .move:
-            request.httpMethod = "MOVE"
+            method = "MOVE"
+            url = sourceURL
         case .remove:
-            request.httpMethod = "DELETE"
+            method = "DELETE"
+            url = sourceURL
         default:
-            return nil
+            fatalError("Unimplemented operation \(operation.description) in \(#file)")
         }
         
+        var request = URLRequest(url: url)
+        request.httpMethod = method
         request.set(httpAuthentication: credential, with: credentialType)
-        if let overwrite = overwrite, !overwrite {
-            request.setValue("F", forHTTPHeaderField: "Overwrite")
-        }
-        let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
-            var responseError: FileProviderWebDavError?
-            if let response = response as? HTTPURLResponse, let code = FileProviderHTTPErrorCode(rawValue: response.statusCode) {
-                if response.statusCode >= 300  {
-                    responseError = FileProviderWebDavError(code: code, path: source, errorDescription: String(data: data ?? Data(), encoding: .utf8), url: sourceURL)
-                }
-                if code == .multiStatus, let data = data {
-                    let xresponses = DavResponse.parse(xmlResponse: data, baseURL: self.baseURL)
-                    for xresponse in xresponses where (xresponse.status ?? 0) >= 300 {
-                        let error = FileProviderWebDavError(code: code, path: source, errorDescription: String(data: data, encoding: .utf8), url: sourceURL)
-                        completionHandler?(error)
-                    }
-                }
-            }
-            if (response as? HTTPURLResponse)?.statusCode ?? 0 != FileProviderHTTPErrorCode.multiStatus.rawValue {
-                completionHandler?(responseError ?? error)
-            }
-            
-            self.delegateNotify(opType, error: responseError ?? error)
-        })
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
-    }
-    
-    @discardableResult
-    open func copyItem(localFile: URL, to toPath: String, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        // check file is not a folder
-        guard (try? localFile.resourceValues(forKeys: [.fileResourceTypeKey]))?.fileResourceType ?? .unknown == .regular else {
-            dispatch_queue.async {
-                completionHandler?(self.throwError(localFile.path, code: URLError.fileIsDirectory))
-            }
-            return nil
+        request.setValue(overwrite ? "T" : "F", forHTTPHeaderField: "Overwrite")
+        if let dest = operation.destination, !dest.hasPrefix("file://") {
+            request.setValue(self.url(of:dest).absoluteString, forHTTPHeaderField: "Destination")
         }
         
-        let opType = FileOperationType.copy(source: localFile.absoluteString, destination: toPath)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        let url = self.url(of:toPath)
-        var request = URLRequest(url: url)
-        if !overwrite {
-            request.setValue("F", forHTTPHeaderField: "Overwrite")
-        }
-        request.httpMethod = "PUT"
-        request.set(httpAuthentication: credential, with: credentialType)
-        let task = session.uploadTask(with: request, fromFile: localFile)
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { [weak self] error in
-            var responseError: FileProviderWebDavError?
-            if let code = (task.response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
-                // We can't fetch server result from delegate!
-                responseError = FileProviderWebDavError(code: rCode, path: toPath, errorDescription: nil, url: url)
-            }
-            completionHandler?(responseError ?? error)
-            self?.delegateNotify(.create(path: toPath), error: responseError ?? error)
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
+        return request
     }
     
-    @discardableResult
-    open func copyItem(path: String, toLocalURL destURL: URL, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.copy(source: path, destination: destURL.absoluteString)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
+    override func serverError(with code: FileProviderHTTPErrorCode, path: String?, data: Data?) -> FileProviderHTTPError {
+        return FileProviderWebDavError(code: code, path: path ?? "", errorDescription:  data.flatMap({ String(data: $0, encoding: .utf8) }), url: self.url(of: path))
+    }
+    
+    override func multiStatusHandler(source: String, data: Data, completionHandler: SimpleCompletionHandler) {
+        let xresponses = DavResponse.parse(xmlResponse: data, baseURL: self.baseURL)
+        for xresponse in xresponses where (xresponse.status ?? 0) >= 300 {
+            let code = xresponse.status.flatMap { FileProviderHTTPErrorCode(rawValue: $0) } ?? .internalServerError
+            let error = FileProviderWebDavError(code: code, path: source, errorDescription: String(data: data, encoding: .utf8), url: self.url(of: source))
+            completionHandler?(error)
         }
-        let url = self.url(of:path)
-        var request = URLRequest(url: url)
-        request.set(httpAuthentication: credential, with: credentialType)
-        let task = session.downloadTask(with: request)
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = completionHandler
-        downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
-            guard let httpResponse = task.response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
-                let code = FileProviderHTTPErrorCode(rawValue: (task.response as? HTTPURLResponse)?.statusCode ?? -1)
-                let serverError : FileProviderWebDavError? = code != nil ? FileProviderWebDavError(code: code!, path: path, errorDescription: code?.description, url: url) : nil
-                completionHandler?(serverError)
-                return
-            }
-            do {
-                try FileManager.default.moveItem(at: tempURL, to: destURL)
-                completionHandler?(nil)
-            } catch let e {
-                completionHandler?(e)
-            }
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
     }
 }
-
-extension WebDAVFileProvider: FileProviderReadWrite {
-    @discardableResult
-    open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        if length == 0 || offset < 0 {
-            dispatch_queue.async {
-                completionHandler(Data(), nil)
-            }
-            return nil
-        }
-        
-        let opType = FileOperationType.fetch(path: path)
-        let url = self.url(of: path)
-        var request = URLRequest(url: url)
-        request.set(httpAuthentication: credential, with: credentialType)
-        request.set(rangeWithOffset: offset, length: length)
-        
-        let task = session.downloadTask(with: request)
-        let handle = RemoteOperationHandle(operationType: opType, tasks: [task])
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { error in
-            completionHandler(nil, error)
-        }
-        downloadCompletionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { tempURL in
-            guard let httpResponse = task.response as? HTTPURLResponse , httpResponse.statusCode < 300 else {
-                let code = FileProviderHTTPErrorCode(rawValue: (task.response as? HTTPURLResponse)?.statusCode ?? -1)
-                let serverError : FileProviderWebDavError? = code != nil ? FileProviderWebDavError(code: code!, path: path, errorDescription: code?.description, url: url) : nil
-                completionHandler(nil, serverError)
-                return
-            }
-            do {
-                let data = try Data(contentsOf: tempURL)
-                self.dispatch_queue.async {
-                    completionHandler(data, nil)
-                }
-            } catch let e {
-                completionHandler(nil, e)
-            }
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return handle
-    }
-    
-    @discardableResult
-    open func writeContents(path: String, contents data: Data?, atomically: Bool, overwrite: Bool, completionHandler: SimpleCompletionHandler) -> OperationHandle? {
-        let opType = FileOperationType.modify(path: path)
-        guard fileOperationDelegate?.fileProvider(self, shouldDoOperation: opType) ?? true == true else {
-            return nil
-        }
-        // FIXME: lock destination before writing process
-        let url = atomically ? self.url(of: path).appendingPathExtension("tmp") : self.url(of: path)
-        var request = URLRequest(url: url)
-        request.httpMethod = "PUT"
-        request.set(httpAuthentication: credential, with: credentialType)
-        if !overwrite {
-            request.setValue("F", forHTTPHeaderField: "Overwrite")
-        }
-        let task = session.uploadTask(with: request, from: data ?? Data())
-        completionHandlersForTasks[session.sessionDescription!]?[task.taskIdentifier] = { [weak self] error in
-            var responseError: FileProviderWebDavError?
-            if let code = (task.response as? HTTPURLResponse)?.statusCode , code >= 300, let rCode = FileProviderHTTPErrorCode(rawValue: code) {
-                // We can't fetch server result from delegate!
-                responseError = FileProviderWebDavError(code: rCode, path: path, errorDescription: nil, url: url)
-            }
-            completionHandler?(responseError ?? error)
-            self?.delegateNotify(opType, error: responseError ?? error)
-        }
-        task.taskDescription = opType.json
-        task.resume()
-        return RemoteOperationHandle(operationType: opType, tasks: [task])
-    }
+extension WebDAVFileProvider {
     
     /*
     fileprivate func registerNotifcation(path: String, eventHandler: (() -> Void)) {
@@ -640,22 +392,8 @@ extension WebDAVFileProvider: FileProviderSharing {
     }
 }
 
-extension WebDAVFileProvider: FileProvider { }
-
 // MARK: WEBDAV XML response implementation
 
-internal extension WebDAVFileProvider {
-    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