feat(aiv): add stdin stdout for json conversion

Author: gynt

sourcehold/tool/convert/aiv/__init__.py

@@ -1,4 +1,4 @@
-import pathlib
+import pathlib, sys
 
 from sourcehold.tool.convert.aiv.exports import to_json
 from sourcehold.tool.convert.aiv.imports import from_json
@@ -13,7 +13,7 @@ def convert_aiv(args):
      return None
 
   inp = args.input
-  if not pathlib.Path(inp).exists():
+  if inp != '-' and not pathlib.Path(inp).exists():
       raise Exception(f"file does not exist: {inp}")
   inp_invert_y = False
   inp_format = args.from_format
@@ -45,7 +45,10 @@ def convert_aiv(args):
     if out_format == "json":
       args.output = "-"
     elif out_format == "aiv":
-      args.output = f"{pathlib.Path(inp).name}.aiv"
+      if inp == "-":
+        args.output = "output.aiv"
+      else:
+        args.output = f"{pathlib.Path(inp).name}.aiv"
     #args.output = f"{pathlib.Path(inp).name}.json"
 
   if args.debug:
@@ -55,13 +58,17 @@ def convert_aiv(args):
 
     conv = to_json(path = inp, include_extra=args.extra, report=args.debug, invert_y=out_invert_y, skip_keep=out_skip_keep)
     if args.output == "-":
-      print(conv)
+      sys.stdout.write(conv)
+      sys.stdout.flush()
     else:
       pathlib.Path(args.output).write_text(conv)
   elif inp_format.startswith('json') and out_format.startswith("aiv"):
-    conv = from_json(path = inp, report=args.debug, invert_y=inp_invert_y)
+    if inp == "-":
+      conv = from_json(f = sys.stdin, report=args.debug, invert_y=inp_invert_y)
+    else:
+      conv = from_json(path = inp, report=args.debug, invert_y=inp_invert_y)
     conv.to_file(args.output)
   else:
-    raise NotImplementedError(f"combination of in-format '{inp_format}' and out-format '{out_format}' not implemented")
+    raise NotImplementedError(f"combination of from-format '{inp_format}' and to-format '{out_format}' not implemented")
 
   return True

sourcehold/tool/convert/aiv/exports.py

@@ -21,12 +21,15 @@
 
 
 
-def to_json(aiv=None, path: str='', include_extra=False, invert_y=True, skip_keep=False, report=False):
-  if aiv == None and not path:
+def to_json(aiv=None, path: str='', f=None, include_extra=False, invert_y=True, skip_keep=False, report=False):
+  if not aiv and not path and not f:
     raise Exception()
   if aiv == None:
-    aiv = AIV().from_file(path)
-  
+    if path:
+      aiv = AIV().from_file(path)
+    else:
+      aiv = AIV().from_buffer(f) # type: ignore
+
   if report:
     print(f"INFO: aiv has version: {aiv.directory.version_number}")
 

sourcehold/tool/convert/aiv/imports.py

@@ -28,13 +28,16 @@ def convert_offsets(offsets, invert_y=False):
   for loc in offsets:
     yield convert_offset(loc, invert_y=invert_y)
 
-def from_json(path = None, data: Dict | None = None, invert_y = True, report = False):
-  if not path and not data:
+def from_json(path: str | None = None, data: Dict | None = None, f=None, invert_y = True, report = False):
+  if not path and not data and not f:
     raise Exception()
 
-  if path and not data:
-    with open(path, 'rb') as f:
-      data = json.load(f)
+  if not data:
+      if path:
+        with open(path, 'rb') as f:
+          data = json.load(f)
+      elif f:
+        data = json.load(f)
 
   if data == None:
     raise Exception()

tests/aiv/test_aiv_to_json.py

@@ -3,7 +3,7 @@
 import unittest
 
 from sourcehold.aivs.AIV import AIV
-from sourcehold.aivs.conversion import to_json
+from sourcehold.tool.convert.aiv.exports import to_json
 
 BASEPATH = pathlib.Path("C:/Program Files (x86)/Steam/steamapps/common/Stronghold Crusader Extreme/aiv")