Properties: Show item location instead of full path (#1153)

Author: tsvietOK

Files/Helpers/StringExtensions.cs

@@ -73,7 +73,8 @@ public static string Right([NotNull] this string value, int length)
             { "GiB", ResourceController.GetTranslation("GigaByteSymbol") },
             { "TiB", ResourceController.GetTranslation("TeraByteSymbol") },
             { "PiB", ResourceController.GetTranslation("PetaByteSymbol") },
-            { "B", ResourceController.GetTranslation("ByteSymbol") }
+            { "B", ResourceController.GetTranslation("ByteSymbol") },
+            { "b", ResourceController.GetTranslation("ByteSymbol") }
         };
 
         public static string ConvertSizeAbbreviation(this string value)

Files/View Models/SelectedItemsPropertiesViewModel.cs

@@ -1,19 +1,14 @@
-using Files.DataModels;
 using Files.Filesystem;
 using GalaSoft.MvvmLight;
-using Windows.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Security.Cryptography.Core;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
-using Windows.Storage.Search;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
 using System.IO;
 using Windows.UI.Core;
 using FileAttributes = System.IO.FileAttributes;
@@ -24,71 +19,88 @@ namespace Files.View_Models
 {
     public class SelectedItemsPropertiesViewModel : ViewModelBase
     {
-        #region ItemProperties
         private string _ItemName;
+
         public string ItemName
         {
             get => _ItemName;
             set => Set(ref _ItemName, value);
         }
+
         private string _ItemType;
+
         public string ItemType
         {
             get => _ItemType;
             set => Set(ref _ItemType, value);
         }
+
         private string _ItemPath;
+
         public string ItemPath
         {
             get => _ItemPath;
             set => Set(ref _ItemPath, value);
         }
+
         private long _ItemSizeReal;
 
         public long ItemSizeReal
         {
             get => _ItemSizeReal;
             set => Set(ref _ItemSizeReal, value);
         }
+
         private Visibility _ItemSizeProgressVisibility = Visibility.Collapsed;
 
         public Visibility ItemSizeProgressVisibility
         {
             get => _ItemSizeProgressVisibility;
             set => Set(ref _ItemSizeProgressVisibility, value);
         }
+
         private bool _SizeCalcError;
 
         public bool SizeCalcError
         {
             get => _SizeCalcError;
             set => Set(ref _SizeCalcError, value);
         }
+
         private string _ItemModifiedTimestamp;
+
         public string ItemModifiedTimestamp
         {
             get => _ItemModifiedTimestamp;
             set => Set(ref _ItemModifiedTimestamp, value);
         }
+
         private ImageSource _FileIconSource;
+
         public ImageSource FileIconSource
         {
             get => _FileIconSource;
             set => Set(ref _FileIconSource, value);
         }
+
         private bool _LoadFolderGlyph;
+
         public bool LoadFolderGlyph
         {
             get => _LoadFolderGlyph;
             set => Set(ref _LoadFolderGlyph, value);
         }
+
         private bool _LoadUnknownTypeGlyph;
+
         public bool LoadUnknownTypeGlyph
         {
             get => _LoadUnknownTypeGlyph;
             set => Set(ref _LoadUnknownTypeGlyph, value);
         }
+
         private bool _LoadFileIcon;
+
         public bool LoadFileIcon
         {
             get => _LoadFileIcon;
@@ -118,26 +130,33 @@ public bool IsItemSelected
             get => _IsItemSelected;
             set => Set(ref _IsItemSelected, value);
         }
+
         private string _ItemCreatedTimestamp;
 
         public string ItemCreatedTimestamp
         {
             get => _ItemCreatedTimestamp;
             set => Set(ref _ItemCreatedTimestamp, value);
         }
+
         public string _ItemAccessedTimestamp;
+
         public string ItemAccessedTimestamp
         {
             get => _ItemAccessedTimestamp;
             set => Set(ref _ItemAccessedTimestamp, value);
         }
+
         public string _ItemFileOwner;
+
         public string ItemFileOwner
         {
             get => _ItemFileOwner;
             set => Set(ref _ItemFileOwner, value);
         }
+
         public string _ItemMD5Hash;
+
         public string ItemMD5Hash
         {
             get => _ItemMD5Hash;
@@ -150,7 +169,9 @@ public string ItemMD5Hash
                 }
             }
         }
+
         private bool _ItemMD5HashCalcError;
+
         public bool ItemMD5HashCalcError
         {
             get => _ItemMD5HashCalcError;
@@ -164,38 +185,35 @@ public Visibility ItemMD5HashVisibility
             get => _ItemMD5HashVisibility;
             set => Set(ref _ItemMD5HashVisibility, value);
         }
+
         public Visibility _ItemMD5HashProgressVisibiity = Visibility.Collapsed;
 
         public Visibility ItemMD5HashProgressVisibility
         {
             get => _ItemMD5HashProgressVisibiity;
             set => Set(ref _ItemMD5HashProgressVisibiity, value);
         }
-        #endregion
-        #region Properties
 
         public Microsoft.UI.Xaml.Controls.ProgressBar ItemMD5HashProgress { get; set; }
 
         public ListedItem Item { get; }
 
         public CoreDispatcher Dispatcher { get; set; }
-        #endregion
-        #region Constructors
+
         public SelectedItemsPropertiesViewModel(ListedItem item)
         {
             Item = item;
 
             ItemName = Item?.ItemName;
             ItemType = Item?.ItemType;
-            ItemPath = Item?.ItemPath;
+            ItemPath = Path.GetDirectoryName(Item?.ItemPath);
             ItemModifiedTimestamp = Item?.ItemDateModified;
             FileIconSource = Item?.FileImage;
             LoadFolderGlyph = Item != null ? Item.LoadFolderGlyph : false;
             LoadUnknownTypeGlyph = Item != null ? Item.LoadUnknownTypeGlyph : false;
             LoadFileIcon = Item != null ? Item.LoadFileIcon : false;
         }
-        #endregion
-        #region Methods
+
         public async void GetOtherPropeties(StorageItemContentProperties properties)
         {
             string dateAccessedProperty = "System.DateAccessed";
@@ -207,6 +225,7 @@ public async void GetOtherPropeties(StorageItemContentProperties properties)
             ItemAccessedTimestamp = ListedItem.GetFriendlyDate((DateTimeOffset)extraProperties[dateAccessedProperty]);
             ItemFileOwner = extraProperties[fileOwnerProperty].ToString();
         }
+
         private async void GetFolderSize(StorageFolder storageFolder, CancellationToken token)
         {
             ItemSizeProgressVisibility = Visibility.Visible;
@@ -230,6 +249,7 @@ private async void GetFolderSize(StorageFolder storageFolder, CancellationToken
             }
             ItemSizeProgressVisibility = Visibility.Collapsed;
         }
+
         public async Task<long> CalculateFolderSizeAsync(string path, CancellationToken token)
         {
             long size = 0;
@@ -359,6 +379,5 @@ public async Task GetPropertiesAsync(CancellationTokenSource _tokenSource)
                 GetFolderSize(storageFolder, _tokenSource.Token);
             }
         }
-        #endregion
     }
 }