v4.1.12172.0-Beta2

Author: ITHitBuild

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>

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.

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;
+    }
+}

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>

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>

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)

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 });

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>

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;
+}

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" />