Skip to content

Improved performance of the delete confirmation dialog #8041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2022
Merged

Improved performance of the delete confirmation dialog #8041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 30 additions & 15 deletions src/Files.Launcher/MessageHandlers/FileOperationsHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,12 @@ await Win32API.StartSTATask(() =>
var operation = (DataPackageOperation)(long)message["operation"];
var fileList = new System.Collections.Specialized.StringCollection();
fileList.AddRange(fileToCopy.Split('|'));
if (operation == DataPackageOperation.Copy)
{
System.Windows.Forms.Clipboard.SetFileDropList(fileList);
}
else if (operation == DataPackageOperation.Move)
{
byte[] moveEffect = new byte[] { 2, 0, 0, 0 };
MemoryStream dropEffect = new MemoryStream();
dropEffect.Write(moveEffect, 0, moveEffect.Length);
var data = new System.Windows.Forms.DataObject();
data.SetFileDropList(fileList);
data.SetData("Preferred DropEffect", dropEffect);
System.Windows.Forms.Clipboard.SetDataObject(data, true);
}
MemoryStream dropEffect = new MemoryStream(operation == DataPackageOperation.Copy ?
new byte[] { 5, 0, 0, 0 } : new byte[] { 2, 0, 0, 0 });
var data = new System.Windows.Forms.DataObject();
data.SetFileDropList(fileList);
data.SetData("Preferred DropEffect", dropEffect);
System.Windows.Forms.Clipboard.SetDataObject(data, true);
return true;
});
break;
Expand Down Expand Up @@ -233,7 +225,8 @@ await Win32API.StartSTATask(() =>
if (!Extensions.IgnoreExceptions(() =>
{
using var shi = new ShellItem(fileToDeletePath[i]);
op.QueueDeleteOperation(shi);
var file = Extensions.IgnoreExceptions(() => GetFirstFile(shi)) ?? shi;
op.QueueDeleteOperation(file);
}))
{
shellOperationResult.Items.Add(new ShellOperationItemResult()
Expand Down Expand Up @@ -821,6 +814,28 @@ await Win32API.StartSTATask(() =>
}
}

private ShellItem GetFirstFile(ShellItem shi)
{
if (!shi.IsFolder || shi.Attributes.HasFlag(ShellItemAttribute.Stream))
{
return shi;
}
using var shf = new ShellFolder(shi);
if (shf.FirstOrDefault(x => !x.IsFolder || x.Attributes.HasFlag(ShellItemAttribute.Stream)) is ShellItem item)
{
return item;
}
foreach (var shsfi in shf.Where(x => x.IsFolder && !x.Attributes.HasFlag(ShellItemAttribute.Stream)))
{
using var shsf = new ShellFolder(shsfi);
if (GetFirstFile(shsf) is ShellItem item2)
{
return item2;
}
}
return null;
}

public void WaitForCompletion()
{
progressHandler.WaitForCompletion();
Expand Down