Fix incorrect item size value (#1138)

tsvietOK · web-flow · commit 5c5925855cf5 · 2020-06-19T13:28:41.000-04:00
Fix incorrect drive space calculation
Show item size in bytes in properties window.
diff --git a/Files/Filesystem/DriveItem.cs b/Files/Filesystem/DriveItem.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using ByteSizeLib;
+using System;
 using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.UI.Xaml;
@@ -11,8 +12,9 @@ public class DriveItem : INavigationControlItem
         public string Text { get; set; }
         public string Path { get; set; }
         public NavigationControlItemType ItemType { get; set; } = NavigationControlItemType.Drive;
-        public ulong MaxSpace { get; set; } = 0;
-        public ulong SpaceUsed { get; set; } = 0;
+        public ByteSize MaxSpace { get; set; }
+        public ByteSize FreeSpace { get; set; }
+        public ByteSize SpaceUsed { get; set; }
         public string SpaceText { get; set; }
         public Visibility ItemVisibility { get; set; } = Visibility.Visible;
 
@@ -45,13 +47,15 @@ public DriveItem(StorageFolder root, DriveType type)
             }).Result;
 
             try
-            {
-                SpaceUsed = MaxSpace -
-                            Convert.ToUInt64(ByteSizeLib.ByteSize.FromBytes((ulong)properties["System.FreeSpace"]).GigaBytes);
-                MaxSpace = Convert.ToUInt64(ByteSizeLib.ByteSize.FromBytes((ulong)properties["System.Capacity"]).GigaBytes);
-                SpaceText = String.Format(ResourceController.GetTranslation("DriveFreeSpaceAndCapacity"),
-                    ByteSizeLib.ByteSize.FromBytes((ulong)properties["System.FreeSpace"]).ToString(),
-                    ByteSizeLib.ByteSize.FromBytes((ulong)properties["System.Capacity"]).ToString());
+            {           
+                MaxSpace = ByteSize.FromBytes((ulong)properties["System.Capacity"]);
+                FreeSpace = ByteSize.FromBytes((ulong)properties["System.FreeSpace"]);
+
+                SpaceUsed = MaxSpace - FreeSpace;
+                SpaceText = string.Format(
+                    ResourceController.GetTranslation("DriveFreeSpaceAndCapacity"),
+                    FreeSpace.ToBinaryString(),
+                    MaxSpace.ToBinaryString());
             }
             catch (NullReferenceException)
             {
diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf
@@ -837,6 +837,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf
@@ -830,6 +830,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="translated">Ver propiedades de multiples elementos seleccionados</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf
@@ -833,6 +833,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf
@@ -837,6 +837,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.ja-JP.xlf b/Files/MultilingualResources/Files.ja-JP.xlf
@@ -830,6 +830,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf
@@ -833,6 +833,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf
@@ -833,6 +833,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf
@@ -835,6 +835,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="translated">байт</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.ta.xlf b/Files/MultilingualResources/Files.ta.xlf
@@ -836,6 +836,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf
@@ -833,6 +833,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf
@@ -835,6 +835,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="translated">байт</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf
@@ -830,6 +830,10 @@
           <source>Open properties in Multiple Windows</source>
           <target state="new">Open properties in Multiple Windows</target>
         </trans-unit>
+        <trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
+          <source>bytes</source>
+          <target state="new">bytes</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
@@ -735,4 +735,7 @@
   <data name="BaseLayoutContextFlyoutPinDirectoryToSidebar.Text" xml:space="preserve">
     <value>Pin directory to sidebar</value>
   </data>
+  <data name="ItemSizeBytes" xml:space="preserve">
+    <value>bytes</value>
+  </data>
 </root>
diff --git a/Files/View Models/ItemViewModel.cs b/Files/View Models/ItemViewModel.cs
@@ -1111,7 +1111,7 @@ private void AddFile(WIN32_FIND_DATA findData, string pathRoot)
                     fileSize = fDataFSize;
                 }
             }
-            var itemSize = ByteSize.FromBytes(fileSize).ToString();
+            var itemSize = ByteSize.FromBytes(fileSize).ToBinaryString();
             var itemSizeBytes = (findData.nFileSizeHigh << 32) + (ulong)findData.nFileSizeLow;
             string itemType = ResourceController.GetTranslation("ItemTypeFile");
             string itemFileExtension = null;
@@ -1197,7 +1197,7 @@ private async Task AddFile(StorageFile file)
             var itemName = file.DisplayName;
             var itemDate = basicProperties.DateModified;
             var itemPath = file.Path;
-            var itemSize = ByteSize.FromBytes(basicProperties.Size).ToString();
+            var itemSize = ByteSize.FromBytes(basicProperties.Size).ToBinaryString();
             var itemSizeBytes = basicProperties.Size;
             var itemType = file.DisplayType;
             var itemFolderImgVis = false;
diff --git a/Files/View Models/SelectedItemsPropertiesViewModel.cs b/Files/View Models/SelectedItemsPropertiesViewModel.cs
@@ -221,7 +221,8 @@ private async void GetFolderSize(StorageFolder storageFolder, CancellationToken
             {
                 var folderSize = await fileSizeTask;
                 ItemSizeReal = folderSize;
-                ItemsSize = ByteSizeLib.ByteSize.FromBytes(folderSize).ToString();
+                ItemsSize = ByteSizeLib.ByteSize.FromBytes(folderSize).ToBinaryString()
+                    + " (" + ByteSizeLib.ByteSize.FromBytes(folderSize).Bytes.ToString("#,##0") + " " + ResourceController.GetTranslation("ItemSizeBytes") + ")";
             }
             catch (Exception ex)
             {
@@ -293,7 +294,7 @@ public async Task<long> CalculateFolderSizeAsync(string path, CancellationToken
                         await Dispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
                         {
                             ItemSizeReal = size;
-                            ItemsSize = ByteSizeLib.ByteSize.FromBytes(size).ToString();
+                            ItemsSize = ByteSizeLib.ByteSize.FromBytes(size).ToBinaryString();
                         });
                     }
 
@@ -317,7 +318,8 @@ public async Task GetPropertiesAsync(CancellationTokenSource _tokenSource)
                 var file = await StorageFile.GetFileFromPathAsync(Item.ItemPath);
                 ItemCreatedTimestamp = ListedItem.GetFriendlyDate(file.DateCreated);
                 GetOtherPropeties(file.Properties);
-                ItemsSize = Item.FileSize;
+                ItemsSize = ByteSizeLib.ByteSize.FromBytes(Item.FileSizeBytes).ToBinaryString()
+                    + " (" + ByteSizeLib.ByteSize.FromBytes(Item.FileSizeBytes).Bytes.ToString("#,##0") + " " + ResourceController.GetTranslation("SizeBytes") + ")";
 
                 // Get file MD5 hash
                 var hashAlgTypeName = HashAlgorithmNames.Md5;
