v5.6.16274.0-Beta2

ITHit · Jul 6, 2022 · 73080a6 · 73080a6
1 parent 39675e1
commit 73080a6
Show file tree

Hide file tree

Showing 27 changed files with 49 additions and 47 deletions.
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -10,6 +10,6 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem" Version="5.6.16274.0-Beta2" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Common.Windows.Core.csproj b/Windows/Common/Core/Common.Windows.Core.csproj
@@ -20,8 +20,8 @@
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="5.6.16262.0-Beta2" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="5.6.16274.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="5.6.16274.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj b/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj
@@ -9,7 +9,7 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="5.6.16274.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
   </ItemGroup>

diff --git a/Windows/Common/VirtualDrive/VirtualEngineBase.cs b/Windows/Common/VirtualDrive/VirtualEngineBase.cs
@@ -63,28 +63,28 @@ public VirtualEngineBase(
         }
 
         /// <inheritdoc/>
-        public override async Task<bool> FilterAsync(SyncDirection direction, OperationType operationType, string path, string newPath = null, FileAttributes? attributes = null, IOperationContext operationContext = null)
+        public override async Task<bool> FilterAsync(SyncDirection direction, OperationType operationType, string path, FileSystemItemType itemType, string newPath = null, FileAttributes? attributes = null, IOperationContext operationContext = null)
         {
             // Use the code below to filter based on files and folders attributes.
-            //if (await new AttributesFilter(FileAttributes.Hidden | FileAttributes.Temporary).FilterAsync(direction, operationType, path, newPath, attributes))
+            //if (await new AttributesFilter(FileAttributes.Hidden | FileAttributes.Temporary).FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             //{
             //    LogDebug($"{nameof(AttributesFilter)} filtered {operationType}", path, newPath, operationContext);
             //    return true;
             //}
 
-            if (await new ZipFilter().FilterAsync(direction, operationType, path, newPath, attributes))
+            if (await new ZipFilter().FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             {
                 LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
-            if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, newPath, attributes))
+            if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             {
                 LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
-            if (await new AutoCadFilter().FilterAsync(direction, operationType, path, newPath, attributes))
+            if (await new AutoCadFilter().FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             {
                 LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;

diff --git a/Windows/VirtualDrive/VirtualDrive.ShellExtension/ContextMenuVerbRpc.cs b/Windows/VirtualDrive/VirtualDrive.ShellExtension/ContextMenuVerbRpc.cs
@@ -11,7 +11,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.ContextMenuVerb")]
     [Guid("9C923BF3-3A4B-487B-AB4E-B4CF87FD1C25")]
-    public class ContextMenuVerbRpc : ContextMenuVerbRpcBase
+    public class ContextMenuVerbRpc : CloudFilesContextMenuVerbRpcBase
     {
 
     }

diff --git a/Windows/VirtualDrive/VirtualDrive.ShellExtension/CustomStateProviderRpc.cs b/Windows/VirtualDrive/VirtualDrive.ShellExtension/CustomStateProviderRpc.cs
@@ -12,7 +12,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.CustomStateProvider")]
     [Guid("000562AA-2879-4CF1-89E8-0AEC9596FE19")]
-    public class CustomStateProviderRpc : CustomStateProviderRpcBase
+    public class CustomStateProviderRpc : CustomStateHandlerRpcBase
     {
 
     }

diff --git a/Windows/VirtualDrive/VirtualDrive.ShellExtension/ThumbnailProviderRpc.cs b/Windows/VirtualDrive/VirtualDrive.ShellExtension/ThumbnailProviderRpc.cs
@@ -10,7 +10,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.ThumbnailProvider")]
     [Guid("05CF065E-E135-4B2B-9D4D-CFB3FBAC73A4")]
-    public class ThumbnailProviderRpc : ThumbnailProviderRpcBase
+    public class ThumbnailProviderRpc : ThumbnailProviderHandlerRpcBase
     {
 
     }

diff --git a/Windows/VirtualDrive/VirtualDrive.ShellExtension/UriSourceRpc.cs b/Windows/VirtualDrive/VirtualDrive.ShellExtension/UriSourceRpc.cs
@@ -10,7 +10,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.UriSource")]
     [Guid("6D45BC7A-D0B7-4913-8984-FD7261550C08")]
-    public class UriSourceRpc : UriSourceRpcBase
+    public class UriSourceRpc : ContentUriSourceRpcBase
     {
 
     }

diff --git a/Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj b/Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16274.0-Beta2" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">

diff --git a/Windows/VirtualDrive/VirtualDrive/RemoteStorage/Drawing.dwg b/Windows/VirtualDrive/VirtualDrive/RemoteStorage/Drawing.dwg
diff --git a/Windows/VirtualDrive/VirtualDrive/ShellExtension/ContextMenuVerbIntegrated.cs b/Windows/VirtualDrive/VirtualDrive/ShellExtension/ContextMenuVerbIntegrated.cs
@@ -11,7 +11,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.ContextMenuVerb")]
     [Guid("9C923BF3-3A4B-487B-AB4E-B4CF87FD1C25")]
-    public class ContextMenuVerbIntegrated : ContextMenuVerbIntegratedBase
+    public class ContextMenuVerbIntegrated : CloudFilesContextMenuVerbIntegratedBase
     {
         public ContextMenuVerbIntegrated() : base(Program.Engine)
         {

diff --git a/Windows/VirtualDrive/VirtualDrive/ShellExtension/CustomStateProviderIntegrated.cs b/Windows/VirtualDrive/VirtualDrive/ShellExtension/CustomStateProviderIntegrated.cs
@@ -12,7 +12,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.CustomStateProvider")]
     [Guid("000562AA-2879-4CF1-89E8-0AEC9596FE19")]
-    public class CustomStateProviderIntegrated : CustomStateProviderIntegratedBase
+    public class CustomStateProviderIntegrated : CustomStateHandlerIntegratedBase
     {
         public CustomStateProviderIntegrated() : base(Program.Engine, Program.Engine.IconsFolderPath)
         {

diff --git a/Windows/VirtualDrive/VirtualDrive/ShellExtension/ThumbnailProviderIntegrated.cs b/Windows/VirtualDrive/VirtualDrive/ShellExtension/ThumbnailProviderIntegrated.cs
@@ -11,7 +11,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.ThumbnailProvider")]
     [Guid("05CF065E-E135-4B2B-9D4D-CFB3FBAC73A4")]
-    public class ThumbnailProviderIntegrated : ThumbnailProviderIntegratedBase
+    public class ThumbnailProviderIntegrated : ThumbnailProviderHandlerIntegratedBase
     {
         public ThumbnailProviderIntegrated() : base(Program.Engine)
         {

diff --git a/Windows/VirtualDrive/VirtualDrive/ShellExtension/UriSourceIntegrated.cs b/Windows/VirtualDrive/VirtualDrive/ShellExtension/UriSourceIntegrated.cs
@@ -10,7 +10,7 @@ namespace VirtualDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("VirtualDrive.UriSource")]
     [Guid("6D45BC7A-D0B7-4913-8984-FD7261550C08")]
-    public class UriSourceIntegrated : UriSourceBase
+    public class UriSourceIntegrated : ContentUriSourceIntegratedBase
     {
         public UriSourceIntegrated() : base(Program.Engine)
         {

diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj b/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj
@@ -40,8 +40,8 @@ This is an advanced project with ETags support, Microsoft Office documents editi
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="5.6.16262.0-Beta2" />
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="5.6.16274.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16274.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
     <ProjectReference Include="..\VirtualDrive.ShellExtension\VirtualDrive.ShellExtension.csproj" />

diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualFileSystemItem.cs b/Windows/VirtualDrive/VirtualDrive/VirtualFileSystemItem.cs
@@ -283,7 +283,10 @@ public async Task<LockMode> GetLockModeAsync(IOperationContext operationContext
             {
                 if (placeholder.Properties.TryGetValue("LockMode", out IDataItem property))
                 {
-                    return await property.GetValueAsync<LockMode>();
+                    if(property.TryGetValue<LockMode>(out LockMode lockMode))
+                    {
+                        return lockMode;
+                    }
                 }
             }
 

diff --git a/Windows/VirtualFileSystem/VirtualEngine.cs b/Windows/VirtualFileSystem/VirtualEngine.cs
@@ -48,28 +48,28 @@ public VirtualEngine(string license, string userFileSystemRootPath, string remot
         }
 
         /// <inheritdoc/>
-        public override async Task<bool> FilterAsync(SyncDirection direction, OperationType operationType, string path, string newPath = null, FileAttributes? attributes = null, IOperationContext operationContext = null)
+        public override async Task<bool> FilterAsync(SyncDirection direction, OperationType operationType, string path, FileSystemItemType itemType, string newPath = null, FileAttributes? attributes = null, IOperationContext operationContext = null)
         {
             // Use the code below to filter based on files and folders attributes.
-            //if (await new AttributesFilter(FileAttributes.Hidden | FileAttributes.Temporary).FilterAsync(direction, operationType, path, newPath, attributes))
+            //if (await new AttributesFilter(FileAttributes.Hidden | FileAttributes.Temporary).FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             //{
             //    LogDebug($"{nameof(AttributesFilter)} filtered {operationType}", path, newPath, operationContext);
             //    return true;
             //}
 
-            if (await new ZipFilter().FilterAsync(direction, operationType, path, newPath, attributes))
+            if (await new ZipFilter().FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             {
                 LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
-            if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, newPath, attributes))
+            if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             {
                 LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
-            if (await new AutoCadFilter().FilterAsync(direction, operationType, path, newPath, attributes))
+            if (await new AutoCadFilter().FilterAsync(direction, operationType, path, itemType, newPath, attributes))
             {
                 LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;

diff --git a/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/ContextMenuVerbRpc.cs b/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/ContextMenuVerbRpc.cs
@@ -9,7 +9,7 @@ namespace WebDAVDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("WebDAVDrive.ContextMenuVerb")]
     [Guid("A22EBD03-343E-433C-98DF-372C6B3A1538")]
-    public class ContextMenuVerbRpc : ContextMenuVerbRpcBase
+    public class ContextMenuVerbRpc : CloudFilesContextMenuVerbRpcBase
     {
 
     }

diff --git a/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/CustomStateProviderRpc.cs b/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/CustomStateProviderRpc.cs
@@ -11,7 +11,7 @@ namespace WebDAVDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("WebDAVDrive.CustomStateProvider")]
     [Guid("754F334F-095C-46CD-B033-B2C0523D2829")]
-    public class CustomStateProviderRpc : CustomStateProviderRpcBase
+    public class CustomStateProviderRpc : CustomStateHandlerRpcBase
     {
 
     }

diff --git a/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/ThumbnailProviderRpc.cs b/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/ThumbnailProviderRpc.cs
@@ -10,7 +10,7 @@ namespace WebDAVDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("WebDAVDrive.ThumbnailProvider")]
     [Guid("A5B0C82F-50AA-445C-A404-66DEB510E84B")]
-    public class ThumbnailProviderRpc : ThumbnailProviderRpcBase
+    public class ThumbnailProviderRpc : ThumbnailProviderHandlerRpcBase
     {
 
     }

diff --git a/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj b/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj
@@ -12,7 +12,7 @@
     <Copyright>IT HIT LTD.</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16274.0-Beta2" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">

diff --git a/Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj b/Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="ITHitWebDAVClient" Version="5.3.3490" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="5.6.16274.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/ContextMenuVerbIntegrated.cs b/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/ContextMenuVerbIntegrated.cs
@@ -9,7 +9,7 @@ namespace WebDAVDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("WebDAVDrive.ContextMenuVerb")]
     [Guid("A22EBD03-343E-433C-98DF-372C6B3A1538")]
-    public class ContextMenuVerbIntegrated : ContextMenuVerbIntegratedBase
+    public class ContextMenuVerbIntegrated : CloudFilesContextMenuVerbIntegratedBase
     {
         public ContextMenuVerbIntegrated() : base(Program.Engine)
         {

diff --git a/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/CustomStateProviderIntegrated.cs b/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/CustomStateProviderIntegrated.cs
@@ -11,7 +11,7 @@ namespace WebDAVDrive.ShellExtension
     [ComVisible(true)]
     [ProgId("WebDAVDrive.CustomStateProvider")]
     [Guid("754F334F-095C-46CD-B033-B2C0523D2829")]
-    public class CustomStateProviderIntegrated : CustomStateProviderIntegratedBase
+    public class CustomStateProviderIntegrated : CustomStateHandlerIntegratedBase
     {
         public CustomStateProviderIntegrated() : base(Program.Engine, Program.Engine.IconsFolderPath)
         {

diff --git a/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/ThumbnailProviderIntegrated.cs b/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/ThumbnailProviderIntegrated.cs
@@ -3,18 +3,16 @@
 
 namespace WebDAVDrive.ShellExtension
 {
-
     /// <summary>
     /// Thumbnails provider Windows Shell Extension.
     /// </summary>
     [ComVisible(true)]
     [ProgId("WebDAVDrive.ThumbnailProvider")]
     [Guid("A5B0C82F-50AA-445C-A404-66DEB510E84B")]
-    public class ThumbnailProviderIntegrated : ThumbnailProviderIntegratedBase
+    public class ThumbnailProviderIntegrated : ThumbnailProviderHandlerIntegratedBase
     {
         public ThumbnailProviderIntegrated() : base(Program.Engine)
         {
         }
     }
-
 }
diff --git a/Windows/WebDAVDrive/WebDAVDrive/VirtualFileSystemItem.cs b/Windows/WebDAVDrive/WebDAVDrive/VirtualFileSystemItem.cs
@@ -286,17 +286,18 @@ public async Task LockAsync(LockMode lockMode, IOperationContext operationContex
         ///<inheritdoc>
         public async Task<LockMode> GetLockModeAsync(IOperationContext operationContext = null, CancellationToken cancellationToken = default)
         {
-            PlaceholderItem placeholder = Engine.Placeholders.GetItem(UserFileSystemPath);
-
-            IDataItem property;
-            if (placeholder.Properties.TryGetValue("LockMode", out property))
-            {
-                return await property.GetValueAsync<LockMode>();
-            }
-            else
+            if (Engine.Placeholders.TryGetItem(UserFileSystemPath, out PlaceholderItem placeholder))
             {
-                return LockMode.None;
+                if (placeholder.Properties.TryGetValue("LockMode", out IDataItem property))
+                {
+                    if (property.TryGetValue<LockMode>(out LockMode lockMode))
+                    {
+                        return lockMode;
+                    }
+                }
             }
+
+            return LockMode.None;
         }
 
 

diff --git a/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj b/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj
@@ -33,8 +33,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="5.6.16262.0-Beta2" />
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16262.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="5.6.16274.0-Beta2" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="5.6.16274.0-Beta2" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
     <ProjectReference Include="..\WebDAVDrive.ShellExtension\WebDAVDrive.ShellExtension.csproj" />
     <ProjectReference Include="..\WebDAVDrive.UI\WebDAVDrive.UI.csproj" />