load input directory and files

src/diffpy/labpdfproc/tests/test_tools.py

@@ -15,14 +15,14 @@
 
 params1 = [
     (
-        [],
+        ["--input-file", "."],
         [
             ".",
-            ["good_data.chi", "good_data.xy", "good_data.txt", "unreadable_file.txt", "binary.pkl", "input_dir"],
+            ["good_data.chi", "good_data.xy", "good_data.txt", "unreadable_file.txt", "binary.pkl"],
         ],
     ),
     (["--input-file", "good_data.chi"], [".", "good_data.chi"]),
-    (["--input-file", "input_dir/unreadable_file.txt"], ["input_dir", "input_dir/unreadable_file.txt"]),
+    (["--input-file", "input_dir/unreadable_file.txt"], ["input_dir", "unreadable_file.txt"]),
     # ([Path.cwd()], [Path.cwd()]),
 ]
 

src/diffpy/labpdfproc/tools.py

@@ -8,7 +8,7 @@
 
 def set_input_files(args):
     """
-    Set input directory and files, default is current working directory and all files in it
+    Set input directory and files
 
     Parameters
     ----------
@@ -20,12 +20,19 @@ def set_input_files(args):
     args argparse.Namespace
 
     """
-    input_dir = Path.cwd() / Path(args.input_file).parent if args.input_file else Path.cwd()
-    setattr(args, "input_directory", input_dir)
-    if not args.input_file:
-        input_files = glob.glob(str(input_dir) + "/*", recursive=True)
+    if not args.input_file or not Path(args.input_file).exists():
+        raise ValueError("Please specify valid input file or directory.")
+
+    if not Path(args.input_file).is_dir():
+        input_dir = Path.cwd() / Path(args.input_file).parent
+        input_file_name = Path(args.input_file).name
+        args.input_file = input_file_name
+    else:
+        input_dir = Path(args.input_file).resolve()
+        input_files = [file for file in glob.glob(str(input_dir) + "/*", recursive=True) if os.path.isfile(file)]
         input_file_names = [os.path.basename(input_file_path) for input_file_path in input_files]
         args.input_file = input_file_names
+    setattr(args, "input_directory", input_dir)
     return args