Fixed decompression error

+ JSON export: raw bytes will be hexlified first

docs/conf.py

@@ -11,7 +11,7 @@
 project = 'fsapi-tools'
 copyright = '2022, MatrixEditor'
 author = 'MatrixEditor'
-release = '2.0.3'
+release = '2.0.4'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

fsapi/__init__.py

@@ -26,5 +26,5 @@
 >>> python3 -m fsapi --help
 """
 
-__version__ = "2.0.3"
+__version__ = "2.0.4"
 __author__ = 'MatrixEditor'

fsapi/isu/cli.py

@@ -27,6 +27,7 @@
 import pathlib
 import dataclasses
 import json
+import binascii
 
 from colorama import Fore
 
@@ -39,7 +40,7 @@
 class BytesJSONEncoder(json.JSONEncoder):
     def default(self, o: Any) -> Any:
         if isinstance(o, bytes):
-            return o.decode(errors="replace")
+            return binascii.hexlify(o).decode(errors="replace")
         return super().default(o)
 
 
@@ -206,6 +207,7 @@ def _run(argv, target: pathlib.Path, pp: DataclassPrinter):
                             Fore.RED, "[!] Could not decompress core:", str(core.errors)
                         )
                         print(pp_msg)
+                        return
                     fp.write(data)
                 else:
                     msg = "[out] Saved core to"

fsapi/isu/format.py

@@ -41,7 +41,7 @@
 import enum
 import construct as cs
 
-from lzallright import LZOCompressor, LZOError
+from lzallright import LZOCompressor, LZOError, InputNotConsumed
 from construct_dataclasses import dataclass_struct, csfield, tfield, subcsfield
 
 
@@ -110,8 +110,8 @@ class ISUDataField:
     name_length: int = csfield(cs.Int16ul)
     flags: int = csfield(cs.Int16ul)
     name: str = csfield(cs.PaddedString(cs.this.name_length, "utf-8"))
-    value: int | None = csfield(cs.If(cs.this.length == 32, cs.Int32ul))
     unknown_2: int | None = csfield(cs.If(cs.this.length == 32, cs.Int32ul))
+    value: int | None = csfield(cs.If(cs.this.length == 32, cs.Int32ul))
 
 
 @dataclass_struct
@@ -231,7 +231,7 @@ class ISU(metaclass=isu_t):
     >>> decomp_data = core.decompress(decomp_size.value, verify=True)
     """
 
-    def __init__(self, stream: io.IOBase | mmap.mmap) -> None:
+    def __init__(self, stream: t.Union[io.IOBase, mmap.mmap]) -> None:
         if isinstance(stream, io.IOBase):
             self.stream = mmap.mmap(stream.fileno(), 0)
         elif isinstance(stream, mmap.mmap):
@@ -433,7 +433,7 @@ class isu_core_t:
     :param errors: Optional list of error messages (default: empty list).
     """
 
-    def __init__(self, isu: ISU, data: bytes, compressed=True, *errors) -> None:
+    def __init__(self, isu: ISU, data: bytes, *errors, compressed=True) -> None:
         self.errors = list(errors)
         self.data = data
         self.isu = isu
@@ -469,8 +469,12 @@ def decompress(self, decomp_size: int, verify=False) -> bytes:
                 self.data, output_size_hint=decomp_size
             )
         except LZOError as err:
-            self.errors.append(err)
-            decomp_buf = bytes()  # to prevent errors
+            if isinstance(err, InputNotConsumed):
+                # decompression finished with leftover data
+                _, decomp_buf = err.args
+            else:
+                self.errors.append(err)
+                decomp_buf = bytes()  # to prevent errors
 
         if len(decomp_buf) != decomp_size and verify:
             raise ValueError(

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fsapi-tools"
-version = "2.0.3"
+version = "2.0.4"
 description="Frontier Smart Firmware Tools and FSAPI Implementation."
 authors = [
   { name="MatrixEditor", email="[email protected]" },