Skip to content

Fix: Keep folder metadata reads from blocking the UI #19014

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

Open
nietus wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −11
Open

Fix: Keep folder metadata reads from blocking the UI #19014

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
23 changes: 12 additions & 11 deletions src/Files.App/ViewModels/ShellViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2494,12 +2494,7 @@ await Task.Run(async () =>
// after the final list update, which would delay load completion and watcher setup.
// The desktop.ini task is awaited before applying the adaptive layout, which reads DesktopIni.
_ = dispatcherQueue.EnqueueOrInvokeAsync(CheckForSolutionFile, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
desktopIniUpdateTask = dispatcherQueue.EnqueueOrInvokeAsync(() =>
{
GetDesktopIniFileData();
CheckForBackgroundImage();
},
Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
desktopIniUpdateTask = UpdateDesktopIniAsync(path, cancellationToken);
});

// Cache the resolved folder so the post-enum switch reuses it.
Expand Down Expand Up @@ -2584,12 +2579,18 @@ private void CheckForSolutionFile()
.FirstOrDefault()?.ItemPath;
}

private void GetDesktopIniFileData()
private async Task UpdateDesktopIniAsync(string directoryPath, CancellationToken cancellationToken)
{
var workingDirectory = WorkingDirectory
?? throw new InvalidOperationException("The working directory has not been initialized.");
var path = Path.Combine(workingDirectory, "desktop.ini");
DesktopIni = WindowsIniService.GetData(path);
// File.Exists and ReadLines can wait for the SMB timeout on an unavailable share.
var data = await Task.Run(() => WindowsIniService.GetData(Path.Combine(directoryPath, "desktop.ini")));
await dispatcherQueue.EnqueueOrInvokeAsync(() =>
{
if (cancellationToken.IsCancellationRequested || WorkingDirectory != directoryPath)
return;

DesktopIni = data;
CheckForBackgroundImage();
}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
}

public void CheckForBackgroundImage()
Expand Down