Fixed SftpClientConnection.ListDirectoryAsync

ARKlab · Aug 6, 2024 · 52a2cbe · 52a2cbe
1 parent 5720b42
commit 52a2cbe
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/Ark.Tools.FtpClient.SftpClient/SftpClientConnection.cs b/Ark.Tools.FtpClient.SftpClient/SftpClientConnection.cs
@@ -50,9 +50,15 @@ public override async Task<IEnumerable<FtpEntry>> ListDirectoryAsync(string path
             path ??= "./";
             await _ensureConnected(ctk);
 
-            var rawLs = await _client.ListDirectoryAsync(path);
-            return _parse(rawLs);
+            var rawLs = _client.ListDirectoryAsync(path, cancellationToken: ctk);
+            var res = new List<FtpEntry>();
 
+            await foreach (var file in rawLs)
+            {
+                res.Add(_parse(file));
+            }
+
+            return res;
         }
 
         private async Task _ensureConnected(CancellationToken ctk)
@@ -210,19 +216,24 @@ private List<FtpEntry> _parse(IEnumerable<SftpFile> files)
 
             foreach (var file in files)
             {
-                var entry = new FtpEntry
-                {
-                    FullPath = file.FullName,
-                    IsDirectory = file.IsDirectory,
-                    Modified = file.LastWriteTimeUtc,
-                    Name = file.Name,
-                    Size = file.Length
-                };
+                FtpEntry entry = _parse(file);
                 result.Add(entry);
             }
             return result;
         }
 
+        private static FtpEntry _parse(ISftpFile file)
+        {
+            return new FtpEntry
+            {
+                FullPath = file.FullName,
+                IsDirectory = file.IsDirectory,
+                Modified = file.LastWriteTimeUtc,
+                Name = file.Name,
+                Size = file.Length
+            };
+        }
+
         public override async ValueTask ConnectAsync(CancellationToken ctk)
         {
             if (_client.IsConnected)