lid-cli 0.4__tar.gz → 0.5__tar.gz

{lid_cli-0.4 → lid_cli-0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lid-cli
-Version: 0.4
+Version: 0.5
 Summary: gio-based volume mounting and unmounting tool.
 Author: Christian Heinze
 License-Expression: MIT

{lid_cli-0.4 → lid_cli-0.5}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.10,<0.11" ]
 
 [project]
 name = "lid-cli"
-version = "0.4"
+version = "0.5"
 description = "gio-based volume mounting and unmounting tool."
 readme = "README.md"
 license = "MIT"

{lid_cli-0.4 → lid_cli-0.5}/src/lid/gio.py

@@ -79,11 +79,17 @@ async def mount(kw: str, /, env: types.Environment, runner: AsyncRunner) -> type
             log.exception("Failed to mount volume ID `%s`.", mount_id)
             raise types.GioError(f"failed to mount volume with ID`{mount_id}`") from err
 
+        # Update information to make sure mount information is present.
+        volume_info = await _query_matching_volume_info(
+            kw, include_details=True, env=env, runner=runner
+        )
+        volume = _extract_volume(kw, volume_info=volume_info)
+
     try:
         mp = await _find_mountpoint(
-            volume.data["activation_root"], env=env, runner=runner
+            _extract_gio_location(volume.data), env=env, runner=runner
         )
-    except types.GioError as err:
+    except (ValueError, types.GioError) as err:
         log.exception("Found no mount point for `%s`.", name)
         raise types.GioError(f"found no mount point for `{name}`") from err
 
@@ -112,9 +118,9 @@ async def umount(
 
         try:
             mountpoint = await _find_mountpoint(
-                volume.data["activation_root"], env=env, runner=runner
+                _extract_gio_location(volume.data), env=env, runner=runner
             )
-        except types.GioError as err:
+        except (ValueError, types.GioError) as err:
             log.exception("Found no mount point for `%s`.", name)
             raise types.GioError(f"found no mount point for `{name}`") from err
     else:
@@ -196,14 +202,31 @@ def _extract_volume(kw: str, /, volume_info: Sequence[dict[str, Any]]) -> _Volum
             raise types.GioError("unsupported gio output structure")
 
 
+def _extract_gio_location(info: dict[str, Any], /) -> str:
+    try:
+        mount_info = next(v for k, v in info.items() if k.startswith("Mount"))
+    except StopIteration:
+        raise ValueError("no mount information found") from None
+    if not isinstance(mount_info, dict):
+        raise ValueError("invalid mount information found")
+
+    if (loc := mount_info.get("default_location")) is not None:
+        return loc
+    mount_name, loc_pattern = mount_info.get("__name__", ""), r"->\s*(?P<loc>.+?)$"
+    if (m := re.search(loc_pattern, mount_name)) is not None:
+        return m.group("loc")
+
+    raise ValueError("no mount location found")
+
+
 async def _find_mountpoint(
-    id_: str, /, env: types.Environment, runner: AsyncRunner
+    loc: str, /, env: types.Environment, runner: AsyncRunner
 ) -> str:
     try:
         # Requires volume to be mounted.
         # Need to the US locale as the output key are adapted to that setting.
         gio_out = await runner(
-            env.gio_bin, "info", "-a", "local", id_, env_mods={"LANG": "en_US-UTF-8"}
+            env.gio_bin, "info", "-a", "local", loc, env_mods={"LANG": "en_US-UTF-8"}
         )
     except types.SubprocessError as err:
         raise types.GioError(
@@ -214,7 +237,10 @@ async def _find_mountpoint(
     except types.GioError as err:
         raise types.GioError("failed to parse gio output for path discovery") from err
 
-    return gio_out["local path"]
+    try:
+        return gio_out["local path"]
+    except KeyError:
+        raise types.GioError(f"`{loc}` has no local filesystem path") from None
 
 
 def _parse_output(text: str, /, header_name: str = "__name__") -> dict[str, Any]: