v4.0.10891.0-Beta

Author: ITHitBuild

Common/Common.csproj

@@ -8,6 +8,6 @@
     <Description>Contains functionality common for all Virtual Drive samples, both for Windows and macOS.</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem" Version="4.0.10509.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem" Version="4.0.10891.0-Beta" />
   </ItemGroup>
 </Project>

Common/Settings.cs

@@ -32,11 +32,6 @@ public class Settings
         /// </summary>
         public string UserFileSystemRootPath { get; set; }
 
-        /// <summary>
-        /// Full synchronization interval in milliseconds.
-        /// </summary>
-        public double SyncIntervalMs { get; set; }
-
         /// <summary>
         /// Network delay in milliseconds. When this parameter is > 0 the file download will be delayd to demonstrate file transfer progress.
         /// Set this parameter to 0 to avoid any network simulation delays.

Windows/Common/Common.Windows.csproj

@@ -7,12 +7,15 @@
     <Product>IT Hit User File System</Product>
     <Copyright>IT Hit LTD.</Copyright>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="VirtualDrive\Program.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.12" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.10509.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.10891.0-Beta" />
     <ProjectReference Include="..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>

Windows/Common/Logger.cs

@@ -18,12 +18,12 @@ public class Logger : ILogger
         /// <summary>
         /// Name of the component that is writing to the log.
         /// </summary>
-        private string componentName;
+        private readonly string componentName;
 
         /// <summary>
         /// Log4Net Logger.
         /// </summary>
-        protected ILog Log;
+        protected readonly ILog Log;
 
         /// <summary>
         /// Creates instance of this class.
@@ -43,18 +43,16 @@ public void LogError(string message, string sourcePath = null, string targetPath
             string process = null;
             byte? priorityHint = null;
             long? clientFileId = null;
-            string serverItemId = null;
 
             if (operationContext != null)
             {
                 ProcessInfo processInfo = Marshal.PtrToStructure<ProcessInfo>(operationContext.ProcessInfo);
                 process = System.IO.Path.GetFileName(processInfo.ImagePath);
                 priorityHint = operationContext.PriorityHint;
                 clientFileId = (operationContext as IWindowsOperationContext).FileId;
-                //serverItemId = Convert.ToBase64String(operationContext.ItemId);
             }
 
-            Log.Error($"\n{DateTimeOffset.Now.ToString("hh:mm:ss.fff")} [{process,-25}] {priorityHint,2} {componentName,-26}{message,-45} {sourcePath,-80} {att} ", ex);
+            Log.Error($"{Format(DateTimeOffset.Now.ToString("hh:mm:ss.fff"), process, priorityHint?.ToString(), componentName, message, sourcePath, att, targetPath)}{Environment.NewLine}", ex);
         }
 
         /// <inheritdoc/>
@@ -64,7 +62,6 @@ public void LogMessage(string message, string sourcePath = null, string targetPa
             string process = null;
             byte? priorityHint = null;
             long? clientFileId = null;
-            string serverItemId = null;
             string size = null;
 
             if (operationContext != null)
@@ -74,10 +71,20 @@ public void LogMessage(string message, string sourcePath = null, string targetPa
                 priorityHint = operationContext.PriorityHint;
                 clientFileId = (operationContext as IWindowsOperationContext).FileId;
                 size = FsPath.FormatBytes((operationContext as IWindowsOperationContext).FileSize);
-                //serverItemId = Convert.ToBase64String(operationContext.ItemId);
             }
 
-            Log.Debug($"\n{DateTimeOffset.Now.ToString("hh:mm:ss.fff")} [{process,-25}] {priorityHint,2} {componentName,-26}{message,-45} {sourcePath,-80} {size,7} {att} {targetPath}");
+            Log.Debug(Format(DateTimeOffset.Now.ToString("hh:mm:ss.fff"), process, priorityHint?.ToString(), componentName, message, sourcePath, att, targetPath));
+        }
+
+        private static string Format(string date, string process, string priorityHint, string componentName, string message, string sourcePath, string attributes, string targetPath)
+        {
+            return $"{Environment.NewLine}|{date, -12}| {process,-25}| {priorityHint,-5}| {componentName,-26}| {message,-45}| {sourcePath,-80}| {attributes, -22}| {targetPath}";
+        }
+
+        public static void PrintHeader(ILog logger)
+        {
+            logger.Info(Format("Time", "Process Name", "Prty", "Component", "Operation", "Source Path", "Attributes", "Target Path"));
+            logger.Info(Format("----", "------------", "----", "---------", "---------", "-----------", "----------", "-----------"));
         }
     }
 }

Windows/Common/Registrar.cs

@@ -22,7 +22,10 @@ public static class Registrar
         /// <param name="path">A root folder of your user file system. Your file system tree will be located under this folder.</param>
         /// <param name="displayName">Human readable display name.</param>
         /// <param name="iconPath">Path to the drive ico file.</param>
-        /// <remarks>Call this method during application installation.</remarks>
+        /// <remarks>
+        /// In the case of a packaged installer (msix) call this method during first program start.
+        /// In the case of a regular installer (msi) call this method during installation.
+        /// </remarks>
         public static async Task RegisterAsync(string syncRootId, string path, string displayName, string iconPath)
         {
             StorageProviderSyncRootInfo storageInfo = new StorageProviderSyncRootInfo();
@@ -145,8 +148,16 @@ public static async Task<bool> IsRegisteredAsync(string path)
         /// </summary>
         /// <param name="syncRootId">ID of the sync root.</param>
         /// <remarks>
-        /// Call this method during application ununstall. 
+        /// <para>
+        /// In the case of a packaged installer (msix) you do not need to call this method. 
+        /// The platform will automatically delete sync root registartion during program uninstall.
+        /// </para>
+        /// <para>
+        /// In the case of a regular installer (msi) call this method during uninstall.
+        /// </para>
+        /// <para>
         /// All file and folder placeholders are converted into regular files/folders during this call. 
+        /// </para>
         /// </remarks>
         public static async Task UnregisterAsync(string syncRootId)
         {

Windows/Common/ETagManager.cs renamed to Windows/Common/VirtualDrive/ETagManager.cs

@@ -297,7 +297,7 @@ public async Task RemoveCustomColumnsAsync(IEnumerable<FileSystemItemPropertyDat
         /// Adds or updates custom columns data, preserving existing columns.
         /// </summary>
         /// <param name="customColumnsData">List of columns to add or update.</param>
-        public async Task SetCustomColumnsAsync(IEnumerable<FileSystemItemPropertyData> customColumnsData)
+        private async Task SetCustomColumnsAsync(IEnumerable<FileSystemItemPropertyData> customColumnsData)
         {
             // All cutom columns must be set togather, otherwise columns data will be wiped.
 
@@ -525,5 +525,23 @@ private void DeleteCustomColumns()
                 File.Delete(customColumnsFilePath);
             }
         }
+
+        public async Task SetCustomDataAsync(string eTag, bool? locked, IEnumerable<FileSystemItemPropertyData> customColumnsData)
+        {
+            // Setting ETag also marks an item as not new.
+
+            // ETags must correspond with a server file/folder, NOT with a client placeholder. 
+            // It should NOT be moved/deleted/updated when a placeholder in the user file system is moved/deleted/updated.
+            // It should be moved/deleted when a file/folder in the remote storage is moved/deleted.
+            await ETagManager.SetETagAsync(eTag);
+
+            if (locked != null)
+            {
+                // Set the read-only attribute and all custom columns data.
+                bool isLockedByThisUser = await LockManager.IsLockedByThisUserAsync();
+                await SetLockedByAnotherUserAsync(locked.Value && !isLockedByThisUser);
+            }
+            await SetCustomColumnsAsync(customColumnsData);
+        }
     }
 }

Windows/Common/ExternalDataManager.cs renamed to Windows/Common/VirtualDrive/ExternalDataManager.cs

@@ -13,7 +13,7 @@ namespace ITHit.FileSystem.Samples.Common.Windows
     /// <remarks>
     /// AutoCAD lock files (.dwl and .dwl2), are marked as hidden and filtered by the <see cref="FilterHelper.IsHiddenOrTemp"/> method.
     /// </remarks>
-    internal class AutoCadFilterHelper
+    public class AutoCadFilterHelper
     {
         /// <summary>
         /// Returns true if the file should NOT be synched to the remote storage. False - otherwise.
@@ -48,7 +48,7 @@ private static bool IsAutoCadTemp(string path)
         /// system that corresponds to the provided path to AutoCAD file. False - otherwise.
         /// </summary>
         /// <param name="path">Path to the AutoCAD file.</param>
-        internal static bool IsAutoCadLocked(string path)
+        public static bool IsAutoCadLocked(string path)
         {
             string lockPath = GetLockPathFromAutoCadPath(path);
             return lockPath != null;