Merge pull request #30 from intercreate/feature/use-timeout

Feature/use timeout

Author: JPHutchins

envr-default

@@ -7,6 +7,7 @@ PYTHON_VENV=.venv
 [ADD_TO_PATH]
 
 [ALIASES]
-lint=black --check . && isort --check-only . && flake8 . && mypy .
+lint=black --check --diff --color . && isort --check-only --diff . && flake8 . && mypy .
 test=coverage erase && pytest --cov
 build=python portable.py
+format=black . && isort .

smpmgr/common.py

@@ -70,15 +70,15 @@ def get_smpclient(options: Options) -> SMPClient:
     return get_custom_smpclient(options, SMPClient)
 
 
-async def connect_with_spinner(smpclient: SMPClient) -> None:
+async def connect_with_spinner(smpclient: SMPClient, timeout_s: float) -> None:
     """Spin while connecting to the SMP Server; raises `typer.Exit` if connection fails."""
     with Progress(
         SpinnerColumn(), TextColumn("[progress.description]{task.description}")
     ) as progress:
         connect_task_description = f"Connecting to {smpclient._address}..."
         connect_task = progress.add_task(description=connect_task_description, total=None)
         try:
-            await asyncio.wait_for(smpclient.connect(), timeout=2)
+            await asyncio.wait_for(smpclient.connect(), timeout=timeout_s)
             progress.update(
                 connect_task, description=f"{connect_task_description} OK", completed=True
             )

smpmgr/file_management.py

@@ -40,7 +40,7 @@ def get_supported_hash_types(ctx: typer.Context) -> None:
     smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
 
         r = await smp_request(smpclient, options, SupportedFileHashChecksumTypes(), "Waiting for supported hash types...")  # type: ignore # noqa
 
@@ -64,7 +64,7 @@ def get_hash(
     smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
 
         r = await smp_request(smpclient, options, FileHashChecksum(name=file), "Waiting for hash...")  # type: ignore # noqa
 
@@ -86,7 +86,7 @@ def read_size(
     smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
 
         r = await smp_request(smpclient, options, FileStatus(name=file), "Waiting for file size...")  # type: ignore # noqa
 
@@ -141,10 +141,11 @@ def upload(
 ) -> None:
     """Upload a file."""
 
-    smpclient = get_smpclient(cast(Options, ctx.obj))
+    options = cast(Options, ctx.obj)
+    smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
         with open(file, "rb") as f:
             await upload_with_progress_bar(smpclient, f, destination)
 
@@ -159,10 +160,11 @@ def download(
 ) -> None:
     """Download a file."""
 
-    smpclient = get_smpclient(cast(Options, ctx.obj))
+    options = cast(Options, ctx.obj)
+    smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
         with destination.open("wb") as dest_f:
             file_data = await smpclient.download_file(file)
             dest_f.write(file_data)

smpmgr/image_management.py

@@ -37,7 +37,7 @@ def state_read(ctx: typer.Context) -> None:
     smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
 
         r = await smp_request(smpclient, options, ImageStatesRead(), "Waiting for image states...")  # type: ignore # noqa
 
@@ -104,10 +104,11 @@ def upload(
         logger.exception("Inspection of FW image failed")
         raise typer.Exit(code=1)
 
-    smpclient = get_smpclient(cast(Options, ctx.obj))
+    options = cast(Options, ctx.obj)
+    smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
         with open(file, "rb") as f:
             await upload_with_progress_bar(smpclient, f, slot)
 

smpmgr/main.py

@@ -109,7 +109,7 @@ def upgrade(
     smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
 
         with open(file, "rb") as f:
             await upload_with_progress_bar(smpclient, f, slot)

smpmgr/os_management.py

@@ -18,7 +18,7 @@ def echo(ctx: typer.Context, message: str) -> None:
     smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
         r = await smp_request(smpclient, options, EchoWrite(d=message))  # type: ignore
         print(r)
 
@@ -33,7 +33,7 @@ def reset(ctx: typer.Context) -> None:
     smpclient = get_smpclient(options)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
         r = await smp_request(smpclient, options, ResetWrite())  # type: ignore
         print(r)
 

smpmgr/user/intercreate.py

@@ -69,10 +69,11 @@ def upload(
 ) -> None:
     """Upload data to custom image slots, like a secondary MCU or external storage."""
 
-    smpclient = get_custom_smpclient(cast(Options, ctx.obj), ic.ICUploadClient)
+    options = cast(Options, ctx.obj)
+    smpclient = get_custom_smpclient(options, ic.ICUploadClient)
 
     async def f() -> None:
-        await connect_with_spinner(smpclient)
+        await connect_with_spinner(smpclient, options.timeout)
         with open(file, "rb") as f:
             await upload_with_progress_bar(smpclient, f, image)