Fix #54(FTP login), Refactored ExtendedLocalFileProvider

Fixed Readme errors
Updated Readme fot FTP and SMB description
2017-07-17 05:36:30 +04:30 · 2017-07-14 19:28:41 +04:30 · 2017-07-14 16:49:55 +04:30 · 2017-07-14 16:49:24 +04:30 · 2017-07-05 21:35:15 +04:30 · 2017-07-02 18:26:34 +04:30
20 changed files with 299 additions and 173 deletions
@@ -12,8 +12,8 @@ env:
  - MACOS_SDK=macosx
  - TVOS_SDK=appletvsimulator
  matrix:
-    - DESTINATION="OS=10.2,name=iPad Air 2"        SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="YES" CARTHAGEDEPLOY="NO"
-    - DESTINATION="OS=9.0,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="YES"
+    - DESTINATION="OS=10.2,name=iPad Air 2"        SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO" CARTHAGEDEPLOY="YES"
+    - DESTINATION="OS=9.0,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="YES"  CARTHAGEDEPLOY="NO"
    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="NO"

    - DESTINATION="OS=10.1,name=Apple TV 1080p"    SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD="NO"  CARTHAGEDEPLOY="NO"
@@ -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"
@@ -1,5 +1,5 @@
 #
-#  Be sure to run `pod spec lint FileProvider.podspec' to ensure this is a
+#  Be sure to run `pod spec lint FilesProvider.podspec' to ensure this is a
 #  valid spec and to remove all comments including this before submitting the spec.
 #
 #  To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
@@ -15,8 +15,8 @@ Pod::Spec.new do |s|
  #  summary should be tweet-length, and the description more in depth.
  #

-  s.name         = "FileProvider"
-  s.version      = "0.17.0"
+  s.name         = "FilesProvider"
+  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.
@@ -146,9 +146,9 @@
 		794C220D1D591A4B00EC49B8 /* SMB2QueryTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SMB2QueryTypes.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 /* FileProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FileProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		799396751D48B80D00086753 /* FileProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FileProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		799396821D48B82700086753 /* FileProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FileProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		799396671D48B7F600086753 /* FilesProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FilesProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		799396751D48B80D00086753 /* FilesProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FilesProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		799396821D48B82700086753 /* FilesProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FilesProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7993968B1D48B8C700086753 /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
 		7993968C1D48B8C700086753 /* Info-MacOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-MacOS.plist"; sourceTree = "<group>"; };
 		7993968D1D48B8C700086753 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = "<group>"; };
@@ -269,9 +269,9 @@
 		799396681D48B7F600086753 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				799396671D48B7F600086753 /* FileProvider.framework */,
-				799396751D48B80D00086753 /* FileProvider.framework */,
-				799396821D48B82700086753 /* FileProvider.framework */,
+				799396671D48B7F600086753 /* FilesProvider.framework */,
+				799396751D48B80D00086753 /* FilesProvider.framework */,
+				799396821D48B82700086753 /* FilesProvider.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -368,9 +368,9 @@
 /* End PBXHeadersBuildPhase section */

 /* Begin PBXNativeTarget section */
-		799396661D48B7F600086753 /* FileProvider iOS */ = {
+		799396661D48B7F600086753 /* FilesProvider iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 7993966F1D48B7F600086753 /* Build configuration list for PBXNativeTarget "FileProvider iOS" */;
+			buildConfigurationList = 7993966F1D48B7F600086753 /* Build configuration list for PBXNativeTarget "FilesProvider iOS" */;
 			buildPhases = (
 				799396621D48B7F600086753 /* Sources */,
 				799396631D48B7F600086753 /* Frameworks */,
@@ -381,14 +381,14 @@
 			);
 			dependencies = (
 			);
-			name = "FileProvider iOS";
+			name = "FilesProvider iOS";
 			productName = "FileProvider iOS";
-			productReference = 799396671D48B7F600086753 /* FileProvider.framework */;
+			productReference = 799396671D48B7F600086753 /* FilesProvider.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		799396741D48B80D00086753 /* FileProvider OSX */ = {
+		799396741D48B80D00086753 /* FilesProvider OSX */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 7993967A1D48B80D00086753 /* Build configuration list for PBXNativeTarget "FileProvider OSX" */;
+			buildConfigurationList = 7993967A1D48B80D00086753 /* Build configuration list for PBXNativeTarget "FilesProvider OSX" */;
 			buildPhases = (
 				799396701D48B80D00086753 /* Sources */,
 				799396711D48B80D00086753 /* Frameworks */,
@@ -399,14 +399,14 @@
 			);
 			dependencies = (
 			);
-			name = "FileProvider OSX";
+			name = "FilesProvider OSX";
 			productName = "FileProvider OSX";
-			productReference = 799396751D48B80D00086753 /* FileProvider.framework */;
+			productReference = 799396751D48B80D00086753 /* FilesProvider.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		799396811D48B82700086753 /* FileProvider tvOS */ = {
+		799396811D48B82700086753 /* FilesProvider tvOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 799396871D48B82700086753 /* Build configuration list for PBXNativeTarget "FileProvider tvOS" */;
+			buildConfigurationList = 799396871D48B82700086753 /* Build configuration list for PBXNativeTarget "FilesProvider tvOS" */;
 			buildPhases = (
 				7993967D1D48B82700086753 /* Sources */,
 				7993967E1D48B82700086753 /* Frameworks */,
@@ -417,9 +417,9 @@
 			);
 			dependencies = (
 			);
-			name = "FileProvider tvOS";
+			name = "FilesProvider tvOS";
 			productName = "FileProvider tvOS";
-			productReference = 799396821D48B82700086753 /* FileProvider.framework */;
+			productReference = 799396821D48B82700086753 /* FilesProvider.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -442,7 +442,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 7993965F1D48B7BF00086753 /* Build configuration list for PBXProject "FileProvider" */;
+			buildConfigurationList = 7993965F1D48B7BF00086753 /* Build configuration list for PBXProject "FilesProvider" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -454,9 +454,9 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				799396661D48B7F600086753 /* FileProvider iOS */,
-				799396741D48B80D00086753 /* FileProvider OSX */,
-				799396811D48B82700086753 /* FileProvider tvOS */,
+				799396661D48B7F600086753 /* FilesProvider iOS */,
+				799396741D48B80D00086753 /* FilesProvider OSX */,
+				799396811D48B82700086753 /* FilesProvider tvOS */,
 			);
 		};
 /* End PBXProject section */
@@ -621,7 +621,7 @@
 		799396601D48B7BF00086753 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.17.0;
+				BUNDLE_VERSION_STRING = 0.18.1;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -645,7 +645,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = FileProvider;
+				PRODUCT_NAME = FilesProvider;
 				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
@@ -653,7 +653,7 @@
 		799396611D48B7BF00086753 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_VERSION_STRING = 0.17.0;
+				BUNDLE_VERSION_STRING = 0.18.1;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -673,7 +673,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PRODUCT_NAME = FileProvider;
+				PRODUCT_NAME = FilesProvider;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 			};
@@ -720,7 +720,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FileProvider-iOS";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FilesProvider-iOS";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -766,7 +766,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FileProvider-iOS";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FilesProvider-iOS";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -822,7 +822,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FileProvider-OSX";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FilesProvider-OSX";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -872,7 +872,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FileProvider-OSX";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FilesProvider-OSX";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -923,7 +923,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FileProvider-tvOS";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FilesProvider-tvOS";
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -972,7 +972,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FileProvider-tvOS";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mousavian.FilesProvider-tvOS";
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = 3;
@@ -986,7 +986,7 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		7993965F1D48B7BF00086753 /* Build configuration list for PBXProject "FileProvider" */ = {
+		7993965F1D48B7BF00086753 /* Build configuration list for PBXProject "FilesProvider" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				799396601D48B7BF00086753 /* Debug */,
@@ -995,7 +995,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		7993966F1D48B7F600086753 /* Build configuration list for PBXNativeTarget "FileProvider iOS" */ = {
+		7993966F1D48B7F600086753 /* Build configuration list for PBXNativeTarget "FilesProvider iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				7993966D1D48B7F600086753 /* Debug */,
@@ -1004,7 +1004,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		7993967A1D48B80D00086753 /* Build configuration list for PBXNativeTarget "FileProvider OSX" */ = {
+		7993967A1D48B80D00086753 /* Build configuration list for PBXNativeTarget "FilesProvider OSX" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				7993967B1D48B80D00086753 /* Debug */,
@@ -1013,7 +1013,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		799396871D48B82700086753 /* Build configuration list for PBXNativeTarget "FileProvider tvOS" */ = {
+		799396871D48B82700086753 /* Build configuration list for PBXNativeTarget "FilesProvider tvOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				799396881D48B82700086753 /* Debug */,
@@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "799396741D48B80D00086753"
-               BuildableName = "FileProvider.framework"
-               BlueprintName = "FileProvider OSX"
-               ReferencedContainer = "container:FileProvider.xcodeproj">
+               BuildableName = "FilesProvider.framework"
+               BlueprintName = "FilesProvider OSX"
+               ReferencedContainer = "container:FilesProvider.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -36,6 +37,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -46,9 +48,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "799396741D48B80D00086753"
-            BuildableName = "FileProvider.framework"
-            BlueprintName = "FileProvider OSX"
-            ReferencedContainer = "container:FileProvider.xcodeproj">
+            BuildableName = "FilesProvider.framework"
+            BlueprintName = "FilesProvider OSX"
+            ReferencedContainer = "container:FilesProvider.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
      <AdditionalOptions>
@@ -64,9 +66,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "799396741D48B80D00086753"
-            BuildableName = "FileProvider.framework"
-            BlueprintName = "FileProvider OSX"
-            ReferencedContainer = "container:FileProvider.xcodeproj">
+            BuildableName = "FilesProvider.framework"
+            BlueprintName = "FilesProvider OSX"
+            ReferencedContainer = "container:FilesProvider.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
   </ProfileAction>
@@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "799396661D48B7F600086753"
-               BuildableName = "FileProvider.framework"
-               BlueprintName = "FileProvider iOS"
-               ReferencedContainer = "container:FileProvider.xcodeproj">
+               BuildableName = "FilesProvider.framework"
+               BlueprintName = "FilesProvider iOS"
+               ReferencedContainer = "container:FilesProvider.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -36,6 +37,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -46,9 +48,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "799396661D48B7F600086753"
-            BuildableName = "FileProvider.framework"
-            BlueprintName = "FileProvider iOS"
-            ReferencedContainer = "container:FileProvider.xcodeproj">
+            BuildableName = "FilesProvider.framework"
+            BlueprintName = "FilesProvider iOS"
+            ReferencedContainer = "container:FilesProvider.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
      <AdditionalOptions>
@@ -64,9 +66,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "799396661D48B7F600086753"
-            BuildableName = "FileProvider.framework"
-            BlueprintName = "FileProvider iOS"
-            ReferencedContainer = "container:FileProvider.xcodeproj">
+            BuildableName = "FilesProvider.framework"
+            BlueprintName = "FilesProvider iOS"
+            ReferencedContainer = "container:FilesProvider.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
   </ProfileAction>
@@ -15,9 +15,9 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "799396811D48B82700086753"
-               BuildableName = "FileProvider.framework"
-               BlueprintName = "FileProvider tvOS"
-               ReferencedContainer = "container:FileProvider.xcodeproj">
+               BuildableName = "FilesProvider.framework"
+               BlueprintName = "FilesProvider tvOS"
+               ReferencedContainer = "container:FilesProvider.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
      </BuildActionEntries>
@@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -36,6 +37,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -46,9 +48,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "799396811D48B82700086753"
-            BuildableName = "FileProvider.framework"
-            BlueprintName = "FileProvider tvOS"
-            ReferencedContainer = "container:FileProvider.xcodeproj">
+            BuildableName = "FilesProvider.framework"
+            BlueprintName = "FilesProvider tvOS"
+            ReferencedContainer = "container:FilesProvider.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
      <AdditionalOptions>
@@ -64,9 +66,9 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "799396811D48B82700086753"
-            BuildableName = "FileProvider.framework"
-            BlueprintName = "FileProvider tvOS"
-            ReferencedContainer = "container:FileProvider.xcodeproj">
+            BuildableName = "FilesProvider.framework"
+            BlueprintName = "FilesProvider tvOS"
+            ReferencedContainer = "container:FilesProvider.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
   </ProfileAction>
@@ -1,5 +1,5 @@
 import PackageDescription

 let package = Package(
-    name: "FileProvider"
-)
+    name: "FilesProvider"
+)
@@ -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,12 +57,15 @@ 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.
+
+
 ### Cocoapods / Carthage / Swift Package Manager

 Add this line to your pods file:

 ```ruby
-pod "FileProvider"
+pod "FilesProvider"
 ```

 Or add this to Cartfile:
@@ -94,7 +103,7 @@ Then you can do either:

 * Copy Source folder to your project and Voila!

-* Drop `FileProvider.xcodeproj` to you Xcode workspace and add the framework to your Embeded Binaries in target.
+* Drop `FilesProvider.xcodeproj` to you Xcode workspace and add the framework to your Embeded Binaries in target.

 ## Usage

@@ -105,6 +114,8 @@ Each provider has a specific class which conforms to FileProvider protocol and s
 For LocalFileProvider if you want to deal with `Documents` folder

 ```	swift
+import FilesProvider
+
 let documentsProvider = LocalFileProvider()

 // Equals with:
@@ -118,6 +129,8 @@ let documentsProvider = LocalFileProvider(baseURL: documentsURL)
 Also for using group shared container:

 ```swift
+import FilesProvider
+
 let documentsProvider = LocalFileProvider(sharedContainerId: "group.yourcompany.appContainer")
 // Replace your group identifier
 ```
@@ -127,6 +140,8 @@ You can't change the base url later. and all paths are related to this base url
 To initialize an iCloud Container provider look at [here](https://medium.com/ios-os-x-development/icloud-drive-documents-1a46b5706fe1) to see how to update project settings then use below code, This will automatically manager creating Documents folder in container:

 ```swift
+import FilesProvider
+
 let documentsProvider = CloudFileProvider(containerId: nil)
 ```

@@ -134,6 +149,8 @@ let documentsProvider = CloudFileProvider(containerId: nil)
 For remote file providers authentication may be necessary:

 ```	swift
+import FilesProvider
+
 let credential = URLCredential(user: "user", password: "pass", persistence: .permanent)
 let webdavProvider = WebDAVFileProvider(baseURL: URL(string: "http://www.example.com/dav")!, credential: credential)
 ```
@@ -229,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)")
 	}
 })
 ```
@@ -249,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:
@@ -296,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.
@@ -329,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.

@@ -430,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
        }
@@ -484,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
@@ -497,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/
@@ -71,9 +71,14 @@ open class CloudFileProvider: LocalFileProvider, FileProviderSharing {
        super.init(baseURL: baseURL)
        self.isCoorinating = true
        
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: .concurrent)
+        #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 = "FileProvider.\(type(of: self).type).Operation"
+        operation_queue.name = "\(queueLabel).Operation"
        
        fileManager.url(forUbiquityContainerIdentifier: containerId)
        opFileManager.url(forUbiquityContainerIdentifier: containerId)
@@ -101,9 +101,14 @@ open class DropboxFileProvider: FileProviderBasicRemote {
        self.apiURL = URL(string: "https://api.dropboxapi.com/2/")!
        self.contentURL = URL(string: "https://content.dropboxapi.com/2/")!
        
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: .concurrent)
+        #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 = "FileProvider.\(type(of: self).type).Operation"
+        operation_queue.name = "\(queueLabel).Operation"
    }
    
    public required convenience init?(coder aDecoder: NSCoder) {
@@ -197,8 +197,13 @@ public struct LocalFileInformationGenerator {
    static public var audioThumbnail: (_ fileURL: URL) -> ImageClass? = { fileURL in
        let playerItem = AVPlayerItem(url: fileURL)
        let metadataList = playerItem.asset.commonMetadata
+        #if swift(>=4.0)
+        let commonKeyArtwork = AVMetadataKey.commonKeyArtwork
+        #else
+        let commonKeyArtwork = AVMetadataCommonKeyArtwork
+        #endif
        for item in metadataList {
-            if item.commonKey == AVMetadataCommonKeyArtwork {
+            if item.commonKey == commonKeyArtwork {
                if let data = item.dataValue {
                    return ImageClass(data: data)
                }
@@ -319,28 +324,34 @@ public struct LocalFileInformationGenerator {
            guard let key = key else {
                return nil
            }
-            guard let regex = try? NSRegularExpression(pattern: "([a-z])([A-Z])" , options: NSRegularExpression.Options()) else {
+            guard let regex = try? NSRegularExpression(pattern: "([a-z])([A-Z])" , options: []) else {
                return nil
            }
-            let newKey = regex.stringByReplacingMatches(in: key, options: NSRegularExpression.MatchingOptions(), range: NSMakeRange(0, (key as NSString).length) , withTemplate: "$1 $2")
+            let newKey = regex.stringByReplacingMatches(in: key, options: [], range: NSRange(location: 0, length: (key as NSString).length) , withTemplate: "$1 $2")
            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 let description = makeDescription(item.commonKey) {
-                    if let value = item.stringValue {
-                        keys.append(description)
-                        dic[description] = value
-                    }
+        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
+                let commonKey = item.commonKey
+            #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)
    }
@@ -366,7 +377,11 @@ public struct LocalFileInformationGenerator {
            }
        }
        let asset = AVURLAsset(url: fileURL, options: nil)
+        #if swift(>=4.0)
+        let videoTracks = asset.tracks(withMediaType: AVMediaType.video)
+        #else
        let videoTracks = asset.tracks(withMediaType: AVMediaTypeVideo)
+        #endif
        if let videoTrack = videoTracks.first {
            var bitrate: Float = 0
            let width = Int(videoTrack.naturalSize.width)
@@ -380,7 +395,11 @@ public struct LocalFileInformationGenerator {
            add(key: "Duration", value: TimeInterval(duration).formatshort)
            add(key: "Video Bitrate", value: "\(Int(ceil(bitrate / 1000))) kbps")
        }
+        #if swift(>=4.0)
+        let audioTracks = asset.tracks(withMediaType: AVMediaType.audio)
+        #else
        let audioTracks = asset.tracks(withMediaType: AVMediaTypeAudio)
+        #endif
        // dic["Audio channels"] = audioTracks.count
        var bitrate: Float = 0
        for track in audioTracks {
@@ -403,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
            }
@@ -428,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)
    }
    
@@ -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
@@ -93,14 +94,19 @@ open class FTPFileProvider: FileProviderBasicRemote {
        self.cache = cache
        self.credential = credential
        
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: [])
+        #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 = "FileProvider.\(type(of: self).type).Operation"
+        operation_queue.name = "\(queueLabel).Operation"
    }
    
    public required convenience init?(coder aDecoder: NSCoder) {
        guard let baseURL = aDecoder.decodeObject(forKey: "baseURL") as? URL else { return nil }
-        self.init(baseURL: baseURL, credential: aDecoder.decodeObject(forKey: "credential") as? URLCredential)
+        self.init(baseURL: baseURL, passive: aDecoder.decodeBool(forKey: "passiveMode"), credential: aDecoder.decodeObject(forKey: "credential") as? URLCredential)
        self.currentPath     = aDecoder.decodeObject(forKey: "currentPath") as? String ?? ""
        self.useCache        = aDecoder.decodeBool(forKey: "useCache")
        self.validatingCache = aDecoder.decodeBool(forKey: "validatingCache")
@@ -114,6 +120,7 @@ open class FTPFileProvider: FileProviderBasicRemote {
        aCoder.encode(self.useCache, forKey: "useCache")
        aCoder.encode(self.validatingCache, forKey: "validatingCache")
        aCoder.encode(self.useAppleImplementation, forKey: "useAppleImplementation")
+        aCoder.encode(self.passiveMode, forKey: "passiveMode")
    }
    
    public static var supportsSecureCoding: Bool {
@@ -160,7 +167,6 @@ open class FTPFileProvider: FileProviderBasicRemote {
         `contents`: An array of `FileObject` identifying the the directory entries.
         `error`: Error returned by system.
     */
-    
    open func contentsOfDirectory(path apath: String, rfc3659enabled: Bool , completionHandler: @escaping ((_ contents: [FileObject], _ error: Error?) -> Void)) {
        let path = ftpPath(apath)
        
@@ -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()
            }
@@ -198,7 +215,7 @@ internal extension FTPFileProvider {
                return
            }
            
-            guard let response = response, let destString = response.components(separatedBy: " ").flatMap({ $0 }).last else {
+            guard let response = response, let destString = response.components(separatedBy: " ").flatMap({ $0 }).last.flatMap({ String($0) }) else {
                completionHandler(nil, self.throwError("", code: URLError.badServerResponse))
                return
            }
@@ -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()
@@ -347,7 +365,7 @@ internal extension FTPFileProvider {
                        return
                    }
                    
-                    let contents = response.components(separatedBy: "\n").flatMap({ $0.trimmingCharacters(in: .whitespacesAndNewlines) })
+                    let contents: [String] = response.components(separatedBy: "\n").flatMap({ $0.trimmingCharacters(in: .whitespacesAndNewlines) })
                    success = true
                    completionHandler(contents, nil)
                    return
@@ -143,9 +143,16 @@ open class FileObject: Equatable {
        if rhs === lhs  {
            return true
        }
+        #if swift(>=3.1)
+        if Swift.type(of: lhs) != Swift.type(of: rhs) {
+            return false
+        }
+        #else
        if type(of: lhs) != type(of: rhs) {
            return false
        }
+        #endif
+        
        if let rurl = rhs.allValues[.fileURLKey] as? URL, let lurl = lhs.allValues[.fileURLKey] as? URL {
            return rurl == lurl
        }
@@ -19,7 +19,7 @@ public typealias ImageClass = NSImage
 public typealias SimpleCompletionHandler = ((_ error: Error?) -> Void)?

 /// This protocol defines FileProvider neccesary functions and properties to connect and get contents list
-public protocol FileProviderBasic: class, NSCoding, NSSecureCoding {
+public protocol FileProviderBasic: class, NSSecureCoding {
    /// An string to identify type of provider.
    static var type: String { get }
    
@@ -631,13 +631,17 @@ public protocol FileProviderSharing {
 }

 /// Defines protocol for provider allows all common operations.
-public protocol FileProvider: FileProviderBasic, FileProviderOperations, FileProviderReadWrite, NSCopying {
+public protocol FileProvider: FileProviderOperations, FileProviderReadWrite, NSCopying {
 }

 internal let pathTrimSet = CharacterSet(charactersIn: " /")
 extension FileProviderBasic {
    public var type: String {
+        #if swift(>=3.1)
+        return Swift.type(of: self).type
+        #else
        return type(of: self).type
+        #endif
    }
    
    public func url(of path: String? = nil) -> URL {
@@ -103,9 +103,14 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
        self.credential = nil
        self.isCoorinating = false
        
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: .concurrent)
+        #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 = "FileProvider.\(type(of: self).type).Operation"
+        operation_queue.name = "\(queueLabel).Operation"
        
        fileProviderManagerDelegate = LocalFileProviderManagerDelegate(provider: self)
        opFileManager.delegate = fileProviderManagerDelegate
@@ -250,7 +255,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo
        return self.doOperation(opType, completionHandler: completionHandler)
    }
    
-    dynamic func doSimpleOperation(_ box: UndoBox) {
+    @objc dynamic func doSimpleOperation(_ box: UndoBox) {
        guard let _ = self.undoManager else { return }
        _ = self.doOperation(box.undoOperation) { (_) in
            return
@@ -94,9 +94,15 @@ open class OneDriveFileProvider: FileProviderBasicRemote {
        self.validatingCache = true
        self.cache = cache
        self.credential = credential
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: .concurrent)
+        
+        #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 = "FileProvider.\(type(of: self).type).Operation"
+        operation_queue.name = "\(queueLabel).Operation"
    }
    
    public required convenience init?(coder aDecoder: NSCoder) {
@@ -24,9 +24,15 @@ class SMBFileProvider: FileProvider, FileProviderMonitor {
            return nil
        }
        self.baseURL = baseURL.appendingPathComponent("")
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: .concurrent)
+        
+        #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 = "FileProvider.\(type(of: self).type).Operation"
+        operation_queue.name = "\(queueLabel).Operation"
        
        self.credential = credential
    }
@@ -90,9 +90,15 @@ open class WebDAVFileProvider: FileProviderBasicRemote {
        self.validatingCache = true
        self.cache = cache
        self.credential = credential
-        dispatch_queue = DispatchQueue(label: "FileProvider.\(type(of: self).type)", attributes: .concurrent)
+        
+        #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 = "FileProvider.\(type(of: self).type).Operation"
+        operation_queue.name = "\(queueLabel).Operation"
    }
    
    public required convenience init?(coder aDecoder: NSCoder) {
Author	SHA1	Message	Date
Amir Abbas	41e266c2a9	Fix #54(FTP login), Refactored ExtendedLocalFileProvider	2017-07-17 05:36:30 +04:30
Amir Abbas	6127f4a7d9	Fixed Readme errors	2017-07-14 19:28:41 +04:30
Amir Abbas	faca943beb	Updated Readme fot FTP and SMB description	2017-07-14 16:49:55 +04:30
Amir Abbas	9345436fa2	Enhanced PDF Meta-info, Better FTPS handling	2017-07-14 16:49:24 +04:30
Amir Abbas	6228d88d41	Adjusting readme badges	2017-07-05 21:35:15 +04:30
Amir Abbas	5b395915a9	Updated Readme for Pods and SPM file	2017-07-02 18:26:34 +04:30
Amir Abbas	e4f12a502b	Fixed repo name and Readme	2017-07-01 16:57:23 +04:30
Amir Abbas	8faad0ec65	Fixed project name in schemes	2017-07-01 14:14:45 +04:30
Amir Abbas	bd5569d213	Updated scheme names	2017-07-01 14:09:39 +04:30
Amir Abbas	14ed279879	Renamed framework for compatibility with iOS 11	2017-07-01 13:50:22 +04:30
Amir Abbas	fd293f7bdb	[Amend] Fixed swift 3.0 compile error for type(of:)	2017-07-01 11:08:49 +04:30
Amir Abbas	3d9625e243	Fixed swift 3.0 compile error for type(of:)	2017-07-01 11:03:22 +04:30
Amir Abbas	0d017ebfc4	Fix #52 (Swift 4.0 source compatibility)	2017-07-01 10:47:48 +04:30
Amir Abbas	fd36df67f3	FTP passive property encoding - removed redundant protocol conforming	2017-07-01 09:43:45 +04:30