Fix #54(FTP login), Refactored ExtendedLocalFileProvider

.travis.yml

@@ -75,6 +75,7 @@ deploy:
   file: $FRAMEWORK_NAME.zip
   skip_cleanup: true
   on:
-    repo: amosavian/$PROJECTNAME
+    # repo: amosavian/$PROJECTNAME
+    repo: amosavian/FileProvider
     tags: true
     condition: "$CARTHAGEDEPLOY = YES"

FilesProvider.podspec

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

@@ -621,7 +621,7 @@
 		799396601D48B7BF00086753 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.18.0;
+				BUNDLE_VERSION_STRING = 0.18.1;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -653,7 +653,7 @@
 		799396611D48B7BF00086753 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.18.0;
+				BUNDLE_VERSION_STRING = 0.18.1;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;

Package.swift

@@ -1,5 +1,5 @@
 import PackageDescription
 
 let package = Package(
-    name: "FileProvider"
-)
+    name: "FilesProvider"
+)

README.md

@@ -2,21 +2,28 @@
 
 >This Swift library provide a swifty way to deal with local and remote files and directories in a unified way.
 
+<center>
+
 [![Swift Version][swift-image]][swift-url]
 [![Platform][platform-image]](#)
 [![License][license-image]][license-url]
-
-[![Release versin][release-image]][release-url]
-[![CocoaPods version](https://img.shields.io/cocoapods/v/FileProvider.svg)][cocoapods]
-[![Carthage compatible][carthage-image]](https://github.com/Carthage/Carthage)
-
 [![Build Status][travis-image]][travis-url]
 [![Codebeat Badge][codebeat-image]][codebeat-url]
-[![Cocoapods Docs][docs-image]][docs-url]
+
+[![Release version][release-image]][release-url]
+[![CocoaPods version](https://img.shields.io/cocoapods/v/FilesProvider.svg)][cocoapods]
+[![Carthage compatible][carthage-image]](https://github.com/Carthage/Carthage)
 [![Cocoapods Downloads][cocoapods-downloads]][cocoapods]
 [![Cocoapods Apps][cocoapods-apps]][cocoapods]
 
+Old Cocoapods repo stats:
+[![Cocoapods Downloads][cocoapods-downloads-old]][cocoapods-old]
+[![Cocoapods Apps][cocoapods-apps-old]][cocoapods-old]
+
+</center>
+
 <!--- 
+[![Cocoapods Doc][docs-image]][docs-url]
 [![codecov](https://codecov.io/gh/amosavian/FileProvider/branch/master/graph/badge.svg)](https://codecov.io/gh/amosavian/FileProvider) 
 ---> 
 
@@ -30,7 +37,6 @@ All functions do async calls and it wont block your main thread.
 - [x] **CloudFileProvider** A wrapper around app's ubiquitous container API of iCloud Drive.
 - [x] **WebDAVFileProvider** WebDAV protocol is defacto file transmission standard, supported by some cloud services like `ownCloud`, `Box.com` and `Yandex.disk`.
 - [x] **FTPFileProvider** While deprecated in 1990s due to serious security concerns, it's still in use on some Web hosts.
-    * Active mode is not implemented yet.
 - [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.
@@ -39,7 +45,7 @@ All functions do async calls and it wont block your main thread.
 - [ ] **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 deprecated and very tricky to be implemented due to strict memory allignment in Swift.
+    * SMBv1/CIFS is insecure, deprecated and kinda tricky to be implemented due to strict memory allignment in Swift.
 
 ## Requirements
 
@@ -51,7 +57,7 @@ Legacy version is available in swift-2 branch.
 
 ## Installation
 
-###Important: this library has been renamed to avoid conflict in iOS 11, macOS 10.13 and Xcode 9.0. Please read issue [#53](https://github.com/amosavian/FileProvider/issues/53) to find more.
+### Important: this library has been renamed to avoid conflict in iOS 11, macOS 10.13 and Xcode 9.0. Please read issue [#53](https://github.com/amosavian/FileProvider/issues/53) to find more.
 
 
 ### Cocoapods / Carthage / Swift Package Manager
@@ -240,10 +246,10 @@ To get list of files in a directory:
 documentsProvider.contentsOfDirectory(path: "/", completionHandler: {
 	contents, error in
 	for file in contents {
-		print("Name: \(attributes.name)")
-		print("Size: \(attributes.size)")
-		print("Creation Date: \(attributes.creationDate)")
-		print("Modification Date: \(attributes.modifiedDate)")
+		print("Name: \(file.name)")
+		print("Size: \(file.size)")
+		print("Creation Date: \(file.creationDate)")
+		print("Modification Date: \(file.modifiedDate)")
 	}
 })
 ```
@@ -260,15 +266,6 @@ func storageProperties(completionHandler: { total, used in
 	
 * if this function is unavailable on provider or an error has been occurred, total space will be reported `-1` and used space `0`
 
-### Change current directory
-
-```swift
-documentsProvider.currentPath = "/New Folder"
-// now path is ~/Documents/New Folder
-```
-	
-You can then pass "" (empty string) to `contentsOfDirectory` method to list files in current directory.
-
 ### Creating File and Folders
 
 Creating new directory:
@@ -307,8 +304,6 @@ documentsProvider.moveItem(path: "new folder/old.txt", to: "new.txt", overwrite:
 documentsProvider.removeItem(path: "new.txt", completionHandler: nil)
 ```
 
-***Caution:*** This method will delete directories with all it's contents recursively except for FTP providers that don't support `SITE RMDIR` command, this will be fixed later.
-
 ### Fetching Contents of File
 
 There is two method for this purpose, one of them loads entire file into `Data` and another can load a portion of file.
@@ -340,7 +335,7 @@ let data = "What's up Newyork!".data(encoding: .utf8)
 documentsProvider.writeContents(path: "old.txt", content: data, atomically: true, completionHandler: nil)
 ```
 
-### Copying Files to and From Local URL
+### Copying Files to and From Local Storage
 
 There are two methods to download and upload files between provider's and local storage. These methods use `URLSessionDownloadTask` and `URLSessionUploadTask` classes and allows to use background session and provide progress via delegate.
 
@@ -441,9 +436,10 @@ To check either file thumbnail is supported or not and fetch thumbnail, use (and
 
 ```swift
 let path = "/newImage.jpg"
-let thumbSize = CGSize(width: 64, height: 64)
+let thumbSize = CGSize(width: 64, height: 64) // or nil which renders to default dimension of provider
 if documentsProvider.thumbnailOfFileSupported(path: path {
     documentsProvider.thumbnailOfFile(path: file.path, dimension: thumbSize, completionHandler: { (image, error) in
+        // Interacting with UI must be placed in main thread
         DispatchQueue.main.async {
             self.previewImage.image = image
         }
@@ -495,10 +491,11 @@ Distributed under the MIT license. See `LICENSE` for more information.
 
 [https://github.com/amosavian/](https://github.com/amosavian/)
 
-[cocoapods]: https://cocoapods.org/pods/FileProvider
+[cocoapods]: https://cocoapods.org/pods/FilesProvider
+[cocoapods-old]: https://cocoapods.org/pods/FileProvider
 [swift-image]: https://img.shields.io/badge/swift-3.0,%203.1-orange.svg
 [swift-url]: https://swift.org/
-[platform-image]: https://img.shields.io/cocoapods/p/FileProvider.svg
+[platform-image]: https://img.shields.io/cocoapods/p/FilesProvider.svg
 [license-image]: https://img.shields.io/github/license/amosavian/FileProvider.svg
 [license-url]: LICENSE
 [codebeat-image]: https://codebeat.co/badges/7b359f48-78eb-4647-ab22-56262a827517
@@ -508,7 +505,9 @@ Distributed under the MIT license. See `LICENSE` for more information.
 [release-url]: https://github.com/amosavian/FileProvider/releases
 [release-image]: https://img.shields.io/github/release/amosavian/FileProvider.svg
 [carthage-image]: https://img.shields.io/badge/Carthage-compatible-4BC51D.svg
-[cocoapods-downloads]: https://img.shields.io/cocoapods/dt/FileProvider.svg
-[cocoapods-apps]: https://img.shields.io/cocoapods/at/FileProvider.svg
-[docs-image]: https://img.shields.io/cocoapods/metrics/doc-percent/FileProvider.svg
-[docs-url]: http://cocoadocs.org/docsets/FileProvider/
+[cocoapods-downloads-old]: https://img.shields.io/cocoapods/dt/FileProvider.svg
+[cocoapods-apps-old]: https://img.shields.io/cocoapods/at/FileProvider.svg
+[cocoapods-downloads]: https://img.shields.io/cocoapods/dt/FilesProvider.svg
+[cocoapods-apps]: https://img.shields.io/cocoapods/at/FilesProvider.svg
+[docs-image]: https://img.shields.io/cocoapods/metrics/doc-percent/FilesProvider.svg
+[docs-url]: http://cocoadocs.org/docsets/FilesProvider/

Sources/ExtendedLocalFileProvider.swift

@@ -331,26 +331,27 @@ public struct LocalFileInformationGenerator {
             return newKey.capitalized
         }
         
-        if FileManager.default.fileExists(atPath: fileURL.path) {
-            let playerItem = AVPlayerItem(url: fileURL)
-            let metadataList = playerItem.asset.commonMetadata
-            for item in metadataList {
-                #if swift(>=4.0)
+        guard FileManager.default.fileExists(atPath: fileURL.path) else {
+            return (dic, keys)
+        }
+        let playerItem = AVPlayerItem(url: fileURL)
+        let metadataList = playerItem.asset.commonMetadata
+        for item in metadataList {
+            #if swift(>=4.0)
                 let commonKey = item.commonKey?.rawValue
-                #else
+            #else
                 let commonKey = item.commonKey
-                #endif
-                if let description = makeDescription(commonKey) {
-                    if let value = item.stringValue {
-                        keys.append(description)
-                        dic[description] = value
-                    }
+            #endif
+            if let description = makeDescription(commonKey) {
+                if let value = item.stringValue {
+                    keys.append(description)
+                    dic[description] = value
                 }
             }
-            if let ap = try? AVAudioPlayer(contentsOf: fileURL) {
-                add(key: "Duration", value: ap.duration.formatshort)
-                add(key: "Bitrate", value: ap.settings[AVSampleRateKey] as? Int)
-            }
+        }
+        if let ap = try? AVAudioPlayer(contentsOf: fileURL) {
+            add(key: "Duration", value: ap.duration.formatshort)
+            add(key: "Bitrate", value: ap.settings[AVSampleRateKey] as? Int)
         }
         return (dic, keys)
     }
@@ -421,21 +422,40 @@ public struct LocalFileInformationGenerator {
         }
         
         func getKey(_ key: String, from dict: CGPDFDictionaryRef) -> String? {
-            var cfValue: CGPDFStringRef? = nil
-            if (CGPDFDictionaryGetString(dict, key, &cfValue)), let value = CGPDFStringCopyTextString(cfValue!) {
+            var cfStrValue: CGPDFStringRef?
+            if (CGPDFDictionaryGetString(dict, key, &cfStrValue)), let value = cfStrValue.flatMap({ CGPDFStringCopyTextString($0) }) {
                 return value as String
             }
+            var cfArrayValue: CGPDFArrayRef?
+            if (CGPDFDictionaryGetArray(dict, key, &cfArrayValue)), let cfArray = cfArrayValue {
+                var array = [String]()
+                for i in 0..<CGPDFArrayGetCount(cfArray) {
+                    var cfItemValue: CGPDFStringRef?
+                    if CGPDFArrayGetString(cfArray, i, &cfItemValue), let item = cfItemValue.flatMap({ CGPDFStringCopyTextString($0) }) {
+                        array.append(item as String)
+                    }
+                }
+                return array.joined(separator: ", ")
+            }
             return nil
         }
         
         func convertDate(_ date: String?) -> Date? {
             guard let date = date else { return nil }
-            var dateStr = date
+            var dateStr = date.replacingOccurrences(of: "'", with: "")
             if dateStr.hasPrefix("D:") {
                 dateStr.characters.removeFirst(2)
             }
             let dateFormatter = DateFormatter()
-            dateFormatter.dateFormat = "yyyyMMddHHmmssTZD"
+            dateFormatter.dateFormat = "yyyyMMddHHmmssTZ"
+            if let result = dateFormatter.date(from: dateStr) {
+                return result
+            }
+            dateFormatter.dateFormat = "yyyyMMddHHmmssZZZZZ"
+            if let result = dateFormatter.date(from: dateStr) {
+                return result
+            }
+            dateFormatter.dateFormat = "yyyyMMddHHmmssZ"
             if let result = dateFormatter.date(from: dateStr) {
                 return result
             }
@@ -446,29 +466,32 @@ public struct LocalFileInformationGenerator {
             return nil
         }
         
-        if let provider = CGDataProvider(url: fileURL as CFURL), let reference = CGPDFDocument(provider), let dict = reference.info {
-            add(key: "Title", value: getKey("Title", from: dict))
-            add(key: "Author", value: getKey("Author", from: dict))
-            add(key: "Subject", value: getKey("Subject", from: dict))
-            var majorVersion: Int32 = 0
-            var minorVersion: Int32 = 0
-            reference.getVersion(majorVersion: &majorVersion, minorVersion: &minorVersion)
-            if majorVersion > 0 {
-                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
-                add(key: "Resolution", value: "\(Int(size.width))x\(Int(size.height))")
-            }
-            add(key: "Content creator", value: getKey("Creator", from: dict))
-            add(key: "Creation date", value: convertDate(getKey("CreationDate", from: dict)))
-            add(key: "Modified date", value: convertDate(getKey("ModDate", from: dict)))
-            add(key: "Security", value: reference.isEncrypted ? "Present" : "None")
-            add(key: "Allows printing", value: reference.allowsPrinting ? "Yes" : "No")
-            add(key: "Allows copying", value: reference.allowsCopying ? "Yes" : "No")
+        guard let provider = CGDataProvider(url: fileURL as CFURL), let reference = CGPDFDocument(provider), let dict = reference.info else {
+            return (dic, keys)
         }
+        add(key: "Title", value: getKey("Title", from: dict))
+        add(key: "Author", value: getKey("Author", from: dict))
+        add(key: "Subject", value: getKey("Subject", from: dict))
+        add(key: "Producer", value: getKey("Producer", from: dict))
+        add(key: "Keywords", value: getKey("Keywords", from: dict))
+        var majorVersion: Int32 = 0
+        var minorVersion: Int32 = 0
+        reference.getVersion(majorVersion: &majorVersion, minorVersion: &minorVersion)
+        if majorVersion > 0 {
+            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
+            add(key: "Resolution", value: "\(Int(size.width))x\(Int(size.height))")
+        }
+        add(key: "Content creator", value: getKey("Creator", from: dict))
+        add(key: "Creation date", value: convertDate(getKey("CreationDate", from: dict)))
+        add(key: "Modified date", value: convertDate(getKey("ModDate", from: dict)))
+        add(key: "Security", value: reference.isEncrypted)
+        add(key: "Allows printing", value: reference.allowsPrinting)
+        add(key: "Allows copying", value: reference.allowsCopying)
         return (dic, keys)
     }
     

Sources/FTPFileProvider.swift

@@ -82,7 +82,8 @@ open class FTPFileProvider: FileProviderBasicRemote {
         guard (baseURL.scheme ?? "ftp").lowercased().hasPrefix("ftp") else { return nil }
         guard baseURL.host != nil else { return nil }
         var urlComponents = URLComponents(url: baseURL, resolvingAgainstBaseURL: true)!
-        urlComponents.port = urlComponents.port ?? 21
+        let defaultPort: Int = baseURL.scheme == "ftps" ? 990 : 21
+        urlComponents.port = urlComponents.port ?? defaultPort
         urlComponents.scheme = urlComponents.scheme ?? "ftp"
         
         self.baseURL =  (urlComponents.url!.path.hasSuffix("/") ? urlComponents.url! : urlComponents.url!.appendingPathComponent("")).absoluteURL

Sources/FTPHelper.swift

@@ -80,6 +80,13 @@ internal extension FTPFileProvider {
             task.resume()
         }
         
+        var isSecure = false
+        // Implicit FTP Connection
+        if self.baseURL?.port == 990 || self.baseURL?.scheme == "ftps" {
+            task.startSecureConnection()
+            isSecure = true
+        }
+        
         let credential = self.credential
         
         task.readData(ofMinLength: 4, maxLength: 2048, timeout: timeout) { (data, eof, error) in
@@ -99,7 +106,7 @@ internal extension FTPFileProvider {
                 return
             }
             
-            let loginHandle = {
+            let loginHandle: () -> Void = {
                 self.execute(command: "USER \(credential?.user ?? "anonymous")", on: task) { (response, error) in
                     if let error = error {
                         completionHandler(error)
@@ -118,7 +125,7 @@ internal extension FTPFileProvider {
                     }
                     
                     // needs password
-                    if response.hasPrefix("33") {
+                    if FileProviderFTPError(message: response).code == 331 {
                         self.execute(command: "PASS \(credential?.password ?? "fileprovider@")", on: task) { (response, error) in
                             if response?.hasPrefix("23") ?? false {
                                 completionHandler(nil)
@@ -135,7 +142,8 @@ internal extension FTPFileProvider {
                 }
             }
             
-            if self.baseURL?.scheme == "ftps" || self.baseURL?.port == 990 {
+            if !isSecure && self.baseURL?.scheme == "ftpes" {
+                // Explicit FTP Connection, by upgrading connection to FTP/SSL
                 self.execute(command: "AUTH TLS", on: task, minLength: 0, completionHandler: { (response, error) in
                     if let error = error {
                         completionHandler(error)
@@ -144,6 +152,7 @@ internal extension FTPFileProvider {
                     
                     if let response = response, response.hasPrefix("23") {
                         task.startSecureConnection()
+                        isSecure = true
                         self.execute(command: "PBSZ 0\r\nPROT P", on: task, completionHandler: { (response, error) in
                             if let error = error {
                                 completionHandler(error)
@@ -152,9 +161,17 @@ internal extension FTPFileProvider {
                             
                             loginHandle()
                         })
-                        
                     }
                 })
+            } else if isSecure {
+                self.execute(command: "PBSZ 0\r\nPROT P", on: task, completionHandler: { (response, error) in
+                    if let error = error {
+                        completionHandler(error)
+                        return
+                    }
+                    
+                    loginHandle()
+                })
             } else {
                 loginHandle()
             }
@@ -219,7 +236,7 @@ internal extension FTPFileProvider {
             
             let passiveTask = self.session.fpstreamTask(withHostName: host, port: port)
             passiveTask.resume()
-            if self.baseURL?.scheme == "ftps" || self.baseURL?.port == 990 {
+            if self.baseURL?.scheme == "ftps" || self.baseURL?.scheme == "ftpes" || self.baseURL?.port == 990 {
                 passiveTask.startSecureConnection()
             }
             completionHandler(passiveTask, nil)
@@ -238,6 +255,7 @@ internal extension FTPFileProvider {
         if self.baseURL?.scheme == "ftps" || self.baseURL?.port == 990 {
             activeTask.startSecureConnection()
         }
+        
         self.execute(command: "PORT \(service.port)", on: task) { (response, error) in
             if let error = error {
                 activeTask.cancel()