changing app inputs to required input directory/file list

Author: sbillinge

src/diffpy/labpdfproc/labpdfprocapp.py

@@ -11,7 +11,20 @@
 def get_args(override_cli_inputs=None):
     p = ArgumentParser()
     p.add_argument("mud", help="Value of mu*D for your " "sample. Required.", type=float)
-    p.add_argument("-i", "--input-file", help="The filename of the " "datafile to load.")
+    p.add_argument(
+        "input",
+        nargs="+",
+        help="The filename(s) or folder(s) of the datafile(s) to load.  "
+        "Required.\nSupply a space-separated list of files or directories."
+        "Long lists can be supplied, one per line, in a file with name "
+        "file_list.txt. If one or more directory is provided, all valid "
+        "data-files in that directory will be processed. Examples of valid "
+        "inputs are 'file.xy', 'data/file.xy', 'file.xy, data/file.xy', "
+        "'.' (load everything in the current directory), 'data' (load"
+        "everything in the folder ./data', 'data/file_list.txt' (load"
+        " the list of files contained in the text-file called "
+        "file_list.txt that can be found in the folder ./data).",
+    )
     p.add_argument(
         "-a",
         "--anode-type",

src/diffpy/labpdfproc/tests/test_tools.py

@@ -17,7 +17,7 @@
 @pytest.mark.parametrize("inputs, expected", params1)
 def test_set_output_directory(inputs, expected, user_filesystem):
     expected_output_directory = Path(user_filesystem) / expected[0]
-    cli_inputs = ["2.5"] + inputs
+    cli_inputs = ["2.5", "data.xy"] + inputs
     actual_args = get_args(cli_inputs)
     actual_args.output_directory = set_output_directory(actual_args)
     assert actual_args.output_directory == expected_output_directory
@@ -26,7 +26,7 @@ def test_set_output_directory(inputs, expected, user_filesystem):
 
 
 def test_set_output_directory_bad(user_filesystem):
-    cli_inputs = ["2.5", "--output-directory", "good_data.chi"]
+    cli_inputs = ["2.5", "data.xy", "--output-directory", "good_data.chi"]
     actual_args = get_args(cli_inputs)
     with pytest.raises(FileExistsError):
         actual_args.output_directory = set_output_directory(actual_args)
@@ -45,7 +45,7 @@ def test_set_output_directory_bad(user_filesystem):
 @pytest.mark.parametrize("inputs, expected", params2)
 def test_set_wavelength(inputs, expected):
     expected_wavelength = expected[0]
-    cli_inputs = ["2.5"] + inputs
+    cli_inputs = ["2.5", "data.xy"] + inputs
     actual_args = get_args(cli_inputs)
     actual_args.wavelength = set_wavelength(actual_args)
     assert actual_args.wavelength == expected_wavelength
@@ -69,7 +69,7 @@ def test_set_wavelength(inputs, expected):
 
 @pytest.mark.parametrize("inputs, msg", params3)
 def test_set_wavelength_bad(inputs, msg):
-    cli_inputs = ["2.5"] + inputs
+    cli_inputs = ["2.5", "data.xy"] + inputs
     actual_args = get_args(cli_inputs)
     with pytest.raises(ValueError, match=re.escape(msg[0])):
         actual_args.wavelength = set_wavelength(actual_args)
@@ -87,12 +87,12 @@ def test_set_wavelength_bad(inputs, msg):
 
 @pytest.mark.parametrize("inputs, expected", params5)
 def test_load_user_metadata(inputs, expected):
-    expected_args = get_args(["2.5"])
+    expected_args = get_args(["2.5", "data.xy"])
     for expected_pair in expected:
         setattr(expected_args, expected_pair[0], expected_pair[1])
     delattr(expected_args, "user_metadata")
 
-    cli_inputs = ["2.5"] + inputs
+    cli_inputs = ["2.5", "data.xy"] + inputs
     actual_args = get_args(cli_inputs)
     actual_args = load_user_metadata(actual_args)
     assert actual_args == expected_args
@@ -129,7 +129,7 @@ def test_load_user_metadata(inputs, expected):
 
 @pytest.mark.parametrize("inputs, msg", params6)
 def test_load_user_metadata_bad(inputs, msg):
-    cli_inputs = ["2.5"] + inputs
+    cli_inputs = ["2.5", "data.xy"] + inputs
     actual_args = get_args(cli_inputs)
     with pytest.raises(ValueError, match=msg[0]):
         actual_args = load_user_metadata(actual_args)