splat64 0.33.2__py3-none-any.whl → 0.34.1__py3-none-any.whl

splat/__init__.py

@@ -1,7 +1,7 @@
 __package_name__ = __name__
 
 # Should be synced with pyproject.toml
-__version__ = "0.33.2"
+__version__ = "0.34.1"
 __author__ = "ethteck"
 
 from . import util as util

splat/scripts/split.py

@@ -452,7 +452,8 @@ def main(
     make_full_disasm_for_code=False,
 ):
     if stdout_only:
-        progress_bar.out_file = sys.stdout
+        log.write("--stdout-only flag is deprecated", status="warn")
+    progress_bar.out_file = sys.stdout
 
     # Load config
     global config
@@ -475,7 +476,8 @@ def main(
 
     cache = cache_handler.Cache(config, use_cache, verbose)
 
-    initialize_platform(rom_bytes)
+    if not options.opts.is_unsupported_platform:
+        initialize_platform(rom_bytes)
 
     # Initialize segments
     all_segments = initialize_segments(config["segments"])
@@ -537,7 +539,9 @@ def add_arguments_to_parser(parser: argparse.ArgumentParser):
         help="Skips the disassembler's version check",
     )
     parser.add_argument(
-        "--stdout-only", help="Print all output to stdout", action="store_true"
+        "--stdout-only",
+        help="Print all output to stdout (deprecated)",
+        action="store_true",
     )
     parser.add_argument(
         "--disassemble-all",

splat/segtypes/segment.py

@@ -99,10 +99,21 @@ class Segment:
         if seg_type.startswith("."):
             seg_type = seg_type[1:]
 
-        segment_class = Segment.get_base_segment_class(seg_type)
-        if segment_class == None:
-            # Look in extensions
+        if options.opts.allow_segment_overrides:
             segment_class = Segment.get_extension_segment_class(seg_type)
+            if segment_class == None:
+                segment_class = Segment.get_base_segment_class(seg_type)
+        else:
+            segment_class = Segment.get_base_segment_class(seg_type)
+            if segment_class == None:
+                # Look in extensions
+                segment_class = Segment.get_extension_segment_class(seg_type)
+
+        if segment_class == None:
+            log.error(
+                f"could not load segment type '{seg_type}'\n(hint: confirm your extension directory is configured correctly)"
+            )
+
         return segment_class
 
     @staticmethod
@@ -147,11 +158,8 @@ class Segment:
             ext_mod = importlib.util.module_from_spec(ext_spec)
             assert ext_spec.loader is not None
             ext_spec.loader.exec_module(ext_mod)
-        except Exception as err:
-            log.write(err, status="error")
-            log.error(
-                f"could not load segment type '{seg_type}'\n(hint: confirm your extension directory is configured correctly)"
-            )
+        except Exception:
+            return None
 
         return getattr(
             ext_mod, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}"

splat/util/log.py

@@ -18,7 +18,12 @@ def write(*args, status=None, **kwargs):
         print("")
         newline = True
 
-    print(status_to_ansi(status) + str(args[0]), *args[1:], **kwargs)
+    print(
+        status_to_ansi(status) + str(args[0]),
+        *args[1:],
+        **kwargs,
+        file=output_file(status),
+    )
 
 
 def error(*args, **kwargs) -> NoReturn:
@@ -44,3 +49,9 @@ def status_to_ansi(status: Status):
         return Style.DIM
     else:
         return ""
+
+
+def output_file(status: Status):
+    if status == "warn" or status == "error":
+        return sys.stderr
+    return sys.stdout

splat/util/options.py

@@ -41,6 +41,10 @@ class SplatOpts:
     gp: Optional[int]
     # Checks and errors if there are any non consecutive segment types
     check_consecutive_segment_types: bool
+    # Disable checks on `platform` option.
+    is_unsupported_platform: bool
+    # Allows to take precedence over the splat builtin platform segments via splat extension.
+    allow_segment_overrides: bool
 
     # Paths
     asset_path: Path
@@ -355,7 +359,13 @@ def _parse_yaml(
     p = OptParser(yaml)
 
     basename = p.parse_opt("basename", str)
-    platform = p.parse_opt_within("platform", str, ["n64", "psx", "ps2", "psp"])
+    is_unsupported_platform = p.parse_opt("is_unsupported_platform", bool, False)
+
+    if is_unsupported_platform:
+        platform = p.parse_opt("platform", str)
+    else:
+        platform = p.parse_opt_within("platform", str, ["n64", "psx", "ps2", "psp"])
+
     comp = compiler.for_name(p.parse_opt("compiler", str, "IDO"))
 
     base_path = Path(
@@ -399,6 +409,8 @@ def _parse_yaml(
         target_path=p.parse_path(base_path, "target_path"),
         elf_path=p.parse_optional_path(base_path, "elf_path"),
         platform=platform,
+        is_unsupported_platform=is_unsupported_platform,
+        allow_segment_overrides=p.parse_opt("allow_segment_overrides", bool, False),
         compiler=comp,
         endianness=parse_endianness(),
         section_order=p.parse_opt(

{splat64-0.33.2.dist-info → splat64-0.34.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splat64
-Version: 0.33.2
+Version: 0.34.1
 Summary: A binary splitting tool to assist with decompilation and modding projects
 Project-URL: Repository, https://github.com/ethteck/splat
 Project-URL: Issues, https://github.com/ethteck/splat/issues
@@ -76,7 +76,7 @@ The brackets corresponds to the optional dependencies to install while installin
 If you use a `requirements.txt` file in your repository, then you can add this library with the following line:
 
 ```txt
-splat64[mips]>=0.33.2,<1.0.0
+splat64[mips]>=0.34.1,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.33.2.dist-info → splat64-0.34.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-splat/__init__.py,sha256=RsNLR9JOXykmo-1waX9VcDxc1ayMcuHDl38qCnLmJ4E,291
+splat/__init__.py,sha256=5wCRNvmA64KRVk8KGG4Kk3C9PltHiwgfFf_FxkNA_Pw,291
 splat/__main__.py,sha256=T333dHDgr-2HYYhtARnYMEjdECnYiNIKfcXDD99o22A,732
 splat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 splat/disassembler/__init__.py,sha256=IubLMnm_F5cZ7WUPBfk1VJ7vdj6i1if5GG6RBvEoBEA,226
@@ -15,10 +15,10 @@ splat/platforms/psx.py,sha256=YxQERdOBr4p3ab9Wk80FNhVYi-uvmh7p_jeykSFp23M,40
 splat/scripts/__init__.py,sha256=OY0nHg6a7JB437Sb96qLbZ_7ByVsal1gStj35wJAI_Y,101
 splat/scripts/capy.py,sha256=svbOfLO34-QN3xLiBy9vk2RGs_To8TWMWEKBw6yx2xQ,3674
 splat/scripts/create_config.py,sha256=nFwIt1UWzlWE9C3i-2dGsVyGX2cuXzIqkp2kur2-pdE,7670
-splat/scripts/split.py,sha256=EJLpvwGurQZEe-FE3hfNcMFIbxLToB4SX95OXdL_qoE,19285
+splat/scripts/split.py,sha256=pzNPJRy11YwIA_2wbRYU2m-zIfBRpo2RySJ9nKVBqRI,19433
 splat/segtypes/__init__.py,sha256=-upUw_4JGQtvyp6IfTMzOq_CK3xvVaT_0K0_EipHyOo,208
 splat/segtypes/linker_entry.py,sha256=e2IzjAWC1B_JCx5pxBdKJrzOCse4SYUBrLHM8l3AR3o,24765
-splat/segtypes/segment.py,sha256=Y8OaNle09VeQ8pghzMQtxu8I2sWKy8fWPdfRH1zkUXU,28820
+splat/segtypes/segment.py,sha256=pWpX_PqPCRo8ZFVhqoiYcopzuAyB8PnKa0euEGUV5qc,29094
 splat/segtypes/common/__init__.py,sha256=mnq0acScilSCCo6q2PvkDk0Or3V8qitA7I8QMVw8haI,631
 splat/segtypes/common/asm.py,sha256=k3p4vgbQJP40iyTgQkIci1j3CpKkWksqoWBx2Pb2oh8,703
 splat/segtypes/common/asmtu.py,sha256=C52kKh-8YeDHu0EucEfQ-tQMtDgfKfwAJ6wwiW6nOBU,354
@@ -80,8 +80,8 @@ splat/util/cache_handler.py,sha256=N0SggmvYwh0k-0fngHXoHG1CosC2rCsnlCTDsG8z5aE,1
 splat/util/color.py,sha256=FSmy0dAQJ9FzRBc99Yt4kBEyB62MC_YiVkqoWgPMsRU,371
 splat/util/compiler.py,sha256=xDDNdnutmkB7T21j-BccBMdkA2leU3GzXuTYEWgVgNw,1530
 splat/util/conf.py,sha256=aM6O2QikosjL95pCxI2FcCxrwDsLP8T8sRf2Uev_Pac,3236
-splat/util/log.py,sha256=GguW9AolH-EXGBmh-8aZXgUeBFJthqAOb3qKtRYUSj8,999
-splat/util/options.py,sha256=JHyZnBuB86tbZN_HvhAvOH8oZGsppIc9KmgRVRkBWvg,28632
+splat/util/log.py,sha256=aJA1rg8IirJu1wGzjNuATHvepYvD3k5CtEyMasyJWxI,1193
+splat/util/options.py,sha256=iIwI3ZVbwWNIK4_0BIe3Iu9NxhEfIoXyjVGWgjPmG-Q,29157
 splat/util/palettes.py,sha256=d3KoZnwt-zunI9eNwb3txysXg4DY3xnF0O5aQRxM4so,2920
 splat/util/progress_bar.py,sha256=41VehpIFK1cphENaXV_Aq6_3mFx25eQ8V7Z51SKFPeM,166
 splat/util/relocs.py,sha256=cgQYSaAtNpLlUZQdhEfa7ZpI8i0HqoDhwB88QtFqdJs,4212
@@ -94,8 +94,8 @@ splat/util/n64/find_code_length.py,sha256=uUoPoUORAjsAvH8oGqwnGvw6j8I_NnSrZtA-x9
 splat/util/n64/rominfo.py,sha256=U6TieblUAmxhZsn7u8nbjOKkbC6ygsC_7IiLLaOWwUE,14646
 splat/util/psx/__init__.py,sha256=kCCaR-KB1mNlIcXB4OuuSQ2zVLbWg_SnIZIUeyjeBBI,39
 splat/util/psx/psxexeinfo.py,sha256=MrxY28nes0uzpFmCz0o9JFbF8s1eQRQNOpC_82wsMVI,5725
-splat64-0.33.2.dist-info/METADATA,sha256=CFJ6z02JMyJ-uNmy8mBoRrVFXUvxbPnmlmk653LBbd0,3830
-splat64-0.33.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-splat64-0.33.2.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
-splat64-0.33.2.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
-splat64-0.33.2.dist-info/RECORD,,
+splat64-0.34.1.dist-info/METADATA,sha256=WATpGC8bfgKAPc5XzA_aUB7Iib55DdqNVPxIWTkSF2s,3830
+splat64-0.34.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+splat64-0.34.1.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
+splat64-0.34.1.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
+splat64-0.34.1.dist-info/RECORD,,