.vscode/launch.json

@@ -13,7 +13,6 @@
                 "${workspaceFolder}/tests/resources",
                 "${workspaceFolder}/output.csv",
                 "-r",
-                "-n",
                 "-p",
                 "group_num:group(\\d)-\\w-\\d+\\.txt",
                 "group(\\d)-(?P<sect>\\w)-(?P<patid>\\d+)\\.txt",

csvbyname/cli.py

@@ -63,7 +63,6 @@ def main():
         "Alternatively, use named REGEX groups.",
         nargs="+",
         type=str,
-        required=True
     )
     argparser.add_argument(
         "-n",

csvbyname/generate.py

@@ -72,24 +72,20 @@ def collect_files(
 
 
 def write_collected_to_csv(
-    output_path: str,
+    output_path: str, collected: dict[str, dict[str, str]], property_keys: Iterable[str]
-    collected: dict[str, dict[str, str]],
-    property_keys: Iterable[str],
-    output_basename: bool,
 ):
     with open(output_path, "w") as output_fd:
         s_property_keys = sorted(property_keys)
-        header = ["path"]
+        header = ["path", *s_property_keys]
-        if output_basename:
-            header.append("basename")
-        header.extend(s_property_keys)
         writer = csv.writer(output_fd)
         writer.writerow(header)
         for full_path, properties in collected.items():
-            row = [full_path]
+            writer.writerow(
-            if output_basename:
+                [
-                row.append(os.path.basename(full_path))
+                    full_path,
-            row.extend(
+                    *(
-                (properties[k] if k in properties else "N/A" for k in s_property_keys)
+                        properties[k] if k in properties else "N/A"
+                        for k in s_property_keys
+                    ),
+                ]
             )
-            writer.writerow(row)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = csvbyname
-version = 0.0.5
+version = 0.0.4
 author = Harrison
 
 [options]