Distinguish error code for file/folder

Author: gave92

Files/Filesystem/StorageFileHelpers/FilesystemResult.cs

@@ -61,7 +61,7 @@ public static explicit operator FilesystemResult(bool res) =>
 
     public static class TaskExtensions
     {
-        private static FilesystemErrorCode GetErrorCode(Exception ex)
+        private static FilesystemErrorCode GetErrorCode(Exception ex, Type T = null)
         {
             if (ex is UnauthorizedAccessException)
             {
@@ -83,7 +83,8 @@ private static FilesystemErrorCode GetErrorCode(Exception ex)
             }
             else if (ex is ArgumentException) // Item was invalid
             {
-                return FilesystemErrorCode.ERROR_NOTAFOLDER;
+                return (T == typeof(StorageFolder) || T == typeof(StorageFolderWithPath)) ?
+                    FilesystemErrorCode.ERROR_NOTAFOLDER : FilesystemErrorCode.ERROR_NOTAFILE;
             }
             else if ((uint)ex.HResult == 0x800700A1 // The specified path is invalid (usually an mtp device was disconnected)
                 || (uint)ex.HResult == 0x8007016A // The cloud file provider is not running
@@ -105,7 +106,7 @@ public async static Task<FilesystemResult<T>> Wrap<T>(this Task<T> wrapped)
             }
             catch (Exception ex)
             {
-                return new FilesystemResult<T>(default(T), GetErrorCode(ex));
+                return new FilesystemResult<T>(default(T), GetErrorCode(ex, typeof(T)));
             }
         }
 

Files/Interacts/Interaction.cs

@@ -667,19 +667,13 @@ private async void Manager_DataRequested(DataTransferManager sender, DataRequest
                 }
                 else if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
                 {
-                    StorageFolder folderAsItem = await AssociatedInstance.FilesystemViewModel.GetFolderFromPathAsync(item.ItemPath);
-                    if (folderAsItem != null)
-                    {
-                        items.Add(folderAsItem);
-                    }
+                    await AssociatedInstance.FilesystemViewModel.GetFolderFromPathAsync(item.ItemPath)
+                        .OnSuccess(folderAsItem => items.Add(folderAsItem));
                 }
                 else
                 {
-                    StorageFile fileAsItem = await AssociatedInstance.FilesystemViewModel.GetFileFromPathAsync(item.ItemPath);
-                    if (fileAsItem != null)
-                    {
-                        items.Add(fileAsItem);
-                    }
+                    await AssociatedInstance.FilesystemViewModel.GetFileFromPathAsync(item.ItemPath)
+                        .OnSuccess(fileAsItem => items.Add(fileAsItem));
                 }
             }