Update UniGetUI Pinget consumer for 0.6.0 JSON contract

Author: mamoreau-devolutions

src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/PingetCliHelper.cs

@@ -18,7 +18,6 @@ internal sealed partial class PingetCliHelper : IWinGetManagerHelper
     private static readonly JsonSerializerOptions SerializationOptions = new()
     {
         PropertyNameCaseInsensitive = true,
-        PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
     };
     private static readonly PingetCliJsonContext SerializationContext = new(SerializationOptions);
 
@@ -55,7 +54,7 @@ public IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
                 match.Id,
                 match.InstalledVersion,
                 match.AvailableVersion!,
-                GetSource(match.SourceName, match.Id),
+                GetSource(match),
                 Manager
             );
 
@@ -87,7 +86,7 @@ public IReadOnlyList<Package> GetInstalledPackages_UnSafe()
                     match.Name,
                     match.Id,
                     match.InstalledVersion,
-                    GetSource(match.SourceName, match.Id),
+                    GetSource(match),
                     Manager
                 )
             )
@@ -234,6 +233,32 @@ internal static T DeserializeJson<T>(string output)
             : throw new InvalidOperationException("Pinget returned empty JSON output.");
     }
 
+    internal static string? InferSourceName(ListMatch match)
+    {
+        if (!string.IsNullOrWhiteSpace(match.SourceName))
+        {
+            return match.SourceName;
+        }
+
+        if (match.Id.Contains("_Microsoft.Winget.Source_8wekyb3d8bbwe", StringComparison.OrdinalIgnoreCase))
+        {
+            return "winget";
+        }
+
+        if (!string.IsNullOrWhiteSpace(match.InstallLocation)
+            && match.InstallLocation.Contains("\\Microsoft\\WinGet\\Packages\\", StringComparison.OrdinalIgnoreCase))
+        {
+            return "winget";
+        }
+
+        return null;
+    }
+
+    private IManagerSource GetSource(ListMatch match)
+    {
+        return GetSource(InferSourceName(match), match.Id);
+    }
+
     private IManagerSource GetSource(string? sourceName, string packageId)
     {
         if (string.IsNullOrWhiteSpace(sourceName))

src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/PingetPackageDetailsProvider.cs

@@ -84,10 +84,10 @@ private IReadOnlyList<string> GetSourceNames(INativeTaskLogger logger)
     {
         try
         {
-            string output = RunPinget(["source", "list", "--output", "json"], logger);
+            string output = RunPinget(["source", "export", "--output", "json"], logger);
             using JsonDocument document = JsonDocument.Parse(output);
             if (
-                !document.RootElement.TryGetProperty("sources", out JsonElement sources)
+                !document.RootElement.TryGetProperty("Sources", out JsonElement sources)
                 || sources.ValueKind != JsonValueKind.Array
             )
             {
@@ -97,7 +97,7 @@ private IReadOnlyList<string> GetSourceNames(INativeTaskLogger logger)
             return sources
                 .EnumerateArray()
                 .Select(source =>
-                    source.TryGetProperty("name", out JsonElement name)
+                    source.TryGetProperty("Name", out JsonElement name)
                         ? name.GetString()
                         : null
                 )

src/UniGetUI.PackageEngine.Tests/WinGetManagerTests.cs

@@ -300,28 +300,28 @@ public void FindCandidateExecutableFilesReturnsEmptyWhenNoCliToolExists()
     [Fact]
     public void PingetCliHelperDeserializesListResponsesWithGeneratedContext()
     {
-        // pinget 0.4.1+ emits snake_case keys.
+        // Pinget emits PascalCase keys.
         const string json = """
             {
-                "matches": [
+                "Matches": [
                     {
-                        "name": "Contoso Tool",
-                        "id": "Contoso.Tool",
-                        "local_id": null,
-                        "installed_version": "1.2.3",
-                        "available_version": "2.0.0",
-                        "source_name": "winget",
-                        "publisher": null,
-                        "scope": null,
-                        "installer_category": null,
-                        "install_location": null,
-                        "package_family_names": [],
-                        "product_codes": [],
-                        "upgrade_codes": []
+                        "Name": "Contoso Tool",
+                        "Id": "Contoso.Tool",
+                        "LocalId": null,
+                        "InstalledVersion": "1.2.3",
+                        "AvailableVersion": "2.0.0",
+                        "SourceName": "winget",
+                        "Publisher": null,
+                        "Scope": null,
+                        "InstallerCategory": null,
+                        "InstallLocation": null,
+                        "PackageFamilyNames": [],
+                        "ProductCodes": [],
+                        "UpgradeCodes": []
                     }
                 ],
-                "warnings": [],
-                "truncated": false
+                "Warnings": [],
+                "Truncated": false
             }
             """;
 
@@ -335,6 +335,38 @@ public void PingetCliHelperDeserializesListResponsesWithGeneratedContext()
         Assert.Equal("winget", match.SourceName);
     }
 
+    [Fact]
+    public void PingetCliHelperInfersWingetSourceWhenInstalledSourceNameIsMissing()
+    {
+        const string json = """
+            {
+                "Matches": [
+                    {
+                        "Name": "Contoso Tool",
+                        "Id": "ARP\\User\\X64\\Contoso.Tool_Microsoft.Winget.Source_8wekyb3d8bbwe",
+                        "LocalId": null,
+                        "InstalledVersion": "1.2.3",
+                        "AvailableVersion": null,
+                        "SourceName": null,
+                        "Publisher": "Contoso",
+                        "Scope": "User",
+                        "InstallerCategory": "exe",
+                        "InstallLocation": "C:\\Users\\example\\AppData\\Local\\Microsoft\\WinGet\\Packages\\Contoso.Tool_Microsoft.Winget.Source_8wekyb3d8bbwe",
+                        "PackageFamilyNames": [],
+                        "ProductCodes": [],
+                        "UpgradeCodes": []
+                    }
+                ],
+                "Warnings": [],
+                "Truncated": false
+            }
+            """;
+
+        ListMatch match = Assert.Single(PingetCliHelper.DeserializeJson<ListResponse>(json).Matches);
+
+        Assert.Equal("winget", PingetCliHelper.InferSourceName(match));
+    }
+
     [Fact]
     public void GetCliToolPreferenceUsesEnvironmentBeforeSettings()
     {