[datatransfer] added upload command

Author: MrClock8163

src/instrumentman/__init__.py

@@ -64,6 +64,11 @@ def cli_download() -> None:
     """Download data from the instrument."""
 
 
+@cli.group("upload")  # type: ignore[misc]
+def cli_upload() -> None:
+    """Upload data to the instrument."""
+
+
 cli.add_command(morse.cli)
 cli.add_command(terminal.cli)
 cli_measure.add_command(setmeasurement.cli_measure)
@@ -81,3 +86,4 @@ def cli_download() -> None:
 cli_list.add_command(jobs.cli_list)
 cli_download.add_command(filetransfer.cli_download)
 cli_download.add_command(datatransfer.cli_download)
+cli_upload.add_command(datatransfer.cli_upload)

src/instrumentman/datatransfer/__init__.py

@@ -2,6 +2,7 @@
 
 from click_extra import (
     extra_command,
+    argument,
     option,
     File
 )
@@ -43,3 +44,23 @@ def cli_download(**kwargs: Any) -> None:
     from .app import main_download
 
     main_download(**kwargs)
+
+
+@extra_command(
+    "data",
+    params=None,
+    context_settings={"auto_envvar_prefix": None}
+)  # type: ignore[misc]
+@com_port_argument()
+@argument(
+    "file",
+    help="data file to upload",
+    type=File("rt", encoding="ascii")
+)
+@com_baud_option(1200)
+@com_timeout_option()
+def cli_upload(**kwargs: Any) -> None:
+    """Upload ASCII data to the instrument."""
+    from .app import main_upload
+
+    main_upload(**kwargs)

src/instrumentman/datatransfer/app.py

@@ -1,7 +1,7 @@
-from io import BufferedWriter
+from io import BufferedWriter, TextIOWrapper
 
 from serial import SerialTimeoutException
-from click_extra import echo
+from click_extra import echo, progressbar
 from geocompy.communication import open_serial
 
 from ..utils import echo_green, echo_red, echo_yellow
@@ -32,15 +32,43 @@ def main_download(
                     output.write(data + eol_bytes)
 
                 if data == eof_bytes and autoclose:
-                    echo_green("Transfer finished (end-of-file)")
+                    echo_green("Download finished (end-of-file)")
                     return
             except SerialTimeoutException:
                 if started and autoclose:
-                    echo_green("Transfer finished (timeout)")
+                    echo_green("Download finished (timeout)")
                     return
             except KeyboardInterrupt:
-                echo_yellow("Transfer stopped manually")
+                echo_yellow("Download stopped manually")
                 return
             except Exception as e:
-                echo_red(f"Transfer interrupted by error ({e})")
+                echo_red(f"Download interrupted by error ({e})")
                 return
+
+
+def main_upload(
+    port: str,
+    file: TextIOWrapper,
+    baud: int = 1200,
+    timeout: int = 15
+) -> None:
+    with open_serial(
+        port,
+        speed=baud,
+        timeout=timeout
+    ) as com:
+        try:
+            count = 0
+            with progressbar(
+                file,
+                label="Uploading data",
+                item_show_func=lambda x: f"{count} line(s)"
+            ) as bar:
+                for line in bar:
+                    com.send(line)
+                    count += 1
+        except Exception as e:
+            echo_red(f"Upload interrupted by error ({e})")
+            return
+
+        echo_green("Upload finished")

src/instrumentman/utils.py

@@ -54,7 +54,9 @@ def com_timeout_option(
     )
 
 
-def com_baud_option() -> Callable[[F], F]:
+def com_baud_option(
+    default: int = 9600
+) -> Callable[[F], F]:
     return option(
         "-b",
         "--baud",
@@ -75,7 +77,7 @@ def com_baud_option() -> Callable[[F], F]:
             ]
         ),
         callback=lambda ctx, param, value: int(value),
-        default="9600"
+        default=str(default)
     )