feat: Cleanup

nlogozzo · nlogozzo · commit e473e1754fa3 · 2025-11-09T08:00:56.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -381,7 +381,7 @@ MigrationBackup/
 FodyWeavers.xsd
 
 # VS Code files for those working on multiple tools
-.vscode/*
+.vscode/
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
diff --git a/Nickvision.FlatpakGenerator/FlatpakSourcesGenerator.cs b/Nickvision.FlatpakGenerator/FlatpakSourcesGenerator.cs
@@ -18,25 +18,25 @@ public class FlatpakSourcesGenerator
     static FlatpakSourcesGenerator()
     {
         HttpClient = new HttpClient();
-        JsonSerializerOptions = new JsonSerializerOptions()
+        JsonSerializerOptions = new JsonSerializerOptions
         {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
             WriteIndented = true
         };
     }
-    
+
     public async Task<bool> CheckRuntimeAsync(string runtime, bool runAsUser)
     {
-        using var process = new Process()
+        using var process = new Process
         {
-            StartInfo = new ProcessStartInfo()
+            StartInfo = new ProcessStartInfo
             {
                 FileName = "flatpak",
                 ArgumentList =
                 {
                     "list",
                     "--runtime",
-                    "--columns=application,branch",
+                    "--columns=application,branch"
                 },
                 UseShellExecute = false,
                 RedirectStandardOutput = true,
@@ -68,16 +68,12 @@ public async Task<bool> CheckRuntimeAsync(string runtime, bool runAsUser)
         return false;
     }
 
-    public async Task<List<NugetSource>> GenerateSourcesAsync(string input,
-        int dotnetVersion,
-        string? temp,
-        bool selfContained,
-        bool runAsUser)
+    public async Task<List<NugetSource>> GenerateSourcesAsync(string input, int dotnetVersion, string? temp, bool selfContained, bool runAsUser)
     {
         input = input.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
         temp = Path.Combine(temp?.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) ?? Directory.GetCurrentDirectory(), "nuget-temp");
         Directory.CreateDirectory(temp);
-        if(string.IsNullOrEmpty(input) || !File.Exists(input) || Path.GetExtension(input) != ".csproj")
+        if (string.IsNullOrEmpty(input) || !File.Exists(input) || Path.GetExtension(input) != ".csproj")
         {
             Console.Error.WriteLine("[Error] Invalid input csproj file path");
             return [];
@@ -90,9 +86,9 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,
         {
             return [];
         }
-        using var process = new Process()
+        using var process = new Process
         {
-            StartInfo = new ProcessStartInfo()
+            StartInfo = new ProcessStartInfo
             {
                 FileName = "flatpak",
                 ArgumentList =
@@ -131,7 +127,7 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,
             return [];
         }
         var sources = new List<NugetSource>();
-        foreach(var file in Directory.GetFiles(temp, "*.nupkg.sha512", SearchOption.AllDirectories))
+        foreach (var file in Directory.GetFiles(temp, "*.nupkg.sha512", SearchOption.AllDirectories))
         {
             using var reader = new StreamReader(file);
             var hash = Convert.ToHexString(Convert.FromBase64String(await reader.ReadToEndAsync())).ToLower();
@@ -151,7 +147,8 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,
         Directory.Delete(temp, true);
         if (selfContained)
         {
-            foreach (var extra in new[]{
+            foreach (var extra in new[]
+            {
                 "microsoft.aspnetcore.app.runtime.linux-arm",
                 "microsoft.aspnetcore.app.runtime.linux-arm64",
                 "microsoft.aspnetcore.app.runtime.linux-x64",
@@ -197,7 +194,7 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,
         }
         var filename = $"{name}.{latestEntry.Version}.nupkg";
         Console.WriteLine($"[Found] {name}");
-        return new NugetSource()
+        return new NugetSource
         {
             Url = $"https://api.nuget.org/v3-flatcontainer/{name}/{latestEntry.Version}/{filename}",
             Sha512 = Convert.ToHexString(Convert.FromBase64String(latestEntry.PackageHash)).ToLower(),
@@ -213,7 +210,7 @@ public async Task WriteSourcesFileAsync(List<NugetSource> sources, string? outpu
         {
             output = "nuget-sources.json";
         }
-        else if(!string.IsNullOrEmpty(output) && Path.GetExtension(output) != ".json")
+        else if (!string.IsNullOrEmpty(output) && Path.GetExtension(output) != ".json")
         {
             output += ".json";
         }
diff --git a/Nickvision.FlatpakGenerator/NugetCatalog.cs b/Nickvision.FlatpakGenerator/NugetCatalog.cs
@@ -5,11 +5,11 @@ namespace Nickvision.FlatpakGenerator;
 
 public class NugetCatalog
 {
-    [JsonPropertyName("@id")]
-    public string Url { get; set; }
     public int Count { get; set; }
     [JsonPropertyName("items")]
     public List<NugetCatalogPage> Pages { get; set; }
+    [JsonPropertyName("@id")]
+    public string Url { get; set; }
 
     public NugetCatalog()
     {
diff --git a/Nickvision.FlatpakGenerator/NugetCatalogEntry.cs b/Nickvision.FlatpakGenerator/NugetCatalogEntry.cs
@@ -4,12 +4,12 @@ namespace Nickvision.FlatpakGenerator;
 
 public class NugetCatalogEntry
 {
+    public string PackageHash { get; set; }
+    public string PackageHashAlgorithm { get; set; }
     [JsonPropertyName("@id")]
     public string Url { get; set; }
-    public string PackageHashAlgorithm { get; set; }
-    public string PackageHash { get; set; }
     public string Version { get; set; }
-    
+
     public NugetCatalogEntry()
     {
         Url = string.Empty;
diff --git a/Nickvision.FlatpakGenerator/NugetCatalogPackage.cs b/Nickvision.FlatpakGenerator/NugetCatalogPackage.cs
@@ -4,10 +4,10 @@ namespace Nickvision.FlatpakGenerator;
 
 public class NugetCatalogPackage
 {
+    public NugetCatalogEntry CatalogEntry { get; set; }
     [JsonPropertyName("@id")]
     public string Url { get; set; }
-    public NugetCatalogEntry CatalogEntry { get; set; }
-    
+
     public NugetCatalogPackage()
     {
         Url = string.Empty;
diff --git a/Nickvision.FlatpakGenerator/NugetCatalogPage.cs b/Nickvision.FlatpakGenerator/NugetCatalogPage.cs
@@ -5,12 +5,12 @@ namespace Nickvision.FlatpakGenerator;
 
 public class NugetCatalogPage
 {
-    [JsonPropertyName("@id")]
-    public string Url { get; set; }
     public int Count { get; set; }
     [JsonPropertyName("items")]
     public List<NugetCatalogPackage> Packages { get; set; }
-    
+    [JsonPropertyName("@id")]
+    public string Url { get; set; }
+
     public NugetCatalogPage()
     {
         Url = string.Empty;
diff --git a/Nickvision.FlatpakGenerator/NugetSource.cs b/Nickvision.FlatpakGenerator/NugetSource.cs
@@ -4,12 +4,12 @@ namespace Nickvision.FlatpakGenerator;
 
 public class NugetSource
 {
-    public required string Url { get; set; }
-    public required string Sha512 { get; set; }
     [JsonPropertyName("dest")]
     public required string Destination { get; set; }
     [JsonPropertyName("dest-filename")]
     public required string DestinationFileName { get; set; }
-        
+    public required string Sha512 { get; set; }
+    public required string Url { get; set; }
+
     public string Type => "file";
 }
diff --git a/Nickvision.FlatpakGenerator/Program.cs b/Nickvision.FlatpakGenerator/Program.cs
@@ -1,20 +1,18 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.CommandLine;
-using System.IO;
 using System.Threading.Tasks;
 
 namespace Nickvision.FlatpakGenerator;
 
 public class Program
 {
-    private static FlatpakSourcesGenerator _generator;
-    
+    private static readonly FlatpakSourcesGenerator _generator;
+
     static Program()
     {
         _generator = new FlatpakSourcesGenerator();
     }
-    
+
     public static async Task<int> Main(string[] args)
     {
         if (Environment.OSVersion.Platform != PlatformID.Unix)
@@ -105,25 +103,16 @@ public static async Task<int> Main(string[] args)
         };
         checkCommand.SetAction(async x =>
         {
-            await _generator.CheckRuntimeAsync(
-                "org.freedesktop.Sdk//24.08",
-                x.GetValue<bool>("--run-as-user"));
-            await _generator.CheckRuntimeAsync(
-                $"org.freedesktop.Sdk.Extension.dotnet{x.GetRequiredValue<int>("--dotnet")}//24.08", 
-                x.GetValue<bool>("--run-as-user"));
+            await _generator.CheckRuntimeAsync("org.freedesktop.Sdk//24.08", x.GetValue<bool>("--run-as-user"));
+            await _generator.CheckRuntimeAsync($"org.freedesktop.Sdk.Extension.dotnet{x.GetRequiredValue<int>("--dotnet")}//24.08", x.GetValue<bool>("--run-as-user"));
         });
         generateCommand.SetAction(async x =>
         {
-            var sources = await _generator.GenerateSourcesAsync(
-                x.GetRequiredValue<string>("--input"),
-                x.GetRequiredValue<int>("--dotnet"),
-                x.GetValue<string>("--temp"),
-                x.GetValue<bool>("--self-contained"),
-                x.GetValue<bool>("--run-as-user"));
+            var sources = await _generator.GenerateSourcesAsync(x.GetRequiredValue<string>("--input"), x.GetRequiredValue<int>("--dotnet"), x.GetValue<string>("--temp"), x.GetValue<bool>("--self-contained"), x.GetValue<bool>("--run-as-user"));
             await _generator.WriteSourcesFileAsync(sources, x.GetValue<string>("--output"));
         });
         rootCommand.Subcommands.Add(checkCommand);
         rootCommand.Subcommands.Add(generateCommand);
         return await rootCommand.Parse(args).InvokeAsync();
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -18,25 +18,25 @@ public class FlatpakSourcesGenerator`
`18`	`18`	`static FlatpakSourcesGenerator()`
`19`	`19`	`{`
`20`	`20`	`HttpClient = new HttpClient();`
`21`		`- JsonSerializerOptions = new JsonSerializerOptions()`
	`21`	`+ JsonSerializerOptions = new JsonSerializerOptions`
`22`	`22`	`{`
`23`	`23`	`PropertyNamingPolicy = JsonNamingPolicy.CamelCase,`
`24`	`24`	`WriteIndented = true`
`25`	`25`	`};`
`26`	`26`	`}`
`27`		`-`
	`27`	`+`
`28`	`28`	`public async Task<bool> CheckRuntimeAsync(string runtime, bool runAsUser)`
`29`	`29`	`{`
`30`		`- using var process = new Process()`
	`30`	`+ using var process = new Process`
`31`	`31`	`{`
`32`		`- StartInfo = new ProcessStartInfo()`
	`32`	`+ StartInfo = new ProcessStartInfo`
`33`	`33`	`{`
`34`	`34`	`FileName = "flatpak",`
`35`	`35`	`ArgumentList =`
`36`	`36`	`{`
`37`	`37`	`"list",`
`38`	`38`	`"--runtime",`
`39`		`- "--columns=application,branch",`
	`39`	`+ "--columns=application,branch"`
`40`	`40`	`},`
`41`	`41`	`UseShellExecute = false,`
`42`	`42`	`RedirectStandardOutput = true,`
`@@ -68,16 +68,12 @@ public async Task<bool> CheckRuntimeAsync(string runtime, bool runAsUser)`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
`71`		`- public async Task<List<NugetSource>> GenerateSourcesAsync(string input,`
`72`		`- int dotnetVersion,`
`73`		`- string? temp,`
`74`		`- bool selfContained,`
`75`		`- bool runAsUser)`
	`71`	`+ public async Task<List<NugetSource>> GenerateSourcesAsync(string input, int dotnetVersion, string? temp, bool selfContained, bool runAsUser)`
`76`	`72`	`{`
`77`	`73`	`input = input.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));`
`78`	`74`	`temp = Path.Combine(temp?.Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) ?? Directory.GetCurrentDirectory(), "nuget-temp");`
`79`	`75`	`Directory.CreateDirectory(temp);`
`80`		`- if(string.IsNullOrEmpty(input) \|\| !File.Exists(input) \|\| Path.GetExtension(input) != ".csproj")`
	`76`	`+ if (string.IsNullOrEmpty(input) \|\| !File.Exists(input) \|\| Path.GetExtension(input) != ".csproj")`
`81`	`77`	`{`
`82`	`78`	`Console.Error.WriteLine("[Error] Invalid input csproj file path");`
`83`	`79`	`return [];`
`@@ -90,9 +86,9 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,`
`90`	`86`	`{`
`91`	`87`	`return [];`
`92`	`88`	`}`
`93`		`- using var process = new Process()`
	`89`	`+ using var process = new Process`
`94`	`90`	`{`
`95`		`- StartInfo = new ProcessStartInfo()`
	`91`	`+ StartInfo = new ProcessStartInfo`
`96`	`92`	`{`
`97`	`93`	`FileName = "flatpak",`
`98`	`94`	`ArgumentList =`
`@@ -131,7 +127,7 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,`
`131`	`127`	`return [];`
`132`	`128`	`}`
`133`	`129`	`var sources = new List<NugetSource>();`
`134`		`- foreach(var file in Directory.GetFiles(temp, "*.nupkg.sha512", SearchOption.AllDirectories))`
	`130`	`+ foreach (var file in Directory.GetFiles(temp, "*.nupkg.sha512", SearchOption.AllDirectories))`
`135`	`131`	`{`
`136`	`132`	`using var reader = new StreamReader(file);`
`137`	`133`	`var hash = Convert.ToHexString(Convert.FromBase64String(await reader.ReadToEndAsync())).ToLower();`
`@@ -151,7 +147,8 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,`
`151`	`147`	`Directory.Delete(temp, true);`
`152`	`148`	`if (selfContained)`
`153`	`149`	`{`
`154`		`- foreach (var extra in new[]{`
	`150`	`+ foreach (var extra in new[]`
	`151`	`+ {`
`155`	`152`	`"microsoft.aspnetcore.app.runtime.linux-arm",`
`156`	`153`	`"microsoft.aspnetcore.app.runtime.linux-arm64",`
`157`	`154`	`"microsoft.aspnetcore.app.runtime.linux-x64",`
`@@ -197,7 +194,7 @@ public async Task<List<NugetSource>> GenerateSourcesAsync(string input,`
`197`	`194`	`}`
`198`	`195`	`var filename = $"{name}.{latestEntry.Version}.nupkg";`
`199`	`196`	`Console.WriteLine($"[Found] {name}");`
`200`		`- return new NugetSource()`
	`197`	`+ return new NugetSource`
`201`	`198`	`{`
`202`	`199`	`Url = $"https://api.nuget.org/v3-flatcontainer/{name}/{latestEntry.Version}/{filename}",`
`203`	`200`	`Sha512 = Convert.ToHexString(Convert.FromBase64String(latestEntry.PackageHash)).ToLower(),`
`@@ -213,7 +210,7 @@ public async Task WriteSourcesFileAsync(List<NugetSource> sources, string? outpu`
`213`	`210`	`{`
`214`	`211`	`output = "nuget-sources.json";`
`215`	`212`	`}`
`216`		`- else if(!string.IsNullOrEmpty(output) && Path.GetExtension(output) != ".json")`
	`213`	`+ else if (!string.IsNullOrEmpty(output) && Path.GetExtension(output) != ".json")`
`217`	`214`	`{`
`218`	`215`	`output += ".json";`
`219`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ namespace Nickvision.FlatpakGenerator;`
`5`	`5`
`6`	`6`	`public class NugetCatalog`
`7`	`7`	`{`
`8`		`- [JsonPropertyName("@id")]`
`9`		`- public string Url { get; set; }`
`10`	`8`	`public int Count { get; set; }`
`11`	`9`	`[JsonPropertyName("items")]`
`12`	`10`	`public List<NugetCatalogPage> Pages { get; set; }`
	`11`	`+ [JsonPropertyName("@id")]`
	`12`	`+ public string Url { get; set; }`
`13`	`13`
`14`	`14`	`public NugetCatalog()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ namespace Nickvision.FlatpakGenerator;`
`4`	`4`
`5`	`5`	`public class NugetCatalogPackage`
`6`	`6`	`{`
	`7`	`+ public NugetCatalogEntry CatalogEntry { get; set; }`
`7`	`8`	`[JsonPropertyName("@id")]`
`8`	`9`	`public string Url { get; set; }`
`9`		`- public NugetCatalogEntry CatalogEntry { get; set; }`
`10`		`-`
	`10`	`+`
`11`	`11`	`public NugetCatalogPackage()`
`12`	`12`	`{`
`13`	`13`	`Url = string.Empty;`