v4.1.12172.0-Beta2

ITHit · Feb 22, 2022 · 0da32b8 · 0da32b8
1 parent e9de969
commit 0da32b8
Show file tree

Hide file tree

Showing 90 changed files with 1,830 additions and 1,601 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.0.11399.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem" Version="4.1.12172.0-Beta2" />
   </ItemGroup>
 </Project>
diff --git a/Common/FileSystemItemMetadataExt.cs b/Common/FileSystemItemMetadataExt.cs
@@ -13,7 +13,7 @@ namespace ITHit.FileSystem.Samples.Common
     public class FileSystemItemMetadataExt : IFileSystemItemMetadata
     {
         /// <inheritdoc/>
-        public byte[] ItemId { get; set; }
+        public byte[] RemoteStorageItemId { get; set; }
 
         ///<inheritdoc/>
         public string Name { get; set; }
@@ -37,14 +37,13 @@ public class FileSystemItemMetadataExt : IFileSystemItemMetadata
         public DateTimeOffset ChangeTime { get; set; }
 
         /// <summary>
-        /// Server ETag.
+        /// Lock info.
         /// </summary>
-        public string ETag { get; set; }
-
-        /// <summary>
-        /// Indicates if the item is locked in the remote storage.
-        /// </summary>
-        public bool IsLocked { get; set; } = false;
+        /// <remarks>
+        /// If the item is locked, this property contains info about the lock. 
+        /// It is set to null otherwise.
+        /// </remarks>
+        public ServerLockInfo Lock { get; set; }
 
         /// <summary>
         /// Custom columns data to be displayed in the file manager.

diff --git a/Common/ServerLockInfo.cs b/Common/ServerLockInfo.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ITHit.FileSystem.Samples.Common
+{
+    /// <summary>
+    /// Information about the lock returned from the remote storage as a result of the lock operation.
+    /// </summary>
+    public class ServerLockInfo
+    {
+        /// <summary>
+        /// Lock-token. Must be supplied during the item update and unlock operations.
+        /// </summary>
+        public string LockToken { get; set; }
+
+        /// <summary>
+        /// Lock expidation date/time returned by the server.
+        /// </summary>
+        public DateTimeOffset LockExpirationDateUtc { get; set; }
+
+        /// <summary>
+        /// Name of the user that locked the item.
+        /// </summary>
+        public string Owner { get; set; }
+
+        /// <summary>
+        /// True if the item is locked exclusively. False in case the item has a shared lock.
+        /// </summary>
+        public bool Exclusive { get; set; } = true;
+    }
+}
diff --git a/Common/Settings.cs b/Common/Settings.cs
@@ -50,15 +50,10 @@ public class Settings
         public string ProductName { get; set; }
 
         /// <summary>
-        /// Automatically lock the file in remote storage when a file handle is being opened for writing, unlock on close.
+        /// Automatically lock the file in the remote storage when a file handle is being opened for writing, unlock on close.
         /// </summary>
         public bool AutoLock { get; set; }
 
-        /// <summary>
-        /// Path to the folder that stores custom data associated with files and folders.
-        /// </summary>
-        public string ServerDataFolderPath { get; set; }
-
         /// <summary>
         /// Communication channel name is used by RPC to establish connection over named pipes.
         /// </summary>

diff --git a/Windows/Common/Core/Common.Windows.Core.csproj b/Windows/Common/Core/Common.Windows.Core.csproj
@@ -7,13 +7,14 @@
     <Product>IT Hit User File System</Product>
     <Copyright>IT Hit LTD.</Copyright>
     <RootNamespace>ITHit.FileSystem.Samples.Common.Windows.Core</RootNamespace>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.13" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11399.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.1.12172.0-Beta2" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Logger.cs b/Windows/Common/Core/Logger.cs
@@ -11,7 +11,7 @@
 namespace ITHit.FileSystem.Samples.Common.Windows
 {
     /// <summary>
-    /// Implements unified logging.
+    /// Implements logging.
     /// </summary>
     public class Logger : ILogger
     {
@@ -42,7 +42,7 @@ public void LogError(string message, string sourcePath = null, string targetPath
             string att = FsPath.Exists(sourcePath) ? FsPath.GetAttString(sourcePath) : null;
             string process = null;
             byte? priorityHint = null;
-            long? clientFileId = null;
+            ulong? clientFileId = null;
 
             if (operationContext != null)
             {
@@ -61,7 +61,7 @@ public void LogMessage(string message, string sourcePath = null, string targetPa
             string att = FsPath.Exists(sourcePath) ? FsPath.GetAttString(sourcePath) : null;
             string process = null;
             byte? priorityHint = null;
-            long? clientFileId = null;
+            ulong? clientFileId = null;
             string size = null;
 
             if (operationContext != null)

diff --git a/Windows/Common/Core/Registrar.cs b/Windows/Common/Core/Registrar.cs
@@ -59,7 +59,7 @@ public static async Task RegisterAsync(string syncRootId, string path, string di
 
 
             // Adds columns to Windows File Manager. 
-            // Show/hide columns in the "More..." context menu on the columns header.
+            // Show/hide columns in the "More..." context menu on the columns header in Windows Explorer.
             var proDefinitions = storageInfo.StorageProviderItemPropertyDefinitions;
             proDefinitions.Add(new StorageProviderItemPropertyDefinition { DisplayNameResource = "Lock Owner"   , Id = (int)CustomColumnIds.LockOwnerIcon });            
             proDefinitions.Add(new StorageProviderItemPropertyDefinition { DisplayNameResource = "Lock Scope"   , Id = (int)CustomColumnIds.LockScope });

diff --git a/Windows/Common/Rpc.Proto/Common.Windows.Rpc.Proto.csproj b/Windows/Common/Rpc.Proto/Common.Windows.Rpc.Proto.csproj
@@ -9,6 +9,7 @@
     <Product>IT Hit User File System</Product>
     <Copyright>IT Hit LTD.</Copyright>
     <RootNamespace>ITHit.FileSystem.Samples.Common.Windows.Rpc.Proto</RootNamespace>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Windows/Common/Rpc.Proto/ShellExtension.proto b/Windows/Common/Rpc.Proto/ShellExtension.proto
@@ -6,6 +6,9 @@ service ShellExtensionRpc {
 	rpc SetLockStatus (ItemsStatusList) returns (EmptyMessage) {}
 	rpc GetLockStatus (ItemsPathList) returns (ItemsStatusList) {}
 	rpc GetThumbnail (ThumbnailRequest) returns (Thumbnail) {}
+    rpc LogMessage (LogMessageRequest) returns (EmptyMessage) {}
+    rpc LogError (LogErrorRequest) returns (EmptyMessage) {}
+    rpc GetItemProperties (ItemPropertyRequest) returns (ItemsPropertyList) {}
 }
 
 message ItemsPathList {
@@ -25,5 +28,34 @@ message Thumbnail {
     bytes image = 1;	
 }
 
+message LogMessageRequest {
+    string componentName = 1;
+    string message = 2;
+    string sourcePath = 3;
+    string targetPath = 4;
+}
+
+message LogErrorRequest {
+    string componentName = 1;
+    string message = 2;
+    string sourcePath = 3;
+    string targetPath = 4;
+    string exSerialized = 5;
+}
+
 message EmptyMessage {
 }
+
+message ItemProperty {
+    string iconResource = 1;
+    int32 id = 2;
+    string value = 3;
+}
+
+message ItemsPropertyList {
+    repeated ItemProperty properties = 1;
+}
+
+message ItemPropertyRequest {
+    string path = 1;
+}
diff --git a/Windows/Common/Rpc/Common.Windows.Rpc.csproj b/Windows/Common/Rpc/Common.Windows.Rpc.csproj
@@ -7,6 +7,7 @@
     <Product>IT Hit User File System</Product>
     <Copyright>IT Hit LTD.</Copyright>
     <RootNamespace>ITHit.FileSystem.Samples.Common.Windows.Rpc</RootNamespace>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.13" />

diff --git a/Windows/Common/ShellExtension/Common.Windows.ShellExtension.csproj b/Windows/Common/ShellExtension/Common.Windows.ShellExtension.csproj
@@ -7,6 +7,7 @@
     <Product>IT Hit User File System</Product>
     <Copyright>IT Hit LTD.</Copyright>
     <RootNamespace>ITHit.FileSystem.Samples.Common.Windows.ShellExtension</RootNamespace>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="ThumbnailProviderCommon.cs" />
@@ -19,7 +20,7 @@
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11399.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.1.12172.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/ShellExtension/ContextMenusProviderBase.cs b/Windows/Common/ShellExtension/ContextMenusProviderBase.cs
@@ -5,6 +5,9 @@
 using System.IO;
 using log4net;
 using ITHit.FileSystem.Samples.Common.Windows.ShellExtension.Interop;
+using ITHit.FileSystem.Samples.Common.Windows.Rpc;
+using ITHit.FileSystem.Samples.Common.Windows.Rpc.Generated;
+using System.Xml.Serialization;
 
 namespace ITHit.FileSystem.Samples.Common.Windows.ShellExtension
 {
@@ -37,7 +40,7 @@ public abstract class ContextMenusProviderBase : IExplorerCommand
         /// <param name="filesPath">List of selected items.</param>
         public abstract Task<string> GetIconAsync(IEnumerable<string> filesPath);
 
-        protected ILog Log { get; }
+        protected ILogger Log { get; }
 
         /// <summary>
         /// Creates instance of this class.
@@ -46,7 +49,7 @@ public ContextMenusProviderBase()
         {
             ReferenceManager.AddObjectReference();
 
-            Log = ShellExtensionConfiguration.GetLogger("ContextMenus.log");
+            Log = new GrpcLogger("Context Menu Provider");
         }
 
         ~ContextMenusProviderBase()
@@ -65,7 +68,7 @@ public int GetTitle(IShellItemArray itemArray, out string title)
                 if (!files.Any() || !files.All(File.Exists))
                     return WinError.E_NOTIMPL;
 
-                Log.Info($"\nGetting menu title for {string.Join(",", files)}");
+                Log.LogMessage($"{nameof(ContextMenusProviderBase)}.{nameof(GetTitle)}()", string.Join(", ", files));
 
                 title = GetMenuTitleAsync(files).GetAwaiter().GetResult();
 
@@ -80,7 +83,7 @@ public int GetTitle(IShellItemArray itemArray, out string title)
             }
             catch (Exception ex)
             {
-                Log.Error(ex);
+                Log.LogError("", null, null, ex);
                 return WinError.E_FAIL;
             }
         }
@@ -94,7 +97,7 @@ public int Invoke(IShellItemArray itemArray, object bindCtx)
                 if (!files.Any() || !files.All(File.Exists))
                     return WinError.E_NOTIMPL;
 
-                Log.Info($"\nInvoke menu command for {string.Join(",", files)}");
+                Log.LogMessage($"{nameof(ContextMenusProviderBase)}.{nameof(Invoke)}()", string.Join(", ", files));
 
                 InvokeMenuCommandAsync(files).GetAwaiter().GetResult();
 
@@ -106,7 +109,7 @@ public int Invoke(IShellItemArray itemArray, object bindCtx)
             }
             catch (Exception ex)
             {
-                Log.Error(ex);
+                Log.LogError("", null, null, ex);
                 return WinError.E_FAIL;
             }
         }
@@ -129,7 +132,7 @@ public int GetState(IShellItemArray itemArray, bool okToBeSlow, out EXPCMDSTATE
                     return WinError.E_NOTIMPL;
                 }
 
-                Log.Info($"\nGetting menu state for {string.Join(",", files)}");
+                Log.LogMessage($"{nameof(ContextMenusProviderBase)}.{nameof(GetState)}()", string.Join(", ", files));
 
                 commandState = GetMenuStateAsync(files).GetAwaiter().GetResult();
 
@@ -141,7 +144,7 @@ public int GetState(IShellItemArray itemArray, bool okToBeSlow, out EXPCMDSTATE
             }
             catch (Exception ex)
             {
-                Log.Error(ex);
+                Log.LogError("", null, null, ex);
                 return WinError.E_FAIL;
             }
         }
@@ -164,7 +167,7 @@ public int GetIcon(IShellItemArray itemArray, out string resourceString)
                 if (!files.Any() || !files.All(File.Exists))
                     return WinError.E_NOTIMPL;
 
-                Log.Info($"\nGetting menu icon for {string.Join(",", files)}");
+                Log.LogMessage($"{nameof(ContextMenusProviderBase)}.{nameof(GetIcon)}()", string.Join(", ", files));
 
                 resourceString = GetIconAsync(files).GetAwaiter().GetResult();
 
@@ -179,7 +182,7 @@ public int GetIcon(IShellItemArray itemArray, out string resourceString)
             }
             catch (Exception ex)
             {
-                Log.Error(ex);
+                Log.LogError("", null, null, ex);
                 return WinError.E_FAIL;
             }
         }
@@ -204,6 +207,5 @@ public int EnumSubCommands(out IEnumExplorerCommand commandEnum)
             commandEnum = null;
             return WinError.E_NOTIMPL;
         }
-
     }
 }