Handle winget "Unknown" version packages

marticliment · Feb 25, 2024 · 1cc3a85 · 1cc3a85
1 parent 2c7eb4f
commit 1cc3a85
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/wingetui-interface/PackageEngine/Classes/Package.cs b/src/wingetui-interface/PackageEngine/Classes/Package.cs
@@ -45,7 +45,7 @@ public class Package : INotifyPropertyChanged
         public ManagerSource Source { get; set; }
         public PackageManager Manager { get; }
         public string UniqueId { get; }
-        public string NewVersion { get; }
+        public string NewVersion { get; set;  }
         public virtual bool IsUpgradable { get; } = false;
         public PackageScope Scope { get; set; }
         public string SourceAsString
@@ -238,7 +238,6 @@ protected void OnPropertyChanged([CallerMemberName] string name = null)
     public class UpgradablePackage : Package
     {
         // Public properties
-        public new string NewVersion { get; }
         public float NewVersionAsFloat { get; }
         public override bool IsUpgradable { get; } = true;
 

diff --git a/src/wingetui-interface/PackageEngine/Managers/Chocolatey.cs b/src/wingetui-interface/PackageEngine/Managers/Chocolatey.cs
@@ -492,10 +492,10 @@ protected override async Task<ManagerStatus> LoadManager()
             };
             process.Start();
             status.Version = (await process.StandardOutput.ReadToEndAsync()).Trim();
-
+
+            // If the user is running bundled chocolatey and chocolatey is not in path, add chocolatey to path
             if (/*Tools.GetSettings("ShownWelcomeWizard") && */!Tools.GetSettings("UseSystemChocolatey") && !Tools.GetSettings("ChocolateyAddedToPath") && !File.Exists(@"C:\ProgramData\Chocolatey\bin\choco.exe"))
             {
-                // If the user is running bundled chocolatey and chocolatey is not in path, add chocolatey to path
                 AppTools.Log("Adding chocolatey to path");
                 string path = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User);
                 Environment.SetEnvironmentVariable("PATH", $"{status.ExecutablePath.Replace("\\choco.exe", "\\bin")};{path}", EnvironmentVariableTarget.User);

diff --git a/src/wingetui-interface/PackageEngine/Operations/PackageOperations.cs b/src/wingetui-interface/PackageEngine/Operations/PackageOperations.cs
@@ -303,7 +303,10 @@ protected override async Task<AfterFinshAction> HandleSuccess()
                 {
                     AppTools.Log(ex);
                 }
-            await Task.Delay(0);
+
+            if(Package.Version == "Unknown")
+                await Package.AddToIgnoredUpdatesAsync(Package.NewVersion);
+
             return AfterFinshAction.TimeoutClose;
         }