fixed fetchItemList: CloudPath was the same for all ItemMetadata. Add…

…itionally it is now relative to the rootURL.
cryptomator · Sep 15, 2020 · 484eb4b · 484eb4b
1 parent 71d8a3e
commit 484eb4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/CloudAccess/LocalFileSystem/LocalFileSystemProvider.swift b/CloudAccess/LocalFileSystem/LocalFileSystemProvider.swift
@@ -101,7 +101,8 @@ public class LocalFileSystemProvider: CloudProvider {
 					let size = (try? url.resourceValues(forKeys: [.fileSizeKey]))?.fileSize
 					let lastModifiedDate = (try? url.resourceValues(forKeys: [.contentModificationDateKey]))?.contentModificationDate
 					let itemType = getItemType(from: (try? url.resourceValues(forKeys: [.fileResourceTypeKey]))?.fileResourceType)
-					return CloudItemMetadata(name: name, cloudPath: cloudPath, itemType: itemType, lastModifiedDate: lastModifiedDate, size: size)
+					let itemCloudPath = getRelativeCloudPath(from: url)
+					return CloudItemMetadata(name: name, cloudPath: itemCloudPath, itemType: itemType, lastModifiedDate: lastModifiedDate, size: size)
 				}
 				promise = Promise(CloudItemList(items: metadatas, nextPageToken: nil))
 			} catch CocoaError.fileReadNoSuchFile {
@@ -356,4 +357,17 @@ public class LocalFileSystemProvider: CloudProvider {
 	private func validateItemType(at url: URL, with itemType: CloudItemType) -> Bool {
 		return url.hasDirectoryPath == (itemType == .folder) || !url.hasDirectoryPath == (itemType == .file)
 	}
+
+	private func getRelativeCloudPath(from url: URL) -> CloudPath {
+		assert(url.isFileURL)
+		let relativePath = url.path.deletingPrefix(rootURL.path)
+		return CloudPath(relativePath + (url.hasDirectoryPath ? "/" : ""))
+	}
+}
+
+private extension String {
+	func deletingPrefix(_ prefix: String) -> String {
+		guard hasPrefix(prefix) else { return self }
+		return String(dropFirst(prefix.count))
+	}
 }
diff --git a/CloudAccessTests/LocalFileSystem/LocalFileSystemTests.swift b/CloudAccessTests/LocalFileSystem/LocalFileSystemTests.swift
@@ -82,8 +82,8 @@ class LocalFileSystemTests: XCTestCase {
 		FileManager.default.createFile(atPath: fileURL.path, contents: nil, attributes: nil)
 		provider.fetchItemList(forFolderAt: CloudPath("/"), withPageToken: nil).then { itemList in
 			XCTAssertEqual(2, itemList.items.count)
-			XCTAssertTrue(itemList.items.contains(where: { $0.name == "dir" }))
-			XCTAssertTrue(itemList.items.contains(where: { $0.name == "file" }))
+			XCTAssertTrue(itemList.items.contains(where: { $0.name == "dir" && $0.cloudPath == CloudPath("/dir/") }))
+			XCTAssertTrue(itemList.items.contains(where: { $0.name == "file" && $0.cloudPath == CloudPath("/file") }))
 		}.catch { error in
 			XCTFail("Error in promise: \(error)")
 		}.always {