bugfixes?

BBpezsgo · BBpezsgo · commit 3fafccf0f909 · 2025-09-03T06:10:28.000+02:00
diff --git a/Program.cs b/Program.cs
@@ -28,7 +28,10 @@ public static void Main(string[] args)
 
     static async Task Run(string[] args, CancellationToken ct)
     {
-        if (args.Length == 0)
+        string? action = args.Length > 0 && !args[0].StartsWith('-') ? args[0] : null;
+        if (action is not null) args = args[1..];
+
+        if (action is null && (args.Contains("-h") || args.Contains("--help") || args.Length == 0))
         {
             Help.PrintHelp(null);
             return;
@@ -42,16 +45,16 @@ static async Task Run(string[] args, CancellationToken ct)
             Actions.Install.PerformInstall();
         }
 
-        switch (args[0])
+        switch (action)
         {
             case "update":
                 if (args.ContainsAny("--help", "-h"))
                 {
-                    Help.PrintHelp(args[0]);
+                    Help.PrintHelp(action);
                     break;
                 }
 
-                if (args.Length != 1)
+                if (args.Length != 0)
                 {
                     throw new ApplicationArgumentsException($"Wrong number of arguments passed");
                 }
@@ -61,11 +64,11 @@ static async Task Run(string[] args, CancellationToken ct)
             case "check":
                 if (args.ContainsAny("--help", "-h"))
                 {
-                    Help.PrintHelp(args[0]);
+                    Help.PrintHelp(action);
                     break;
                 }
 
-                if (args.Length != 1)
+                if (args.Length != 0)
                 {
                     throw new ApplicationArgumentsException($"Wrong number of arguments passed");
                 }
@@ -75,39 +78,39 @@ static async Task Run(string[] args, CancellationToken ct)
             case "add":
                 if (args.ContainsAny("--help", "-h"))
                 {
-                    Help.PrintHelp(args[0]);
+                    Help.PrintHelp(action);
                     break;
                 }
 
-                if (args.Length < 2)
+                if (args.Length < 1)
                 {
                     throw new ApplicationArgumentsException($"Wrong number of arguments passed");
                 }
 
-                await Actions.Add.PerformAdd(args[1..], ct);
+                await Actions.Add.PerformAdd(args, ct);
                 break;
             case "remove":
                 if (args.ContainsAny("--help", "-h"))
                 {
-                    Help.PrintHelp(args[0]);
+                    Help.PrintHelp(action);
                     break;
                 }
 
-                if (args.Length < 2)
+                if (args.Length < 1)
                 {
                     throw new ApplicationArgumentsException($"Wrong number of arguments passed");
                 }
 
-                await Actions.Remove.PerformRemove(args[1..], ct);
+                await Actions.Remove.PerformRemove(args, ct);
                 break;
             case "list":
                 if (args.ContainsAny("--help", "-h"))
                 {
-                    Help.PrintHelp(args[0]);
+                    Help.PrintHelp(action);
                     break;
                 }
 
-                if (args.Length != 1)
+                if (args.Length != 0)
                 {
                     throw new ApplicationArgumentsException($"Wrong number of arguments passed");
                 }
@@ -117,25 +120,19 @@ static async Task Run(string[] args, CancellationToken ct)
             case "change":
                 if (args.ContainsAny("--help", "-h"))
                 {
-                    Help.PrintHelp(args[0]);
+                    Help.PrintHelp(action);
                     break;
                 }
 
-                if (args.Length != 2)
+                if (args.Length != 1)
                 {
                     throw new ApplicationArgumentsException($"Wrong number of arguments passed");
                 }
 
-                await Actions.Change.PerformChange(args[1], ct);
+                await Actions.Change.PerformChange(args[0], ct);
                 break;
             default:
-                if (args.ContainsAny("--help", "-h"))
-                {
-                    Help.PrintHelp(null);
-                    break;
-                }
-
-                throw new ApplicationArgumentsException($"Invalid action {args[0]}");
+                throw new ApplicationArgumentsException($"Invalid action {action}");
         }
     }
 }
diff --git a/Source/Actions/Add.cs b/Source/Actions/Add.cs
@@ -4,6 +4,8 @@ public static class Add
 {
     public static async Task PerformAdd(string[] queries, CancellationToken ct)
     {
+        bool didAddSomething = false;
+
         foreach (string query in queries)
         {
             if (Context.Instance.Modlist.Mods.Any(v => v.Id == query) &&
@@ -33,8 +35,11 @@ public static async Task PerformAdd(string[] queries, CancellationToken ct)
                 Id = id,
                 Name = v.Value.Name,
             });
+            didAddSomething = true;
         }
 
+        if (!didAddSomething) return;
+
         Changes changes = await ModInstaller.CheckChanges(ct);
 
         await ModInstaller.PerformChanges(changes, ct);
diff --git a/Source/Actions/Update.cs b/Source/Actions/Update.cs
@@ -109,6 +109,11 @@ void AddThese(IEnumerable<string> mods)
             }
         }
 
+        if (modUpdates.Count == 0)
+        {
+            Log.Info($"All mods are up to date");
+        }
+
         return new Changes()
         {
             Install = modUpdates.ToImmutable(),
diff --git a/Source/ModInstaller.cs b/Source/ModInstaller.cs
@@ -334,17 +334,19 @@ public static async Task PerformChanges(Changes changes, CancellationToken ct)
 
         {
             int nameMaxWidth = 0;
-            nameMaxWidth = changes.Install.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));
-            nameMaxWidth = changes.Uninstall.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));
-            nameMaxWidth += 2;
+            if (!Console.IsOutputRedirected)
+            {
+                nameMaxWidth = changes.Install.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));
+                nameMaxWidth = changes.Uninstall.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));
+                nameMaxWidth += 2;
+                nameMaxWidth = Math.Clamp(nameMaxWidth, 4, Console.WindowWidth * 2 / 3);
+            }
 
             if (!changes.IsEmpty)
             {
                 Console.WriteLine();
             }
 
-            nameMaxWidth = Math.Clamp(nameMaxWidth, 4, Console.WindowWidth * 2 / 3);
-
             foreach (ModInstallInfo update in changes.Install)
             {
                 string name = update.Name;
@@ -367,16 +369,24 @@ public static async Task PerformChanges(Changes changes, CancellationToken ct)
                 }
                 Console.ResetColor();
 
-                if (name.Length > nameMaxWidth)
+                if (Console.IsOutputRedirected)
                 {
-                    Console.Write(name.AsSpan(0, nameMaxWidth - 3));
-                    Console.Write("...");
+                    Console.Write(name);
+                    Console.Write(' ');
                 }
                 else
                 {
-                    Console.Write(name);
+                    if (name.Length > nameMaxWidth)
+                    {
+                        Console.Write(name.AsSpan(0, nameMaxWidth - 3));
+                        Console.Write("...");
+                    }
+                    else
+                    {
+                        Console.Write(name);
+                    }
+                    Console.Write(new string(' ', nameMaxWidth - name.Length));
                 }
-                Console.Write(new string(' ', nameMaxWidth - name.Length));
 
                 IMod? existing = update.LockEntry is null ? null : mods.FirstOrDefault(v => Path.GetFileName(v.FileName) == update.LockEntry.FileName).Mod;
 
diff --git a/publish.sh b/publish.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 dotnet publish ./mmm.csproj -c Release -o ./publish/linux-x64 -r linux-x64 /p:UseAppHost=true
 dotnet publish ./mmm.csproj -c Release -o ./publish/win-x64 -r win-x64 /p:UseAppHost=true
-mv ./publish/linux-x64/mmm ./publish/linux-x64/mmm-linux-x64
-mv ./publish/win-x64/mmm.exe ./publish/win-x64/mmm-win-x64.exe
+
+mv ./publish/linux-x64/mmm ./publish/mmm-linux-x64
+rm -r ./publish/linux-x64
+
+mv ./publish/win-x64/mmm.exe ./publish/mmm-win-x64.exe
+rm -r ./publish/win-x64

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,10 @@ public static void Main(string[] args)`
`28`	`28`
`29`	`29`	`static async Task Run(string[] args, CancellationToken ct)`
`30`	`30`	`{`
`31`		`- if (args.Length == 0)`
	`31`	`+ string? action = args.Length > 0 && !args[0].StartsWith('-') ? args[0] : null;`
	`32`	`+ if (action is not null) args = args[1..];`
	`33`	`+`
	`34`	`+ if (action is null && (args.Contains("-h") \|\| args.Contains("--help") \|\| args.Length == 0))`
`32`	`35`	`{`
`33`	`36`	`Help.PrintHelp(null);`
`34`	`37`	`return;`
`@@ -42,16 +45,16 @@ static async Task Run(string[] args, CancellationToken ct)`
`42`	`45`	`Actions.Install.PerformInstall();`
`43`	`46`	`}`
`44`	`47`
`45`		`- switch (args[0])`
	`48`	`+ switch (action)`
`46`	`49`	`{`
`47`	`50`	`case "update":`
`48`	`51`	`if (args.ContainsAny("--help", "-h"))`
`49`	`52`	`{`
`50`		`- Help.PrintHelp(args[0]);`
	`53`	`+ Help.PrintHelp(action);`
`51`	`54`	`break;`
`52`	`55`	`}`
`53`	`56`
`54`		`- if (args.Length != 1)`
	`57`	`+ if (args.Length != 0)`
`55`	`58`	`{`
`56`	`59`	`throw new ApplicationArgumentsException($"Wrong number of arguments passed");`
`57`	`60`	`}`
`@@ -61,11 +64,11 @@ static async Task Run(string[] args, CancellationToken ct)`
`61`	`64`	`case "check":`
`62`	`65`	`if (args.ContainsAny("--help", "-h"))`
`63`	`66`	`{`
`64`		`- Help.PrintHelp(args[0]);`
	`67`	`+ Help.PrintHelp(action);`
`65`	`68`	`break;`
`66`	`69`	`}`
`67`	`70`
`68`		`- if (args.Length != 1)`
	`71`	`+ if (args.Length != 0)`
`69`	`72`	`{`
`70`	`73`	`throw new ApplicationArgumentsException($"Wrong number of arguments passed");`
`71`	`74`	`}`
`@@ -75,39 +78,39 @@ static async Task Run(string[] args, CancellationToken ct)`
`75`	`78`	`case "add":`
`76`	`79`	`if (args.ContainsAny("--help", "-h"))`
`77`	`80`	`{`
`78`		`- Help.PrintHelp(args[0]);`
	`81`	`+ Help.PrintHelp(action);`
`79`	`82`	`break;`
`80`	`83`	`}`
`81`	`84`
`82`		`- if (args.Length < 2)`
	`85`	`+ if (args.Length < 1)`
`83`	`86`	`{`
`84`	`87`	`throw new ApplicationArgumentsException($"Wrong number of arguments passed");`
`85`	`88`	`}`
`86`	`89`
`87`		`- await Actions.Add.PerformAdd(args[1..], ct);`
	`90`	`+ await Actions.Add.PerformAdd(args, ct);`
`88`	`91`	`break;`
`89`	`92`	`case "remove":`
`90`	`93`	`if (args.ContainsAny("--help", "-h"))`
`91`	`94`	`{`
`92`		`- Help.PrintHelp(args[0]);`
	`95`	`+ Help.PrintHelp(action);`
`93`	`96`	`break;`
`94`	`97`	`}`
`95`	`98`
`96`		`- if (args.Length < 2)`
	`99`	`+ if (args.Length < 1)`
`97`	`100`	`{`
`98`	`101`	`throw new ApplicationArgumentsException($"Wrong number of arguments passed");`
`99`	`102`	`}`
`100`	`103`
`101`		`- await Actions.Remove.PerformRemove(args[1..], ct);`
	`104`	`+ await Actions.Remove.PerformRemove(args, ct);`
`102`	`105`	`break;`
`103`	`106`	`case "list":`
`104`	`107`	`if (args.ContainsAny("--help", "-h"))`
`105`	`108`	`{`
`106`		`- Help.PrintHelp(args[0]);`
	`109`	`+ Help.PrintHelp(action);`
`107`	`110`	`break;`
`108`	`111`	`}`
`109`	`112`
`110`		`- if (args.Length != 1)`
	`113`	`+ if (args.Length != 0)`
`111`	`114`	`{`
`112`	`115`	`throw new ApplicationArgumentsException($"Wrong number of arguments passed");`
`113`	`116`	`}`
`@@ -117,25 +120,19 @@ static async Task Run(string[] args, CancellationToken ct)`
`117`	`120`	`case "change":`
`118`	`121`	`if (args.ContainsAny("--help", "-h"))`
`119`	`122`	`{`
`120`		`- Help.PrintHelp(args[0]);`
	`123`	`+ Help.PrintHelp(action);`
`121`	`124`	`break;`
`122`	`125`	`}`
`123`	`126`
`124`		`- if (args.Length != 2)`
	`127`	`+ if (args.Length != 1)`
`125`	`128`	`{`
`126`	`129`	`throw new ApplicationArgumentsException($"Wrong number of arguments passed");`
`127`	`130`	`}`
`128`	`131`
`129`		`- await Actions.Change.PerformChange(args[1], ct);`
	`132`	`+ await Actions.Change.PerformChange(args[0], ct);`
`130`	`133`	`break;`
`131`	`134`	`default:`
`132`		`- if (args.ContainsAny("--help", "-h"))`
`133`		`- {`
`134`		`- Help.PrintHelp(null);`
`135`		`- break;`
`136`		`- }`
`137`		`-`
`138`		`- throw new ApplicationArgumentsException($"Invalid action {args[0]}");`
	`135`	`+ throw new ApplicationArgumentsException($"Invalid action {action}");`
`139`	`136`	`}`
`140`	`137`	`}`
`141`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ public static class Add`
`4`	`4`	`{`
`5`	`5`	`public static async Task PerformAdd(string[] queries, CancellationToken ct)`
`6`	`6`	`{`
	`7`	`+ bool didAddSomething = false;`
	`8`	`+`
`7`	`9`	`foreach (string query in queries)`
`8`	`10`	`{`
`9`	`11`	`if (Context.Instance.Modlist.Mods.Any(v => v.Id == query) &&`
`@@ -33,8 +35,11 @@ public static async Task PerformAdd(string[] queries, CancellationToken ct)`
`33`	`35`	`Id = id,`
`34`	`36`	`Name = v.Value.Name,`
`35`	`37`	`});`
	`38`	`+ didAddSomething = true;`
`36`	`39`	`}`
`37`	`40`
	`41`	`+ if (!didAddSomething) return;`
	`42`	`+`
`38`	`43`	`Changes changes = await ModInstaller.CheckChanges(ct);`
`39`	`44`
`40`	`45`	`await ModInstaller.PerformChanges(changes, ct);`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,11 @@ void AddThese(IEnumerable<string> mods)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ if (modUpdates.Count == 0)`
	`113`	`+ {`
	`114`	`+ Log.Info($"All mods are up to date");`
	`115`	`+ }`
	`116`	`+`
`112`	`117`	`return new Changes()`
`113`	`118`	`{`
`114`	`119`	`Install = modUpdates.ToImmutable(),`
Original file line number	Diff line number	Diff line change
`@@ -334,17 +334,19 @@ public static async Task PerformChanges(Changes changes, CancellationToken ct)`
`334`	`334`
`335`	`335`	`{`
`336`	`336`	`int nameMaxWidth = 0;`
`337`		`- nameMaxWidth = changes.Install.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));`
`338`		`- nameMaxWidth = changes.Uninstall.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));`
`339`		`- nameMaxWidth += 2;`
	`337`	`+ if (!Console.IsOutputRedirected)`
	`338`	`+ {`
	`339`	`+ nameMaxWidth = changes.Install.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));`
	`340`	`+ nameMaxWidth = changes.Uninstall.Aggregate(nameMaxWidth, (a, v) => Math.Max(a, v.Name.Length));`
	`341`	`+ nameMaxWidth += 2;`
	`342`	`+ nameMaxWidth = Math.Clamp(nameMaxWidth, 4, Console.WindowWidth * 2 / 3);`
	`343`	`+ }`
`340`	`344`
`341`	`345`	`if (!changes.IsEmpty)`
`342`	`346`	`{`
`343`	`347`	`Console.WriteLine();`
`344`	`348`	`}`
`345`	`349`
`346`		`- nameMaxWidth = Math.Clamp(nameMaxWidth, 4, Console.WindowWidth * 2 / 3);`
`347`		`-`
`348`	`350`	`foreach (ModInstallInfo update in changes.Install)`
`349`	`351`	`{`
`350`	`352`	`string name = update.Name;`
`@@ -367,16 +369,24 @@ public static async Task PerformChanges(Changes changes, CancellationToken ct)`
`367`	`369`	`}`
`368`	`370`	`Console.ResetColor();`
`369`	`371`
`370`		`- if (name.Length > nameMaxWidth)`
	`372`	`+ if (Console.IsOutputRedirected)`
`371`	`373`	`{`
`372`		`- Console.Write(name.AsSpan(0, nameMaxWidth - 3));`
`373`		`- Console.Write("...");`
	`374`	`+ Console.Write(name);`
	`375`	`+ Console.Write(' ');`
`374`	`376`	`}`
`375`	`377`	`else`
`376`	`378`	`{`
`377`		`- Console.Write(name);`
	`379`	`+ if (name.Length > nameMaxWidth)`
	`380`	`+ {`
	`381`	`+ Console.Write(name.AsSpan(0, nameMaxWidth - 3));`
	`382`	`+ Console.Write("...");`
	`383`	`+ }`
	`384`	`+ else`
	`385`	`+ {`
	`386`	`+ Console.Write(name);`
	`387`	`+ }`
	`388`	`+ Console.Write(new string(' ', nameMaxWidth - name.Length));`
`378`	`389`	`}`
`379`		`- Console.Write(new string(' ', nameMaxWidth - name.Length));`
`380`	`390`
`381`	`391`	`IMod? existing = update.LockEntry is null ? null : mods.FirstOrDefault(v => Path.GetFileName(v.FileName) == update.LockEntry.FileName).Mod;`
`382`	`392`