refactor: simplify !with command argument parsing

app/api/domains/cho.py

@@ -397,8 +397,15 @@ async def handle(self, player: Player) -> None:
                         # use player mode if not specified
                         mode_vn = player.status.mode.as_vanilla
 
+                    # parse the mods from regex
+                    if r_match["mods"] is not None:
+                        mods = Mods.from_np(r_match["mods"][1:], mode_vn)
+                    else:
+                        mods = None
+
                     player.last_np = {
                         "bmap": bmap,
+                        "mods": mods,
                         "mode_vn": mode_vn,
                         "timeout": time.time() + 300,  # /np's last 5mins
                     }
@@ -1214,9 +1221,16 @@ async def handle(self, player: Player) -> None:
                             # use player mode if not specified
                             mode_vn = player.status.mode.as_vanilla
 
+                        # parse the mods from regex
+                        if r_match["mods"] is not None:
+                            mods = Mods.from_np(r_match["mods"][1:], mode_vn)
+                        else:
+                            mods = None
+
                         player.last_np = {
                             "bmap": bmap,
                             "mode_vn": mode_vn,
+                            "mods": mods,
                             "timeout": time.time() + 300,  # /np's last 5mins
                         }
 

app/commands.py

@@ -422,59 +422,6 @@ async def top(ctx: Context) -> str | None:
 # TODO: !compare (compare to previous !last/!top post's map)
 
 
-class ParsingError(str):
-    ...
-
-
-def parse__with__command_args(
-    mode: int,
-    args: Sequence[str],
-) -> Mapping[str, Any] | ParsingError:
-    """Parse arguments for the !with command."""
-
-    # tried to balance complexity vs correctness for this function
-    # TODO: it can surely be cleaned up further - need to rethink it?
-
-    if not args or len(args) > 4:
-        return ParsingError("Invalid syntax: !with <acc/nmiss/combo/mods ...>")
-
-    # !with 95% 1m 429x hddt
-    acc = mods = combo = nmiss = None
-
-    # parse acc, misses, combo and mods from arguments.
-    # tried to balance complexity vs correctness here
-    for arg in (str.lower(arg) for arg in args):
-        # mandatory suffix, combo & nmiss
-        if combo is None and arg.endswith("x") and arg[:-1].isdecimal():
-            combo = int(arg[:-1])
-            # if combo > bmap.max_combo:
-            #    return "Invalid combo."
-        elif nmiss is None and arg.endswith("m") and arg[:-1].isdecimal():
-            nmiss = int(arg[:-1])
-            # TODO: store nobjects?
-            # if nmiss > bmap.combo:
-            #    return "Invalid misscount."
-        else:
-            # optional prefix/suffix, mods & accuracy
-            arg_stripped = arg.removeprefix("+").removesuffix("%")
-            if mods is None and arg_stripped.isalpha() and len(arg_stripped) % 2 == 0:
-                mods = Mods.from_modstr(arg_stripped)
-                mods = mods.filter_invalid_combos(mode)
-            elif acc is None and arg_stripped.replace(".", "", 1).isdecimal():
-                acc = float(arg_stripped)
-                if not 0 <= acc <= 100:
-                    return ParsingError("Invalid accuracy.")
-            else:
-                return ParsingError(f"Unknown argument: {arg}")
-
-    return {
-        "acc": acc,
-        "mods": mods,
-        "combo": combo,
-        "nmiss": nmiss,
-    }
-
-
 @command(Privileges.UNRESTRICTED, aliases=["w"], hidden=True)
 async def _with(ctx: Context) -> str | None:
     """Specify custom accuracy & mod combinations with `/np`."""
@@ -490,46 +437,52 @@ async def _with(ctx: Context) -> str | None:
     if not await ensure_local_osu_file(osu_file_path, bmap.id, bmap.md5):
         return "Mapfile could not be found; this incident has been reported."
 
-    mode_vn = ctx.player.last_np["mode_vn"]
-
-    command_args = parse__with__command_args(mode_vn, ctx.args)
-    if isinstance(command_args, ParsingError):
-        return str(command_args)
-
-    msg_fields = []
-
-    score_args = ScoreParams(mode=mode_vn)
+    score_args = ScoreParams(mode=ctx.player.last_np["mode_vn"])
+    attributes_table = {
+        "xgeki": "ngeki",
+        "xkatu": "nkatu",
+        "x100": "n100",
+        "x50": "n50",
+        "x": "combo",
+        "m": "nmiss",
+        "%": "acc",
+    }
 
-    mods = command_args["mods"]
-    if mods is not None:
-        score_args.mods = mods
-        msg_fields.append(f"{mods!r}")
+    # if the last np contains mod info, use it as the default
+    if ctx.player.last_np["mods"] is not None:
+        score_args.mods = ctx.player.last_np["mods"]
 
-    nmiss = command_args["nmiss"]
-    if nmiss:
-        score_args.nmiss = nmiss
-        msg_fields.append(f"{nmiss}m")
+    for arg in (arg.lower() for arg in ctx.args):
+        try:
+            # handle mods extra
+            if arg.startswith("+"):
+                score_args.mods = Mods.from_modstr(arg[1:]).filter_invalid_combos(
+                    ctx.player.last_np["mode_vn"],
+                )
+                continue
 
-    combo = command_args["combo"]
-    if combo is not None:
-        score_args.combo = combo
-        msg_fields.append(f"{combo}x")
+            for suffix, attribute in attributes_table.items():
+                if arg.endswith(suffix):
+                    valueStr = arg[: -len(suffix)]
+                    value = (
+                        min(max(float(valueStr), 0), 100)
+                        if attribute == "acc"
+                        else int(valueStr)
+                    )
+                    setattr(score_args, attribute, value)
 
-    acc = command_args["acc"]
-    if acc is not None:
-        score_args.acc = acc
-        msg_fields.append(f"{acc:.2f}%")
+        except ValueError as ex:
+            return f"Could not parse parameter '{arg}'."
 
     result = app.usecases.performance.calculate_performances(
         osu_file_path=str(osu_file_path),
         scores=[score_args],  # calculate one score
     )
 
-    return "{msg}: {pp:.2f}pp ({stars:.2f}*)".format(
-        msg=" ".join(msg_fields),
+    return "{pp:.2f}pp ({stars:.2f}*)".format(
         pp=result[0]["performance"]["pp"],
-        stars=result[0]["difficulty"]["stars"],  # (first score result)
-    )
+        stars=result[0]["difficulty"]["stars"],
+    )  # (first score result)
 
 
 @command(Privileges.UNRESTRICTED, aliases=["req"])