Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

CmdPal: init Details in a slow pass; add more winget logs (#41425)

Browse Source 
Related to #41384

We should load the `IDetails` from a `IListItem` in the slow pass,
instead of immediately when we load the list of items.

see also #39215

Also adds a lot of logging on our side, which helped ID that it isn't
our fault that the winget APIs are returning slowly. That's tracked
upstream (somewhere)
This commit is contained in:
Mike Griese
2025-09-02 06:20:56 -05:00
committed by GitHub
parent 95b19739f6
commit 7fb2ff5119
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
View File

@@ -160,7 +160,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
Initialized |= InitializedState.Initialized; Initialized |= InitializedState.Initialized;
} }
public void SlowInitializeProperties() public virtual void SlowInitializeProperties()
{ {
if (IsSelectedInitialized) if (IsSelectedInitialized)
{ {

18
src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
View File

@@ -47,9 +47,21 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
UpdateTags(li.Tags); UpdateTags(li.Tags);
TextToSuggest = li.TextToSuggest;
Section = li.Section ?? string.Empty; Section = li.Section ?? string.Empty;
var extensionDetails = li.Details;
UpdateProperty(nameof(Section));
}
public override void SlowInitializeProperties()
{
base.SlowInitializeProperties();
var model = Model.Unsafe;
if (model is null)
{
return;
}
var extensionDetails = model.Details;
if (extensionDetails is not null) if (extensionDetails is not null)
{ {
Details = new(extensionDetails, PageContext); Details = new(extensionDetails, PageContext);
@@ -58,8 +70,8 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
UpdateProperty(nameof(HasDetails)); UpdateProperty(nameof(HasDetails));
} }
TextToSuggest = model.TextToSuggest;
UpdateProperty(nameof(TextToSuggest)); UpdateProperty(nameof(TextToSuggest));
UpdateProperty(nameof(Section));
} }
protected override void FetchProperty(string propertyName) protected override void FetchProperty(string propertyName)

12
src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
View File

@@ -65,6 +65,7 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
if (_results is not null && _results.Count != 0) if (_results is not null && _results.Count != 0)
{ {
var stopwatch = Stopwatch.StartNew();
var count = _results.Count; var count = _results.Count;
var results = new ListItem[count]; var results = new ListItem[count];
var next = 0; var next = 0;
@@ -82,6 +83,8 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
} }
} }
stopwatch.Stop();
Logger.LogDebug($"Building ListItems took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(GetItems));
IsLoading = false; IsLoading = false;
return results; return results;
} }
@@ -244,15 +247,22 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
// foreach (var catalog in connections) // foreach (var catalog in connections)
{ {
Stopwatch findPackages_stopwatch = new();
findPackages_stopwatch.Start();
Logger.LogDebug($" Searching {catalog.Info.Name} ({query})", memberName: nameof(DoSearchAsync)); Logger.LogDebug($" Searching {catalog.Info.Name} ({query})", memberName: nameof(DoSearchAsync));
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
Logger.LogDebug($"Preface for \"{searchDebugText}\" took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(DoSearchAsync));
// BODGY, re: microsoft/winget-cli#5151 // BODGY, re: microsoft/winget-cli#5151
// FindPackagesAsync isn't actually async. // FindPackagesAsync isn't actually async.
var internalSearchTask = Task.Run(() => catalog.FindPackages(opts), ct); var internalSearchTask = Task.Run(() => catalog.FindPackages(opts), ct);
var searchResults = await internalSearchTask; var searchResults = await internalSearchTask;
findPackages_stopwatch.Stop();
Logger.LogDebug($"FindPackages for \"{searchDebugText}\" took {findPackages_stopwatch.ElapsedMilliseconds}ms", memberName: nameof(DoSearchAsync));
// TODO more error handling like this: // TODO more error handling like this:
if (searchResults.Status != FindPackagesResultStatus.Ok) if (searchResults.Status != FindPackagesResultStatus.Ok)
{ {
@@ -261,6 +271,8 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
return []; return [];
} }
ct.ThrowIfCancellationRequested();
Logger.LogDebug($" got results for ({query})", memberName: nameof(DoSearchAsync)); Logger.LogDebug($" got results for ({query})", memberName: nameof(DoSearchAsync));
// FYI Using .ToArray or any other kind of enumerable loop // FYI Using .ToArray or any other kind of enumerable loop