Fix handling of root container metadata

Signed-off-by: Claudio Cambra <[email protected]>
claucambra · May 15, 2024 · 5e5b575 · 5e5b575
1 parent ce9083c
commit 5e5b575
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager+Directories.swift b/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager+Directories.swift
@@ -12,6 +12,7 @@
  * for more details.
  */
 
+import FileProvider
 import Foundation
 import OSLog
 
@@ -40,9 +41,15 @@ extension FilesDatabaseManager {
     }
 
     public func childItemsForDirectory(_ directoryMetadata: ItemMetadata) -> [ItemMetadata] {
-        let directoryServerUrl = directoryMetadata.serverUrl + "/" + directoryMetadata.fileName
+        var directoryServerUrl: String
+        if directoryMetadata.ocId == NSFileProviderItemIdentifier.rootContainer.rawValue {
+            directoryServerUrl = directoryMetadata.serverUrl
+        } else {
+            directoryServerUrl = directoryMetadata.serverUrl + "/" + directoryMetadata.fileName
+        }
         let metadatas = ncDatabase().objects(ItemMetadata.self).filter(
-            "serverUrl BEGINSWITH %@", directoryServerUrl)
+            "serverUrl BEGINSWITH %@", directoryServerUrl
+        )
         return sortedItemMetadatas(metadatas)
     }
 

diff --git a/Sources/NextcloudFileProviderKit/Item/Item.swift b/Sources/NextcloudFileProviderKit/Item/Item.swift
@@ -161,8 +161,6 @@ public class Item: NSObject, NSFileProviderItem {
         metadata.account = ncKit.nkCommonInstance.account
         metadata.directory = true
         metadata.ocId = NSFileProviderItemIdentifier.rootContainer.rawValue
-        metadata.fileName = "root"
-        metadata.fileNameView = "root"
         metadata.serverUrl = ncKit.nkCommonInstance.urlBase
         metadata.classFile = NKCommon.TypeClassFile.directory.rawValue
         return Item(metadata: metadata, parentItemIdentifier: .rootContainer, ncKit: ncKit)