Update WindowsRecentItemsService.cs

Author: 0x5bfa

src/Files.App/Services/Windows/WindowsRecentItemsService.cs

@@ -76,7 +76,7 @@ public async Task<bool> UpdateRecentFilesAsync()
 		{
 			return await Task.Run(() =>
 			{
-				return UpdateRecentFilesInternal();
+				return UpdateRecentItems(false);
 			});
 		}
 
@@ -85,7 +85,7 @@ public async Task<bool> UpdateRecentFoldersAsync()
 		{
 			return await Task.Run(() =>
 			{
-				return false;
+				return UpdateRecentItems(true);
 			});
 		}
 
@@ -109,7 +109,7 @@ public unsafe bool Add(string path)
 		/// <inheritdoc/>
 		public unsafe bool Remove(RecentItem item)
 		{
-			return false; // TODO: Use IShellFileOperation interface
+			return false; // TODO: Use ContextMenu class to invoke "delete" verb
 		}
 
 		/// <inheritdoc/>
@@ -131,47 +131,51 @@ public unsafe bool Clear()
 		/// <inheritdoc/>
 		public bool CheckIsRecentItemsEnabled()
 		{
-			using var subkey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer");
+			using var explorerSubKey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer");
 			using var advSubkey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced");
 			using var userPolicySubkey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer");
 			using var sysPolicySubkey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer");
 
-			if (subkey is not null)
+			if (explorerSubKey is not null)
 			{
-				// File Explorer settings
-				bool showRecentValue = Convert.ToBoolean(subkey.GetValue("ShowRecent", true)); // 1 by default
+				// File Explorer settings (default: 1)
+				bool showRecentValue = Convert.ToBoolean(explorerSubKey.GetValue("ShowRecent", true));
 				if (!showRecentValue)
 					return false;
 			}
 
 			if (advSubkey is not null)
 			{
-				// Windows Settings
-				bool startTrackDocsValue = Convert.ToBoolean(advSubkey.GetValue("Start_TrackDocs", true)); // 1 by default
+				// Windows Settings (default: 1)
+				bool startTrackDocsValue = Convert.ToBoolean(advSubkey.GetValue("Start_TrackDocs", true));
 				if (!startTrackDocsValue)
 					return false;
 			}
 
-			// Group policy settings
+			// Group Policy settings (default: 0)
 			var policySubkey = userPolicySubkey ?? sysPolicySubkey;
 			if (policySubkey is not null)
 			{
-				bool noRecentDocsHistoryValue = Convert.ToBoolean(policySubkey.GetValue("NoRecentDocsHistory", false)); // 0 by default
+				bool noRecentDocsHistoryValue = Convert.ToBoolean(policySubkey.GetValue("NoRecentDocsHistory", false));
 				if (noRecentDocsHistoryValue)
 					return false;
 			}
 
 			return true;
 		}
 
-		private unsafe bool UpdateRecentFilesInternal()
+		private unsafe bool UpdateRecentItems(bool isFolder)
 		{
 			try
 			{
 				HRESULT hr = default;
 
-				// Get IShellItem of the quick access shell folder
-				string szFolderShellPath = "Shell:::{679f85cb-0220-4080-b29b-5540cc05aab6}";
+				string szFolderShellPath =
+					isFolder
+						? "Shell:::{22877a6d-37a1-461a-91b0-dbda5aaebc99}"  // Recent Places folder
+						: "Shell:::{679f85cb-0220-4080-b29b-5540cc05aab6}"; // Quick Access folder
+
+				// Get IShellItem of the shell folder
 				var shellItemIid = typeof(IShellItem).GUID;
 				using ComPtr<IShellItem> pFolderShellItem = default;
 				fixed (char* pszFolderShellPath = szFolderShellPath)
@@ -194,15 +198,14 @@ private unsafe bool UpdateRecentFilesInternal()
 						break;
 
 					// Get the target path
-					pShellItem.Get()->GetDisplayName(SIGDN.SIGDN_DESKTOPABSOLUTEEDITING, out var szTargetItemPath);
-					if (szTargetItemPath.Value == null)
-						pShellItem.Get()->GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out szTargetItemPath);
-					var targetPath = szTargetItemPath.ToString();
-					PInvoke.CoTaskMemFree((void*)szTargetItemPath.Value);
+					pShellItem.Get()->GetDisplayName(SIGDN.SIGDN_DESKTOPABSOLUTEEDITING, out var szDisplayName);
+					var targetPath = szDisplayName.ToString();
+					PInvoke.CoTaskMemFree((void*)szDisplayName.Value);
 
 					// Get the display name
-					var fileName = GetPropertyKey(pShellItem.Get(), "System.ItemNameDisplay"); 
-					// TODO: Probably should try also SIGDN_NORMALDISPLAY and then SIGDN_PARENTRELATIVEPARSING too?
+					pShellItem.Get()->GetDisplayName(SIGDN.SIGDN_NORMALDISPLAY, out szDisplayName);
+					var fileName = szDisplayName.ToString();
+					PInvoke.CoTaskMemFree((void*)szDisplayName.Value);
 
 					// Strip the file extension except when the file name only contains extension (e.g. ".gitignore")
 					if (!FoldersSettingsService.ShowFileExtensions)
@@ -211,6 +214,8 @@ private unsafe bool UpdateRecentFilesInternal()
 						fileName = string.IsNullOrEmpty(strippedExtension) ? SystemIO.Path.GetFileName(fileName) : strippedExtension;
 					}
 
+					// TODO: Get PIDL to prepare for removal of the item via "delete" verb for now
+
 					recentItems.Add(new()
 					{
 						Path = targetPath,
@@ -223,34 +228,40 @@ private unsafe bool UpdateRecentFilesInternal()
 				if (recentItems.Count is 0)
 					return false;
 
-				var snapshot = RecentFiles;
+				// TODO: Sort by last modified
 
-				lock (_RecentFiles)
+				var snapshot = isFolder ? RecentFolders : RecentFiles;
+
+				if (isFolder)
+				{
+					lock (_RecentFolders)
+					{
+						_RecentFolders.Clear();
+						_RecentFolders.AddRange(recentItems);
+					}				
+				}
+				else
 				{
-					_RecentFiles.Clear();
-					_RecentFiles.AddRange(recentItems);
+					lock (_RecentFiles)
+					{
+						_RecentFiles.Clear();
+						_RecentFiles.AddRange(recentItems);
+					}				
 				}
 
 				var eventArgs = GetChangedActionEventArgs(snapshot, recentItems);
-				RecentFilesChanged?.Invoke(this, eventArgs);
+
+				if (isFolder)
+ 					RecentFoldersChanged?.Invoke(this, eventArgs);
+				else
+ 					RecentFilesChanged?.Invoke(this, eventArgs);
 
 				return true;
 			}
 			catch
 			{
 				return false;
 			}
-
-			unsafe static string GetPropertyKey(IShellItem* pShellItem, string propertyKeyName)
-			{
-				var shellItem2Iid = typeof(IShellItem2).GUID;
-				using ComPtr<IShellItem2> pShellItem2 = default;
-				pShellItem->QueryInterface(&shellItem2Iid, (void**)pShellItem2.GetAddressOf());
-				PInvoke.PSGetPropertyKeyFromName(propertyKeyName, out var propertyKey);
-				pShellItem2.Get()->GetString(propertyKey, out var szPropertyValue);
-
-				return szPropertyValue.ToString();
-			}
 		}
 
 		private void Watcher_Changed(object sender, SystemIO.FileSystemEventArgs e)