v6.1.18092.0-Beta

ITHitBuild · ITHitBuild · commit 68cecc953582 · 2022-09-03T14:59:30.000+03:00
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="6.1.17328.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem" Version="6.1.18092.0-Beta" />
   </ItemGroup>
 </Project>
diff --git a/Common/StreamCopy.cs b/Common/StreamCopy.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using ITHit.FileSystem.Exceptions;
 
 namespace ITHit.FileSystem.Samples.Common
 {
@@ -12,7 +13,6 @@ namespace ITHit.FileSystem.Samples.Common
     /// </summary>
     public static class StreamCopy
     {
-
         /// <summary>
         /// Asynchronously copies specified number of bytes from current stream to destination stream, using a specified buffer size.
         /// </summary>
@@ -31,6 +31,11 @@ public static async Task CopyToAsync(this Stream source, Stream destination, int
                 await destination.WriteAsync(buffer, 0, read, cancellationToken);
                 count -= read;
             }
+
+            if (count > 0)
+            {
+                throw new CloudFileException("Source file was modified");
+            }
         }
     }
 }
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="6.1.17328.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.17328.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.18092.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.18092.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
@@ -9,7 +9,7 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.17328.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.18092.0-Beta" />
     <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
@@ -69,19 +69,25 @@ public override async Task<bool> FilterAsync(SyncDirection direction, OperationT
 
             if (await new ZipFilter().FilterAsync(direction, operationType, path, itemType, newPath))
             {
-                LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);
+                Logger.LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
             if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, itemType, newPath))
             {
-                LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);
+                Logger.LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
             if (await new AutoCadFilter().FilterAsync(direction, operationType, path, itemType, newPath))
             {
-                LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);
+                Logger.LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);
+                return true;
+            }
+
+            if (await new ErrorStatusFilter().FilterAsync(direction, operationType, path, itemType, newPath))
+            {
+                Logger.LogDebug($"{nameof(ErrorStatusFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
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="6.1.17328.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.18092.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="6.1.17328.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.18092.0-Beta" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
   </ItemGroup>
diff --git a/Windows/VirtualFileSystem/VirtualEngine.cs b/Windows/VirtualFileSystem/VirtualEngine.cs
@@ -51,19 +51,25 @@ public override async Task<bool> FilterAsync(SyncDirection direction, OperationT
 
             if (await new ZipFilter().FilterAsync(direction, operationType, path, itemType, newPath))
             {
-                LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);
+                Logger.LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
             if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, itemType, newPath))
             {
-                LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);
+                Logger.LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
             if (await new AutoCadFilter().FilterAsync(direction, operationType, path, itemType, newPath))
             {
-                LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);
+                Logger.LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);
+                return true;
+            }
+
+            if (await new ErrorStatusFilter().FilterAsync(direction, operationType, path, itemType, newPath))
+            {
+                Logger.LogDebug($"{nameof(ErrorStatusFilter)} filtered {operationType}", path, newPath, operationContext);
                 return true;
             }
 
diff --git a/Windows/VirtualFileSystem/appsettings.json b/Windows/VirtualFileSystem/appsettings.json
@@ -26,10 +26,6 @@
   "UserFileSystemRootPath": "%USERPROFILE%\\VFSv6\\",
 
 
-  // Automatically lock the file in the remote storage when a file handle is being opened for writing, unlock on close.
-  "AutoLock": true,
-
-
   // To test performance:
   // 1. Compile the project in the release mode.
   // 2. Run without debugger arrached (Ctrl-F5).
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="6.1.17328.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.18092.0-Beta" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">
diff --git a/Windows/WebDAVDrive/WebDAVDrive/VirtualFile.cs b/Windows/WebDAVDrive/WebDAVDrive/VirtualFile.cs
@@ -148,6 +148,7 @@ public async Task WriteAsync(IFileMetadata fileMetadata, Stream content = null,
 
                     Logger.LogMessage($"Conflict. The item is modified.", UserFileSystemPath, default, operationContext);
                     placeholder.SetErrorStatus(true);
+                    inSyncResultContext.SetInSync = false;
                 }
             }
         }
diff --git a/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj b/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.17328.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.18092.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
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Threading;`
`6`	`6`	`using System.Threading.Tasks;`
	`7`	`+using ITHit.FileSystem.Exceptions;`
`7`	`8`
`8`	`9`	`namespace ITHit.FileSystem.Samples.Common`
`9`	`10`	`{`
`@@ -12,7 +13,6 @@ namespace ITHit.FileSystem.Samples.Common`
`12`	`13`	`/// </summary>`
`13`	`14`	`public static class StreamCopy`
`14`	`15`	`{`
`15`		`-`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Asynchronously copies specified number of bytes from current stream to destination stream, using a specified buffer size.`
`18`	`18`	`/// </summary>`
`@@ -31,6 +31,11 @@ public static async Task CopyToAsync(this Stream source, Stream destination, int`
`31`	`31`	`await destination.WriteAsync(buffer, 0, read, cancellationToken);`
`32`	`32`	`count -= read;`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+ if (count > 0)`
	`36`	`+ {`
	`37`	`+ throw new CloudFileException("Source file was modified");`
	`38`	`+ }`
`34`	`39`	`}`
`35`	`40`	`}`
`36`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,19 +69,25 @@ public override async Task<bool> FilterAsync(SyncDirection direction, OperationT`
`69`	`69`
`70`	`70`	`if (await new ZipFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
`71`	`71`	`{`
`72`		`- LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);`
	`72`	`+ Logger.LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);`
`73`	`73`	`return true;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
`77`	`77`	`{`
`78`		`- LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);`
	`78`	`+ Logger.LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);`
`79`	`79`	`return true;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (await new AutoCadFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
`83`	`83`	`{`
`84`		`- LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);`
	`84`	`+ Logger.LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);`
	`85`	`+ return true;`
	`86`	`+ }`
	`87`	`+`
	`88`	`+ if (await new ErrorStatusFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
	`89`	`+ {`
	`90`	`+ Logger.LogDebug($"{nameof(ErrorStatusFilter)} filtered {operationType}", path, newPath, operationContext);`
`85`	`91`	`return true;`
`86`	`92`	`}`
`87`	`93`
Original file line number	Diff line number	Diff line change
`@@ -51,19 +51,25 @@ public override async Task<bool> FilterAsync(SyncDirection direction, OperationT`
`51`	`51`
`52`	`52`	`if (await new ZipFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
`53`	`53`	`{`
`54`		`- LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);`
	`54`	`+ Logger.LogDebug($"{nameof(ZipFilter)} filtered {operationType}", path, newPath, operationContext);`
`55`	`55`	`return true;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if (await new MsOfficeFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
`59`	`59`	`{`
`60`		`- LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);`
	`60`	`+ Logger.LogDebug($"{nameof(MsOfficeFilter)} filtered {operationType}", path, newPath, operationContext);`
`61`	`61`	`return true;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (await new AutoCadFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
`65`	`65`	`{`
`66`		`- LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);`
	`66`	`+ Logger.LogDebug($"{nameof(AutoCadFilter)} filtered {operationType}", path, newPath, operationContext);`
	`67`	`+ return true;`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ if (await new ErrorStatusFilter().FilterAsync(direction, operationType, path, itemType, newPath))`
	`71`	`+ {`
	`72`	`+ Logger.LogDebug($"{nameof(ErrorStatusFilter)} filtered {operationType}", path, newPath, operationContext);`
`67`	`73`	`return true;`
`68`	`74`	`}`
`69`	`75`