Fix #21 inconsistent Volume order

trannamtrung1st · Feb 20, 2022 · 70829c4 · 70829c4
1 parent a4e72f4
commit 70829c4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/...t.Plugins.FileSystemQuotaManagement/elFinder.Net.Plugins.FileSystemQuotaManagement.csproj b/...t.Plugins.FileSystemQuotaManagement/elFinder.Net.Plugins.FileSystemQuotaManagement.csproj
@@ -12,7 +12,7 @@
     <RepositoryUrl>https://github.com/trannamtrung1st/elFinder.Net.Core</RepositoryUrl>
     <RepositoryType>OSS</RepositoryType>
     <PackageTags>elFinder, connector, file-manager, driver, plugins</PackageTags>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/elFinder.Net.Core/elFinder.Net.AspNetCore/elFinder.Net.AspNetCore.csproj b/elFinder.Net.Core/elFinder.Net.AspNetCore/elFinder.Net.AspNetCore.csproj
@@ -14,7 +14,7 @@
     <IsPackable>true</IsPackable>
     <Description>This package enables ASP.NET Core 2.2 projects to easily integrate the elFinder.Net.Core connector. See the example project on Github for usage detail.</Description>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/elFinder.Net.Core/elFinder.Net.Core/Connector.cs b/elFinder.Net.Core/elFinder.Net.Core/Connector.cs
@@ -151,13 +151,16 @@ protected virtual async Task<ConnectorResult> ProcessCoreAsync(ConnectorCommand
 
                             if (openCmd.Tree == 1)
                             {
-                                foreach (var volume in Volumes)
+                                for (var i = 0; i < Volumes.Count; i++)
                                 {
+                                    var volume = Volumes[i];
+
                                     if (openCmd.TargetPath.IsRoot && volume == openVolume) continue;
 
                                     var rootVolumeDir = volume.Driver.CreateDirectory(volume.RootDirectory, volume);
                                     var hash = rootVolumeDir.GetHash(volume, pathParser);
-                                    openResp.files.Add(await rootVolumeDir.ToFileInfoAsync(hash, null, volume, Options, cancellationToken: cancellationToken));
+                                    var dirInfo = await rootVolumeDir.ToFileInfoAsync(hash, null, volume, Options, cancellationToken: cancellationToken);
+                                    openResp.files.Insert(i, dirInfo);
                                 }
                             }
 

diff --git a/elFinder.Net.Core/elFinder.Net.Core/elFinder.Net.Core.csproj b/elFinder.Net.Core/elFinder.Net.Core/elFinder.Net.Core.csproj
@@ -17,7 +17,7 @@
       See the example project on Github for usage detail.
     </Description>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/elFinder.Net.Core/elFinder.Net.Drivers.FileSystem/elFinder.Net.Drivers.FileSystem.csproj b/elFinder.Net.Core/elFinder.Net.Drivers.FileSystem/elFinder.Net.Drivers.FileSystem.csproj
@@ -13,7 +13,7 @@
     <IsPackable>true</IsPackable>
     <Description>elFinder.Net.Core Local File System driver.</Description>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>