isReachable returns error (#87), Updating version

amosavian · amosavian · commit 47ca97158914 · 2018-03-06T19:19:46.000+03:30
diff --git a/FilesProvider.podspec b/FilesProvider.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "FilesProvider"
-  s.version      = "0.22.0"
+  s.version      = "0.23.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.
diff --git a/FilesProvider.xcodeproj/project.pbxproj b/FilesProvider.xcodeproj/project.pbxproj
@@ -72,9 +72,6 @@
 		799396B91D48C02300086753 /* SMBFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799396981D48C02300086753 /* SMBFileProvider.swift */; };
 		799396BA1D48C02300086753 /* SMBFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799396981D48C02300086753 /* SMBFileProvider.swift */; };
 		799396BB1D48C02300086753 /* SMBFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799396981D48C02300086753 /* SMBFileProvider.swift */; };
-		799396BC1D48C02300086753 /* CIFSTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7993969A1D48C02300086753 /* CIFSTypes.swift */; };
-		799396BD1D48C02300086753 /* CIFSTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7993969A1D48C02300086753 /* CIFSTypes.swift */; };
-		799396BE1D48C02300086753 /* CIFSTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7993969A1D48C02300086753 /* CIFSTypes.swift */; };
 		799396BF1D48C02300086753 /* SMB2DataTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7993969B1D48C02300086753 /* SMB2DataTypes.swift */; };
 		799396C01D48C02300086753 /* SMB2DataTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7993969B1D48C02300086753 /* SMB2DataTypes.swift */; };
 		799396C11D48C02300086753 /* SMB2DataTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7993969B1D48C02300086753 /* SMB2DataTypes.swift */; };
@@ -593,7 +590,6 @@
 				799396B91D48C02300086753 /* SMBFileProvider.swift in Sources */,
 				794C220E1D591A4B00EC49B8 /* SMB2QueryTypes.swift in Sources */,
 				794C21FE1D58912A00EC49B8 /* DropboxHelper.swift in Sources */,
-				799396BC1D48C02300086753 /* CIFSTypes.swift in Sources */,
 				794C220A1D5893F800EC49B8 /* SMB2Notification.swift in Sources */,
 				799396D11D48C02300086753 /* SMB2SetInfo.swift in Sources */,
 				7924B1961D89DAE000589DB7 /* Document.swift in Sources */,
@@ -638,7 +634,6 @@
 				799396BA1D48C02300086753 /* SMBFileProvider.swift in Sources */,
 				794C220F1D591A4B00EC49B8 /* SMB2QueryTypes.swift in Sources */,
 				794C21FF1D58912A00EC49B8 /* DropboxHelper.swift in Sources */,
-				799396BD1D48C02300086753 /* CIFSTypes.swift in Sources */,
 				794C220B1D5893F800EC49B8 /* SMB2Notification.swift in Sources */,
 				799396D21D48C02300086753 /* SMB2SetInfo.swift in Sources */,
 				7924B1971D89DAE000589DB7 /* Document.swift in Sources */,
@@ -683,7 +678,6 @@
 				799396BB1D48C02300086753 /* SMBFileProvider.swift in Sources */,
 				794C22101D591A4B00EC49B8 /* SMB2QueryTypes.swift in Sources */,
 				794C22001D58912A00EC49B8 /* DropboxHelper.swift in Sources */,
-				799396BE1D48C02300086753 /* CIFSTypes.swift in Sources */,
 				794C220C1D5893F800EC49B8 /* SMB2Notification.swift in Sources */,
 				799396D31D48C02300086753 /* SMB2SetInfo.swift in Sources */,
 				7924B1981D89DAE000589DB7 /* Document.swift in Sources */,
@@ -802,6 +796,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				BUNDLE_VERSION_STRING = 0.23.0;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -837,6 +832,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				BUNDLE_VERSION_STRING = 0.23.0;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
diff --git a/Sources/CloudFileProvider.swift b/Sources/CloudFileProvider.swift
@@ -283,9 +283,9 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
         return progress
     }
     
-    open override func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    open override func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         dispatch_queue.async {
-            completionHandler(self.fileManager.ubiquityIdentityToken != nil)
+            completionHandler(self.fileManager.ubiquityIdentityToken != nil, nil)
         }
     }
     
diff --git a/Sources/FTPFileProvider.swift b/Sources/FTPFileProvider.swift
@@ -343,9 +343,9 @@ open class FTPFileProvider: FileProviderBasicRemote, FileProviderOperations, Fil
         return relativePath.replacingOccurrences(of: "/", with: "", options: .anchored)
     }
     
-    open func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    open func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         self.attributesOfItem(path: "/") { (file, error) in
-            completionHandler(file != nil)
+            completionHandler(file != nil, error)
         }
     }
     
diff --git a/Sources/FileProvider.swift b/Sources/FileProvider.swift
@@ -153,7 +153,8 @@ public protocol FileProviderBasic: class, NSSecureCoding {
     /// - Note: To prevent race condition, use this method wisely and avoid it as far possible.
     ///
     /// - Parameter success: indicated server is reachable or not.
-    func isReachable(completionHandler: @escaping(_ success: Bool) -> Void)
+    /// - Parameter error: `Error` returned by server if occured.
+    func isReachable(completionHandler: @escaping(_ success: Bool, _ error: Error?) -> Void)
 }
 
 extension FileProviderBasic {
diff --git a/Sources/HTTPFileProvider.swift b/Sources/HTTPFileProvider.swift
@@ -153,9 +153,16 @@ open class HTTPFileProvider: FileProviderBasicRemote, FileProviderOperations, Fi
         fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")
     }
     
-    open func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    open func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         self.storageProperties { volume in
-            completionHandler(volume != nil)
+            if volume != nil {
+                completionHandler(volume != nil, nil)
+                return
+            } else {
+                self.contentsOfDirectory(path: "", completionHandler: { (files, error) in
+                    completionHandler(false, error)
+                })
+            }
         }
     }
     
diff --git a/Sources/LocalFileProvider.swift b/Sources/LocalFileProvider.swift
@@ -215,9 +215,14 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {
         return progress
     }
     
-    open func isReachable(completionHandler: @escaping (_ success: Bool) -> Void) {
+    open func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         dispatch_queue.async {
-            completionHandler(self.fileManager.isReadableFile(atPath: self.baseURL!.path))
+            do {
+                let isReachable = try self.baseURL!.checkResourceIsReachable()
+                completionHandler(isReachable, nil)
+            } catch {
+                completionHandler(false, error)
+            }
         }
     }
     
diff --git a/Sources/OneDriveFileProvider.swift b/Sources/OneDriveFileProvider.swift
@@ -361,13 +361,19 @@ open class OneDriveFileProvider: HTTPFileProvider, FileProviderSharing {
     /// - Note: To prevent race condition, use this method wisely and avoid it as far possible.
     ///
     /// - Parameter success: indicated server is reachable or not.
-    open override func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    open override func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         var request = URLRequest(url: url(of: ""))
         request.httpMethod = "HEAD"
         request.setValue(authentication: credential, with: .oAuth2)
         let task = session.dataTask(with: request, completionHandler: { (data, response, error) in
             let status = (response as? HTTPURLResponse)?.statusCode ?? 400
-            completionHandler(status == 200)
+            if status >= 400, let code = FileProviderHTTPErrorCode(rawValue: status) {
+                let errorDesc = data.flatMap({ String(data: $0, encoding: .utf8) })
+                let error = FileProviderOneDriveError(code: code, path: "", serverDescription: errorDesc)
+                completionHandler(false, error)
+                return
+            }
+            completionHandler(status == 200, error)
         })
         task.resume()
     }
diff --git a/Sources/SMBFileProvider.swift b/Sources/SMBFileProvider.swift
@@ -68,7 +68,7 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {
         NotImplemented()
     }
     
-    func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         NotImplemented()
     }
     
diff --git a/Sources/WebDAVFileProvider.swift b/Sources/WebDAVFileProvider.swift
@@ -267,7 +267,7 @@ open class WebDAVFileProvider: HTTPFileProvider, FileProviderSharing {
         return progress
     }
     
-    override open func isReachable(completionHandler: @escaping (Bool) -> Void) {
+    override open func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {
         var request = URLRequest(url: baseURL!)
         request.httpMethod = "PROPFIND"
         request.setValue("0", forHTTPHeaderField: "Depth")
@@ -276,7 +276,13 @@ open class WebDAVFileProvider: HTTPFileProvider, FileProviderSharing {
         request.httpBody = WebDavFileObject.xmlProp([.volumeTotalCapacityKey, .volumeAvailableCapacityKey])
         runDataTask(with: request, completionHandler: { (data, response, error) in
             let status = (response as? HTTPURLResponse)?.statusCode ?? 400
-            completionHandler(status < 300)
+            if status >= 400, let code = FileProviderHTTPErrorCode(rawValue: status) {
+                let errorDesc = data.flatMap({ String(data: $0, encoding: .utf8) })
+                let error = FileProviderWebDavError(code: code, path: "", serverDescription: errorDesc, url: self.baseURL!)
+                completionHandler(false, error)
+                return
+            }
+            completionHandler(status < 300, error)
         })
     }
     

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ Pod::Spec.new do \|s\|`
`16`	`16`	`#`
`17`	`17`
`18`	`18`	`s.name = "FilesProvider"`
`19`		`- s.version = "0.22.0"`
	`19`	`+ s.version = "0.23.0"`
`20`	`20`	`s.summary = "FileManager replacement for Local and Remote (WebDAV/FTP/Dropbox/OneDrive/SMB2) files on iOS and macOS."`
`21`	`21`
`22`	`22`	`# This description is used to generate tags and improve search results.`
Original file line number	Diff line number	Diff line change
`@@ -283,9 +283,9 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {`
`283`	`283`	`return progress`
`284`	`284`	`}`
`285`	`285`
`286`		`- open override func isReachable(completionHandler: @escaping (Bool) -> Void) {`
	`286`	`+ open override func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {`
`287`	`287`	`dispatch_queue.async {`
`288`		`- completionHandler(self.fileManager.ubiquityIdentityToken != nil)`
	`288`	`+ completionHandler(self.fileManager.ubiquityIdentityToken != nil, nil)`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
Original file line number	Diff line number	Diff line change
`@@ -343,9 +343,9 @@ open class FTPFileProvider: FileProviderBasicRemote, FileProviderOperations, Fil`
`343`	`343`	`return relativePath.replacingOccurrences(of: "/", with: "", options: .anchored)`
`344`	`344`	`}`
`345`	`345`
`346`		`- open func isReachable(completionHandler: @escaping (Bool) -> Void) {`
	`346`	`+ open func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {`
`347`	`347`	`self.attributesOfItem(path: "/") { (file, error) in`
`348`		`- completionHandler(file != nil)`
	`348`	`+ completionHandler(file != nil, error)`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,8 @@ public protocol FileProviderBasic: class, NSSecureCoding {`
`153`	`153`	`/// - Note: To prevent race condition, use this method wisely and avoid it as far possible.`
`154`	`154`	`///`
`155`	`155`	`/// - Parameter success: indicated server is reachable or not.`
`156`		`- func isReachable(completionHandler: @escaping(_ success: Bool) -> Void)`
	`156`	+ /// - Parameter error: `Error` returned by server if occured.
	`157`	`+ func isReachable(completionHandler: @escaping(_ success: Bool, _ error: Error?) -> Void)`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`extension FileProviderBasic {`
Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,16 @@ open class HTTPFileProvider: FileProviderBasicRemote, FileProviderOperations, Fi`
`153`	`153`	`fatalError("HTTPFileProvider is an abstract class. Please implement \(#function) in subclass.")`
`154`	`154`	`}`
`155`	`155`
`156`		`- open func isReachable(completionHandler: @escaping (Bool) -> Void) {`
	`156`	`+ open func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {`
`157`	`157`	`self.storageProperties { volume in`
`158`		`- completionHandler(volume != nil)`
	`158`	`+ if volume != nil {`
	`159`	`+ completionHandler(volume != nil, nil)`
	`160`	`+ return`
	`161`	`+ } else {`
	`162`	`+ self.contentsOfDirectory(path: "", completionHandler: { (files, error) in`
	`163`	`+ completionHandler(false, error)`
	`164`	`+ })`
	`165`	`+ }`
`159`	`166`	`}`
`160`	`167`	`}`
`161`	`168`
Original file line number	Diff line number	Diff line change
`@@ -215,9 +215,14 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor {`
`215`	`215`	`return progress`
`216`	`216`	`}`
`217`	`217`
`218`		`- open func isReachable(completionHandler: @escaping (_ success: Bool) -> Void) {`
	`218`	`+ open func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {`
`219`	`219`	`dispatch_queue.async {`
`220`		`- completionHandler(self.fileManager.isReadableFile(atPath: self.baseURL!.path))`
	`220`	`+ do {`
	`221`	`+ let isReachable = try self.baseURL!.checkResourceIsReachable()`
	`222`	`+ completionHandler(isReachable, nil)`
	`223`	`+ } catch {`
	`224`	`+ completionHandler(false, error)`
	`225`	`+ }`
`221`	`226`	`}`
`222`	`227`	`}`
`223`	`228`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {`
`68`	`68`	`NotImplemented()`
`69`	`69`	`}`
`70`	`70`
`71`		`- func isReachable(completionHandler: @escaping (Bool) -> Void) {`
	`71`	`+ func isReachable(completionHandler: @escaping (_ success: Bool, _ error: Error?) -> Void) {`
`72`	`72`	`NotImplemented()`
`73`	`73`	`}`
`74`	`74`