[sets] reworked output options

Author: MrClock8163

src/instrumentman/setmeasurement/__init__.py

@@ -7,8 +7,7 @@
     constraint,
     Choice,
     IntRange,
-    file_path,
-    dir_path
+    file_path
 )
 from cloup.constraints import all_or_none
 
@@ -32,20 +31,25 @@
     help="JSON file containing target definitions"
 )
 @argument(
-    "directory",
-    type=dir_path(),
-    help="Directory to save measurement output to"
+    "output",
+    type=str,
+    help=(
+        "Output file path or path template with placeholders "
+        "('{date}', '{time}', '{order}', '{cycles}')"
+    )
 )
 @com_option_group()
 @option(
-    "-f",
-    "--format",
+    "--dateformat",
     type=str,
-    default="setmeasurement_{time}.json",
-    help=(
-        "Session output file name format with placeholders "
-        "(`{time}`: timestamp, `{order}`: order, `{cycle}`: cycles)"
-    )
+    default="%Y%m%d",
+    help="Date format as accepted by strftime"
+)
+@option(
+    "--timeformat",
+    type=str,
+    default="%H%M%S",
+    help="Time format as accepted by strftime"
 )
 @option(
     "-c",

src/instrumentman/setmeasurement/measure.py

@@ -1,4 +1,3 @@
-import os
 from datetime import datetime
 from logging import Logger, getLogger
 from typing import Iterator, Literal
@@ -177,12 +176,13 @@ def measure_set(
 def main(
     port: str,
     targets: pathlib.Path,
-    directory: pathlib.Path,
+    output: str,
     baud: int = 9600,
     timeout: int = 15,
     retry: int = 1,
     sync_after_timeout: bool = False,
-    format: str = "setmeasurement_{time}.json",
+    dateformat: str = "%Y%m%d",
+    timeformat: str = "%H%M%S",
     cycles: int = 1,
     order: Literal['AaBb', 'AabB', 'ABab', 'ABba', 'ABCD'] = "ABba",
     sync_time: bool = True,
@@ -211,10 +211,14 @@ def main(
             points
         )
 
-    timestamp = session.cycles[0].time.strftime("%Y%m%d_%H%M%S")
-    filename = os.path.join(
-        directory,
-        format.format(time=timestamp, order=order, cycle=cycles)
+    epoch = session.cycles[0].time
+    date = epoch.strftime(dateformat)
+    time = epoch.strftime(timeformat)
+    filename = output.format(
+        date=date,
+        time=time,
+        order=order,
+        cycles=cycles
     )
     session.export_to_json(filename)
     logger.info(f"Saved measurement results to '{filename}'")