From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 1 Feb 2023 17:24:23 +0000 (+0100)
Subject: Don't unnecessarily fail to get serverUrl for enumerated item in FileProviderEnumerat... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~55^2~236
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=476d6a2456b1b088af0b6a18ab23589be9adbcc1;p=nextcloud-desktop.git

Don't unnecessarily fail to get serverUrl for enumerated item in FileProviderEnumerator when this can be acquired straight from the itemMetadata

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
index 113037a5b..c4c8e7efb 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
@@ -33,12 +33,11 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
         } else {
             NSLog("Providing enumerator for item with identifier: %@", enumeratedItemIdentifier.rawValue)
             let dbManager = NextcloudFilesDatabaseManager.shared
-            if let itemMetadata = dbManager.itemMetadataFromFileProviderItemIdentifier(enumeratedItemIdentifier),
-               let itemDirectoryMetadata = dbManager.parentDirectoryMetadataForItem(itemMetadata) {
-
-                self.serverUrl = itemDirectoryMetadata.serverUrl + "/" + itemMetadata.fileName
+            if let itemMetadata = dbManager.itemMetadataFromFileProviderItemIdentifier(enumeratedItemIdentifier) {
+                self.serverUrl = itemMetadata.serverUrl + "/" + itemMetadata.fileName
+            } else {
+                NSLog("Could not find itemMetadata for file with identifier: %@", enumeratedItemIdentifier.rawValue)
             }
-
         }
 
         NSLog("Set up enumerator for user: %@ with serverUrl: %@", ncAccount.username, serverUrl)