Fix: Fixed errors that occurred with shortcut items in git repositories (#17015)

Author: marcofranzen99

src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs

@@ -35,7 +35,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			if (context.ShellPage?.ShellViewModel is null)
 				return;
 
-			var item = context.SelectedItem as ShortcutItem;
+			var item = context.SelectedItem as IShortcutItem;
 
 			if (string.IsNullOrWhiteSpace(item?.TargetPath))
 				return;

src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs

@@ -42,7 +42,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				{
 					await NavigationHelpers.AddNewTabByPathAsync(
 						typeof(ShellPanesPage),
-						(listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath,
+						(listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath,
 						false);
 				},
 				Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);

src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs

@@ -48,7 +48,7 @@ public virtual async Task ExecuteAsync(object? parameter = null)
 
 			foreach (ListedItem listedItem in items)
 			{
-				var selectedItemPath = (listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath;
+				var selectedItemPath = (listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath;
 				var folderUri = new Uri($"files-dev:?folder={@selectedItemPath}");
 
 				await Launcher.LaunchUriAsync(folderUri);

src/Files.App/Actions/Start/PinToStartAction.cs

@@ -39,7 +39,7 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 						IStorable storable = listedItem.IsFolder switch
 						{
 							true => await StorageService.GetFolderAsync(listedItem.ItemPath),
-							_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
+							_ => await StorageService.GetFileAsync((listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath)
 						};
 						await StartMenuService.PinAsync(storable, listedItem.Name);
 					});

src/Files.App/Actions/Start/UnpinFromStartAction.cs

@@ -36,7 +36,7 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 						IStorable storable = listedItem.IsFolder switch
 						{
 							true => await StorageService.GetFolderAsync(listedItem.ItemPath),
-							_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
+							_ => await StorageService.GetFileAsync((listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath)
 						};
 						await StartMenuService.UnpinAsync(storable);
 					});

src/Files.App/Data/Items/IListedItem.cs

@@ -0,0 +1,79 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Files.App.ViewModels.Properties;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Storage;
+
+namespace Files.App.Utils
+{
+	public interface IListedItem
+	{
+		GitItem AsGitItem { get; }
+		RecycleBinItem AsRecycleBinItem { get; }
+		bool ContainsFilesOrFolders { get; set; }
+		string ContextualProperty { get; set; }
+		BitmapImage CustomIcon { get; set; }
+		Uri CustomIconSource { get; set; }
+		ObservableCollection<FileProperty> FileDetails { get; set; }
+		string FileExtension { get; set; }
+		ulong? FileFRN { get; set; }
+		BitmapImage FileImage { get; set; }
+		string FileSize { get; set; }
+		long FileSizeBytes { get; set; }
+		string FileSizeDisplay { get; }
+		string[] FileTags { get; set; }
+		IList<TagViewModel>? FileTagsUI { get; }
+		string FileVersion { get; set; }
+		string FolderRelativeId { get; set; }
+		bool HasTags { get; set; }
+		BitmapImage IconOverlay { get; set; }
+		string ImageDimensions { get; set; }
+		bool IsAlternateStream { get; }
+		bool IsArchive { get; }
+		bool IsDriveRoot { get; }
+		bool IsElevationRequired { get; set; }
+		bool IsExecutable { get; }
+		bool IsFolder { get; }
+		bool IsFtpItem { get; }
+		bool IsGitItem { get; }
+		bool IsHiddenItem { get; set; }
+		bool IsItemPinnedToStart { get; }
+		bool IsLibrary { get; }
+		bool IsLinkItem { get; }
+		bool IsPinned { get; }
+		bool IsRecycleBinItem { get; }
+		bool IsScriptFile { get; }
+		bool IsShortcut { get; }
+		string ItemDateAccessed { get; }
+		DateTimeOffset ItemDateAccessedReal { get; set; }
+		string ItemDateCreated { get; }
+		DateTimeOffset ItemDateCreatedReal { get; set; }
+		string ItemDateModified { get; }
+		DateTimeOffset ItemDateModifiedReal { get; set; }
+		BaseStorageFile ItemFile { get; set; }
+		string ItemNameRaw { get; set; }
+		string ItemPath { get; set; }
+		ObservableCollection<FileProperty> ItemProperties { get; set; }
+		bool ItemPropertiesInitialized { get; set; }
+		string ItemTooltipText { get; }
+		string ItemType { get; set; }
+		string Key { get; set; }
+		bool LoadCustomIcon { get; set; }
+		bool LoadFileIcon { get; set; }
+		ByteSizeLib.ByteSize MaxSpace { get; set; }
+		string MediaDuration { get; set; }
+		string Name { get; }
+		bool NeedsPlaceholderGlyph { get; set; }
+		double Opacity { get; set; }
+		StorageItemTypes PrimaryItemAttribute { get; set; }
+		BitmapImage ShieldIcon { get; set; }
+		bool ShowDriveStorageDetails { get; set; }
+		ByteSizeLib.ByteSize SpaceUsed { get; set; }
+		string SyncStatusString { get; }
+		CloudDriveSyncStatusUI SyncStatusUI { get; set; }
+
+		string ToString();
+		void UpdateContainsFilesFolders();
+	}
+}

src/Files.App/Data/Items/ListedItem.cs

@@ -16,7 +16,7 @@
 
 namespace Files.App.Utils
 {
-	public partial class ListedItem : ObservableObject, IGroupableItem
+	public partial class ListedItem : ObservableObject, IGroupableItem, IListedItem
 	{
 		protected static IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
@@ -187,7 +187,7 @@ public BitmapImage FileImage
 			}
 		}
 
-		public bool IsItemPinnedToStart => StartMenuService.IsPinned((this as ShortcutItem)?.TargetPath ?? ItemPath);
+		public bool IsItemPinnedToStart => StartMenuService.IsPinned((this as IShortcutItem)?.TargetPath ?? ItemPath);
 
 		private BitmapImage iconOverlay;
 		public BitmapImage IconOverlay
@@ -352,7 +352,7 @@ public ByteSize SpaceUsed
 			set => SetProperty(ref spaceUsed, value);
 
 		}
-		
+
 		private string imageDimensions;
 		public string ImageDimensions
 		{
@@ -427,7 +427,7 @@ public override string ToString()
 		public bool IsRecycleBinItem => this is RecycleBinItem;
 		public bool IsShortcut => this is IShortcutItem;
 		public bool IsLibrary => this is LibraryItem;
-		public bool IsLinkItem => IsShortcut && ((ShortcutItem)this).IsUrl;
+		public bool IsLinkItem => IsShortcut && ((IShortcutItem)this).IsUrl;
 		public bool IsFtpItem => this is FtpItem;
 		public bool IsArchive => this is ZipItem;
 		public bool IsAlternateStream => this is AlternateStreamItem;
@@ -788,7 +788,7 @@ public override string Name
 		public bool IsSymLink { get; set; }
 		public override bool IsExecutable => FileExtensionHelpers.IsExecutableFile(TargetPath, true);
 	}
-	public interface IGitItem
+	public interface IGitItem : IListedItem
 	{
 		public bool StatusPropertiesInitialized { get; set; }
 		public bool CommitPropertiesInitialized { get; set; }
@@ -815,7 +815,7 @@ public string ItemPath
 			set;
 		}
 	}
-	public interface IShortcutItem
+	public interface IShortcutItem : IListedItem
 	{
 		public string TargetPath { get; set; }
 		public string Name { get; }

src/Files.App/Helpers/Navigation/NavigationHelpers.cs

@@ -330,7 +330,7 @@ public static void OpenInSecondaryPane(IShellPage associatedInstance, ListedItem
 			if (associatedInstance is null || listedItem is null)
 				return;
 
-			associatedInstance.PaneHolder?.OpenSecondaryPane((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath);
+			associatedInstance.PaneHolder?.OpenSecondaryPane((listedItem as IShortcutItem)?.TargetPath ?? listedItem.ItemPath);
 		}
 
 		public static Task LaunchNewWindowAsync()

src/Files.App/Helpers/ShareItemHelpers.cs

@@ -59,7 +59,7 @@ async void Manager_DataRequested(DataTransferManager sender, DataRequestedEventA
 
 				foreach (ListedItem item in itemsToShare)
 				{
-					if (item is ShortcutItem shItem)
+					if (item is IShortcutItem shItem)
 					{
 						if (shItem.IsLinkItem && !string.IsNullOrEmpty(shItem.TargetPath))
 						{

src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs

@@ -65,7 +65,7 @@ private async Task ItemPointerPressedAsync(PointerRoutedEventArgs e)
 				_associatedInstance.SlimContentPage.IsMiddleClickToScrollEnabled = true;
 
 				if (Item.IsShortcut)
-					await NavigationHelpers.OpenPathInNewTab(((e.OriginalSource as FrameworkElement)?.DataContext as ShortcutItem)?.TargetPath ?? Item.ItemPath);
+					await NavigationHelpers.OpenPathInNewTab(((e.OriginalSource as FrameworkElement)?.DataContext as IShortcutItem)?.TargetPath ?? Item.ItemPath);
 				else
 					await NavigationHelpers.OpenPathInNewTab(Item.ItemPath);
 			}