v9.0.29527.0

Author: ITHitBuild

Common/Common.csproj

@@ -15,7 +15,7 @@
     <Compile Remove="FolderMetadataExt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29481.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem" Version="9.0.29481.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem" Version="9.0.29527.0" />
   </ItemGroup>
 </Project>

Common/Settings.cs

@@ -55,10 +55,6 @@ public class Settings
         /// <summary>
         /// Get or set the custom columns for the file system items.
         /// </summary>
-        /// <remarks>
-        /// Each custom column is represented by an instance of the <see cref="CustomColumn"/> class, 
-        /// which includes an ID and a Name.
-        /// </remarks>
         public Dictionary<int, string> CustomColumns { get; set; }
     }
 }

Windows/Common/Core/Common.Windows.Core.csproj

@@ -23,8 +23,8 @@
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1742" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="9.0.29481.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29481.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29527.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>

Windows/Common/Core/ConsoleProcessor.cs

@@ -34,10 +34,6 @@ public void PrintHelp()
             logFormatter.LogMessage("\n Commands:");
             PrintCommandDescription("Spacebar", "Exit without unregistering (simulate reboot).");
             PrintCommandDescription("Esc", "Unregister file system, delete all files/folders and exit.");
-            if (FileSystem.Windows.Package.PackageRegistrar.IsRunningWithSparsePackageIdentity())
-            {
-                PrintCommandDescription("Shift-Esc", "Unregister file system, delete all files/folders, unregister handlers, uninstall developer certificate, unregister sparse package and exit (simulate full uninstall).");
-            }
             PrintCommandDescription("e", "Start/stop the Engine and all sync services.");
             PrintCommandDescription("s", "Start/stop synchronization service.");
             PrintCommandDescription("m", "Start/stop remote storage monitor.");

Windows/Common/Core/LogFormatter.cs

@@ -12,6 +12,7 @@
 
 using ITHit.FileSystem.Windows;
 using ITHit.FileSystem.Windows.Package;
+using ITHit.FileSystem.Extensions;
 using Windows.Storage.Search;
 using System.Text;
 
@@ -25,7 +26,7 @@ public class LogFormatter
         /// <summary>
         /// Log file path.
         /// </summary>
-        public readonly string LogFilePath;
+        public string LogFilePath { get; set; }
 
         /// <summary>
         /// Indicates if more debugging and performance information should be logged.
@@ -210,15 +211,15 @@ private void WriteLog(IEngine sender, EngineMessageEventArgs e, log4net.Core.Lev
                 if (ocWin != null)
                 {
                     fileId = ocWin.FileId.ToString();
-                    size = FormatBytes((e.OperationContext as IWindowsOperationContext).FileSize);
+                    size = (e.OperationContext as IWindowsOperationContext).FileSize.FormatBytes();
                 }
             }
 
             string sourcePath = e.SourcePath?.FitString(sourcePathWidth, 6);
             string targetPath = e.TargetPath?.FitString(sourcePathWidth, 6);
 
             string message = Format(DateTimeOffset.Now.ToString("hh:mm:ss.fff"), process, priorityHint?.ToString(), fileId, e.ComponentName, e.CallerLineNumber.ToString(), e.CallerMemberName, e.CallerFilePath, e.Message, remoteStorageId, sourcePath, attSource);
-            if (targetPath!=null)
+            if (targetPath != null)
             {
                 // For move operation output target path in the next line.
                 message += Format(null, null, null, null, null, null, null, null, null, null, targetPath, attTarget);
@@ -274,7 +275,7 @@ public static string GetAttString(string path)
             {
                 return WindowsFileSystemItem.GetFileAttributesString(attributes.Value);
             }
-            
+
             return null;
         }
 
@@ -299,33 +300,15 @@ public static string Size(string path)
                 return null;
             }
 
-            return FormatBytes(length);
-        }
-
-        /// <summary>
-        /// Formats bytes to string.
-        /// </summary>
-        /// <param name="length">Bytes to format.</param>
-        /// <returns>Human readable bytes string.</returns>
-        public static string FormatBytes(long length)
-        {
-            string[] suf = { "b ", "KB", "MB", "GB", "TB", "PB", "EB" };
-            if (length == 0)
-            {
-                return "0" + suf[0];
-            }
-            long bytes = Math.Abs(length);
-            int place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
-            double num = Math.Round(bytes / Math.Pow(1024, place), 0);
-            return (Math.Sign(length) * num).ToString() + suf[place];
+            return length.FormatBytes();
         }
 
         public static string IdToSting(byte[] remoteStorageItemId)
         {
             if (remoteStorageItemId == null)
                 return null;
 
-            switch(remoteStorageItemId.Length)
+            switch (remoteStorageItemId.Length)
             {
                 case 8:
                     return BitConverter.ToInt64(remoteStorageItemId, 0).ToString();

Windows/Common/Core/Registrar.cs

@@ -123,15 +123,15 @@ public static async Task<bool> UnregisterSyncRootAsync(string syncRootPath, stri
 
             if (res && !string.IsNullOrWhiteSpace(dataPath))
             {
-                log.Debug($"Deleteing data folder for {syncRootPath}");
+                log.Debug($"\nDeleting data folder for {syncRootPath}");
                 try
                 {
                     Directory.Delete(dataPath, true);
                 }
                 catch (Exception ex)
                 {
                     res = false;
-                    log.Error($"Failed to delete data folder {syncRootPath} {dataPath}", ex);
+                    log.Error($"\nFailed to delete data folder {syncRootPath} {dataPath}", ex);
                 }
             }
 
@@ -149,25 +149,25 @@ private static async Task<bool> UnregisterSyncRootAsync(string syncRootPath, ILo
             StorageProviderSyncRootInfo syncRootInfo = null;
             try
             {
-                logger.Debug($"Getting sync root info {syncRootPath}");
+                logger.Debug($"\nGetting sync root info {syncRootPath}");
                 syncRootInfo = StorageProviderSyncRootManager.GetSyncRootInformationForFolder(storageFolder);
             }
             catch (Exception ex)
             {
-                logger.Error($"Sync root is not registered {syncRootPath}", ex);
+                logger.Error($"\nSync root is not registered {syncRootPath}", ex);
             }
 
             // Unregister sync root.
             if (syncRootInfo != null)
             {
                 try
-                { 
-                    logger.Debug($"Unregistering sync root {syncRootPath} {syncRootInfo.Id}");
+                {
+                    logger.Debug($"\nUnregistering sync root {syncRootPath} {syncRootInfo.Id}");
                     StorageProviderSyncRootManager.Unregister(syncRootInfo.Id);
                 }
                 catch (Exception ex)
                 {
-                    logger.Error($"Failed to unregister sync root {syncRootPath} {syncRootInfo.Id}", ex);
+                    logger.Error($"\nFailed to unregister sync root {syncRootPath} {syncRootInfo.Id}", ex);
                     // IMPORTANT!
                     // If Unregister() failed, deleting items on the client may trigger deleting
                     // items in the remote storage if the Engine did not stop or if started again.
@@ -178,22 +178,22 @@ private static async Task<bool> UnregisterSyncRootAsync(string syncRootPath, ILo
 
             // Remore the read-only arrtibute. Otherwise delete fails.
             var allItems = Directory.EnumerateFileSystemEntries(syncRootPath, "*", SearchOption.AllDirectories);
-            foreach(var path in allItems)
+            foreach (var path in allItems)
             {
                 try
                 {
                     new FileInfo(path).IsReadOnly = false;
                 }
                 catch (Exception ex)
                 {
-                    logger.Error($"Failed to remove read-only attribute for {path}", ex);
+                    logger.Error($"\nFailed to remove read-only attribute for {path}", ex);
                 }
             }
 
             // Delete sync root folder.
             try
             {
-                logger.Debug($"Deleteing sync root folder {syncRootPath}");
+                logger.Debug($"\nDeleting sync root folder {syncRootPath}");
                 Directory.Delete(syncRootPath, true);
                 res = true;
             }
@@ -217,7 +217,7 @@ public virtual async Task<bool> UnregisterAllSyncRootsAsync(string providerId, b
         {
             bool res = true;
             var syncRoots = StorageProviderSyncRootManager.GetCurrentSyncRoots();
-            foreach(var syncRoot in syncRoots)
+            foreach (var syncRoot in syncRoots)
             {
                 string storedProviderId = syncRoot.Id?.Split('!')?.FirstOrDefault();
                 if (storedProviderId.Equals(providerId))
@@ -333,14 +333,14 @@ private static async Task<StorageProviderSyncRootInfo> RegisterAsync(string sync
             // Adds columns to Windows File Manager. 
             // Show/hide columns in the "More..." context menu on the columns header in Windows Explorer.
             var proDefinitions = storageInfo.StorageProviderItemPropertyDefinitions;
-            if(customColumns != null)
+            if (customColumns != null)
             {
                 foreach (var column in customColumns)
                 {
                     proDefinitions.Add(new StorageProviderItemPropertyDefinition { DisplayNameResource = column.Value, Id = column.Key });
                 }
             }
-      
+
             ValidateStorageProviderSyncRootInfo(storageInfo);
 
             StorageProviderSyncRootManager.Register(storageInfo);
@@ -469,7 +469,7 @@ private static StorageProviderSyncRootInfo GetSyncRootInfo(Uri uri)
                     {
                         return syncRoot;
                     }
-                }    
+                }
             }
 
             return null;
@@ -510,7 +510,7 @@ public static async Task<IEnumerable<StorageProviderSyncRootInfo>> GetMountedSyn
                     string storedUri = syncRoot.GetRemoteStoragePath();
                     if (!System.Uri.TryCreate(storedUri, UriKind.Absolute, out System.Uri _))
                     {
-                        log.Error($"Can not parse URI for {syncRoot.DisplayNameResource}: {storedUri}");
+                        log.Error($"\nCan not parse URI for {syncRoot.DisplayNameResource}: {storedUri}");
                         continue;
                     }
 

Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj

@@ -13,8 +13,8 @@
     <Compile Remove="IVirtualFolder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.AppHelper" Version="9.0.29481.0-Beta" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29481.0-Beta" />
+    <PackageReference Include="ITHit.FileSystem.Windows.AppHelper" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29527.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
   </ItemGroup>