Fixed Cloud provider listing (RunLoop) bug

- Added ubiquity scope to Cloud provider
- Renamed `temporaryLink` to `publicLink`
- Added deprecated renaming guide

FileProvider.podspec

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

FileProvider.xcodeproj/project.pbxproj

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

README.md

@@ -31,15 +31,15 @@ Local and WebDAV providers are fully tested and can be used in production enviro
 - [x] **LocalFileProvider** a wrapper around `FileManager` with some additions like searching and reading a portion of file.
 - [x] **CloudFileProvider** A wrapper around app's ubiquitous container to iCloud Drive in iOS 8+ API.
 - [x] **WebDAVFileProvider** WebDAV protocol is defacto file transmission standard, replaced FTP.
-- [x] **DropboxFileProvider** A wrapper around Dropbox REST API.
+- [x] **DropboxFileProvider** A wrapper around Dropbox Web API.
     * For now it has limitation in uploading files up to 150MB.
 - [x] **OneDriveFileProvider** A wrapper around OneDrive REST API, works with `onedrive.com` and compatible (business) servers.
     * For now it has limitation in uploading files up to 100MB.
 - [ ] **GoogleFileProvider** A wrapper around Goodle Drive REST API.
 - [ ] **AmazonS3FileProvider** Amazon storage backend. Used by many sites.
 - [ ] **SMBFileProvider** SMB2/3 introduced in 2006, which is a file and printer sharing protocol originated from Microsoft Windows and now is replacing AFP protocol on macOS.
-    * Data types and some basic functions are implemented but *main interface is not implemented yet!*
-    *  SMB1/CIFS is depericated and very tricky to be implemented
+    * Data types and some basic functions are implemented but *main interface is not implemented yet!*.
+    * SMB1/CIFS is deprecated and very tricky to be implemented.
 - [ ] **FTPFileProvider** while deprecated in 1990s, it's still in use on some Web hosts.
 
 ## Requirements
@@ -69,7 +69,7 @@ github "amosavian/FileProvider"
 Or to use in Swift Package Manager add this line in `Dependencies`:
 
 ```swift
-.Package(url: "https://github.com/amosavian/FileProvider.git", majorVersion: 0, minorVersion: 8)
+.Package(url: "https://github.com/amosavian/FileProvider.git", majorVersion: 0, minorVersion: 12)
 ```
 
 ### Manually

Sources/CloudFileProvider.swift

@@ -11,7 +11,8 @@ import Foundation
 open class CloudFileProvider: LocalFileProvider {
     open override class var type: String { return "iCloudDrive" }
     
-    /// Actually is readonly, value is true
+    /// Forces file operations to use `NSFileCoordinating`,
+    /// Actually this is readonly, and value is always true.
     override open var isCoorinating: Bool {
         get {
             return true
@@ -24,6 +25,9 @@ open class CloudFileProvider: LocalFileProvider {
     /// The fully-qualified container identifier for an iCloud container directory.
     open fileprivate(set) var containerId: String?
     
+    /// Scope of container, indicates user can manipulate data/files or not.
+    open fileprivate(set) var scope: UbiquitousScope
+    
     /**
      Initializes the provider for the iCloud container associated with the specified identifier and 
      establishes access to that container.
@@ -31,10 +35,11 @@ open class CloudFileProvider: LocalFileProvider {
      - Important: Do not call this method from your app’s main thread. Because this method might take a nontrivial amount of time to set up iCloud and return the requested URL, you should always call it from a secondary thread.
      
      - Parameter containerId: The fully-qualified container identifier for an iCloud container directory. The string you specify must not contain wildcards and must be of the form `<TEAMID>.<CONTAINER>`, where `<TEAMID>` is your development team ID and `<CONTAINER>` is the bundle identifier of the container you want to access.\
-     The container identifiers for your app must be declared in the `com.apple.developer.ubiquity-container-identifiers` array of the `.entitlements` property list file in your Xcode project.\
-     If you specify nil for this parameter, this method uses the first container listed in the `com.apple.developer.ubiquity-container-identifiers` entitlement array.
+         The container identifiers for your app must be declared in the `com.apple.developer.ubiquity-container-identifiers` array of the `.entitlements` property list file in your Xcode project.\
+         If you specify nil for this parameter, this method uses the first container listed in the `com.apple.developer.ubiquity-container-identifiers` entitlement array.
+     - 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?) {
+    public init? (containerId: String?, scope: UbiquitousScope = .documents) {
         assert(!Thread.isMainThread, "LocalFileProvider.init(containerId:) is not recommended to be executed on Main Thread.")
         guard FileManager.default.ubiquityIdentityToken == nil else {
             return nil
@@ -43,7 +48,14 @@ open class CloudFileProvider: LocalFileProvider {
             return nil
         }
         self.containerId = containerId
-        let baseURL = ubiquityURL.standardized.appendingPathComponent("Documents/")
+        self.scope = scope
+        let baseURL: URL
+        if scope == .documents {
+            baseURL = ubiquityURL.standardized.appendingPathComponent("Documents/")
+        } else {
+            baseURL = ubiquityURL.standardized
+        }
+        
         super.init(baseURL: baseURL)
         self.isCoorinating = true
         
@@ -57,12 +69,14 @@ open class CloudFileProvider: LocalFileProvider {
         try? fileManager.createDirectory(at: baseURL, withIntermediateDirectories: true)
     }
     
+    // FIXME: create runloop for dispatch_queue, start query on it
     open override func contentsOfDirectory(path: String, completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
         dispatch_queue.async {
             let pathURL = self.url(of: path)
+            
             let query = NSMetadataQuery()
             query.predicate = NSPredicate(format: "%K BEGINSWITH %@", NSMetadataItemPathKey, pathURL.path)
-            query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
+            query.searchScopes = [self.scope.rawValue]
             var finishObserver: NSObjectProtocol?
             finishObserver = NotificationCenter.default.addObserver(forName: NSNotification.Name.NSMetadataQueryDidFinishGathering, object: query, queue: nil, using: { (notification) in
                 defer {
@@ -91,9 +105,14 @@ open class CloudFileProvider: LocalFileProvider {
                     }
                 }
                 
+                query.stop()
                 completionHandler(contents, nil)
             })
-            query.start()
+            DispatchQueue.main.async {
+                if !query.start() {
+                    completionHandler([], self.throwError(path, code: CocoaError.fileReadNoPermission))
+                }
+            }
         }
     }
     
@@ -107,7 +126,7 @@ open class CloudFileProvider: LocalFileProvider {
             let pathURL = self.url(of: path)
             let query = NSMetadataQuery()
             query.predicate = NSPredicate(format: "%K LIKE %@", NSMetadataItemPathKey, pathURL.path)
-            query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
+            query.searchScopes = [self.scope.rawValue]
             var finishObserver: NSObjectProtocol?
             finishObserver = NotificationCenter.default.addObserver(forName: NSNotification.Name.NSMetadataQueryDidFinishGathering, object: query, queue: nil, using: { (notification) in
                 defer {
@@ -130,7 +149,11 @@ open class CloudFileProvider: LocalFileProvider {
                     completionHandler(nil, noFileError)
                 }
             })
-            query.start()
+            DispatchQueue.main.async {
+                if !query.start() {
+                    completionHandler(nil, self.throwError(path, code: CocoaError.fileReadNoPermission))
+                }
+            }
         }
     }
     
@@ -239,7 +262,7 @@ open class CloudFileProvider: LocalFileProvider {
             let pathURL = self.url(of: path)
             let query = NSMetadataQuery()
             query.predicate = NSPredicate(format: "(%K BEGINSWITH %@) && (%K LIKE %@)", NSMetadataItemPathKey, pathURL.path, NSMetadataItemFSNameKey, query)
-            query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
+            query.searchScopes = [self.scope.rawValue]
             
             var lastReportedCount = 0
             
@@ -302,18 +325,22 @@ open class CloudFileProvider: LocalFileProvider {
                 completionHandler(contents, nil)
             })
             
-            query.start()
+            DispatchQueue.main.async {
+                if !query.start() {
+                    completionHandler([], self.throwError(path, code: CocoaError.fileReadNoPermission))
+                }
+            }
         }
     }
     
-    fileprivate var monitors = [URL: (NSMetadataQuery, NSObjectProtocol)]()
-    //
+    fileprivate var monitors = [String: (NSMetadataQuery, NSObjectProtocol)]()
+    
     open override func registerNotifcation(path: String, eventHandler: @escaping (() -> Void)) {
         self.unregisterNotifcation(path: path)
         let pathURL = self.url(of: path)
         let query = NSMetadataQuery()
         query.predicate = NSPredicate(format: "(%K BEGINSWITH %@)", NSMetadataItemPathKey, pathURL.path)
-        query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
+        query.searchScopes = [self.scope.rawValue]
         
         let updateObserver = NotificationCenter.default.addObserver(forName: .NSMetadataQueryDidUpdate, object: query, queue: nil, using: { (notification) in
             
@@ -324,24 +351,25 @@ open class CloudFileProvider: LocalFileProvider {
             query.enableUpdates()
         })
         
-        query.start()
-        
-        monitors[pathURL] = (query, updateObserver)
+        DispatchQueue.main.async {
+            if query.start() {
+                self.monitors[path] = (query, updateObserver)
+            }
+        }
     }
     
     open override func unregisterNotifcation(path: String) {
-        let key = url(of: path)
-        guard let (query, observer) = monitors[key] else {
+        guard let (query, observer) = monitors[path] else {
             return
         }
         query.disableUpdates()
         query.stop()
-        monitors.removeValue(forKey: key)
         NotificationCenter.default.removeObserver(observer)
+        monitors.removeValue(forKey: path)
     }
     
     open override func isRegisteredForNotification(path: String) -> Bool {
-        return monitors[url(of: path)] != nil
+        return monitors[path] != nil
     }
     
     open override func copy(with zone: NSZone? = nil) -> Any {
@@ -401,6 +429,38 @@ open class CloudFileProvider: LocalFileProvider {
     }
 }
 
+public enum UbiquitousScope: RawRepresentable {
+    /// Search all files not in the Documents directories of the app’s iCloud container directories.
+    /// Use this scope to store user-related data files that your app needs to share 
+    /// but that are not files you want the user to manipulate directly.
+    case data
+    /// Search all files in the Documents directories of the app’s iCloud container directories.
+    /// Put documents that the user is allowed to access inside a Documents subdirectory.
+    case documents
+    
+    public typealias RawValue = String
+    
+    public init? (rawValue: String) {
+        switch rawValue {
+        case NSMetadataQueryUbiquitousDataScope:
+            self = .data
+        case NSMetadataQueryUbiquitousDocumentsScope:
+            self = .documents
+        default:
+            return nil
+        }
+    }
+    
+    public var rawValue: String {
+        switch self {
+        case .data:
+            return NSMetadataQueryUbiquitousDataScope
+        case .documents:
+            return NSMetadataQueryUbiquitousDocumentsScope
+        }
+    }
+}
+
 open class CloudOperationHandle: OperationHandle {
     public let baseURL: URL?
     public let operationType: FileOperationType
@@ -458,11 +518,12 @@ open class CloudOperationHandle: OperationHandle {
     fileprivate static func getMetadataItem(url: URL) -> NSMetadataItem? {
         let query = NSMetadataQuery()
         query.predicate = NSPredicate(format: "(%K LIKE %@)", NSMetadataItemPathKey, url.path)
-        query.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
+        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 {
@@ -479,8 +540,9 @@ open class CloudOperationHandle: OperationHandle {
             
         })
         
-        group.enter()
-        query.start()
+        DispatchQueue.main.async {
+            query.start()
+        }
         _ = group.wait(timeout: DispatchTime.now() + 30)
         return item
     }

Sources/DropboxFileProvider.swift

@@ -133,8 +133,6 @@ open class DropboxFileProvider: FileProviderBasicRemote {
 }
 
 extension DropboxFileProvider: FileProviderOperations {
-    
-    
     public 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)
@@ -244,7 +242,10 @@ extension DropboxFileProvider: FileProviderOperations {
 
 extension DropboxFileProvider: FileProviderReadWrite {
     public func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        if length == 0 {
+        if length == 0 || offset < 0 {
+            dispatch_queue.async {
+                completionHandler(Data(), nil)
+            }
             return nil
         }
         
@@ -305,12 +306,12 @@ extension DropboxFileProvider: FileProviderReadWrite {
         NotImplemented()
     }
     
-    // TODO: Implement /copy_reference, /get_account & /get_current_account
+    // TODO: Implement /get_account & /get_current_account
 }
 
 extension DropboxFileProvider {
     /// *DEPRECATED:* Use `publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?))` function instead.
-    @available(*, deprecated, message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
+    @available(*, deprecated, renamed: "publicLink(to:completionHandler:)", message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
     open func temporaryLink(to path: String, completionHandler: @escaping ((_ link: URL?, _ attribute: DropboxFileObject?, _ error: Error?) -> Void)) {
         self.publicLink(to: path) { (url, file, _, error) in
             completionHandler(url, file, error)
@@ -318,7 +319,7 @@ extension DropboxFileProvider {
     }
     
     /// *DEPRECATED:* Use `publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?))` function instead.
-    @available(*, deprecated, message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
+    @available(*, deprecated, renamed: "publicLink(to:completionHandler:)", message: "Use publicLink(to:, completionHandler: (URL?, DropboxFileObject?, Date?,  Error?)) function instead.")
     open func temporaryLink(to path: String, completionHandler: @escaping ((_ link: URL?, _ attribute: DropboxFileObject?, _ expiration: Date?, _ error: Error?) -> Void)) {
         self.publicLink(to: path) { (url, file, expiration, error) in
             completionHandler(url, file, expiration, error)

Sources/ExtendedLocalFileProvider.swift

@@ -189,6 +189,16 @@ public struct LocalFileInformationGenerator {
     }
     
     static public var imageProperties: ((_ fileURL: URL) -> (prop: [String: Any], keys: [String]))? = { fileURL in
+        var dic = [String: Any]()
+        var keys = [String]()
+        
+        func add(key: String, value: Any?) {
+            if let value = value {
+                keys.append(key)
+                dic[key] = value
+            }
+        }
+        
         func simplify(_ top:Int64, _ bottom:Int64) -> (newTop:Int, newBottom:Int) {
             var x = top
             var y = bottom
@@ -203,79 +213,57 @@ public struct LocalFileInformationGenerator {
             return(Int(newTopVal), Int(newBottomVal))
         }
         
-        var dic = [String: Any]()
-        var keys = [String]()
         guard let cgDataRef = CGImageSourceCreateWithURL(fileURL as CFURL, nil), let cfImageDict = CGImageSourceCopyPropertiesAtIndex(cgDataRef, 0, nil) else {
             return (dic, keys)
         }
         let imageDict = cfImageDict as NSDictionary
-        let tiffDict = imageDict[kCGImagePropertyTIFFDictionary as String] as? [String : AnyObject] ?? [:]
-        let exifDict = imageDict[kCGImagePropertyExifDictionary as String] as? [String : AnyObject] ?? [:]
-        if let pixelWidth: AnyObject = imageDict.object(forKey: kCGImagePropertyPixelWidth) as? NSNumber, let pixelHeight: AnyObject = imageDict.object(forKey: kCGImagePropertyPixelHeight) as? NSNumber {
-            keys.append("Dimensions")
-            dic["Dimensions"] = "\(pixelWidth)x\(pixelHeight)"
-        }
-        if let dpi = imageDict[kCGImagePropertyDPIWidth as String] {
-            keys.append("DPI")
-            dic["DPI"] = dpi
-        }
-        if let devicemake = tiffDict[kCGImagePropertyTIFFMake as String] {
-            keys.append("Device make")
-            dic["Device make"] = devicemake
-        }
-        if let devicemodel = tiffDict[kCGImagePropertyTIFFModel as String] {
-            keys.append("Device model")
-            dic["Device model"] = devicemodel
-        }
-        if let lensmodel = exifDict[kCGImagePropertyExifLensModel as String] {
-            keys.append("Lens model")
-            dic["Lens model"] = lensmodel
-        }
-        if let artist = tiffDict[kCGImagePropertyTIFFArtist as String] as? String , !artist.isEmpty {
-            keys.append("Artist")
-            dic["Artist"] = artist
+        let tiffDict = imageDict[kCGImagePropertyTIFFDictionary as String] as? NSDictionary ?? [:]
+        let exifDict = imageDict[kCGImagePropertyExifDictionary as String] as? NSDictionary ?? [:]
+        if let pixelWidth = imageDict.object(forKey: kCGImagePropertyPixelWidth) as? NSNumber, let pixelHeight = imageDict.object(forKey: kCGImagePropertyPixelHeight) as? NSNumber {
+            add(key: "Dimensions", value: "\(pixelWidth)x\(pixelHeight)")
         }
+        
+        add(key: "DPI", value: imageDict[kCGImagePropertyDPIWidth as String])
+        add(key: "Device make", value: tiffDict[kCGImagePropertyTIFFMake as String])
+        add(key: "Device model", value: tiffDict[kCGImagePropertyTIFFModel as String])
+        add(key: "Lens model", value: exifDict[kCGImagePropertyExifLensModel as String])
+        add(key: "Artist", value: tiffDict[kCGImagePropertyTIFFArtist as String] as? String)
         if let cr = tiffDict[kCGImagePropertyTIFFCopyright as String] as? String , !cr.isEmpty {
-            keys.append("Copyright")
-            dic["Copyright"] = cr
+            add(key: "Copyright", value: cr)
+
         }
         if let date = tiffDict[kCGImagePropertyTIFFDateTime as String] as? String , !date.isEmpty {
-            keys.append("Date taken")
-            dic["Date taken"] = date
+            add(key: "Date taken", value: date)
         }
-        if let latitude = tiffDict[kCGImagePropertyGPSLatitude as String]?.doubleValue, let longitude = tiffDict[kCGImagePropertyGPSLongitude as String]?.doubleValue {
-            keys.append("Location")
-            dic["Location"] = "\(latitude), \(longitude)"
+        if let latitude = tiffDict[kCGImagePropertyGPSLatitude as String] as? NSNumber, let longitude = tiffDict[kCGImagePropertyGPSLongitude as String] as? NSNumber {
+            add(key: "Location", value: "\(latitude), \(longitude)")
         }
-        if let colorspace = imageDict[kCGImagePropertyColorModel as String] {
-            keys.append("Color space")
-            dic["Color space"] = colorspace
-        }
-        if let focallen = exifDict[kCGImagePropertyExifFocalLength as String] {
-            keys.append("Focal length")
-            dic["Focal length"] = focallen
-        }
-        if let fnum = exifDict[kCGImagePropertyExifFNumber as String] {
-            keys.append("F number")
-            dic["F number"] = fnum
-        }
-        if let expprog = exifDict[kCGImagePropertyExifExposureProgram as String] {
-            keys.append("Exposure program")
-            dic["Exposure program"] = expprog
-        }
-        if let exp = exifDict[kCGImagePropertyExifExposureTime as String]?.doubleValue {
-            let expfrac = simplify(Int64(exp * 10_000_000_000_000), 10_000_000_000_000)
-            keys.append("Exposure time")
-            dic["Exposure time"] = "\(expfrac.newTop)/\(expfrac.newBottom)"
+        add(key: "Color space", value: imageDict[kCGImagePropertyColorModel as String])
+        add(key: "Focal length", value: exifDict[kCGImagePropertyExifFocalLength as String])
+        add(key: "F number", value: exifDict[kCGImagePropertyExifFNumber as String])
+        add(key: "Exposure program", value: exifDict[kCGImagePropertyExifExposureProgram as String])
+        
+        if let exp = exifDict[kCGImagePropertyExifExposureTime as String] as? NSNumber {
+            let expfrac = simplify(Int64(exp.doubleValue * 10_000_000_000_000), 10_000_000_000_000)
+            add(key: "Exposure time", value: "\(expfrac.newTop)/\(expfrac.newBottom)")
         }
         if let iso = exifDict[kCGImagePropertyExifISOSpeedRatings as String] as? NSArray , iso.count > 0 {
-            keys.append("ISO speed")
-            dic["ISO speed"] = iso[0]
+            add(key: "ISO speed", value: iso[0])
         }
         return (dic, keys)
     }
     
     static var audioProperties: ((_ fileURL: URL) -> (prop: [String: Any], keys: [String]))? = { fileURL in
+        var dic = [String: Any]()
+        var keys = [String]()
+        
+        func add(key: String, value: Any?) {
+            if let value = value {
+                keys.append(key)
+                dic[key] = value
+            }
+        }
+        
         func makeDescription(_ key: String?) -> String? {
             guard let key = key else {
                 return nil
@@ -287,8 +275,6 @@ public struct LocalFileInformationGenerator {
             return newKey.capitalized
         }
         
-        var dic = [String: Any]()
-        var keys = [String]()
         if FileManager.default.fileExists(atPath: fileURL.path) {
             let playerItem = AVPlayerItem(url: fileURL)
             let metadataList = playerItem.asset.commonMetadata
@@ -301,12 +287,8 @@ public struct LocalFileInformationGenerator {
                 }
             }
             if let ap = try? AVAudioPlayer(contentsOf: fileURL) {
-                keys.append("Duration")
-                dic["Duration"] = LocalFileProvider.formatshort(interval: ap.duration)
-                if let bitRate = ap.settings[AVSampleRateKey] as? Int {
-                    keys.append("Bitrate")
-                    dic["Bitrate"] = bitRate
-                }
+                add(key: "Duration", value: LocalFileProvider.formatshort(interval: ap.duration))
+                add(key: "Bitrate", value: ap.settings[AVSampleRateKey] as? Int)
             }
         }
         return (dic, keys)
@@ -315,6 +297,14 @@ public struct LocalFileInformationGenerator {
     static public var videoProperties: ((_ fileURL: URL) -> (prop: [String: Any], keys: [String]))? = { fileURL in
         var dic = [String: Any]()
         var keys = [String]()
+        
+        func add(key: String, value: Any?) {
+            if let value = value {
+                keys.append(key)
+                dic[key] = value
+            }
+        }
+        
         if let audioprops = LocalFileInformationGenerator.audioProperties?(fileURL) {
             dic = audioprops.prop
             keys = audioprops.keys
@@ -329,17 +319,14 @@ public struct LocalFileInformationGenerator {
             var bitrate: Float = 0
             let width = Int(videoTracks[0].naturalSize.width)
             let height = Int(videoTracks[0].naturalSize.height)
-            keys.append("Dimensions")
-            dic["Dimensions"] = "\(width)x\(height)"
+            add(key: "Dimensions", value: "\(width)x\(height)")
             var duration: Int64 = 0
             for track in videoTracks {
                 duration += track.timeRange.duration.timescale > 0 ? track.timeRange.duration.value / Int64(track.timeRange.duration.timescale) : 0
                 bitrate += track.estimatedDataRate
             }
-            keys.append("Duration")
-            dic["Duration"] = LocalFileProvider.formatshort(interval: TimeInterval(duration))
-            keys.append("Video Bitrate")
-            dic["Video Bitrate"] = "\(Int(ceil(bitrate / 1000))) kbps"
+            add(key: "Duration", value: LocalFileProvider.formatshort(interval: TimeInterval(duration)))
+            add(key: "Video Bitrate", value: "\(Int(ceil(bitrate / 1000))) kbps")
         }
         let audioTracks = asset.tracks(withMediaType: AVMediaTypeAudio)
         // dic["Audio channels"] = audioTracks.count
@@ -347,12 +334,21 @@ public struct LocalFileInformationGenerator {
         for track in audioTracks {
             bitrate += track.estimatedDataRate
         }
-        keys.append("Audio Bitrate")
-        dic["Audio Bitrate"] = "\(Int(ceil(bitrate / 1000))) kbps"
+        add(key: "Audio Bitrate", value: "\(Int(ceil(bitrate / 1000))) kbps")
         return (dic, keys)
     }
     
     static public var pdfProperties: ((_ fileURL: URL) -> (prop: [String: Any], keys: [String]))? = { fileURL in
+        var dic = [String: Any]()
+        var keys = [String]()
+        
+        func add(key: String, value: Any?) {
+            if let value = value {
+                keys.append(key)
+                dic[key] = value
+            }
+        }
+        
         func getKey(_ key: String, from dict: CGPDFDictionaryRef) -> String? {
             var cfValue: CGPDFStringRef? = nil
             if (CGPDFDictionaryGetString(dict, key, &cfValue)), let value = CGPDFStringCopyTextString(cfValue!) {
@@ -378,56 +374,40 @@ public struct LocalFileInformationGenerator {
             return nil
         }
         
-        var dic = [String: Any]()
-        var keys = [String]()
         if let data = try? Data(contentsOf: fileURL), let provider = CGDataProvider(data: data as CFData), let reference = CGPDFDocument(provider), let dict = reference.info {
             if let title = getKey("Title", from: dict), !title.isEmpty {
-                keys.append("Title")
-                dic["Title"] = title
+                add(key: "Title", value: title)
             }
             if let author = getKey("Author", from: dict), !author.isEmpty {
-                keys.append("Author")
-                dic["Author"] = author
+                add(key: "Author", value: author)
             }
             if let subject = getKey("Subject", from: dict), !subject.isEmpty {
-                keys.append("Subject")
-                dic["Subject"] = subject
+                add(key: "Subject", value: subject)
             }
             var majorVersion: Int32 = 0
             var minorVersion: Int32 = 0
             reference.getVersion(majorVersion: &majorVersion, minorVersion: &minorVersion)
             if majorVersion > 0 {
-                keys.append("Version")
-                dic["Version"] = String(majorVersion) + "." + String(minorVersion)
-            }
-            if reference.numberOfPages > 0 {
-                keys.append("Pages")
-                dic["Pages"] = reference.numberOfPages
+                add(key: "Version", value:  String(majorVersion) + "." + String(minorVersion))
             }
+            add(key: "Pages", value: reference.numberOfPages)
             
             if reference.numberOfPages > 0, let pageRef = reference.page(at: 1) {
                 let size = pageRef.getBoxRect(CGPDFBox.mediaBox).size
-                keys.append("Resolution")
-                dic["Resolution"] = "\(Int(size.width))x\(Int(size.height))"
+                add(key: "Resolution", value: "\(Int(size.width))x\(Int(size.height))")
             }
             if let creator = getKey("Creator", from: dict), !creator.isEmpty {
-                keys.append("Content creator")
-                dic["Content creator"] = creator
+                add(key: "Content creator", value: creator)
             }
-            if let creationDateString = getKey("CreationDate", from: dict), let creationDate = convertDate(creationDateString) {
-                keys.append("Creation date")
-                dic["Creation date"] = creationDate
+            if let creationDateString = getKey("CreationDate", from: dict) {
+                add(key: "Creation date", value: convertDate(creationDateString))
             }
-            if let modifiedDateString = getKey("ModDate", from: dict), let modDate = convertDate(modifiedDateString) {
-                keys.append("Modified date")
-                dic["Modified date"] = modDate
+            if let modifiedDateString = getKey("ModDate", from: dict) {
+                add(key: "Modified date", value: convertDate(modifiedDateString))
             }
-            keys.append("Security")
-            dic["Security"] = reference.isEncrypted ? "Present" : "None"
-            keys.append("Allows printing")
-            dic["Allows printing"] = reference.allowsPrinting ? "Yes" : "No"
-            keys.append("Allows copying")
-            dic["Allows copying"] = reference.allowsCopying ? "Yes" : "No"
+            add(key: "Security", value: reference.isEncrypted ? "Present" : "None")
+            add(key: "Allows printing", value: reference.allowsPrinting ? "Yes" : "No")
+            add(key: "Allows copying", value: reference.allowsCopying ? "Yes" : "No")
         }
         return (dic, keys)
     }

Sources/FileObject.swift

@@ -25,7 +25,7 @@ open class FileObject {
     }
     
     /// url to access the resource, not supported by Dropbox provider
-    @available(*, deprecated, message: "Use url.absoluteURL instead.")
+    @available(*, deprecated, renamed: "url", message: "Use url.absoluteURL instead.")
     open var absoluteURL: URL? {
         return url?.absoluteURL
     }
@@ -101,8 +101,8 @@ open class FileObject {
         }
     }
     
-    /// **DEPRECATED:** Use `type` property instead.
-    @available(*, deprecated, message: "Use type property instead.")
+    /// **OBSOLETED:** Use `type` property instead.
+    @available(*, obsoleted: 1.0, renamed: "type", message: "Use type property instead.")
     open var fileType: URLFileResourceType? {
         return self.type
     }

Sources/FileProvider.swift

@@ -510,8 +510,8 @@ extension FileProviderBasic {
         return path.trimmingCharacters(in: pathTrimSet).addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
     }
     
-    /// **DEPRECATED:** Use `url(of:).absoluteURL` instead.
-    @available(*, deprecated, message: "Use url(of:).absoluteURL instead.")
+    /// **OBSOLETED:** Use `url(of:).absoluteURL` instead.
+    @available(*, obsoleted: 1.0, renamed: "url(of:)", message: "Use url(of:).absoluteURL instead.")
     public func absoluteURL(_ path: String? = nil) -> URL {
         return url(of: path).absoluteURL
     }
@@ -534,11 +534,20 @@ extension FileProviderBasic {
         }
     }
     
+    
+    /// Returns the relative path of url, wothout percent encoding. Even if url is absolute or
+    /// retrieved from another provider, it will try to resolve the url against `baseURL` of
+    /// current provider. It's highly recomended to use this method for displaying purposes.
+    ///
+    /// - Parameter url: Absolute url to file or directory.
+    /// - Returns: A `String` contains relative path of url against base url.
     public func relativePathOf(url: URL) -> String {
-        if url.baseURL == self.baseURL {
+        // check if url derieved from current base url
+        if url.relativeString.isEmpty, url.baseURL == self.baseURL {
             return url.relativePath.removingPercentEncoding!
         }
         
+        // resolve url string against baseurl
         guard let baseURL = self.baseURL?.standardizedFileURL else { return url.absoluteString }
         return url.standardizedFileURL.absoluteString.replacingOccurrences(of: baseURL.absoluteString, with: "/").removingPercentEncoding!
     }

Sources/LocalFileProvider.swift

@@ -417,7 +417,10 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
     
     @discardableResult
     open func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        if length == 0 {
+        if length == 0 || offset < 0 {
+            dispatch_queue.async {
+                completionHandler(Data(), nil)
+            }
             return nil
         }
         

Sources/LocalHelper.swift

@@ -67,7 +67,7 @@ public final class LocalFileObject: FileObject {
 
 }
 
-internal class LocalFolderMonitor {
+internal final class LocalFolderMonitor {
     fileprivate let source: DispatchSourceFileSystemObject
     fileprivate let descriptor: CInt
     fileprivate let qq: DispatchQueue = DispatchQueue.global(qos: .default)

Sources/OneDriveFileProvide.swift

@@ -240,7 +240,10 @@ extension OneDriveFileProvider: FileProviderOperations {
 
 extension OneDriveFileProvider: FileProviderReadWrite {
     public func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        if length == 0 {
+        if length == 0 || offset < 0 {
+            dispatch_queue.async {
+                completionHandler(Data(), nil)
+            }
             return nil
         }
         

Sources/OneDriveHelper.swift

@@ -235,72 +235,51 @@ internal extension OneDriveFileProvider {
         var dic = [String: Any]()
         var keys = [String]()
         
+        func add(key: String, value: Any?) {
+            if let value = value {
+                keys.append(key)
+                dic[key] = value
+            }
+        }
+        
         if let parent = json["image"] as? [String: Any] ?? json["video"] as? [String: Any], let height = parent["height"] as? UInt64, let width = parent["width"] as? UInt64 {
-            keys.append("Dimensions")
-            dic["Dimensions"] = "\(width)x\(height)"
+            add(key: "Dimensions", value: "\(width)x\(height)")
         }
         if let location = json["location"] as? [String: Any], let latitude = location["latitude"] as? Double, let longitude = location["longitude"] as? Double {
-            
             OneDriveFileProvider.decimalFormatter.numberStyle = .decimal
             OneDriveFileProvider.decimalFormatter.maximumFractionDigits = 5
-            keys.append("Location")
             let latStr = OneDriveFileProvider.decimalFormatter.string(from: NSNumber(value: latitude))
             let longStr = OneDriveFileProvider.decimalFormatter.string(from: NSNumber(value: longitude))
-            dic["Location"] = "\(latStr), \(longStr)"
+            add(key: "Location", value: "\(latStr), \(longStr)")
         }
         if let parent = json["image"] as? [String: Any] ?? json["video"] as? [String: Any], let duration = parent["duration"] as? UInt64 {
-            keys.append("Duration")
-            dic["Duration"] = OneDriveFileProvider.formatshort(interval: TimeInterval(duration) / 1000)
+            add(key: "Duration", value: OneDriveFileProvider.formatshort(interval: TimeInterval(duration) / 1000))
         }
         if let timeTakenStr = json["takenDateTime"] as? String, let timeTaken = resolve(dateString: timeTakenStr) {
-            keys.append("Date taken")
             OneDriveFileProvider.dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
-            dic["Date taken"] = OneDriveFileProvider.dateFormatter.string(from: timeTaken)
+            add(key: "Date taken", value:  OneDriveFileProvider.dateFormatter.string(from: timeTaken))
         }
         
         if let photo = json["photo"] as? [String: Any] {
-            if let devicemake = photo["cameraMake"] as? String {
-                keys.append("Device make")
-                dic["Device make"] = devicemake
-            }
-            if let devicemodel = photo["cameraModel"] as? String {
-                keys.append("Device model")
-                dic["Device model"] = devicemodel
-            }
-            if let focallen = photo["focalLength"] as? Double {
-                keys.append("Focal length")
-                dic["Focal length"] = focallen
-            }
-            if let fnum = photo["fNumber"] as? Double {
-                keys.append("F number")
-                dic["F number"] = fnum
-            }
+            add(key: "Device make", value: photo["cameraMake"] as? String)
+            add(key: "Device model", value: photo["cameraModel"] as? String)
+            add(key: "focalLength", value: photo["focalLength"] as? Double)
+            add(key: "fNumber", value: photo["fNumber"] as? Double)
             if let expNom = photo["exposureNumerator"] as? Double, let expDen = photo["exposureDenominator"] as? Double {
-                keys.append("Exposure time")
-                dic["Exposure time"] = "\(Int(expNom))/\(Int(expDen))"
+                add(key: "Exposure time", value: "\(Int(expNom))/\(Int(expDen))")
             }
-            if let iso = photo["iso"] as? Int64 {
-                keys.append("ISO speed")
-                dic["ISO speed"] = iso
-            }
-
+            add(key: "ISO speed", value: photo["iso"] as? Int64)
         }
         
         if let audio = json["audio"] as? [String: Any] {
             for (key, value) in audio {
                 if key == "bitrate" || key == "isVariableBitrate" { continue }
                 let casedKey = spaceCamelCase(key)
-                keys.append(casedKey)
-                dic[casedKey] = value
+                add(key: casedKey, value: value)
             }
         }
         
-        if let video = json["video"] as? [String: Any] {
-            if let bitRate = video["bitrate"] as? Int {
-                keys.append("Bitrate")
-                dic["Bitrate"] = bitRate
-            }
-        }
+        add(key: "Bitrate", value: (json["video"] as? NSDictionary)?["bitrate"] as? Int)
         
         return (dic, keys)
     }

Sources/WebDAVFileProvider.swift

@@ -331,7 +331,10 @@ extension WebDAVFileProvider: FileProviderOperations {
 extension WebDAVFileProvider: FileProviderReadWrite {
     @discardableResult
     public func contents(path: String, offset: Int64, length: Int, completionHandler: @escaping ((_ contents: Data?, _ error: Error?) -> Void)) -> OperationHandle? {
-        if length == 0 {
+        if length == 0 || offset < 0 {
+            dispatch_queue.async {
+                completionHandler(Data(), nil)
+            }
             return nil
         }