v4.2.12691.0-Beta2

ITHit · Mar 22, 2022 · 4b7e4af · 4b7e4af
1 parent 0da32b8
commit 4b7e4af
Show file tree

Hide file tree

Showing 59 changed files with 661 additions and 88 deletions.
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -9,6 +9,6 @@
     <RootNamespace>ITHit.FileSystem.Samples.Common</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem" Version="4.1.12172.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem" Version="4.2.12691.0-Beta2" />
   </ItemGroup>
 </Project>
diff --git a/Common/Settings.cs b/Common/Settings.cs
@@ -58,5 +58,10 @@ public class Settings
         /// Communication channel name is used by RPC to establish connection over named pipes.
         /// </summary>
         public string RpcCommunicationChannelName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum number of concurrent tasks
+        /// </summary>
+        public int MaxDegreeOfParallelism { get; set; }
     }
 }
diff --git a/Windows/Common/Core/Common.Windows.Core.csproj b/Windows/Common/Core/Common.Windows.Core.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.1.12172.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.2.12691.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/ShellExtension/Common.Windows.ShellExtension.csproj b/Windows/Common/ShellExtension/Common.Windows.ShellExtension.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.1.12172.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.2.12691.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Rpc.Proto\Common.Windows.Rpc.Proto.csproj" />
     <ProjectReference Include="..\Rpc\Common.Windows.Rpc.csproj" />

diff --git a/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj b/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj
@@ -13,6 +13,7 @@
     <Compile Remove="ETagManager.cs" />
     <Compile Remove="ExternalDataManager.cs" />
     <Compile Remove="FilteredDocsMonitor.cs" />
+    <Compile Remove="FullSync\ClientToServerSync.cs" />
     <Compile Remove="FullSync\ServerToClientSync.cs" />
     <Compile Remove="IMapping.cs" />
     <Compile Remove="LockManager.cs" />
@@ -22,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.1.12172.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.2.12691.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
     <ProjectReference Include="..\Rpc.Proto\Common.Windows.Rpc.Proto.csproj" />

diff --git a/Windows/Common/VirtualDrive/FullSync/FullSyncService.cs b/Windows/Common/VirtualDrive/FullSync/FullSyncService.cs
@@ -117,7 +117,7 @@ private async void Timer_ElapsedAsync(object sender, System.Timers.ElapsedEventA
                 InvokeSyncEvent(SynchronizationState.Synchronizing);
 
                 // UFS -> RS. Recursivery synchronize all updated/created file and folders present in the user file system.
-                await new ClientToServerSync(engine, Log).SyncronizeFolderAsync(userFileSystemRootPath);
+                //await new ClientToServerSync(engine, Log).SyncronizeFolderAsync(userFileSystemRootPath);
 
                 // UFS <- RS. Recursivery synchronize all updated/created/deleted file and folders present in the user file system.
                 //await new ServerToClientSync(engine, Log).SyncronizeFolderAsync(userFileSystemRootPath);

diff --git a/Windows/Common/VirtualDrive/Rpc/GprcServerServiceImpl.cs b/Windows/Common/VirtualDrive/Rpc/GprcServerServiceImpl.cs
@@ -40,7 +40,7 @@ public override async Task<EmptyMessage> SetLockStatus(ItemsStatusList request,
                     string filePath = pair.Key;
                     bool fileStatus = pair.Value;
 
-                    IClientNotificationsWindows clientNotifications = engine.ClientNotifications(filePath);
+                    IClientNotifications clientNotifications = engine.ClientNotifications(filePath);
                     if (fileStatus)
                         await clientNotifications.LockAsync();
                     else
@@ -71,7 +71,7 @@ public override async Task<ItemsStatusList> GetLockStatus(ItemsPathList request,
 
                 foreach (string filePath in request.Files)
                 {
-                    IClientNotificationsWindows clientNotifications = engine.ClientNotifications(filePath);
+                    IClientNotifications clientNotifications = engine.ClientNotifications(filePath);
                     LockMode lockMode = await clientNotifications.GetLockModeAsync();
                     bool lockStatus = lockMode != LockMode.None;
 

diff --git a/Windows/Common/VirtualDrive/VirtualEngineBase.cs b/Windows/Common/VirtualDrive/VirtualEngineBase.cs
@@ -53,6 +53,7 @@ public abstract class VirtualEngineBase : EngineWindows
         /// <param name="iconsFolderPath">Path to the icons folder.</param>
         /// <param name="rpcCommunicationChannelName">Channel name to communicate with Windows Explorer context menu and other components on this machine.</param>
         /// <param name="syncIntervalMs">Full synchronization interval in milliseconds.</param>
+        /// <param name="maxDegreeOfParallelism">A maximum number of concurrent tasks.</param>
         /// <param name="log4net">Log4net logger.</param>
         public VirtualEngineBase(
             string license, 
@@ -61,8 +62,9 @@ public VirtualEngineBase(
             string iconsFolderPath, 
             string rpcCommunicationChannelName,
             double syncIntervalMs,
+            int maxDegreeOfParallelism,
             ILog log4net) 
-            : base(license, userFileSystemRootPath)
+            : base(license, userFileSystemRootPath, maxDegreeOfParallelism)
         {
             logger = new Logger("File System Engine", log4net) ?? throw new NullReferenceException(nameof(log4net));
             this.iconsFolderPath = iconsFolderPath ?? throw new NullReferenceException(nameof(iconsFolderPath));
@@ -120,9 +122,9 @@ public override async Task<bool> FilterAsync(OperationType operationType, string
         }
 
         /// <inheritdoc/>
-        public override async Task StartAsync()
+        public override async Task StartAsync(bool processModified = true)
         {
-            await base.StartAsync();
+            await base.StartAsync(processModified);
             //RemoteStorageMonitor.Start();
             //await SyncService.StartAsync();
             grpcServer.Start();

diff --git a/Windows/Common/WinRT.ShellExtension.Rpc/CustomStateProviderProxy.cs b/Windows/Common/WinRT.ShellExtension.Rpc/CustomStateProviderProxy.cs
@@ -13,13 +13,14 @@ namespace CommonShellExtensionRpc
 {
     public sealed class CustomStateProviderProxy
     {
-        public ItemProperty[] GetItemProperties(string itemPath)
+        public ItemProperty[] GetItemProperties(string itemPath, bool virtualDrivePlatform)
         {
-            GrpcClient grpcClient = new GrpcClient("VirtualDrive.RPC");
+            string channelName = virtualDrivePlatform ? "VirtualDrive.RPC" : "WebDAVDrive.RPC";
+
+            GrpcClient grpcClient = new GrpcClient(channelName);
 
             try
             {
-
                 ItemPropertyRequest request = new()
                 {
                     Path = itemPath
@@ -29,7 +30,7 @@ public ItemProperty[] GetItemProperties(string itemPath)
 
                 return itemPropertyResult
                     .Properties
-                    .Select(i => new ItemProperty(i.Id, i.Value, i.IconResource))
+                    .Select(i => new ItemProperty(i.Id, ValueValidator(i.Value), i.IconResource))
                     .ToArray();
 
             }
@@ -46,5 +47,10 @@ public ItemProperty[] GetItemProperties(string itemPath)
                 return new ItemProperty[] { };
             }
         }
+
+        private string ValueValidator(string val)
+        {
+            return string.IsNullOrWhiteSpace(val) ? "n/a" : val;
+        }
     }
 }