added test case of a wildcard in a file-list file

Author: yucongalicechen

src/diffpy/labpdfproc/tests/conftest.py

@@ -36,6 +36,8 @@ def user_filesystem(tmp_path):
     with open(input_dir / "binary.pkl", "wb") as f:
         f.write(binary_data)
 
+    with open(base_dir / "file_list.txt", "w") as f:
+        f.write("./*.txt")
     with open(input_dir / "file_list.txt", "w") as f:
         f.write("good_data.chi \n good_data.xy \n good_data.txt \n missing_file.txt")
     with open(input_dir / "file_list_example2.txt", "w") as f:

src/diffpy/labpdfproc/tests/test_tools.py

@@ -65,8 +65,8 @@
         ["good_data*"],
         ["good_data.chi", "good_data.xy", "good_data.txt"],
     ),
-    # wildcard pattern for file-list file, currently failing
-    # (["input_dir/file_list*"], "file_list.txt"),
+    # wildcard pattern in a file-list file
+    (["file_list.txt"], ["good_data.txt", "unreadable_file.txt"]),
 ]
 
 

src/diffpy/labpdfproc/tools.py

@@ -42,17 +42,17 @@ def _expand_user_input(args):
     the arguments with the modified input list
 
     """
-    wildcard_inputs = [input_name for input_name in args.input if "*" in input_name]
     file_list_inputs = [input_name for input_name in args.input if "file_list" in input_name]
-    for wildcard_input in wildcard_inputs:
-        input_files = [str(file) for file in Path(".").glob(wildcard_input)]
-        args.input.extend(input_files)
-        args.input.remove(wildcard_input)
     for file_list_input in file_list_inputs:
         with open(file_list_input, "r") as f:
             file_inputs = [input_name.strip() for input_name in f.readlines()]
         args.input.extend(file_inputs)
         args.input.remove(file_list_input)
+    wildcard_inputs = [input_name for input_name in args.input if "*" in input_name]
+    for wildcard_input in wildcard_inputs:
+        input_files = [str(file) for file in Path(".").glob(wildcard_input) if "file_list" not in file.name]
+        args.input.extend(input_files)
+        args.input.remove(wildcard_input)
     return args