Improve handling with file systems.

Squidex · Oct 21, 2021 · 266d795 · 266d795
1 parent 625ba81
commit 266d795
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/FileSystem/IFileSystem.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/FileSystem/IFileSystem.cs
@@ -16,6 +16,8 @@ public interface IFileSystem : IDisposable
 
         bool CanWrite => true;
 
+        bool CanAccessInParallel => false;
+
         IFile GetFile(FilePath path);
 
         IEnumerable<IFile> GetFiles(FilePath path, string extension);

diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/FileSystem/Zip/ZipFileSystem.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/FileSystem/Zip/ZipFileSystem.cs
@@ -20,6 +20,8 @@ public sealed class ZipFileSystem : IFileSystem
 
         public string FullName => fileInfo.FullName;
 
+        public bool CanAccessInParallel => false;
+
         public ZipFileSystem(FileInfo fileInfo)
         {
             zipArchive = new ZipArchive(fileInfo.Open(FileMode.OpenOrCreate), ZipArchiveMode.Update);

diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/Sync/Assets/DownloadPipeline.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/Sync/Assets/DownloadPipeline.cs
@@ -52,6 +52,8 @@ public DownloadPipeline(ISession session, ILogger log, IFileSystem fs)
                 BoundedCapacity = 1
             });
 
+            var maxDegreeOfParallelism = fs.CanAccessInParallel ? Environment.ProcessorCount * 2 : 1;
+
             var downloadStep = new ActionBlock<(AssetDto, FilePath)>(async item =>
             {
                 var (asset, path) = item;
@@ -88,9 +90,9 @@ public DownloadPipeline(ISession session, ILogger log, IFileSystem fs)
                 }
             }, new ExecutionDataflowBlockOptions
             {
-                MaxDegreeOfParallelism = 8,
+                MaxDegreeOfParallelism = maxDegreeOfParallelism,
                 MaxMessagesPerTask = 1,
-                BoundedCapacity = 16
+                BoundedCapacity = maxDegreeOfParallelism * 2
             });
 
             fileNameStep.LinkTo(downloadStep, new DataflowLinkOptions

diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/Sync/Assets/UploadPipeline.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/Sync/Assets/UploadPipeline.cs
@@ -53,6 +53,8 @@ public UploadPipeline(ISession session, ILogger log, IFileSystem fs)
                 BoundedCapacity = 1
             });
 
+            var maxDegreeOfParallelism = fs.CanAccessInParallel ? Environment.ProcessorCount * 2 : 1;
+
             var uploadStep = new ActionBlock<(AssetModel, FilePath)>(async item =>
             {
                 var (asset, path) = item;
@@ -85,9 +87,9 @@ public UploadPipeline(ISession session, ILogger log, IFileSystem fs)
                 }
             }, new ExecutionDataflowBlockOptions
             {
-                MaxDegreeOfParallelism = 8,
+                MaxDegreeOfParallelism = maxDegreeOfParallelism,
                 MaxMessagesPerTask = 1,
-                BoundedCapacity = 16
+                BoundedCapacity = maxDegreeOfParallelism * 2
             });
 
             fileNameStep.LinkTo(uploadStep, new DataflowLinkOptions

diff --git a/cli/Squidex.CLI/Squidex.CLI/Squidex.CLI.csproj b/cli/Squidex.CLI/Squidex.CLI/Squidex.CLI.csproj
@@ -14,7 +14,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <ToolCommandName>sq</ToolCommandName>
-    <Version>7.17</Version>
+    <Version>7.18</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Commands\Implementation\OpenLibrary\Structure\schemas\author.json" />