validate input file

frankrolf · frankrolf · commit 81ad76605d8c · 2023-10-20T11:53:44.000+02:00
fixes #18
diff --git a/kernFeatureWriter.py b/kernFeatureWriter.py
@@ -905,16 +905,27 @@ def write_fea_data(self, data, output_path):
         print(f'Output file written to {output_path}')
 
 
+def check_input_file(parser, file_name):
+    fn = Path(file_name)
+    if fn.suffix.lower() != '.ufo':
+        parser.error(f'{fn.name} is not a UFO file')
+    if not fn.exists():
+        parser.error(f'{fn.name} does not exist')
+    return file_name
+
+
 def get_args(args=None):
 
     defaults = Defaults()
     parser = argparse.ArgumentParser(
         description=__doc__,
         formatter_class=argparse.ArgumentDefaultsHelpFormatter
     )
+
     parser.add_argument(
         'input_file',
-        help='input font file')
+        type=lambda f: check_input_file(parser, f),
+        help='input UFO file')
 
     parser.add_argument(
         '-o', '--output_name',
@@ -979,13 +990,8 @@ def get_args(args=None):
 
 def main(test_args=None):
     args = get_args(test_args)
-    f_path = Path(args.input_file)
-    if f_path.exists():
-        f = defcon.Font(f_path)
-        run(f, args)
-
-    else:
-        print(f_path, 'does not exist.')
+    f = defcon.Font(args.input_file)
+    run(f, args)
 
 
 if __name__ == '__main__':
diff --git a/markFeatureWriter.py b/markFeatureWriter.py
@@ -92,6 +92,15 @@ def __init__(self):
         self.mkgrp_name = 'COMBINING_MARKS'
 
 
+def check_input_file(parser, file_name):
+    fn = Path(file_name)
+    if fn.suffix.lower() != '.ufo':
+        parser.error(f'{fn.name} is not a UFO file')
+    if not fn.exists():
+        parser.error(f'{fn.name} does not exist')
+    return file_name
+
+
 def get_args(args=None):
 
     defaults = Defaults()
@@ -104,6 +113,7 @@ def get_args(args=None):
 
     parser.add_argument(
         'input_file',
+        type=lambda f: check_input_file(parser, f),
         help='input UFO file')
 
     parser.add_argument(
diff --git a/tests/test_kernFeatureWriter.py b/tests/test_kernFeatureWriter.py
@@ -1,4 +1,5 @@
 import defcon
+import pytest
 import sys
 
 from afdko.fdkutils import get_temp_dir_path
@@ -34,9 +35,12 @@ def read_file(path):
 # ----------
 
 def test_get_args():
-    argparse_args = vars(get_args(['dummy']))  # args through argparse
-    dummy_args = Defaults().__dict__  # hard-coded dummy arguments
-    dummy_args['input_file'] = 'dummy'
+    # args through argparse
+    input_ufo = str(TEST_DIR / 'kern_example.ufo')
+    argparse_args = vars(get_args([input_ufo]))
+    # hard-coded dummy arguments
+    dummy_args = Defaults().__dict__
+    dummy_args['input_file'] = input_ufo
     assert argparse_args == dummy_args
 
 
@@ -225,17 +229,30 @@ def test_main():
     assert read_file(fea_example) == read_file(fea_temp)
 
 
-def test_main_invalid_input_file(capsys):
+def test_phantom_input_ufo(capsys):
     '''
-    invalid input file
+    non-existent input UFO
     '''
-    ufo_path = TEST_DIR / 'invalid_input_file.ufo'
+    ufo_path = TEST_DIR / 'phantom.ufo'
     args = Defaults()
     args.input_file = ufo_path
-    main([str(ufo_path)])
+    with pytest.raises(SystemExit):
+        main([str(ufo_path)])
     out, err = capsys.readouterr()
+    assert 'phantom.ufo does not exist' in err
+
 
-    assert 'does not exist' in out
+def test_invalid_input_file(capsys):
+    '''
+    invalid input file
+    '''
+    ufo_path = TEST_DIR / 'some_file.xxx'
+    args = Defaults()
+    args.input_file = ufo_path
+    with pytest.raises(SystemExit):
+        main([str(ufo_path)])
+    out, err = capsys.readouterr()
+    assert 'some_file.xxx is not a UFO file' in err
 
 
 def test_default_rtl():
diff --git a/tests/test_markFeatureWriter.py b/tests/test_markFeatureWriter.py
@@ -19,9 +19,12 @@ def read_file(path):
 
 
 def test_get_args():
-    argparse_args = vars(get_args(['dummy']))  # args through argparse
-    dummy_args = Defaults().__dict__  # hard-coded dummy arguments
-    dummy_args['input_file'] = 'dummy'
+    # args through argparse
+    input_ufo = str(TEST_DIR / 'kern_example.ufo')
+    argparse_args = vars(get_args([input_ufo]))
+    # hard-coded dummy arguments
+    dummy_args = Defaults().__dict__
+    dummy_args['input_file'] = input_ufo
     assert argparse_args == dummy_args
 
 
@@ -238,3 +241,29 @@ def test_liga_rtl():
     tmp_fea_mark.unlink()
     tmp_fea_mkmk.unlink()
     tmp_fea_classes.unlink()
+
+
+def test_phantom_input_ufo(capsys):
+    '''
+    non-existent input UFO
+    '''
+    ufo_path = TEST_DIR / 'phantom.ufo'
+    args = Defaults()
+    args.input_file = ufo_path
+    with pytest.raises(SystemExit):
+        main([str(ufo_path)])
+    out, err = capsys.readouterr()
+    assert 'phantom.ufo does not exist' in err
+
+
+def test_invalid_input_file(capsys):
+    '''
+    invalid input file
+    '''
+    ufo_path = TEST_DIR / 'some_file.xxx'
+    args = Defaults()
+    args.input_file = ufo_path
+    with pytest.raises(SystemExit):
+        main([str(ufo_path)])
+    out, err = capsys.readouterr()
+    assert 'some_file.xxx is not a UFO file' in err
