Skip to content

Recyclebin improvements #1137

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
yaira2 merged 9 commits into from
Jun 26, 2020
Merged

Recyclebin improvements #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d3dc62
Updated Vanara library
gave92 Jun 18, 2020
3df608f
Merge master
gave92 Jun 24, 2020
89965a6
Show foldersize in recyclebin properties
gave92 Jun 24, 2020
2e39a03
Code improvements
gave92 Jun 24, 2020
2dda708
Prettify code
gave92 Jun 24, 2020
3085721
May fix nummpoiterexception
gave92 Jun 25, 2020
766d8e1
Small chages
gave92 Jun 25, 2020
ad195ad
Trim spaces
tsvietOK Jun 25, 2020
1c4eeb7
Merge branch 'master' into pr/1137
yaira2 Jun 26, 2020
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
6 changes: 4 additions & 2 deletions Common/ShellFileItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ public class ShellFileItem
public string FilePath;
public DateTime RecycleDate;
public string FileSize;
public long FileSizeBytes;
public ulong FileSizeBytes;
public string FileType;

public ShellFileItem()
{
}

public ShellFileItem(bool isFolder, string recyclePath, string fileName, string filePath, DateTime recycleDate, string fileSize, long fileSizeBytes, string fileType)
public ShellFileItem(
bool isFolder, string recyclePath, string fileName, string filePath,
DateTime recycleDate, string fileSize, ulong fileSizeBytes, string fileType)
{
this.IsFolder = isFolder;
this.RecyclePath = recyclePath;
Expand Down
118 changes: 76 additions & 42 deletions Files.Launcher/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Files.Common;
using Newtonsoft.Json;
using NLog;
using System;
using System.Collections.Generic;
using System.ComponentModel;
Expand All @@ -15,6 +14,7 @@
using Windows.ApplicationModel.AppService;
using Windows.Foundation.Collections;
using Windows.Storage;
using static Vanara.PInvoke.Shell32;

namespace FilesFullTrust
{
Expand All @@ -25,7 +25,7 @@ internal class Program
[STAThread]
private static void Main(string[] args)
{
Windows.Storage.StorageFolder storageFolder = Windows.Storage.ApplicationData.Current.LocalFolder;
StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
NLog.LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "NLog.config"));
NLog.LogManager.Configuration.Variables["LogPath"] = storageFolder.Path;

Expand All @@ -45,14 +45,31 @@ private static void Main(string[] args)
try
{
// Create shell COM object and get recycle bin folder
recycler = new ShellFolder(Vanara.PInvoke.Shell32.KNOWNFOLDERID.FOLDERID_RecycleBinFolder);
Windows.Storage.ApplicationData.Current.LocalSettings.Values["RecycleBin_Title"] = recycler.Name;

// Create shell watcher to monitor recycle bin folder
watcher = new ShellItemChangeWatcher(recycler, false);
watcher.NotifyFilter = ChangeFilters.AllDiskEvents;
watcher.Changed += Watcher_Changed;
//watcher.EnableRaisingEvents = true; // TODO: uncomment this when updated library is released
recycler = new ShellFolder(KNOWNFOLDERID.FOLDERID_RecycleBinFolder);
ApplicationData.Current.LocalSettings.Values["RecycleBin_Title"] = recycler.Name;

// Create filesystem watcher to monitor recycle bin folder(s)
// SHChangeNotifyRegister only works if recycle bin is open in explorer :(
watchers = new List<FileSystemWatcher>();
var sid = System.Security.Principal.WindowsIdentity.GetCurrent().User.ToString();
foreach (var drive in DriveInfo.GetDrives())
{
var recycle_path = Path.Combine(drive.Name, "$Recycle.Bin", sid);
if (!Directory.Exists(recycle_path))
{
continue;
}
var watcher = new FileSystemWatcher();
watcher.Path = recycle_path;
watcher.Filter = "*.*";
watcher.NotifyFilter = NotifyFilters.LastWrite
| NotifyFilters.FileName
| NotifyFilters.DirectoryName;
watcher.Created += Watcher_Changed;
watcher.Deleted += Watcher_Changed;
watcher.EnableRaisingEvents = true;
watchers.Add(watcher);
}

// Connect to app service and wait until the connection gets closed
appServiceExit = new AutoResetEvent(false);
Expand All @@ -62,7 +79,10 @@ private static void Main(string[] args)
finally
{
connection?.Dispose();
watcher?.Dispose();
foreach (var watcher in watchers)
{
watcher.Dispose();
}
recycler?.Dispose();
appServiceExit?.Dispose();
mutex?.ReleaseMutex();
Expand All @@ -75,20 +95,24 @@ private static void UnhandledExceptionTrapper(object sender, UnhandledExceptionE
Logger.Error(exception, exception.Message);
}

private static async void Watcher_Changed(object sender, ShellItemChangeWatcher.ShellItemChangeEventArgs e)
private static async void Watcher_Changed(object sender, FileSystemEventArgs e)
{
Console.WriteLine($"File: {e.ChangedItems.FirstOrDefault()?.FileSystemPath} {e.ChangeType}");
Debug.WriteLine("Reycle bin event: {0}, {1}", e.ChangeType, e.FullPath);
if (connection != null)
{
// Send message to UWP app to refresh items
await connection.SendMessageAsync(new ValueSet() { { "FileSystem", @"Shell:RecycleBinFolder" }, { "Path", e.ChangedItems.FirstOrDefault()?.FileSystemPath }, { "Type", e.ChangeType.ToString() } });
await connection.SendMessageAsync(new ValueSet() {
{ "FileSystem", @"Shell:RecycleBinFolder" },
{ "Path", e.FullPath },
{ "Type", e.ChangeType.ToString() }
});
}
}

private static AppServiceConnection connection;
private static AutoResetEvent appServiceExit;
private static ShellFolder recycler;
private static ShellItemChangeWatcher watcher;
private static IList<FileSystemWatcher> watchers;

private static async void InitializeAppServiceConnection()
{
Expand Down Expand Up @@ -126,7 +150,7 @@ private static async void Connection_RequestReceived(AppServiceConnection sender
// Instead a single instance of the process is running
// Requests from UWP app are sent via AppService connection
var arguments = (string)args.Request.Message["Arguments"];
var localSettings = Windows.Storage.ApplicationData.Current.LocalSettings;
var localSettings = ApplicationData.Current.LocalSettings;
Logger.Info($"Argument: {arguments}");

await parseArguments(args, messageDeferral, arguments, localSettings);
Expand Down Expand Up @@ -180,8 +204,8 @@ private static async Task parseArguments(AppServiceRequestReceivedEventArgs args
#if DEBUG
// In debug mode this kills this process too??
#else
var pid = (int)args.Request.Message["pid"];
Process.GetProcessById(pid).Kill();
var pid = (int)args.Request.Message["pid"];
Process.GetProcessById(pid).Kill();
#endif

Process process = new Process();
Expand All @@ -201,7 +225,7 @@ private static async Task parseArguments(AppServiceRequestReceivedEventArgs args
case "ParseAguments":
var responseArray = new ValueSet();
var resultArgument = Win32API.CommandLineToArgs((string)args.Request.Message["Command"]);
responseArray.Add("ParsedArguments", Newtonsoft.Json.JsonConvert.SerializeObject(resultArgument));
responseArray.Add("ParsedArguments", JsonConvert.SerializeObject(resultArgument));
await args.Request.SendResponseAsync(responseArray);
break;

Expand Down Expand Up @@ -236,23 +260,27 @@ private static async Task parseRecycleBinAction(AppServiceRequestReceivedEventAr
{
case "Empty":
// Shell function to empty recyclebin
Vanara.PInvoke.Shell32.SHEmptyRecycleBin(IntPtr.Zero, null, Vanara.PInvoke.Shell32.SHERB.SHERB_NOCONFIRMATION | Vanara.PInvoke.Shell32.SHERB.SHERB_NOPROGRESSUI);
SHEmptyRecycleBin(IntPtr.Zero, null, SHERB.SHERB_NOCONFIRMATION | SHERB.SHERB_NOPROGRESSUI);
break;

case "Query":
var responseQuery = new ValueSet();
Win32API.SHQUERYRBINFO queryBinInfo = new Win32API.SHQUERYRBINFO();
queryBinInfo.cbSize = (uint)Marshal.SizeOf(typeof(Win32API.SHQUERYRBINFO));
var res = Win32API.SHQueryRecycleBin("", ref queryBinInfo);
// TODO: use this when updated library is released
//Vanara.PInvoke.Shell32.SHQUERYRBINFO queryBinInfo = new Vanara.PInvoke.Shell32.SHQUERYRBINFO();
//Vanara.PInvoke.Shell32.SHQueryRecycleBin(null, ref queryBinInfo);
SHQUERYRBINFO queryBinInfo = new SHQUERYRBINFO();
queryBinInfo.cbSize = (uint)Marshal.SizeOf(queryBinInfo);
var res = SHQueryRecycleBin(null, ref queryBinInfo);
if (res == Vanara.PInvoke.HRESULT.S_OK)
{
var numItems = queryBinInfo.i64NumItems;
var binSize = queryBinInfo.i64Size;
responseQuery.Add("NumItems", numItems);
responseQuery.Add("BinSize", binSize);
responseQuery.Add("FileOwner", (string)recycler.Properties[Vanara.PInvoke.Ole32.PROPERTYKEY.System.FileOwner]);
if (watchers.Any())
{
var info = new DirectoryInfo(watchers.First().Path);
responseQuery.Add("DateAccessed", info.LastAccessTime.ToBinary());
responseQuery.Add("DateCreated", info.CreationTime.ToBinary());
}
await args.Request.SendResponseAsync(responseQuery);
}
break;
Expand All @@ -265,20 +293,26 @@ private static async Task parseRecycleBinAction(AppServiceRequestReceivedEventAr
{
try
{
folderItem.Properties.ReadOnly = true;
folderItem.Properties.NoInheritedProperties = false;
string recyclePath = folderItem.FileSystemPath; // True path on disk
string fileName = Path.GetFileName(folderItem.Name); // Original file name
string filePath = folderItem.Name; // Original file path + name
var dt = (System.Runtime.InteropServices.ComTypes.FILETIME)folderItem.Properties[Vanara.PInvoke.Ole32.PROPERTYKEY.System.DateCreated];
var recycleDate = dt.ToDateTime().ToLocalTime(); // This is LocalTime
string fileSize = folderItem.Properties.GetPropertyString(Vanara.PInvoke.Ole32.PROPERTYKEY.System.Size);
long fileSizeBytes = (long)folderItem.Properties[Vanara.PInvoke.Ole32.PROPERTYKEY.System.Size];
string fileType = (string)folderItem.Properties[Vanara.PInvoke.Ole32.PROPERTYKEY.System.ItemTypeText];
bool isFolder = folderItem.IsFolder && Path.GetExtension(folderItem.Name) != ".zip";
folderContentsList.Add(new ShellFileItem(isFolder, recyclePath, fileName, filePath, recycleDate, fileSize, fileSizeBytes, fileType));
if (folderItem.Properties == null)
{
folderContentsList.Add(new ShellFileItem(isFolder, recyclePath, fileName, filePath, DateTime.Now, null, 0, null));
continue;
}
folderItem.Properties.TryGetValue<System.Runtime.InteropServices.ComTypes.FILETIME?>(
Vanara.PInvoke.Ole32.PROPERTYKEY.System.DateCreated, out var fileTime);
var recycleDate = fileTime?.ToDateTime().ToLocalTime() ?? DateTime.Now; // This is LocalTime
string fileSize = folderItem.Properties.TryGetValue<ulong?>(
Vanara.PInvoke.Ole32.PROPERTYKEY.System.Size, out var fileSizeBytes) ?
folderItem.Properties.GetPropertyString(Vanara.PInvoke.Ole32.PROPERTYKEY.System.Size) : null;
folderItem.Properties.TryGetValue<string>(
Vanara.PInvoke.Ole32.PROPERTYKEY.System.ItemTypeText, out var fileType);
folderContentsList.Add(new ShellFileItem(isFolder, recyclePath, fileName, filePath, recycleDate, fileSize, fileSizeBytes ?? 0, fileType));
}
catch (System.IO.FileNotFoundException)
catch (FileNotFoundException)
{
// Happens if files are being deleted
}
Expand All @@ -287,7 +321,7 @@ private static async Task parseRecycleBinAction(AppServiceRequestReceivedEventAr
folderItem.Dispose();
}
}
responseEnum.Add("Enumerate", Newtonsoft.Json.JsonConvert.SerializeObject(folderContentsList));
responseEnum.Add("Enumerate", JsonConvert.SerializeObject(folderContentsList));
await args.Request.SendResponseAsync(responseEnum);
break;

Expand Down Expand Up @@ -377,13 +411,13 @@ private static void HandleApplicationLaunch(string application, AppServiceReques
if (!group.Any()) continue;
var files = group.Select(x => new ShellItem(x));
using var sf = files.First().Parent;
Vanara.PInvoke.Shell32.IContextMenu menu = null;
IContextMenu menu = null;
try
{
menu = sf.GetChildrenUIObjects<Vanara.PInvoke.Shell32.IContextMenu>(null, files.ToArray());
menu.QueryContextMenu(Vanara.PInvoke.HMENU.NULL, 0, 0, 0, Vanara.PInvoke.Shell32.CMF.CMF_DEFAULTONLY);
var pici = new Vanara.PInvoke.Shell32.CMINVOKECOMMANDINFOEX();
pici.lpVerb = Vanara.PInvoke.Shell32.CMDSTR_OPEN;
menu = sf.GetChildrenUIObjects<IContextMenu>(null, files.ToArray());
menu.QueryContextMenu(Vanara.PInvoke.HMENU.NULL, 0, 0, 0, CMF.CMF_DEFAULTONLY);
var pici = new CMINVOKECOMMANDINFOEX();
pici.lpVerb = CMDSTR_OPEN;
pici.nShow = Vanara.PInvoke.ShowWindowCommand.SW_SHOW;
pici.cbSize = (uint)Marshal.SizeOf(pici);
menu.InvokeCommand(pici);
Expand Down Expand Up @@ -412,7 +446,7 @@ private static void HandleApplicationLaunch(string application, AppServiceReques

private static bool HandleCommandLineArgs()
{
var localSettings = Windows.Storage.ApplicationData.Current.LocalSettings;
var localSettings = ApplicationData.Current.LocalSettings;
var arguments = (string)localSettings.Values["Arguments"];
if (!string.IsNullOrWhiteSpace(arguments))
{
Expand Down
34 changes: 21 additions & 13 deletions Files.Launcher/Win32API.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,43 @@
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Vanara.Windows.Shell;

namespace FilesFullTrust
{
internal class Win32API
{
// TODO: remove this when updated library is released
[DllImport("shell32.dll")]
public static extern Vanara.PInvoke.HRESULT SHQueryRecycleBin(string pszRootPath, ref SHQUERYRBINFO pSHQueryRBInfo);

// TODO: remove this when updated library is released
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto, Pack = 4)]
public struct SHQUERYRBINFO
public static Task<T> StartSTATask<T>(Func<T> func)
{
public uint cbSize;
public long i64Size;
public long i64NumItems;
var tcs = new TaskCompletionSource<T>();
Thread thread = new Thread(() =>
{
try
{
tcs.SetResult(func());
}
catch (Exception e)
{
tcs.SetException(e);
}
});
thread.SetApartmentState(ApartmentState.STA);
thread.Start();
return tcs.Task;
}

[DllImport("shell32.dll", CharSet = CharSet.Ansi)]
public static extern IntPtr FindExecutable(string lpFile, string lpDirectory, [Out] System.Text.StringBuilder lpResult);
public static extern IntPtr FindExecutable(string lpFile, string lpDirectory, [Out] StringBuilder lpResult);

public static async System.Threading.Tasks.Task<string> GetFileAssociation(string filename)
public static async Task<string> GetFileAssociation(string filename)
{
// Find UWP apps
var uwp_apps = await Windows.System.Launcher.FindFileHandlersAsync(System.IO.Path.GetExtension(filename));
if (uwp_apps.Any()) return uwp_apps.First().PackageFamilyName;
// Find desktop apps
var lpResult = new System.Text.StringBuilder();
var lpResult = new StringBuilder();
var hResult = FindExecutable(filename, null, lpResult);
if (hResult.ToInt64() > 32) return lpResult.ToString();
return null;
Expand Down
18 changes: 1 addition & 17 deletions Files/BaseLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,23 +320,7 @@ private async void MenuLayoutItem_Click(object sender, RoutedEventArgs e)
}
}

public void RightClickContextMenu_Opening(object sender, object e)
{
if (App.CurrentInstance.FilesystemViewModel.WorkingDirectory.StartsWith(AppSettings.RecycleBinPath))
{
(this.FindName("EmptyRecycleBin") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
(this.FindName("OpenTerminal") as MenuFlyoutItemBase).IsEnabled = false;
UnloadMenuFlyoutItemByName("NewEmptySpace");
}
else
{
UnloadMenuFlyoutItemByName("EmptyRecycleBin");
(this.FindName("OpenTerminal") as MenuFlyoutItemBase).IsEnabled = true;
(this.FindName("NewEmptySpace") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
}
}

public async void RightClickItemContextMenu_Opening(object sender, object e)
public void RightClickItemContextMenu_Opening(object sender, object e)
{

SetShellContextmenu();
Expand Down
Loading