Ensure executable files are detected properly

Author: Luke Blevins

Files/Filesystem/ItemViewModel.cs

@@ -13,6 +13,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
@@ -704,6 +705,7 @@ private async Task AddFile(StorageFile file)
         {
             var basicProperties = await file.GetBasicPropertiesAsync();
 
+            bool isExecutable = await IsFileExecutable(file);
             var itemName = file.DisplayName;
             var itemDate = basicProperties.DateModified;
             var itemPath = file.Path;
@@ -787,12 +789,23 @@ private async Task AddFile(StorageFile file)
                 FileType = itemType,
                 FilePath = itemPath,
                 FileSize = itemSize,
-                FileSizeBytes = itemSizeBytes
+                FileSizeBytes = itemSizeBytes,
+                IsFileExecutable = isExecutable
             });
 
             EmptyTextState.isVisible = Visibility.Collapsed;
         }
 
+        public static async Task<bool> IsFileExecutable(StorageFile inputFile)
+        {
+            var firstTwoBytes = new byte[2];
+            using(Stream stream = await inputFile.OpenStreamForReadAsync())
+            {
+                stream.Read(firstTwoBytes, 0, 2);
+            }
+            return Encoding.UTF8.GetString(firstTwoBytes) == "MZ";
+        }
+
         public async void FileContentsChanged(IStorageQueryResultBase sender, object args)
         {
             if (_filesRefreshing)

Files/Filesystem/ListedItem.cs

@@ -7,6 +7,7 @@ namespace Files.Filesystem
 {
     public class ListedItem
     {
+        public bool IsFileExecutable { get; set; }
         public string FolderRelativeId { get; }
         public Visibility FolderImg { get; set; }
         public Visibility FileIconVis { get; set; }

Files/Interacts/Interaction.cs

@@ -411,7 +411,7 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
                             currentInstance.ItemDisplayFrame.Navigate(sourcePageType, selectedItemPath, new SuppressNavigationTransitionInfo());
                         }
                     }
-                    else if (clickedOnItem.FileType == "Application")
+                    else if (clickedOnItem.IsFileExecutable)
                     {
                         // Add location to MRU List
                         mostRecentlyUsed.Add(await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath));
@@ -438,7 +438,7 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
                         {
                             instanceTabsView.AddNewTab(typeof(ProHome), clickedOnItem.FilePath);
                         }
-                        else if (clickedOnItem.FileType == "Application")
+                        else if (clickedOnItem.IsFileExecutable)
                         {
                             // Add location to MRU List
                             mostRecentlyUsed.Add(await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath));

Files/YourHome.xaml.cs

@@ -330,7 +330,7 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)
             try
             {
                 var file = (await StorageFile.GetFileFromPathAsync(path));
-                if (file.DisplayType == "Application")
+                if (await ItemViewModel.IsFileExecutable(file))
                 {
                     await Interaction.LaunchExe(path);