From 4663636803c178b13efbac57022d1447b371d213 Mon Sep 17 00:00:00 2001
From: minisbett <39670899+minisbett@users.noreply.github.com>
Date: Fri, 18 Oct 2024 14:14:31 +0200
Subject: [PATCH 1/6] Remove --output parameter

---
 PerformanceCalculator/Difficulty/DifficultyCommand.cs    | 3 ---
 .../Difficulty/LegacyScoreAttributesCommand.cs           | 3 ---
 PerformanceCalculator/Leaderboard/LeaderboardCommand.cs  | 3 ---
 PerformanceCalculator/ProcessorCommand.cs                | 9 ---------
 PerformanceCalculator/Profile/ProfileCommand.cs          | 3 ---
 5 files changed, 21 deletions(-)

diff --git a/PerformanceCalculator/Difficulty/DifficultyCommand.cs b/PerformanceCalculator/Difficulty/DifficultyCommand.cs
index 5fa1ac98a..484d54b88 100644
--- a/PerformanceCalculator/Difficulty/DifficultyCommand.cs
+++ b/PerformanceCalculator/Difficulty/DifficultyCommand.cs
@@ -63,9 +63,6 @@ public override void Execute()
                 string json = JsonConvert.SerializeObject(resultSet);
 
                 Console.WriteLine(json);
-
-                if (OutputFile != null)
-                    File.WriteAllText(OutputFile, json);
             }
             else
             {
diff --git a/PerformanceCalculator/Difficulty/LegacyScoreAttributesCommand.cs b/PerformanceCalculator/Difficulty/LegacyScoreAttributesCommand.cs
index 31ce58a30..053287b7d 100644
--- a/PerformanceCalculator/Difficulty/LegacyScoreAttributesCommand.cs
+++ b/PerformanceCalculator/Difficulty/LegacyScoreAttributesCommand.cs
@@ -62,9 +62,6 @@ public override void Execute()
                 string json = JsonConvert.SerializeObject(resultSet);
 
                 Console.WriteLine(json);
-
-                if (OutputFile != null)
-                    File.WriteAllText(OutputFile, json);
             }
             else
             {
diff --git a/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs b/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs
index 52bd5fe44..b66fa55b0 100644
--- a/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs
+++ b/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs
@@ -98,9 +98,6 @@ public override void Execute()
                 var json = JsonConvert.SerializeObject(calculatedPlayers);
 
                 Console.Write(json);
-
-                if (OutputFile != null)
-                    File.WriteAllText(OutputFile, json);
             }
             else
             {
diff --git a/PerformanceCalculator/ProcessorCommand.cs b/PerformanceCalculator/ProcessorCommand.cs
index deef8047b..d99e50153 100644
--- a/PerformanceCalculator/ProcessorCommand.cs
+++ b/PerformanceCalculator/ProcessorCommand.cs
@@ -26,10 +26,6 @@ public abstract class ProcessorCommand
         /// </summary>
         public IConsole Console { get; private set; }
 
-        [UsedImplicitly]
-        [Option(Template = "-o|--output <file.txt>", Description = "Output results to text file.")]
-        public string OutputFile { get; }
-
         [UsedImplicitly]
         [Option(Template = "-j|--json", Description = "Output results as JSON.")]
         public bool OutputJson { get; }
@@ -65,9 +61,6 @@ public void OutputPerformance(ScoreInfo score, PerformanceAttributes performance
                 string json = JsonConvert.SerializeObject(result, Formatting.Indented);
 
                 Console.WriteLine(json);
-
-                if (OutputFile != null)
-                    File.WriteAllText(OutputFile, json);
             }
             else
             {
@@ -131,8 +124,6 @@ public void OutputDocument(Document document)
                 str = string.Join('\n', lines);
 
                 Console.Write(str);
-                if (OutputFile != null)
-                    File.WriteAllText(OutputFile, str);
             }
         }
 
diff --git a/PerformanceCalculator/Profile/ProfileCommand.cs b/PerformanceCalculator/Profile/ProfileCommand.cs
index 79a037546..41fc98e9f 100644
--- a/PerformanceCalculator/Profile/ProfileCommand.cs
+++ b/PerformanceCalculator/Profile/ProfileCommand.cs
@@ -109,9 +109,6 @@ public override void Execute()
                 });
 
                 Console.Write(json);
-
-                if (OutputFile != null)
-                    File.WriteAllText(OutputFile, json);
             }
             else
             {

From f7d3b1b9f5dc0a57a4d10d7105b80c2645a44f43 Mon Sep 17 00:00:00 2001
From: minisbett <39670899+minisbett@users.noreply.github.com>
Date: Fri, 18 Oct 2024 15:38:12 +0200
Subject: [PATCH 2/6] Add mod settings support

---
 .../Simulate/SimulateCommand.cs               | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/PerformanceCalculator/Simulate/SimulateCommand.cs b/PerformanceCalculator/Simulate/SimulateCommand.cs
index 51ad4ad67..5f0804d08 100644
--- a/PerformanceCalculator/Simulate/SimulateCommand.cs
+++ b/PerformanceCalculator/Simulate/SimulateCommand.cs
@@ -4,10 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Globalization;
 using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 using McMaster.Extensions.CommandLineUtils;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Extensions;
+using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -34,6 +41,11 @@ public abstract class SimulateCommand : ProcessorCommand
                                                                                           + " Values: hr, dt, hd, fl, etc...")]
         public string[] Mods { get; set; }
 
+        [UsedImplicitly]
+        [Option(CommandOptionType.MultipleValue, Template = "-o|--mod-option <option>",
+            Description = "The options of mods, with one for each setting. Specified as acryonym_settingkey=value. Example: DT_speed_change=1.35")]
+        public string[] ModOptions { get; set; } = [];
+
         [UsedImplicitly]
         [Option(Template = "-X|--misses <misses>", Description = "Number of misses. Defaults to 0.")]
         public int Misses { get; set; }
@@ -92,11 +104,18 @@ protected Mod[] GetMods(Ruleset ruleset)
 
             foreach (var modString in Mods)
             {
-                Mod newMod = availableMods.FirstOrDefault(m => string.Equals(m.Acronym, modString, StringComparison.CurrentCultureIgnoreCase));
-                if (newMod == null)
-                    throw new ArgumentException($"Invalid mod provided: {modString}");
+                APIMod mod = new APIMod() { Acronym = modString };
+
+                foreach(string modOption in ModOptions.Where(x => x.ToUpper().StartsWith($"{modString}_")))
+                {
+                    string[] split = modOption[3..].Split('=');
+                    if (split.Length != 2)
+                        throw new ArgumentException($"Invalid mod-option format (key=value): {modOption[3..]}");
+
+                    mod.Settings[split[0]] = split[1];
+                }
 
-                mods.Add(newMod);
+                mods.Add(mod.ToMod(ruleset));
             }
 
             return mods.ToArray();

From 4ae649dd83221e619e9482a41def0a97ef0caaa8 Mon Sep 17 00:00:00 2001
From: minisbett <39670899+minisbett@users.noreply.github.com>
Date: Fri, 18 Oct 2024 18:44:08 +0200
Subject: [PATCH 3/6] cleanup

---
 .../Leaderboard/LeaderboardCommand.cs                 |  1 -
 PerformanceCalculator/Profile/ProfileCommand.cs       |  1 -
 PerformanceCalculator/Simulate/SimulateCommand.cs     | 11 ++---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs b/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs
index b66fa55b0..a9455ae3a 100644
--- a/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs
+++ b/PerformanceCalculator/Leaderboard/LeaderboardCommand.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Alba.CsConsoleFormat;
 using JetBrains.Annotations;
diff --git a/PerformanceCalculator/Profile/ProfileCommand.cs b/PerformanceCalculator/Profile/ProfileCommand.cs
index 41fc98e9f..7cb90d6f3 100644
--- a/PerformanceCalculator/Profile/ProfileCommand.cs
+++ b/PerformanceCalculator/Profile/ProfileCommand.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Alba.CsConsoleFormat;
 using JetBrains.Annotations;
diff --git a/PerformanceCalculator/Simulate/SimulateCommand.cs b/PerformanceCalculator/Simulate/SimulateCommand.cs
index a3a742003..604c53c2b 100644
--- a/PerformanceCalculator/Simulate/SimulateCommand.cs
+++ b/PerformanceCalculator/Simulate/SimulateCommand.cs
@@ -4,16 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Globalization;
 using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 using McMaster.Extensions.CommandLineUtils;
-using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -97,14 +91,13 @@ protected Mod[] GetMods(Ruleset ruleset)
             if (Mods == null)
                 return Array.Empty<Mod>();
 
-            var availableMods = ruleset.CreateAllMods().ToList();
             var mods = new List<Mod>();
 
             foreach (var modString in Mods)
             {
-                APIMod mod = new APIMod() { Acronym = modString };
+                APIMod mod = new APIMod { Acronym = modString };
 
-                foreach(string modOption in ModOptions.Where(x => x.ToUpper().StartsWith($"{modString}_")))
+                foreach (string modOption in ModOptions.Where(x => x.StartsWith($"{modString}_", StringComparison.CurrentCultureIgnoreCase)))
                 {
                     string[] split = modOption[3..].Split('=');
                     if (split.Length != 2)

From 664597edf74ea47ed6daf04329797a5deecba972 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 23 Oct 2024 15:06:46 +0900
Subject: [PATCH 4/6] Move to utility function

---
 PerformanceCalculator/ProcessorCommand.cs     | 31 +++++++++++++++++++
 .../Simulate/SimulateCommand.cs               | 31 +------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/PerformanceCalculator/ProcessorCommand.cs b/PerformanceCalculator/ProcessorCommand.cs
index d99e50153..67463a84e 100644
--- a/PerformanceCalculator/ProcessorCommand.cs
+++ b/PerformanceCalculator/ProcessorCommand.cs
@@ -12,7 +12,9 @@
 using McMaster.Extensions.CommandLineUtils;
 using Newtonsoft.Json;
 using osu.Game.Online.API;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
@@ -131,6 +133,35 @@ public virtual void Execute()
         {
         }
 
+        public static Mod[] ParseMods(Ruleset ruleset, string[] acronyms, string[] options)
+        {
+            acronyms ??= [];
+            options ??= [];
+
+            if (acronyms.Length == 0)
+                return [];
+
+            var mods = new List<Mod>();
+
+            foreach (var acronym in acronyms)
+            {
+                APIMod mod = new APIMod { Acronym = acronym };
+
+                foreach (string modOption in options.Where(x => x.StartsWith($"{acronym}_", StringComparison.CurrentCultureIgnoreCase)))
+                {
+                    string[] split = modOption[3..].Split('=');
+                    if (split.Length != 2)
+                        throw new ArgumentException($"Invalid mod-option format (key=value): {modOption[3..]}");
+
+                    mod.Settings[split[0]] = split[1];
+                }
+
+                mods.Add(mod.ToMod(ruleset));
+            }
+
+            return mods.ToArray();
+        }
+
         private class Result
         {
             [JsonProperty("score")]
diff --git a/PerformanceCalculator/Simulate/SimulateCommand.cs b/PerformanceCalculator/Simulate/SimulateCommand.cs
index 9a637098f..be3dcb5d2 100644
--- a/PerformanceCalculator/Simulate/SimulateCommand.cs
+++ b/PerformanceCalculator/Simulate/SimulateCommand.cs
@@ -4,13 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using JetBrains.Annotations;
 using McMaster.Extensions.CommandLineUtils;
 using osu.Game.Beatmaps;
-using osu.Game.Online.API;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
@@ -65,7 +62,7 @@ public override void Execute()
             var ruleset = Ruleset;
 
             var workingBeatmap = ProcessorWorkingBeatmap.FromFileOrId(Beatmap);
-            var mods = GetMods(ruleset);
+            var mods = ParseMods(ruleset, Mods, ModOptions);
             var beatmap = workingBeatmap.GetPlayableBeatmap(ruleset.RulesetInfo, mods);
 
             var beatmapMaxCombo = GetMaxCombo(beatmap);
@@ -86,32 +83,6 @@ public override void Execute()
             OutputPerformance(scoreInfo, performanceAttributes, difficultyAttributes);
         }
 
-        protected Mod[] GetMods(Ruleset ruleset)
-        {
-            if (Mods == null)
-                return Array.Empty<Mod>();
-
-            var mods = new List<Mod>();
-
-            foreach (var modString in Mods)
-            {
-                APIMod mod = new APIMod { Acronym = modString };
-
-                foreach (string modOption in ModOptions.Where(x => x.StartsWith($"{modString}_", StringComparison.CurrentCultureIgnoreCase)))
-                {
-                    string[] split = modOption[3..].Split('=');
-                    if (split.Length != 2)
-                        throw new ArgumentException($"Invalid mod-option format (key=value): {modOption[3..]}");
-
-                    mod.Settings[split[0]] = split[1];
-                }
-
-                mods.Add(mod.ToMod(ruleset));
-            }
-
-            return mods.ToArray();
-        }
-
         protected abstract int GetMaxCombo(IBeatmap beatmap);
 
         protected abstract Dictionary<HitResult, int> GenerateHitResults(double accuracy, IBeatmap beatmap, int countMiss, int? countMeh, int? countGood);

From 509791b9f50d64356b197659ae2978285797191c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 23 Oct 2024 15:08:28 +0900
Subject: [PATCH 5/6] Allow specifying options to `difficulty` command

---
 .../Difficulty/DifficultyCommand.cs           | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/PerformanceCalculator/Difficulty/DifficultyCommand.cs b/PerformanceCalculator/Difficulty/DifficultyCommand.cs
index 484d54b88..8bdb8fd89 100644
--- a/PerformanceCalculator/Difficulty/DifficultyCommand.cs
+++ b/PerformanceCalculator/Difficulty/DifficultyCommand.cs
@@ -12,9 +12,7 @@
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
 
 namespace PerformanceCalculator.Difficulty
 {
@@ -36,6 +34,11 @@ public class DifficultyCommand : ProcessorCommand
                                                                                           + "Values: hr, dt, hd, fl, ez, 4k, 5k, etc...")]
         public string[] Mods { get; }
 
+        [UsedImplicitly]
+        [Option(CommandOptionType.MultipleValue, Template = "-o|--mod-option <option>",
+            Description = "The options of mods, with one for each setting. Specified as acryonym_settingkey=value. Example: DT_speed_change=1.35")]
+        public string[] ModOptions { get; set; } = [];
+
         public override void Execute()
         {
             var resultSet = new ResultSet();
@@ -117,7 +120,7 @@ private Result processBeatmap(WorkingBeatmap beatmap)
         {
             // Get the ruleset
             var ruleset = LegacyHelper.GetRulesetFromLegacyID(Ruleset ?? beatmap.BeatmapInfo.Ruleset.OnlineID);
-            var mods = getMods(ruleset);
+            var mods = ParseMods(ruleset, Mods, ModOptions);
             var attributes = ruleset.CreateDifficultyCalculator(beatmap).Calculate(mods);
 
             return new Result
@@ -130,26 +133,6 @@ private Result processBeatmap(WorkingBeatmap beatmap)
             };
         }
 
-        private Mod[] getMods(Ruleset ruleset)
-        {
-            var mods = new List<Mod>();
-            if (Mods == null)
-                return Array.Empty<Mod>();
-
-            var availableMods = ruleset.CreateAllMods().ToList();
-
-            foreach (var modString in Mods)
-            {
-                Mod newMod = availableMods.FirstOrDefault(m => string.Equals(m.Acronym, modString, StringComparison.CurrentCultureIgnoreCase));
-                if (newMod == null)
-                    throw new ArgumentException($"Invalid mod provided: {modString}");
-
-                mods.Add(newMod);
-            }
-
-            return mods.ToArray();
-        }
-
         private class ResultSet
         {
             [JsonProperty("errors")]

From 87fc84fd2493dc4114ca6b6cdb87a5479dc714bd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 23 Oct 2024 15:11:53 +0900
Subject: [PATCH 6/6] Don't assume acronym length

E.g. mania mod: 10K
---
 PerformanceCalculator/ProcessorCommand.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/PerformanceCalculator/ProcessorCommand.cs b/PerformanceCalculator/ProcessorCommand.cs
index 67463a84e..392631c00 100644
--- a/PerformanceCalculator/ProcessorCommand.cs
+++ b/PerformanceCalculator/ProcessorCommand.cs
@@ -147,11 +147,13 @@ public static Mod[] ParseMods(Ruleset ruleset, string[] acronyms, string[] optio
             {
                 APIMod mod = new APIMod { Acronym = acronym };
 
-                foreach (string modOption in options.Where(x => x.StartsWith($"{acronym}_", StringComparison.CurrentCultureIgnoreCase)))
+                foreach (string optionString in options.Where(x => x.StartsWith($"{acronym}_", StringComparison.CurrentCultureIgnoreCase)))
                 {
-                    string[] split = modOption[3..].Split('=');
+                    string optionTuple = optionString[(acronym.Length + 1)..];
+
+                    string[] split = optionTuple.Split('=');
                     if (split.Length != 2)
-                        throw new ArgumentException($"Invalid mod-option format (key=value): {modOption[3..]}");
+                        throw new ArgumentException($"Invalid mod-option format (key=value): {optionTuple}");
 
                     mod.Settings[split[0]] = split[1];
                 }