Handle when applications/gecko.id is all-whitespace

RenderMichael · RenderMichael · commit 9e0a26b226a4 · 2024-12-28T12:28:27.000-05:00
diff --git a/dotnet/src/webdriver/Firefox/FirefoxExtension.cs b/dotnet/src/webdriver/Firefox/FirefoxExtension.cs
@@ -178,15 +178,16 @@ private static string ReadIdFromInstallRdf(string root)
 
         private static string ReadIdFromManifestJson(string root)
         {
-            string id;
+            string id = string.Empty;
             string manifestJsonPath = Path.Combine(root, JsonManifestFileName);
 
             var manifestObject = JsonNode.Parse(File.ReadAllText(manifestJsonPath));
             if (manifestObject!["applications"]?["gecko"]?["id"] is { } idNode)
             {
                 id = idNode.ToString().Trim();
             }
-            else
+
+            if (string.IsNullOrEmpty(id))
             {
                 string addInName = manifestObject["name"]!.ToString().Replace(" ", "");
                 string addInVersion = manifestObject["version"]!.ToString();

Original file line number	Diff line number	Diff line change
`@@ -178,15 +178,16 @@ private static string ReadIdFromInstallRdf(string root)`
`178`	`178`
`179`	`179`	`private static string ReadIdFromManifestJson(string root)`
`180`	`180`	`{`
`181`		`- string id;`
	`181`	`+ string id = string.Empty;`
`182`	`182`	`string manifestJsonPath = Path.Combine(root, JsonManifestFileName);`
`183`	`183`
`184`	`184`	`var manifestObject = JsonNode.Parse(File.ReadAllText(manifestJsonPath));`
`185`	`185`	`if (manifestObject!["applications"]?["gecko"]?["id"] is { } idNode)`
`186`	`186`	`{`
`187`	`187`	`id = idNode.ToString().Trim();`
`188`	`188`	`}`
`189`		`- else`
	`189`	`+`
	`190`	`+ if (string.IsNullOrEmpty(id))`
`190`	`191`	`{`
`191`	`192`	`string addInName = manifestObject["name"]!.ToString().Replace(" ", "");`
`192`	`193`	`string addInVersion = manifestObject["version"]!.ToString();`