Feature: Added support for pinning executable shortcuts to start (#14667)

yaira2 · web-flow · commit 797b7cea1124 · 2024-02-07T14:08:19.000-08:00
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -40,7 +40,7 @@ public async Task ExecuteAsync()
 					IStorable storable = listedItem.IsFolder switch
 					{
 						true => await StorageService.GetFolderAsync(listedItem.ItemPath),
-						_ => await StorageService.GetFileAsync(listedItem.ItemPath)
+						_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
 					};
 					await StartMenuService.PinAsync(storable, listedItem.Name);
 				}
diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -36,7 +36,7 @@ public async Task ExecuteAsync()
 					IStorable storable = listedItem.IsFolder switch
 					{
 						true => await StorageService.GetFolderAsync(listedItem.ItemPath),
-						_ => await StorageService.GetFileAsync(listedItem.ItemPath)
+						_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
 					};
 					await StartMenuService.UnpinAsync(storable);
 				}
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -502,12 +502,12 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.PinToStart)
 				{
-					IsVisible = selectedItems.All(x => !x.IsShortcut && (x.PrimaryItemAttribute == StorageItemTypes.Folder || x.IsExecutable) && !x.IsArchive && !x.IsItemPinnedToStart),
+					IsVisible = selectedItems.All(x => (x.PrimaryItemAttribute == StorageItemTypes.Folder || x.IsExecutable || (x is ShortcutItem shortcutItem && FileExtensionHelpers.IsExecutableFile(shortcutItem.TargetPath))) && !x.IsArchive && !x.IsItemPinnedToStart),
 					ShowOnShift = true,
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.UnpinFromStart)
 				{
-					IsVisible = selectedItems.All(x => !x.IsShortcut && (x.PrimaryItemAttribute == StorageItemTypes.Folder || x.IsExecutable) && !x.IsArchive && x.IsItemPinnedToStart),
+					IsVisible = selectedItems.All(x => (x.PrimaryItemAttribute == StorageItemTypes.Folder || x.IsExecutable|| (x is ShortcutItem shortcutItem && FileExtensionHelpers.IsExecutableFile(shortcutItem.TargetPath))) && !x.IsArchive && x.IsItemPinnedToStart),
 					ShowOnShift = true,
 				}.Build(),
 				new ContextMenuFlyoutItemViewModel
diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs
@@ -182,7 +182,7 @@ public BitmapImage FileImage
 			}
 		}
 
-		public bool IsItemPinnedToStart => StartMenuService.IsPinned(ItemPath);
+		public bool IsItemPinnedToStart => StartMenuService.IsPinned((this as ShortcutItem)?.TargetPath ?? ItemPath);
 
 		private BitmapImage iconOverlay;
 		public BitmapImage IconOverlay

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public async Task ExecuteAsync()`
`40`	`40`	`IStorable storable = listedItem.IsFolder switch`
`41`	`41`	`{`
`42`	`42`	`true => await StorageService.GetFolderAsync(listedItem.ItemPath),`
`43`		`- _ => await StorageService.GetFileAsync(listedItem.ItemPath)`
	`43`	`+ _ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)`
`44`	`44`	`};`
`45`	`45`	`await StartMenuService.PinAsync(storable, listedItem.Name);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public async Task ExecuteAsync()`
`36`	`36`	`IStorable storable = listedItem.IsFolder switch`
`37`	`37`	`{`
`38`	`38`	`true => await StorageService.GetFolderAsync(listedItem.ItemPath),`
`39`		`- _ => await StorageService.GetFileAsync(listedItem.ItemPath)`
	`39`	`+ _ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)`
`40`	`40`	`};`
`41`	`41`	`await StartMenuService.UnpinAsync(storable);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public BitmapImage FileImage`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
`185`		`- public bool IsItemPinnedToStart => StartMenuService.IsPinned(ItemPath);`
	`185`	`+ public bool IsItemPinnedToStart => StartMenuService.IsPinned((this as ShortcutItem)?.TargetPath ?? ItemPath);`
`186`	`186`
`187`	`187`	`private BitmapImage iconOverlay;`
`188`	`188`	`public BitmapImage IconOverlay`