Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,13 @@ var nativePackage in TaskRecycler<IReadOnlyList<CatalogPackage>>.RunOrAttach(
)
)
{
if (nativePackage.IsUpdateAvailable)
try
{
if (!nativePackage.IsUpdateAvailable)
{
continue;
}

IManagerSource source;
source = Manager.SourcesHelper.Factory.GetSourceOrDefault(
nativePackage.DefaultInstallVersion.PackageCatalog.Info.Name
Expand Down Expand Up @@ -311,6 +316,10 @@ var nativePackage in TaskRecycler<IReadOnlyList<CatalogPackage>>.RunOrAttach(
);
}
}
catch (Exception ex)
{
LogSkippedPackage(logger, nativePackage, "listing available updates", ex);
}
}

logger.Close(0);
Expand All @@ -328,41 +337,92 @@ var nativePackage in TaskRecycler<IReadOnlyList<CatalogPackage>>.RunOrAttach(
)
)
{
IManagerSource source;
var availableVersions = nativePackage.AvailableVersions?.ToArray() ?? [];
if (availableVersions.Length > 0)
try
{
var installPackage = nativePackage.GetPackageVersionInfo(availableVersions[0]);
source = Manager.SourcesHelper.Factory.GetSourceOrDefault(
installPackage.PackageCatalog.Info.Name
IManagerSource source;
var availableVersions = nativePackage.AvailableVersions?.ToArray() ?? [];
if (availableVersions.Length > 0)
{
var installPackage = nativePackage.GetPackageVersionInfo(availableVersions[0]);
source = Manager.SourcesHelper.Factory.GetSourceOrDefault(
installPackage.PackageCatalog.Info.Name
);
}
else
{
source = Manager.GetLocalSource(nativePackage.Id);
}

string version = nativePackage.InstalledVersion.Version;
if (version == "Unknown")
version = WinGetPkgOperationHelper.GetLastInstalledVersion(nativePackage.Id);

logger.Log(
$"Found package {nativePackage.Name} {nativePackage.Id} on source {source.Name}"
);
var UniGetUIPackage = new Package(
nativePackage.Name,
nativePackage.Id,
version,
source,
Manager
);
NativePackageHandler.AddPackage(UniGetUIPackage, nativePackage);
packages.Add(UniGetUIPackage);
}
else
catch (Exception ex)
{
source = Manager.GetLocalSource(nativePackage.Id);
LogSkippedPackage(logger, nativePackage, "listing installed packages", ex);
}

string version = nativePackage.InstalledVersion.Version;
if (version == "Unknown")
version = WinGetPkgOperationHelper.GetLastInstalledVersion(nativePackage.Id);

logger.Log(
$"Found package {nativePackage.Name} {nativePackage.Id} on source {source.Name}"
);
var UniGetUIPackage = new Package(
nativePackage.Name,
nativePackage.Id,
version,
source,
Manager
);
NativePackageHandler.AddPackage(UniGetUIPackage, nativePackage);
packages.Add(UniGetUIPackage);
}
logger.Close(0);
return packages;
}

private static void LogSkippedPackage(
INativeTaskLogger logger,
CatalogPackage nativePackage,
string operation,
Exception ex
)
{
string packageDescription = DescribePackage(nativePackage);
logger.Error($"Skipping WinGet package while {operation}: {packageDescription}");
logger.Error(ex);
Logger.Warn(
$"Skipping WinGet package while {operation}: {packageDescription}. {ex.GetType().Name}: {ex.Message}"
);
}

private static string DescribePackage(CatalogPackage nativePackage)
{
try
{
string id = nativePackage.Id;
if (!string.IsNullOrWhiteSpace(id))
{
return id;
}
}
catch
{
}

try
{
string name = nativePackage.Name;
if (!string.IsNullOrWhiteSpace(name))
{
return name;
}
}
catch
{
}

return "<unknown package>";
}

private IReadOnlyList<CatalogPackage> GetLocalWinGetPackages()
{
var logger = Manager.TaskLogger.CreateNew(LoggableTaskType.OtherTask);
Expand Down
2 changes: 1 addition & 1 deletion src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ protected override IReadOnlyList<Package> GetInstalledPackages_UnSafe()
try
{
var packages = WinGetHelper.Instance.GetInstalledPackages_UnSafe();
NO_PACKAGES_HAVE_BEEN_LOADED = !packages.Any();
NO_PACKAGES_HAVE_BEEN_LOADED = false;
return packages;
}
catch (Exception)
Expand Down
3 changes: 2 additions & 1 deletion src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ protected override void WhenPackagesLoaded(ReloadReason reason)
}

if (
WinGet.NO_PACKAGES_HAVE_BEEN_LOADED /* && !Settings.Get(Settings.K.DisableWinGetMalfunctionDetector)*/
WinGet.NO_PACKAGES_HAVE_BEEN_LOADED
&& !Settings.Get(Settings.K.DisableWinGetMalfunctionDetector)
)
{
var infoBar = MainApp.Instance.MainWindow.WinGetWarningBanner;
Expand Down
Loading