v7.1.23457.0-Beta

ITHitBuild · ITHitBuild · commit 5958ef8abeca · 2023-08-17T19:55:05.000+03:00
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -10,7 +10,7 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23321.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem" Version="7.1.23321.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23457.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem" Version="7.1.23457.0-Beta" />
   </ItemGroup>
 </Project>
diff --git a/Common/FileSystemItemMetadataExt.cs b/Common/FileSystemItemMetadataExt.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace ITHit.FileSystem.Samples.Common
 {
@@ -53,9 +54,13 @@ public class FileSystemItemMetadataExt : IFileSystemItemMetadata, IChangedItem
         /// </summary>
         public IEnumerable<FileSystemItemPropertyData> CustomProperties { get; set; } = new FileSystemItemPropertyData[] { };
 
-        /// <summary>
-        /// Type of change.
-        /// </summary>
+        ///<inheritdoc/>
         public Change ChangeType { get; set; }
+
+        ///<inheritdoc/>
+        public Func<Task> BeforeAction { get; set; }
+
+        ///<inheritdoc/>
+        public Func<Task> AfterAction { get; set; }
     }
 }
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="7.1.23321.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23321.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.1.23457.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23457.0-Beta" />
     <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
@@ -13,7 +13,7 @@
     <Compile Remove="IVirtualFolder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23321.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23457.0-Beta" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
   </ItemGroup>
diff --git a/Windows/Common/VirtualDrive/PlaceholderItemExtensions.cs b/Windows/Common/VirtualDrive/PlaceholderItemExtensions.cs
@@ -35,7 +35,7 @@ public static async Task<bool> IsModifiedAsync(this PlaceholderItem placeholder,
         /// as well as any additional custom data required by the client.
         /// </summary>
         /// <param name="placeholder">User file system placeholder item.</param>
-        /// <param name="remoteStorageItem">Remote storage item metadata.</param>
+        /// <param name="metadata">Remote storage item metadata.</param>
         /// <returns>A task object that can be awaited.</returns>
         public static async Task SavePropertiesAsync(this PlaceholderItem placeholder, FileSystemItemMetadataExt metadata)
         {
@@ -50,7 +50,8 @@ public static async Task SavePropertiesAsync(this PlaceholderItem placeholder, F
             }
 
             // Save eTag.
-            if (metadata.ETag != null)
+            // Update eTag only for offline files. For online files eTag is updated in IFile.ReadAsync.
+            if (metadata.ETag != null && System.IO.File.GetAttributes(placeholder.Path).HasFlag(System.IO.FileAttributes.Offline))
             {
                 placeholder.SetETag(metadata.ETag);
             }
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="7.1.23321.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.1.23457.0-Beta" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">
diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj b/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj
@@ -40,7 +40,7 @@ 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="7.1.23321.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.1.23457.0-Beta" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
   </ItemGroup>
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="7.1.23321.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.1.23457.0-Beta" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">
diff --git a/Windows/WebDAVDrive/WebDAVDrive/RemoteStorageMonitor.cs b/Windows/WebDAVDrive/WebDAVDrive/RemoteStorageMonitor.cs
@@ -40,17 +40,22 @@ public override bool Filter(WebSocketMessage webSocketMessage)
                 Logger.LogDebug($"EventType: {webSocketMessage.EventType}", webSocketMessage.ItemPath, webSocketMessage.TargetPath);
 
                 string userFileSystemPath = Mapping.ReverseMapPath(remoteStoragePath);
+                string userFileSystemParentPath = Path.GetDirectoryName(userFileSystemPath);
                 switch (webSocketMessage.EventType)
                 {
                     case "created":
+                        // Verify that parent folder exists and is not offline.
+
+                        return !((Directory.Exists(userFileSystemParentPath) && !new DirectoryInfo(userFileSystemParentPath).Attributes.HasFlag(FileAttributes.Offline)) ||
+                                  engine.Placeholders.IsPinned(userFileSystemParentPath));
                     case "deleted":
                         // Verify that parent folder exists and is not offline.
-                        string userFileSystemParentPath = Path.GetDirectoryName(userFileSystemPath);
                         return !Directory.Exists(userFileSystemParentPath)
                             || new DirectoryInfo(userFileSystemParentPath).Attributes.HasFlag(FileAttributes.Offline);
 
                     case "moved":
                         // Verify that source exists OR target folder exists and is not offline.
+                        // TODO: incorrect condition
                         if (File.Exists(userFileSystemPath))
                         {
                             return false;
@@ -61,7 +66,7 @@ public override bool Filter(WebSocketMessage webSocketMessage)
                             string userFileSystemNewPath = Mapping.ReverseMapPath(remoteStorageNewPath);
                             string userFileSystemNewParentPath = Path.GetDirectoryName(userFileSystemNewPath);
                             return !Directory.Exists(userFileSystemNewParentPath)
-                                || new DirectoryInfo(userFileSystemNewParentPath).Attributes.HasFlag(FileAttributes.Offline);
+                                || (new DirectoryInfo(userFileSystemNewParentPath).Attributes.HasFlag(FileAttributes.Offline) && (((int)new DirectoryInfo(userFileSystemNewParentPath).Attributes & (int)FileAttributesExt.Pinned) == 0));
                         }
 
                     case "updated":
@@ -73,13 +78,5 @@ public override bool Filter(WebSocketMessage webSocketMessage)
 
             return true;
         }
-
-        public override async Task SavePropertiesAsync(IFileSystemItemMetadata metadata, string userFileSystemPath)
-        {
-            if (engine.Placeholders.TryGetItem(userFileSystemPath, out PlaceholderItem placeholderItem))
-            {
-                await placeholderItem.SavePropertiesAsync(metadata as ITHit.FileSystem.Samples.Common.FileSystemItemMetadataExt);
-            }
-        }
     }
 }
diff --git a/Windows/WebDAVDrive/WebDAVDrive/RemoteStorageMonitorBase.cs b/Windows/WebDAVDrive/WebDAVDrive/RemoteStorageMonitorBase.cs
@@ -100,11 +100,6 @@ internal RemoteStorageMonitorBase(string webSocketServerUrl, ILogger logger)
             this.webSocketServerUrl = webSocketServerUrl;
         }
 
-        /// <summary>
-        /// Called to save item properties.
-        /// </summary>
-        public abstract Task SavePropertiesAsync(IFileSystemItemMetadata metadata, string userFileSystemPath);
-
         /// <summary>
         /// Verifies that the WebSockets message is for the item that exists 
         /// in the user file system and should be updated.
@@ -252,7 +247,7 @@ private async Task ProcessAsync()
         {
             try
             {
-                await ServerNotifications.ProcessChangesAsync(SavePropertiesAsync);
+                await ServerNotifications.ProcessChangesAsync();
             }
             catch (Exception ex)
             {
diff --git a/Windows/WebDAVDrive/WebDAVDrive/VirtualFolder.cs b/Windows/WebDAVDrive/WebDAVDrive/VirtualFolder.cs
@@ -12,6 +12,7 @@
 using ITHit.FileSystem.Samples.Common;
 using Client = ITHit.WebDAV.Client;
 using ITHit.FileSystem.Synchronization;
+using Grpc.Core;
 
 namespace WebDAVDrive
 {
@@ -72,7 +73,7 @@ public async Task<byte[]> CreateFolderAsync(IFolderMetadata folderMetadata, IInS
             Logger.LogMessage($"{nameof(IFolder)}.{nameof(CreateFolderAsync)}()", userFileSystemNewItemPath);
 
             Uri newFolderUri = new Uri(new Uri(RemoteStoragePath), folderMetadata.Name);
-            Client.IResponse response =  await Program.DavClient.CreateFolderAsync(newFolderUri, null, null, cancellationToken);
+            Client.IResponse response = await Program.DavClient.CreateFolderAsync(newFolderUri, null, null, cancellationToken);
 
             // Store ETag (if any) unlil the next update here.
             // WebDAV server typically does not provide eTags for folders.
@@ -159,27 +160,49 @@ public async Task<IChanges> GetChangesAsync(string syncToken, bool deep, long? l
             changes.NewSyncToken = syncToken;
 
             // In this sample we use sync id algoritm for synchronization.
-            Client.PropertyName[] propNames = new Client.PropertyName[2];
+            Client.PropertyName[] propNames = new Client.PropertyName[3];
             propNames[0] = new Client.PropertyName("resource-id", "DAV:");
             propNames[1] = new Client.PropertyName("parent-resource-id", "DAV:");
+            propNames[2] = new Client.PropertyName("Etag", "DAV:");
 
             do
             {
                 davChanges = (await Program.DavClient.GetChangesAsync(
-                    new Uri(RemoteStoragePath), 
-                    propNames, 
+                    new Uri(RemoteStoragePath),
+                    propNames,
                     changes.NewSyncToken,
                     deep,
                     limit,
                     cancellationToken: cancellationToken)).WebDavResponse;
                 changes.NewSyncToken = davChanges.NewSyncToken;
 
-                foreach (Client.IChangedItem remoteStorageItem in davChanges)
+                // Ordering results to make sure parents are created before children.
+                IOrderedEnumerable<Client.IChangedItem> sortedChanges = davChanges.OrderBy(p => p.Href.AbsoluteUri.Length);
+
+                foreach (Client.IChangedItem remoteStorageItem in sortedChanges)
                 {
-                    IChangedItem itemInfo = (IChangedItem)Mapping.GetUserFileSystemItemMetadata(remoteStorageItem); 
+                    IChangedItem itemInfo = (IChangedItem)Mapping.GetUserFileSystemItemMetadata(remoteStorageItem);
                     // Changed, created, moved and deleted item.
                     itemInfo.ChangeType = remoteStorageItem.ChangeType == Client.Change.Changed ? Change.Changed : Change.Deleted;
 
+                    if (itemInfo.ChangeType == Change.Changed)
+                    {
+                        itemInfo.AfterAction = async () =>
+                        {
+                            if (Engine.Placeholders.TryGetItem(Mapping.ReverseMapPath(remoteStorageItem.Href.AbsoluteUri), out PlaceholderItem placeholderItem))
+                            {
+                                await placeholderItem.SavePropertiesAsync(itemInfo as FileSystemItemMetadataExt);
+                            }
+                        };
+
+                        if (Engine.Placeholders.TryGetItem(Mapping.ReverseMapPath(remoteStorageItem.Href.AbsoluteUri), out PlaceholderItem placeholderItem))
+                        {
+                            if ((placeholderItem.TryGetETag(out string eTag) && !eTag.Equals((itemInfo as FileSystemItemMetadataExt).ETag)))
+                            {
+                                itemInfo.ChangeType = Change.MetadataAndContent;
+                            }                            
+                        }
+                    }
                     changes.Add(itemInfo);
                 }
             }
diff --git a/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj b/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj
@@ -39,7 +39,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.1.23321.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.1.23457.0-Beta" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
     <ProjectReference Include="..\WebDAVDrive.UI\WebDAVDrive.UI.csproj" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static async Task<bool> IsModifiedAsync(this PlaceholderItem placeholder,`
`35`	`35`	`/// as well as any additional custom data required by the client.`
`36`	`36`	`/// </summary>`
`37`	`37`	`/// <param name="placeholder">User file system placeholder item.</param>`
`38`		`- /// <param name="remoteStorageItem">Remote storage item metadata.</param>`
	`38`	`+ /// <param name="metadata">Remote storage item metadata.</param>`
`39`	`39`	`/// <returns>A task object that can be awaited.</returns>`
`40`	`40`	`public static async Task SavePropertiesAsync(this PlaceholderItem placeholder, FileSystemItemMetadataExt metadata)`
`41`	`41`	`{`
`@@ -50,7 +50,8 @@ public static async Task SavePropertiesAsync(this PlaceholderItem placeholder, F`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// Save eTag.`
`53`		`- if (metadata.ETag != null)`
	`53`	`+ // Update eTag only for offline files. For online files eTag is updated in IFile.ReadAsync.`
	`54`	`+ if (metadata.ETag != null && System.IO.File.GetAttributes(placeholder.Path).HasFlag(System.IO.FileAttributes.Offline))`
`54`	`55`	`{`
`55`	`56`	`placeholder.SetETag(metadata.ETag);`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,6 @@ internal RemoteStorageMonitorBase(string webSocketServerUrl, ILogger logger)`
`100`	`100`	`this.webSocketServerUrl = webSocketServerUrl;`
`101`	`101`	`}`
`102`	`102`
`103`		`- /// <summary>`
`104`		`- /// Called to save item properties.`
`105`		`- /// </summary>`
`106`		`- public abstract Task SavePropertiesAsync(IFileSystemItemMetadata metadata, string userFileSystemPath);`
`107`		`-`
`108`	`103`	`/// <summary>`
`109`	`104`	`/// Verifies that the WebSockets message is for the item that exists`
`110`	`105`	`/// in the user file system and should be updated.`
`@@ -252,7 +247,7 @@ private async Task ProcessAsync()`
`252`	`247`	`{`
`253`	`248`	`try`
`254`	`249`	`{`
`255`		`- await ServerNotifications.ProcessChangesAsync(SavePropertiesAsync);`
	`250`	`+ await ServerNotifications.ProcessChangesAsync();`
`256`	`251`	`}`
`257`	`252`	`catch (Exception ex)`
`258`	`253`	`{`