[Hidden files] - Add support for moving or permanently deleting a hidden folder (#2396)

Author: gave92

Files.Launcher/Program.cs

@@ -422,11 +422,16 @@ await Win32API.StartSTATask(() =>
                     });
                     break;
 
-                case "MoveToBin":
+                case "DeleteItem":
                     var fileToDeletePath = (string)args.Request.Message["filepath"];
+                    var permanently = (bool)args.Request.Message["permanently"];
                     using (var op = new ShellFileOperations())
                     {
-                        op.Options = ShellFileOperations.OperationFlags.AllowUndo | ShellFileOperations.OperationFlags.NoUI;
+                        op.Options = ShellFileOperations.OperationFlags.NoUI;
+                        if (!permanently)
+                        {
+                            op.Options |= ShellFileOperations.OperationFlags.AllowUndo;
+                        }
                         using var shi = new ShellItem(fileToDeletePath);
                         op.QueueDeleteOperation(shi);
                         op.PerformOperations();

Files/Commands/Delete.cs

@@ -151,31 +151,17 @@ private async Task<FilesystemResult> DeleteItemAsync(StorageDeleteOption deleteO
 
                 if (deleted.ErrorCode == FilesystemErrorCode.ERROR_UNAUTHORIZED)
                 {
-                    if (deleteOption == StorageDeleteOption.Default)
+                    // Try again with fulltrust process
+                    if (AppInstance.FilesystemViewModel.Connection != null)
                     {
-                        // Try again with fulltrust process
-                        if (AppInstance.FilesystemViewModel.Connection != null)
-                        {
-                            var response = await AppInstance.FilesystemViewModel.Connection.SendMessageAsync(new ValueSet()
+                        var response = await AppInstance.FilesystemViewModel.Connection.SendMessageAsync(new ValueSet()
                             {
                                 { "Arguments", "FileOperation" },
-                                { "fileop", "MoveToBin" },
-                                { "filepath", storItem.ItemPath }
+                                { "fileop", "DeleteItem" },
+                                { "filepath", storItem.ItemPath },
+                                { "permanently", deleteOption == StorageDeleteOption.PermanentDelete }
                             });
-                            deleted = (FilesystemResult)(response.Status == Windows.ApplicationModel.AppService.AppServiceResponseStatus.Success);
-                        }
-                    }
-                    else
-                    {
-                        // Try again with DeleteFileFromApp
-                        if (!NativeFileOperationsHelper.DeleteFileFromApp(storItem.ItemPath))
-                        {
-                            Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
-                        }
-                        else
-                        {
-                            deleted = (FilesystemResult)true;
-                        }
+                        deleted = (FilesystemResult)(response.Status == Windows.ApplicationModel.AppService.AppServiceResponseStatus.Success);
                     }
                 }
                 else if (deleted.ErrorCode == FilesystemErrorCode.ERROR_INUSE)

Files/Commands/Paste.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.Foundation.Collections;
 using Windows.Storage;
 using static Files.Helpers.NativeFindStorageItemHelper;
 using FileAttributes = System.IO.FileAttributes;
@@ -120,6 +121,11 @@ await AppInstance.FilesystemViewModel.GetFolderFromPathAsync(destinationPath)
                             .OnSuccess(t => CloneDirectoryAsync((StorageFolder)item, t, item.Name))
                             .OnSuccess(t =>
                             {
+                                if (AppInstance.FilesystemViewModel.CheckFolderForHiddenAttribute(item.Path))
+                                {
+                                    // The source folder was hidden, apply hidden attribute to destination
+                                    NativeFileOperationsHelper.SetFileAttribute(t.Path, FileAttributes.Hidden);
+                                }
                                 pastedSourceItems.Add(item);
                                 pastedItems.Add(t);
                             });
@@ -202,10 +208,17 @@ await AppInstance.FilesystemViewModel.GetFolderFromPathAsync(destinationPath)
 
                     if (deleted == FilesystemErrorCode.ERROR_UNAUTHORIZED)
                     {
-                        // Try again with DeleteFileFromApp
-                        if (!NativeFileOperationsHelper.DeleteFileFromApp(item.Path))
+                        // Try again with fulltrust process
+                        if (AppInstance.FilesystemViewModel.Connection != null)
                         {
-                            Debug.WriteLine(System.Runtime.InteropServices.Marshal.GetLastWin32Error());
+                            var response = await AppInstance.FilesystemViewModel.Connection.SendMessageAsync(new ValueSet()
+                            {
+                                { "Arguments", "FileOperation" },
+                                { "fileop", "DeleteItem" },
+                                { "filepath", item.Path },
+                                { "permanently", true }
+                            });
+                            deleted = (FilesystemResult)(response.Status == Windows.ApplicationModel.AppService.AppServiceResponseStatus.Success);
                         }
                     }
                     else if (deleted == FilesystemErrorCode.ERROR_NOTFOUND)

Files/View Models/ItemViewModel.cs

@@ -1050,12 +1050,16 @@ private async Task EnumFromStorageFolderAsync()
             Debug.WriteLine($"Enumerating items in {WorkingDirectory} (device) completed in {stopwatch.ElapsedMilliseconds} milliseconds.\n");
         }
 
-        private bool CheckFolderForHiddenAttribute(string path)
+        public bool CheckFolderForHiddenAttribute(string path)
         {
             FINDEX_INFO_LEVELS findInfoLevel = FINDEX_INFO_LEVELS.FindExInfoBasic;
             int additionalFlags = FIND_FIRST_EX_LARGE_FETCH;
             IntPtr hFileTsk = FindFirstFileExFromApp(path + "\\*.*", findInfoLevel, out WIN32_FIND_DATA findDataTsk, FINDEX_SEARCH_OPS.FindExSearchNameMatch, IntPtr.Zero,
                 additionalFlags);
+            if (hFileTsk.ToInt64() == -1)
+            {
+                return false;
+            }
             var isHidden = ((FileAttributes)findDataTsk.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden;
             FindClose(hFileTsk);
             return isHidden;
@@ -1248,6 +1252,8 @@ public void AddFileOrFolderFromShellFile(ShellFileItem item, string dateReturnFo
                     ItemName = item.FileName,
                     ItemDateModifiedReal = item.RecycleDate,
                     ItemType = item.FileType,
+                    IsHiddenItem = false,
+                    Opacity = 1,
                     LoadFolderGlyph = true,
                     FileImage = null,
                     LoadFileIcon = false,
@@ -1293,6 +1299,8 @@ public void AddFileOrFolderFromShellFile(ShellFileItem item, string dateReturnFo
                     FileImage = null,
                     LoadFileIcon = false,
                     LoadFolderGlyph = false,
+                    IsHiddenItem = false,
+                    Opacity = 1,
                     ItemName = itemName,
                     ItemDateModifiedReal = item.RecycleDate,
                     ItemType = item.FileType,
@@ -1653,6 +1661,8 @@ public async Task AddFolderAsync(StorageFolder folder, string dateReturnFormat)
                     ItemName = folder.Name,
                     ItemDateModifiedReal = basicProperties.DateModified,
                     ItemType = folder.DisplayType,
+                    IsHiddenItem = false,
+                    Opacity = 1,
                     LoadFolderGlyph = true,
                     FileImage = null,
                     LoadFileIcon = false,
@@ -1756,6 +1766,8 @@ public async Task AddFileAsync(StorageFile file, string dateReturnFormat, bool s
                 {
                     PrimaryItemAttribute = StorageItemTypes.File,
                     FileExtension = itemFileExtension,
+                    IsHiddenItem = false,
+                    Opacity = 1,
                     LoadUnknownTypeGlyph = itemEmptyImgVis,
                     FileImage = icon,
                     LoadFileIcon = itemThumbnailImgVis,