mapfile-parser 2.9.1__cp312-cp312-win_amd64.whl → 2.9.3__cp312-cp312-win_amd64.whl

mapfile_parser/__init__.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-__version_info__ = (2, 9, 1)
+__version_info__ = (2, 9, 3)
 __version__ = ".".join(map(str, __version_info__)) # + "-dev0"
 __author__ = "Decompollaborate"
 

mapfile_parser/frontends/objdiff_report.py

@@ -16,6 +16,12 @@ from .. import utils
 from ..internals import objdiff_report as report_internal
 
 
+@dataclasses.dataclass
+class SummaryTableConfig:
+    doUnits: bool = False
+    sort: bool = True
+    remaining: bool = False
+
 def doObjdiffReport(
         mapPath: Path,
         outputPath: Path,
@@ -27,6 +33,7 @@ def doObjdiffReport(
         nonmatchingsPath: Path|None=None,
         emitCategories: bool=False,
         quiet: bool=False,
+        summaryTableConfig: SummaryTableConfig|None=SummaryTableConfig(),
     ) -> int:
     if not mapPath.exists():
         print(f"Could not find mapfile at '{mapPath}'")
@@ -47,12 +54,16 @@ def doObjdiffReport(
         nonmatchingsPath=nonmatchingsPath,
     )
 
-    if not quiet:
+    if not quiet and summaryTableConfig is not None and not emitCategories:
         report = report_internal.Report.readFile(outputPath)
         if report is None:
             utils.eprint(f"Unable to read back the generated report at {outputPath}")
             return 1
-        table = report.asTableStr(sort=True)
+        table = report.asTableStr(
+            do_units=summaryTableConfig.doUnits,
+            sort=summaryTableConfig.sort,
+            remaining=summaryTableConfig.remaining,
+        )
         print(table, end="")
 
         # Output to GitHub Actions job summary, if available
@@ -241,18 +252,26 @@ tools:
       prefixes_to_trim:
 """, end="")
     for trim in prefixesToTrim:
-        print(f"        - \"{trim}\"")
+        print(f"        - {trim}")
 
     def printCategories(categories: list[Category]):
         for cat in categories:
+            ide = cat.ide
+            name = cat.name
+            if ide[0] in "0123456789":
+                ide = f'"{ide}"'
+            if name[0] in "0123456789":
+                name = f'"{name}"'
             print(f"""\
-        - id: "{cat.ide}"
-          name: "{cat.name}"
+        - id: {ide}
+          name: {name}
           paths:
 """, end="")
             for p in cat.paths:
+                if p[0] in "0123456789":
+                    p = f'"{p}"'
                 print(f"""\
-            - "{p}"
+            - {p}
 """, end="")
 
     print("      categories:")
@@ -323,7 +342,10 @@ def processArguments(args: argparse.Namespace, decompConfig: decomp_settings.Con
         nonmatchingsPath = args.nonmatchingspath
 
     emitCategories: bool = args.emit_categories
-    quiet: bool= args.quiet
+    if not args.quiet:
+        summaryTableConfig = SummaryTableConfig()
+    else:
+        summaryTableConfig = None
 
     exit(doObjdiffReport(
         mapPath,
@@ -334,7 +356,7 @@ def processArguments(args: argparse.Namespace, decompConfig: decomp_settings.Con
         pathIndex=pathIndex,
         nonmatchingsPath=nonmatchingsPath,
         emitCategories=emitCategories,
-        quiet=quiet
+        summaryTableConfig=summaryTableConfig,
     ))
 
 def addSubparser(subparser: argparse._SubParsersAction[argparse.ArgumentParser], decompConfig: decomp_settings.Config|None=None):

{mapfile_parser-2.9.1.dist-info → mapfile_parser-2.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapfile_parser
-Version: 2.9.1
+Version: 2.9.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -55,7 +55,7 @@ If you use a `requirements.txt` file in your repository, then you can add
 this library with the following line:
 
 ```txt
-mapfile_parser>=2.9.1,<3.0.0
+mapfile_parser>=2.9.3,<3.0.0
 ```
 
 #### Development version
@@ -94,7 +94,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.9.1"
+mapfile_parser = "2.9.3"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.9.1.dist-info → mapfile_parser-2.9.3.dist-info}/RECORD

@@ -1,13 +1,13 @@
-mapfile_parser-2.9.1.dist-info/METADATA,sha256=xRzJrXev2GIYOEZ0f9jUBFjdQQN0YjB1p4_eUyWYXog,5935
-mapfile_parser-2.9.1.dist-info/WHEEL,sha256=YpU2aDuTyBIvwRZn8idqScP-vkQ8DUGkCILtYmMfnFY,96
-mapfile_parser-2.9.1.dist-info/licenses/LICENSE,sha256=8N8dS9WOtgJ0rkqNNOcazXKVkD2umzsKSHI0bd2HhG0,1094
-mapfile_parser/__init__.py,sha256=E1ZQ2Jbd-VKG43M-pLTMGQH14hoRxJqOyTe0pMSRTUk,883
+mapfile_parser-2.9.3.dist-info/METADATA,sha256=7l0uKfaA_6N-35AlYs76_7udGasvJPuNfMMQzjBmLyg,5935
+mapfile_parser-2.9.3.dist-info/WHEEL,sha256=YpU2aDuTyBIvwRZn8idqScP-vkQ8DUGkCILtYmMfnFY,96
+mapfile_parser-2.9.3.dist-info/licenses/LICENSE,sha256=8N8dS9WOtgJ0rkqNNOcazXKVkD2umzsKSHI0bd2HhG0,1094
+mapfile_parser/__init__.py,sha256=WmvRxaLyN1ALFnMNH8QrmWmskDlo-wOEqzRdfu7btiU,883
 mapfile_parser/__main__.py,sha256=BxL4C_wPsFHjvdYkqmL7O3AmvVs9DG34S6Quu843tgs,2235
 mapfile_parser/frontends/__init__.py,sha256=42Wut4H28j9TjPcADXjPtz5oJ-snrfCDcjotOvReo0k,529
 mapfile_parser/frontends/bss_check.py,sha256=-CiP5UvlKKUGoUHQwuOoEYD9T9UDmkUxL7PpmlONih8,8524
 mapfile_parser/frontends/first_diff.py,sha256=7aeVSwaJ9WuktU4lxZKJvKCttp0exnOGEMs6Pb1pFo4,9102
 mapfile_parser/frontends/jsonify.py,sha256=Epb_uZO-sfZ8DjRgKT_whVrYfbtGFm3Lv9ajkRWXlyw,2724
-mapfile_parser/frontends/objdiff_report.py,sha256=gLFB6nerLEUSJ_y1lTxN70oqoY8veLkXXRv2VPX1TRU,18662
+mapfile_parser/frontends/objdiff_report.py,sha256=aLamem6P2LpfaeWA5TbEj4YMtMqKp7EdHXgvYrnzoYc,19458
 mapfile_parser/frontends/pj64_syms.py,sha256=TeIApSG5MIeQS_f9yVcaL9jAPwu0tvtXrzO1OIKV4bY,2403
 mapfile_parser/frontends/progress.py,sha256=g5sKRg0Lij0j9td_fefC33dqP4VB-mAy4jZNbODLUIw,4658
 mapfile_parser/frontends/sym_info.py,sha256=TpyFLCCtzxRZVJoHjz8ObGVl36PVmZQkMM5_kER8vtQ,3630
@@ -16,10 +16,10 @@ mapfile_parser/frontends/upload_frogress.py,sha256=UNRw5VfWxHZtzr5zfRbZ6xi_ojTbZ
 mapfile_parser/internals/__init__.py,sha256=lA5cxXEs9jtz1O5I68rtpEnz3LozDqNAOxV7GmyW2tg,340
 mapfile_parser/internals/objdiff_report.py,sha256=KBNuqjMxXMXZllqLJd4V-wUFFynLK4qT2UIJgjXKysI,6401
 mapfile_parser/mapfile.py,sha256=IgztKA_yORsCCvcjrMzX7NRWdExBj93m-2E3a60azzE,39913
-mapfile_parser/mapfile_parser.cp312-win_amd64.pyd,sha256=BP8xID8DT74OAqiT31uOl_T_vCCbgabWNts8_vEDD84,2599936
+mapfile_parser/mapfile_parser.cp312-win_amd64.pyd,sha256=JLbCBdmx7N-XZq-Bjm-V-p3ICl6zCLvRlBMMyZKgTM0,2601984
 mapfile_parser/mapfile_parser.pyi,sha256=K8bf1H1DXoa9cSIzjhJQTedNM-HtJnPRX1eVBu_26RM,11533
 mapfile_parser/mapfile_rs.py,sha256=7xLjYmXZ-o6FKy5I40U-9mc6wRY413zgW8fGSFvz278,4199
 mapfile_parser/progress_stats.py,sha256=yHA0u1-5-RPEl5bBMM1kxUdp0hlJWsp8S97J8LfOaNc,2604
 mapfile_parser/progress_stats_rs.py,sha256=5b7uw84OQZUchPlNgosfosifOu9aa5tEz_sUdJGuywo,499
 mapfile_parser/utils.py,sha256=TY1Xibb88dL8-2PwLVkmahhIYdBJk_6MLPQ3BUzrh70,1572
-mapfile_parser-2.9.1.dist-info/RECORD,,
+mapfile_parser-2.9.3.dist-info/RECORD,,