[jobs] added memory device option to listing

Author: MrClock8163

src/instrumentman/jobs/__init__.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from click_extra import extra_command
+from click_extra import extra_command, Choice, option
 
 from ..utils import (
     com_option_group,
@@ -15,6 +15,22 @@
 )  # type: ignore[misc]
 @com_port_argument()
 @com_option_group()
+@option(
+    "-d",
+    "--device",
+    help="Memory device",
+    type=Choice(
+        (
+            "internal",
+            "cf",
+            "sd",
+            "usb",
+            "ram"
+        ),
+        case_sensitive=False
+    ),
+    default="internal"
+)
 def cli_list(**kwargs: Any) -> None:
     """
     List job files on an instrument.

src/instrumentman/jobs/app.py

@@ -5,16 +5,18 @@
 from geocompy.communication import open_serial
 from geocompy.geo import GeoCom
 from geocompy.geo.gctypes import GeoComCode
+from geocompy.geo.gcdata import Device
 
 from ..utils import print_error, print_warning, console
 
 
 def run_listing(
     tps: GeoCom,
+    device: Device,
     logger: Logger
 ) -> None:
     logger.info("Starting job listing")
-    resp_setup = tps.csv.setup_listing()
+    resp_setup = tps.csv.setup_listing(device)
     if resp_setup.error != GeoComCode.OK:
         print_error("Could not set up listing")
         logger.critical(
@@ -58,12 +60,22 @@ def run_listing(
     logger.info("Listing complete")
 
 
+_DEVICE = {
+    "internal": Device.INTERNAL,
+    "cf": Device.CFCARD,
+    "sd": Device.SDCARD,
+    "usb": Device.USB,
+    "ram": Device.RAM
+}
+
+
 def main_list(
     port: str,
     baud: int = 9600,
     timeout: int = 15,
     retry: int = 1,
-    sync_after_timeout: bool = False
+    sync_after_timeout: bool = False,
+    device: str = "internal"
 ) -> None:
     logger = getLogger("iman.jobs.list")
     with open_serial(
@@ -76,6 +88,6 @@ def main_list(
     ) as com:
         tps = GeoCom(com, logger.getChild("instrument"))
         try:
-            run_listing(tps, logger)
+            run_listing(tps, _DEVICE[device], logger)
         finally:
             tps.csv.abort_listing()