Merge branch 'main' of https://github.com/bvdcode/EasyExtensions

bvdcode · Oct 17, 2024 · 2de4eb2 · 2de4eb2
2 parents 2377dcb + 102eb80
commit 2de4eb2
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/Sources/EasyExtensions.WebDav/WebDavCloudClient.cs b/Sources/EasyExtensions.WebDav/WebDavCloudClient.cs
@@ -171,7 +171,7 @@ public async Task<IEnumerable<WebDavResource>> GetResourcesAsync(string folder)
             {
                 return Array.Empty<WebDavResource>();
             }
-            return result.Resources;
+            return result.Resources.Where(x => x.Uri != url);
         }
 
         /// <summary>
@@ -180,14 +180,20 @@ public async Task<IEnumerable<WebDavResource>> GetResourcesAsync(string folder)
         /// <param name="filePath"> The file path. </param>
         /// <returns> The file bytes. </returns>
         public async Task<byte[]> GetFileBytesAsync(string filePath)
+    {
+        if (!await ExistsAsync(filePath))
+        {
+            throw new FileNotFoundException("File not found.", filePath);
+        }
+        else
         {
-            string url = ConcatUris(_baseAddress, filePath).ToString();
-            var file = await _client.GetRawFile(url);
+            string requestUri = ConcatUris(_baseAddress, filePath).ToString();
+            WebDavStreamResponse webDavStreamResponse = await _client.GetRawFile(requestUri);
             using MemoryStream memoryStream = new MemoryStream();
-            await file.Stream.CopyToAsync(memoryStream);
-            byte[] bytes = memoryStream.ToArray();
-            return bytes;
+            await webDavStreamResponse.Stream.CopyToAsync(memoryStream);
+            return memoryStream.ToArray();
         }
+    }
 
         /// <summary>
         /// Gets the underlying <see cref="WebDavClient"/>.