Show original path in properties (files-community#1680)

Author: gave92

Files/Filesystem/ListedItem.cs

@@ -3,6 +3,7 @@
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Uwp.Extensions;
 using System;
+using System.IO;
 using Windows.Storage;
 using Windows.UI.Xaml.Media.Imaging;
 
@@ -265,7 +266,7 @@ public RecycleBinItem(string folderRelativeId, string returnFormat) : base(folde
         // For recycle bin elements (path + name)
         public string ItemOriginalPath { get; set; }
         // For recycle bin elements (path)
-        public string ItemOriginalFolder => System.IO.Path.GetDirectoryName(ItemOriginalPath);
+        public string ItemOriginalFolder => Path.IsPathRooted(ItemOriginalPath) ? Path.GetDirectoryName(ItemOriginalPath) : ItemOriginalPath;
     }
 
     public class ShortcutItem : ListedItem

Files/View Models/Properties/CombinedProperties.cs

@@ -43,8 +43,12 @@ public override void GetBaseProperties()
                 {
                     ViewModel.ItemType = "PropertiesDriveItemTypeDifferent".GetLocalized();
                 }
-                ViewModel.ItemPath = string.Format(
-                    "PropertiesCombinedItemPath".GetLocalized(), Path.GetDirectoryName(List.First().ItemPath));
+                var itemsPath = List.Select(Item => (Item as RecycleBinItem)?.ItemOriginalFolder ??
+                    (Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath));
+                if (itemsPath.Distinct().Count() == 1)
+                {
+                    ViewModel.ItemPath = string.Format("PropertiesCombinedItemPath".GetLocalized(), itemsPath.First());
+                }
             }
         }
 

Files/View Models/Properties/FileProperties.cs

@@ -48,7 +48,8 @@ public override void GetBaseProperties()
                 ViewModel.ItemName = Item.ItemName;
                 ViewModel.OriginalItemName = Item.ItemName;
                 ViewModel.ItemType = Item.ItemType;
-                ViewModel.ItemPath = Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath;
+                ViewModel.ItemPath = (Item as RecycleBinItem)?.ItemOriginalFolder ??
+                    (Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath);
                 ViewModel.ItemModifiedTimestamp = Item.ItemDateModified;
                 //ViewModel.FileIconSource = Item.FileImage;
                 ViewModel.LoadFolderGlyph = Item.LoadFolderGlyph;

Files/View Models/Properties/FolderProperties.cs

@@ -40,7 +40,8 @@ public override void GetBaseProperties()
                 ViewModel.ItemName = Item.ItemName;
                 ViewModel.OriginalItemName = Item.ItemName;
                 ViewModel.ItemType = Item.ItemType;
-                ViewModel.ItemPath = Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath;
+                ViewModel.ItemPath = (Item as RecycleBinItem)?.ItemOriginalFolder ??
+                    (Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath);
                 ViewModel.ItemModifiedTimestamp = Item.ItemDateModified;
                 //ViewModel.FileIconSource = Item.FileImage;
                 ViewModel.LoadFolderGlyph = Item.LoadFolderGlyph;