v4.0.11250.0-Beta

ITHitBuild · ITHitBuild · commit 0e50655fcd8a · 2021-11-30T01:07:44.000+02:00
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.11187.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem" Version="4.0.11250.0-Beta" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Common.Windows.Core.csproj b/Windows/Common/Core/Common.Windows.Core.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11187.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11250.0-Beta" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/ShellExtension/Common.Windows.ShellExtension.csproj b/Windows/Common/ShellExtension/Common.Windows.ShellExtension.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11187.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11250.0-Beta" />
     <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
@@ -118,9 +118,16 @@ public int GetState(IShellItemArray itemArray, bool okToBeSlow, out EXPCMDSTATE
 
             try
             {
+                if (itemArray is null)
+                {
+                    return WinError.E_NOTIMPL;
+                }
+
                 IEnumerable<string> files = itemArray.GetFilesPath().Where(ShellExtensionConfiguration.IsVirtualDriveFolder);
                 if (!files.Any() || !files.All(File.Exists))
+                {
                     return WinError.E_NOTIMPL;
+                }
 
                 Log.Info($"\nGetting menu state for {string.Join(",", files)}");
 
diff --git a/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj b/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11187.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="4.0.11250.0-Beta" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
     <ProjectReference Include="..\Rpc.Proto\Common.Windows.Rpc.Proto.csproj" />
diff --git a/Windows/Common/VirtualDrive/Rpc/GprcServerServiceImpl.cs b/Windows/Common/VirtualDrive/Rpc/GprcServerServiceImpl.cs
@@ -113,13 +113,13 @@ public override async Task<Thumbnail> GetThumbnail(ThumbnailRequest thumbnailReq
             }
             catch (NotImplementedException)
             {
+                logger.LogMessage("Thumbnail is not implemented", path);
                 string msg = $"Thumbnail for {path} is not implemented";
-                logger.LogMessage(msg);
                 throw new RpcException(new Status(StatusCode.Internal, msg));
             }
             catch (Exception ex)
             {
-                logger.LogError(ex.Message);
+                logger.LogError("Error getting thumbnail", path, null, ex);
                 throw new RpcException(new Status(StatusCode.Internal, ex.Message));
             }
         }
diff --git a/Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj b/Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.13" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.774.44" />
-    <PackageReference Include="ITHitWebDAVClient" Version="5.0.2450" />
+    <PackageReference Include="ITHitWebDAVClient" Version="5.0.2539" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Windows/WebDAVDrive/WebDAVDrive/AppSettings.cs b/Windows/WebDAVDrive/WebDAVDrive/AppSettings.cs
@@ -35,6 +35,20 @@ public class AppSettings : Settings
         /// Full synchronization interval in milliseconds.
         /// </summary>
         public double SyncIntervalMs { get; set; }
+        /// <summary>
+        /// URL to get a thumbnail for Windows Explorer thumbnails mode.
+        /// Your server must return 404 Not Found if the thumbnail can not be generated.
+        /// If incorrect size is returned, the image will be resized automatically to show the thumbnail.
+        /// "ThumbnailGeneratorUrl": "{path to file}?width={thumbnail width}&height={thumbnail height}"
+        /// </summary>
+        public string ThumbnailGeneratorUrl { get; set; }
+        /// <summary>
+        /// File types to request thumbnails for.
+        /// To request thumbnails for specific file types, list file types using '|' separator.
+        /// To request thumbnails for all file types set the value to "*".
+        /// "RequestThumbnailsFor": "*|png|jpg|jpeg|gif|bmp|tiff|"
+        /// </summary>
+        public string RequestThumbnailsFor { get; set; }
     }
 
     /// <summary>
diff --git a/Windows/WebDAVDrive/WebDAVDrive/Program.cs b/Windows/WebDAVDrive/WebDAVDrive/Program.cs
@@ -263,7 +263,7 @@ private static void DavClient_WebDavError(ISession sender, WebDavErrorEventArgs
                                 passwordCredential.RetrievePassword();
                                 NetworkCredential networkCredential = new NetworkCredential(passwordCredential.UserName, passwordCredential.Password);
                                 DavClient.Credentials = networkCredential;
-                                Engine.RemoteStorageMonitor.WebSocketCredentials = networkCredential;
+                                Engine.Credentials = networkCredential;
                                 e.Result = WebDavErrorEventResult.Repeat;
                             }
                             else
@@ -299,7 +299,7 @@ private static void DavClient_WebDavError(ISession sender, WebDavErrorEventArgs
                                         CredentialManager.SaveCredentials(Settings.ProductName, login, password);
                                     }
                                     NetworkCredential newNetworkCredential = new NetworkCredential(login, password);
-                                    Engine.RemoteStorageMonitor.WebSocketCredentials = newNetworkCredential;
+                                    Engine.Credentials = newNetworkCredential;
                                     DavClient.Credentials = newNetworkCredential;
                                     e.Result = WebDavErrorEventResult.Repeat;
                                 }
diff --git a/Windows/WebDAVDrive/WebDAVDrive/RemoteStorageMonitor.cs b/Windows/WebDAVDrive/WebDAVDrive/RemoteStorageMonitor.cs
@@ -39,7 +39,6 @@ public virtual SynchronizationState SyncState
         /// <summary>
         /// Gets or sets a value that indicates whether to send an authenticate header with the websocket.
         /// </summary>
-        public NetworkCredential WebSocketCredentials { get; set; }
 
         /// <summary>
         /// WebSocket client.
@@ -112,7 +111,7 @@ await Task.Factory.StartNew(
                       try
                       {
                           repeat = false;
-                          await StartMonitoringAsync(WebSocketCredentials);
+                          await StartMonitoringAsync(engine.Credentials);
                       }
                       catch (Exception e) when (e is WebSocketException || e is AggregateException)
                       {
@@ -157,30 +156,34 @@ internal async Task StopAsync()
         internal async Task ProcessAsync(string jsonString)
         {
             WebSocketMessage jsonMessage = JsonSerializer.Deserialize<WebSocketMessage>(jsonString);
-            LogMessage($"EventType: {jsonMessage.EventType}", jsonMessage.ItemPath, jsonMessage.TargetPath);
-
             string remoteStoragePath = Mapping.GetAbsoluteUri(jsonMessage.ItemPath);
-            switch (jsonMessage.EventType)
+
+            // check if remote url starts with WebDAVServerUrl
+            if (remoteStoragePath.StartsWith(Program.Settings.WebDAVServerUrl))
             {
-                case "created":
-                    await CreatedAsync(remoteStoragePath);
-                    break;
-                case "updated":
-                    await ChangedAsync(remoteStoragePath);
-                    break;
-                case "moved":
-                    string remoteStorageNewPath = Mapping.GetAbsoluteUri(jsonMessage.TargetPath);
-                    await MovedAsync(remoteStoragePath, remoteStorageNewPath);
-                    break;
-                case "deleted":
-                    await DeletedAsync(remoteStoragePath);
-                    break;
-                case "locked":
-                    await LockedAsync(remoteStoragePath);
-                    break;
-                case "unlocked":
-                    await UnlockedAsync(remoteStoragePath);
-                    break;
+                LogMessage($"EventType: {jsonMessage.EventType}", jsonMessage.ItemPath, jsonMessage.TargetPath);
+                switch (jsonMessage.EventType)
+                {
+                    case "created":
+                        await CreatedAsync(remoteStoragePath);
+                        break;
+                    case "updated":
+                        await ChangedAsync(remoteStoragePath);
+                        break;
+                    case "moved":
+                        string remoteStorageNewPath = Mapping.GetAbsoluteUri(jsonMessage.TargetPath);
+                        await MovedAsync(remoteStoragePath, remoteStorageNewPath);
+                        break;
+                    case "deleted":
+                        await DeletedAsync(remoteStoragePath);
+                        break;
+                    case "locked":
+                        await LockedAsync(remoteStoragePath);
+                        break;
+                    case "unlocked":
+                        await UnlockedAsync(remoteStoragePath);
+                        break;
+                }
             }
         }
 
diff --git a/Windows/WebDAVDrive/WebDAVDrive/VirtualEngine.cs b/Windows/WebDAVDrive/WebDAVDrive/VirtualEngine.cs
@@ -2,13 +2,10 @@
 using System.Threading.Tasks;
 using log4net;
 using ITHit.FileSystem;
-using ITHit.FileSystem.Windows;
 using ITHit.FileSystem.Samples.Common.Windows;
-using ITHit.FileSystem.Samples.Common.Windows.Rpc;
 using System;
-using System.Net.WebSockets;
-using System.Threading;
 using System.Net;
+using System.Linq;
 
 namespace WebDAVDrive
 {
@@ -20,6 +17,11 @@ public class VirtualEngine : VirtualEngineBase
         /// </summary>
         internal readonly RemoteStorageMonitor RemoteStorageMonitor;
 
+        /// <summary>
+        /// Gets or sets a value that indicates whether to send an authenticate header with the websocket.
+        /// </summary>
+        public NetworkCredential Credentials { get; set; }
+
         /// <summary>
         /// Creates a vitual file system Engine.
         /// </summary>
@@ -97,14 +99,43 @@ protected override void Dispose(bool disposing)
 
         /// <summary>
         /// Returns thumbnail for item.
-        /// Or throw NotImplementedException if thumbnail is not availible.
+        /// Or throw NotImplementedException if thumbnail is not available.
         /// Also as option might be returned empty array of null as indication of non existed thumbnail.
         /// </summary>
         public override async Task<byte[]> GetThumbnailAsync(string path, uint size)
         {
-            //return File.ReadAllBytes(@".\images\test.jpg");
+            string[] exts = Program.Settings.RequestThumbnailsFor.Trim().Split("|");
+            string ext = System.IO.Path.GetExtension(path).TrimStart('.');
+
+            if (exts.Any(ext.Equals) || exts.Any("*".Equals))
+            {
+                string ThumbnailGeneratorUrl = Program.Settings.ThumbnailGeneratorUrl.Replace("{thumbnail width}", ""+size).Replace("{thumbnail height}", "" + size);
+                string filePathRemote = ThumbnailGeneratorUrl.Replace("{path to file}", WebDAVDrive.Mapping.MapPath(path));
 
-            throw new NotImplementedException();
+                try
+                {
+                    using Stream stream = await Program.DavClient.DownloadAsync(new Uri(filePathRemote));
+                    return await StreamToByteArrayAsync(stream);
+                }
+                catch (WebException we)
+                {
+                    LogMessage(we.Message, path);
+                }
+                catch (Exception e)
+                {
+                    LogError("Failed to load thumbnail", path, null, e);
+                }
+            }
+            return null;
+        }
+
+        private static async Task<byte[]> StreamToByteArrayAsync(Stream stream)
+        {
+            using (MemoryStream memoryStream = new())
+            {
+                await stream.CopyToAsync(memoryStream);
+                return memoryStream.ToArray();
+            }
         }
     }
 }
diff --git a/Windows/WebDAVDrive/WebDAVDrive/appsettings.json b/Windows/WebDAVDrive/WebDAVDrive/appsettings.json
@@ -47,5 +47,16 @@
 
   // Communication channel name is used by RPC to establish connection over named pipes.
   // The channel is used to comunicate between the main app and COM thumbnails handler, Win Explorer context menu, etc.
-  "RpcCommunicationChannelName": "WebDAVDrive.RPC"
+  "RpcCommunicationChannelName": "WebDAVDrive.RPC",
+
+  // URL to get a thumbnail for Windows Explorer thumbnails mode.
+  // Your server must return 404 Not Found if the thumbnail can not be generated.
+  // If incorrect size is returned, the image will be resized automatically to show the thumbnail.
+  "ThumbnailGeneratorUrl": "{path to file}?width={thumbnail width}&height={thumbnail height}",
+
+  // File types to request thumbnails for.
+  // To request thumbnails for specific file types, list file types using '|' separator.
+  // To request thumbnails for all file types set the value to "*".
+  // "RequestThumbnailsFor": "*|png|jpg|jpeg|gif|bmp|tiff|"
+  "RequestThumbnailsFor": "png|jpeg|gif|jpg|apng|avif|jfif|pjpeg|pjp|svg|webp|bmp|ico|cur|tif|tiff|heic|hif"
 }

Original file line number	Diff line number	Diff line change
`@@ -113,13 +113,13 @@ public override async Task<Thumbnail> GetThumbnail(ThumbnailRequest thumbnailReq`
`113`	`113`	`}`
`114`	`114`	`catch (NotImplementedException)`
`115`	`115`	`{`
	`116`	`+ logger.LogMessage("Thumbnail is not implemented", path);`
`116`	`117`	`string msg = $"Thumbnail for {path} is not implemented";`
`117`		`- logger.LogMessage(msg);`
`118`	`118`	`throw new RpcException(new Status(StatusCode.Internal, msg));`
`119`	`119`	`}`
`120`	`120`	`catch (Exception ex)`
`121`	`121`	`{`
`122`		`- logger.LogError(ex.Message);`
	`122`	`+ logger.LogError("Error getting thumbnail", path, null, ex);`
`123`	`123`	`throw new RpcException(new Status(StatusCode.Internal, ex.Message));`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ private static void DavClient_WebDavError(ISession sender, WebDavErrorEventArgs`
`263`	`263`	`passwordCredential.RetrievePassword();`
`264`	`264`	`NetworkCredential networkCredential = new NetworkCredential(passwordCredential.UserName, passwordCredential.Password);`
`265`	`265`	`DavClient.Credentials = networkCredential;`
`266`		`- Engine.RemoteStorageMonitor.WebSocketCredentials = networkCredential;`
	`266`	`+ Engine.Credentials = networkCredential;`
`267`	`267`	`e.Result = WebDavErrorEventResult.Repeat;`
`268`	`268`	`}`
`269`	`269`	`else`
`@@ -299,7 +299,7 @@ private static void DavClient_WebDavError(ISession sender, WebDavErrorEventArgs`
`299`	`299`	`CredentialManager.SaveCredentials(Settings.ProductName, login, password);`
`300`	`300`	`}`
`301`	`301`	`NetworkCredential newNetworkCredential = new NetworkCredential(login, password);`
`302`		`- Engine.RemoteStorageMonitor.WebSocketCredentials = newNetworkCredential;`
	`302`	`+ Engine.Credentials = newNetworkCredential;`
`303`	`303`	`DavClient.Credentials = newNetworkCredential;`
`304`	`304`	`e.Result = WebDavErrorEventResult.Repeat;`
`305`	`305`	`}`