mapfile-parser 2.9.1__cp39-cp39-musllinux_1_2_aarch64.whl → 2.9.3__cp39-cp39-musllinux_1_2_aarch64.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,14 +1,14 @@
-mapfile_parser-2.9.1.dist-info/METADATA,sha256=Lq8fzzA5TnRE2lnoilHWWY4ViJhf-Z-0s8J14knLJ3E,5810
-mapfile_parser-2.9.1.dist-info/WHEEL,sha256=q7wQuuLF3Wf37kPvdOw6GyhvyvSy97yv-4o7K0-XKZc,106
-mapfile_parser-2.9.1.dist-info/licenses/LICENSE,sha256=FT7oxTcFUtz2c5eYIYePfzj2UD3hvxtLTa3FWz_nJuM,1073
+mapfile_parser-2.9.3.dist-info/METADATA,sha256=b9kqC03afAEThFIFSzNQQCJnIY5ocHAtFXd4w66zKBA,5810
+mapfile_parser-2.9.3.dist-info/WHEEL,sha256=q7wQuuLF3Wf37kPvdOw6GyhvyvSy97yv-4o7K0-XKZc,106
+mapfile_parser-2.9.3.dist-info/licenses/LICENSE,sha256=FT7oxTcFUtz2c5eYIYePfzj2UD3hvxtLTa3FWz_nJuM,1073
 mapfile_parser.libs/libgcc_s-e52197c3.so.1,sha256=vkPW1Auw6CH9Bjk7frmX3hry_1H9c0tRI0Ncyg71WUI,724137
-mapfile_parser/__init__.py,sha256=SZZ1j-ivjhezJBzyuRW-3ZATQZuaFOwNaasXMkZu1SY,855
+mapfile_parser/__init__.py,sha256=cNi20NfghMMTY4ovVC7UI6V5amy16jrRkj_4yTSLh1c,855
 mapfile_parser/__main__.py,sha256=vErQTK2miHF7NseqLgI567tbFUjOrQ7UNxXOr_FwBhc,2176
 mapfile_parser/frontends/__init__.py,sha256=RIUBbM6crp4V4EeMQy0whTonYauh0Oi2oaxu1NfWNao,512
 mapfile_parser/frontends/bss_check.py,sha256=O50pVG8uCp7poEqtrCbh05eIC_TYq3OIaD5VCZz4xGQ,8328
 mapfile_parser/frontends/first_diff.py,sha256=P5CqdGM_X7-WCcW7ubktKI6fnhHxezc1R0aL4_v3bOA,8899
 mapfile_parser/frontends/jsonify.py,sha256=Xq4fha2wJ70WH0an4BXaLnwgjYhNgAwTvrZZZoicRNQ,2654
-mapfile_parser/frontends/objdiff_report.py,sha256=ltOhrZ3c-S-6mZjHpEvU_0-TSDZ7uXNgUBwbquT5bgQ,18128
+mapfile_parser/frontends/objdiff_report.py,sha256=d3I9PgjFIbWIoz_ZDAz58CMOMDrHNEiXwLOAVIlTzUo,18902
 mapfile_parser/frontends/pj64_syms.py,sha256=mJwiVGKGBoNrI-6VB4UJSVz7mIlihivX3KvUGRtoyMY,2332
 mapfile_parser/frontends/progress.py,sha256=j-6OtUCx8af8f3mcy1njA8AEEkR3mYf9_caCh-gFWDY,4563
 mapfile_parser/frontends/sym_info.py,sha256=CGpMdOHUpZslvTe8RpGJ-xrYhEjkhuzYKSJS4FZ60WI,3536
@@ -17,10 +17,10 @@ mapfile_parser/frontends/upload_frogress.py,sha256=ei3pSz2rzVpDj-0CASnPuyqqhu5Lm
 mapfile_parser/internals/__init__.py,sha256=WW--q8KRIfYTQLOMvRO7PCMSf7uWk-I1T20KU0C2a_0,327
 mapfile_parser/internals/objdiff_report.py,sha256=sZh7rUHdoWJfZKQ3EIeuNH9LqdEis2t7heCo1OOwKJU,6214
 mapfile_parser/mapfile.py,sha256=498NSrZtorSe-W0BzxnMtq-d0xOBBcaj8fB9iRK4Tmg,38834
-mapfile_parser/mapfile_parser.cpython-39-aarch64-linux-gnu.so,sha256=JEwDeL6TQtdZ0nGHy9ZDBLPeoDse7IKsBUX1BT48-i4,3738793
+mapfile_parser/mapfile_parser.cpython-39-aarch64-linux-gnu.so,sha256=CiXeph0XVJMGxR5Yrmx2D0LM54AZpEIdA-ogpZfzj2I,3738793
 mapfile_parser/mapfile_parser.pyi,sha256=AuaCWiMySw-oBr-AR2NSbYbhpVP8TGS16rMeey6wc28,11227
 mapfile_parser/mapfile_rs.py,sha256=0sVtLGvz5SMH5bKeTYu-3sM0f-_xXFRfDyY2g1GDh54,4078
 mapfile_parser/progress_stats.py,sha256=T9V52QIoNBtvsPAbYRlCOAio95Z8VxzZep8bCc1J-H0,2535
 mapfile_parser/progress_stats_rs.py,sha256=Rc9-PuZoKWVTO9TEIRk3Mpw0v6FdCFaJk2h7jUGyT_0,483
 mapfile_parser/utils.py,sha256=Bz6pcuR9lax72Y7avgbOIBlyN-1GcxfDxz5iBodr3n0,1517
-mapfile_parser-2.9.1.dist-info/RECORD,,
+mapfile_parser-2.9.3.dist-info/RECORD,,