v7.0.22158.0-Beta

ITHit · May 25, 2023 · e2db0a7 · e2db0a7
1 parent 1986f61
commit e2db0a7
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 92 deletions.
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.0.22106.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem" Version="7.0.22106.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.0.22158.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem" Version="7.0.22158.0-Beta" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Commands.cs b/Windows/Common/Core/Commands.cs
@@ -159,18 +159,25 @@ public async Task StopEngineAsync()
         }
 
 #if DEBUG
+
         /// <summary>
-        /// Opens Windows File Manager with both remote storage and user file system for testing.
+        /// Sets console output defaults.
         /// </summary>
-        /// <param name="openRemoteStorage">True if the Remote Storage must be opened. False - otherwise.</param>
-        /// <remarks>This method is provided solely for the development and testing convenience.</remarks>
-        public void ShowTestEnvironment(bool openRemoteStorage = true)
+        public void ConfigureConsole()
         {
             // Enable UTF8 for Console Window and set width.
             Console.OutputEncoding = System.Text.Encoding.UTF8;
             Console.SetWindowSize(Console.LargestWindowWidth, Console.LargestWindowHeight / 3);
-            Console.SetBufferSize(Console.LargestWindowWidth * 2, short.MaxValue / 2);
+            //Console.SetBufferSize(Console.LargestWindowWidth * 2, short.MaxValue / 2);
+        }
 
+        /// <summary>
+        /// Opens Windows File Manager with both remote storage and user file system for testing.
+        /// </summary>
+        /// <param name="openRemoteStorage">True if the Remote Storage must be opened. False - otherwise.</param>
+        /// <remarks>This method is provided solely for the development and testing convenience.</remarks>
+        public void ShowTestEnvironment(bool openRemoteStorage = true)
+        {
             // Open Windows File Manager with user file system.
             Commands.Open(Engine.Path);
 

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.0.22106.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.0.22106.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.0.22158.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.0.22158.0-Beta" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Registrar.cs b/Windows/Common/Core/Registrar.cs
@@ -120,9 +120,9 @@ public async Task CleanupAppFoldersAsync(EngineWindows engine)
 
             try
             {
-                if (engine != null)
+                if (engine != null && !string.IsNullOrWhiteSpace(engine.DataPath))
                 {
-                    await engine.UninstallCleanupAsync();
+                    Directory.Delete(engine.DataPath, true);
                 }
             }
             catch (Exception ex)

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.0.22106.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.0.22158.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
@@ -114,7 +114,7 @@ public override async Task StopAsync()
         /// <param name="e">Contains new and old Engine state.</param>
         private void Engine_StateChanged(Engine engine, EngineWindows.StateChangeEventArgs e)
         {
-            engine.LogMessage($"{e.NewState}");
+            engine.Logger.LogMessage($"{e.NewState}");
         }
 
         /// <summary>

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.0.22106.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.0.22158.0-Beta" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">

diff --git a/Windows/VirtualDrive/VirtualDrive/Program.cs b/Windows/VirtualDrive/VirtualDrive/Program.cs
@@ -71,13 +71,14 @@ static async Task Main(string[] args)
             Settings = new ConfigurationBuilder().AddJsonFile("appsettings.json", false, true).Build().ReadSettings();
 
             logFormatter = new LogFormatter(log, Settings.AppID, Settings.RemoteStorageRootPath);
+            commands = new Commands(log, Settings.RemoteStorageRootPath);
+            commands.ConfigureConsole();
 
             // Log environment description.
             logFormatter.PrintEnvironmentDescription();
 
             registrar = new SparsePackageRegistrar(SyncRootId, Settings.UserFileSystemRootPath, log, ShellExtension.ShellExtensions.Handlers);
 
-            commands = new Commands(log, Settings.RemoteStorageRootPath);
             consoleProcessor = new ConsoleProcessor(registrar, logFormatter, commands);
 
             switch (args.FirstOrDefault())

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.0.22106.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.0.22158.0-Beta" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
   </ItemGroup>

diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualFolder.cs b/Windows/VirtualDrive/VirtualDrive/VirtualFolder.cs
@@ -140,7 +140,7 @@ public async Task GetChildrenAsync(string pattern, IOperationContext operationCo
             // To signal that the children enumeration is completed 
             // always call ReturnChildren(), even if the folder is empty.
             await resultContext.ReturnChildrenAsync(remoteStorageChildren.ToArray(), totalCount);
-            Engine.LogDebug($"Listed {totalCount} item(s). Took: {watch.Elapsed.ToString(@"hh\:mm\:ss\.ff")}", UserFileSystemPath);
+            Logger.LogDebug($"Listed {totalCount} item(s). Took: {watch.Elapsed.ToString(@"hh\:mm\:ss\.ff")}", UserFileSystemPath);
 
             // Save data that you wish to display in custom columns here.
             //foreach (FileSystemItemMetadataExt itemMetadata in userFileSystemChildren)

diff --git a/Windows/VirtualFileSystem/Program.cs b/Windows/VirtualFileSystem/Program.cs
@@ -60,13 +60,14 @@ public static async Task Main(string[] args)
             Settings = new ConfigurationBuilder().AddJsonFile("appsettings.json", false, true).Build().ReadSettings();
 
             logFormatter = new LogFormatter(log, Settings.AppID, Settings.RemoteStorageRootPath);
+            commands = new Commands(log, Settings.RemoteStorageRootPath);
+            commands.ConfigureConsole();
 
             // Log environment description.
             logFormatter.PrintEnvironmentDescription();
 
             registrar = new Registrar(SyncRootId, Settings.UserFileSystemRootPath, log);
 
-            commands = new Commands(log, Settings.RemoteStorageRootPath);
             consoleProcessor = new ConsoleProcessor(registrar, logFormatter, commands);
 
             try

diff --git a/Windows/VirtualFileSystem/VirtualEngine.cs b/Windows/VirtualFileSystem/VirtualEngine.cs
@@ -118,7 +118,7 @@ public override async Task StopAsync()
         /// <param name="e">Contains new and old Engine state.</param>
         private void Engine_StateChanged(Engine engine, EngineWindows.StateChangeEventArgs e)
         {
-            engine.LogMessage($"{e.NewState}");
+            engine.Logger.LogMessage($"{e.NewState}");
         }
 
         /// <summary>

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.0.22106.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.0.22158.0-Beta" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">

diff --git a/Windows/WebDAVDrive/WebDAVDrive/Program.cs b/Windows/WebDAVDrive/WebDAVDrive/Program.cs
@@ -16,12 +16,10 @@
 
 using ITHit.WebDAV.Client;
 using ITHit.WebDAV.Client.Exceptions;
-using System.Net.Http;
 
 using WebDAVDrive.UI;
 using WebDAVDrive.UI.ViewModels;
-using ITHit.FileSystem.Windows;
-using Windows.Media.Protection.PlayReady;
+
 
 namespace WebDAVDrive
 {
@@ -98,13 +96,14 @@ static async Task Main(string[] args)
             Settings = new ConfigurationBuilder().AddJsonFile("appsettings.json", false, true).Build().ReadSettings();
 
             logFormatter = new LogFormatter(log, Settings.AppID, Settings.WebDAVServerUrl);
+            commands = new Commands(log, Settings.WebDAVServerUrl);
+            commands.ConfigureConsole();
 
             // Log environment description.
             logFormatter.PrintEnvironmentDescription();
 
             registrar = new SparsePackageRegistrar(SyncRootId, Settings.UserFileSystemRootPath, log, ShellExtension.ShellExtensions.Handlers);
 
-            commands = new Commands(log, Settings.WebDAVServerUrl);
             consoleProcessor = new ConsoleProcessor(registrar, logFormatter, commands);
 
             switch (args.FirstOrDefault())
@@ -240,7 +239,7 @@ private static async Task StartConsoleReadKeyAsync()
         /// <param name="engineInstanceId">Engine instance ID to be sent with every request to the remote storage.</param>
         private static WebDavSession CreateWebDavSession(Guid engineInstanceId)
         {
-            HttpClientHandler handler = new HttpClientHandler()
+            System.Net.Http.HttpClientHandler handler = new System.Net.Http.HttpClientHandler()
             {
                 AllowAutoRedirect = false,