From 24af7aa4c27abdad5920cf0300cfc05182846ea7 Mon Sep 17 00:00:00 2001 From: Amir Abbas Date: Thu, 20 Apr 2017 01:27:59 +0430 Subject: [PATCH] Fixed LocalFileProvider init baseURL issue --- Sources/LocalFileProvider.swift | 2 +- Sources/OneDriveFileProvider.swift | 2 +- Sources/WebDAVFileProvider.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/LocalFileProvider.swift b/Sources/LocalFileProvider.swift index e78dab4..e3f3423 100644 --- a/Sources/LocalFileProvider.swift +++ b/Sources/LocalFileProvider.swift @@ -98,7 +98,7 @@ open class LocalFileProvider: FileProvider, FileProviderMonitor, FileProvideUndo guard baseURL.isFileURL else { fatalError("Cannot initialize a Local provider from remote URL.") } - self.baseURL = (baseURL.path.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")).absoluteURL + self.baseURL = (baseURL.absoluteString.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")).absoluteURL self.currentPath = "" self.credential = nil self.isCoorinating = false diff --git a/Sources/OneDriveFileProvider.swift b/Sources/OneDriveFileProvider.swift index 3b5b452..9513f9b 100644 --- a/Sources/OneDriveFileProvider.swift +++ b/Sources/OneDriveFileProvider.swift @@ -87,7 +87,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote { */ public init(credential: URLCredential?, serverURL: URL? = nil, drive: String = "root", cache: URLCache? = nil) { let baseURL = serverURL?.absoluteURL ?? URL(string: "https://api.onedrive.com/")! - self.baseURL = baseURL.path.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("") + self.baseURL = baseURL.absoluteString.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("") self.drive = drive self.currentPath = "" self.useCache = false diff --git a/Sources/WebDAVFileProvider.swift b/Sources/WebDAVFileProvider.swift index 920971a..71d6112 100644 --- a/Sources/WebDAVFileProvider.swift +++ b/Sources/WebDAVFileProvider.swift @@ -84,7 +84,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote { if !["http", "https"].contains(baseURL.uw_scheme.lowercased()) { return nil } - self.baseURL = (baseURL.path.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")).absoluteURL + self.baseURL = (baseURL.absoluteString.hasSuffix("/") ? baseURL : baseURL.appendingPathComponent("")).absoluteURL self.currentPath = "" self.useCache = false self.validatingCache = true