add multi line test

AndyEveritt · AndyEveritt · commit 7e0f61ea3d02 · 2024-09-18T11:17:16.000+01:00
diff --git a/main.py b/main.py
@@ -1,7 +1,36 @@
+import argparse
+import os
 from gcodeparser import GcodeParser
 
+
 if __name__ == '__main__':
-    with open('3DBenchy.gcode', 'r') as f:
+    parser = argparse.ArgumentParser(
+        prog='GcodeParser',
+        description='Converts a gcode file into an array of Python objects representing each command',
+    )
+
+    parser.add_argument(
+        'input_file',
+        help='Path to the gcode file to be parsed',
+    )
+
+    parser.add_argument(
+        '-o',
+        '--output_file',
+        help='Path to the output file where the parsed gcode will be saved. Defaults to stdout.',
+        default='-',
+    )
+
+    args = parser.parse_args()
+
+    with open(os.path.expanduser(args.input_file), 'r') as f:
         gcode = f.read()
     parsed_gcode = GcodeParser(gcode)
+    if args.output_file == '-':
+        for line in parsed_gcode.lines:
+            print(line)
+    else:
+        with open(os.path.expanduser(args.output_file), 'w') as f:
+            for line in parsed_gcode.lines:
+                f.write(str(line) + '\n')
     pass
diff --git a/test/test_get_lines.py b/test/test_get_lines.py
@@ -129,4 +129,25 @@ def test_multi_line():
     assert get_lines('G91\nG1 X-10 Y20 ; inline comment\nG1 Z0.5\nT1\nM350 T100') == lines
     assert get_lines('G91G1 X-10 Y20;inline comment\nG1 Z0.5\nT1M350 T100') == lines
     assert get_lines(' \tG91\n\tG1\t  X-10 Y20 \t ;\t inline comment\nG1 Z0.5\nT1\nM350 T100') == lines
-    assert get_lines('G91\nG1 X-10 Y20 ; inline comment\n; comment to be excluded\nG1 Z0.5\nT1\nM350 T100', include_comments=False) == lines
+    assert get_lines('G91\nG1 X-10 Y20 ; inline comment\n; comment to be excluded\nG1 Z0.5\nT1\nM350 T100',
+                     include_comments=False) == lines
+    assert get_lines('G91 G1 X-10 Y20 ; inline comment\n; comment to be excluded\nG1 Z0.5\nT1\nM350 T100',
+                     include_comments=False) == lines
+
+
+def test_multi_line2():
+    """ We want to ignore things that look like gcode in the comments
+    """
+    lines = [
+        GcodeLine(
+            command=('G', 91),
+            params={},
+            comment='',
+        ),
+        GcodeLine(
+            command=('G', 1),
+            params={'X': 100},
+            comment='comment G90'
+        )
+    ]
+    assert get_lines('G91 G1 X100 ; comment G90') == lines
