async-mega-py 2.0.3.dev0__tar.gz → 2.0.4.dev0__tar.gz

{async_mega_py-2.0.3.dev0 → async_mega_py-2.0.4.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: async-mega-py
-Version: 2.0.3.dev0
+Version: 2.0.4.dev0
 Summary: Python library for the Mega.nz and Transfer.it API
 Keywords: api,downloader,mega,mega.nz,transfer.it
 Author: NTFSvolume

{async_mega_py-2.0.3.dev0 → async_mega_py-2.0.4.dev0}/pyproject.toml

@@ -34,7 +34,7 @@ license = "Apache-2.0"
 license-files = ["LICENSE"]
 readme = "README.md"
 requires-python = ">=3.11"
-version = "2.0.3.dev"
+version = "2.0.4.dev"
 
 [project.optional-dependencies]
 cli = [

{async_mega_py-2.0.3.dev0 → async_mega_py-2.0.4.dev0}/src/mega/client.py

@@ -22,7 +22,7 @@ from mega.crypto import (
 from mega.data_structures import AccountStats, Attributes, Crypto, FileInfo, Node, NodeID, NodeType, UserResponse
 from mega.download import DownloadResults
 from mega.filesystem import FileSystem
-from mega.utils import Site, throttled_gather
+from mega.utils import Site, async_map
 
 from .errors import MegaNzError, RequestError, ValidationError
 
@@ -207,7 +207,7 @@ class MegaNzClient(MegaCore):
         base_path = Path(output_dir or ".")
         folder_url = f"{_DOMAIN}/folder/{public_handle}#{public_key}"
 
-        async def worker(file: Node) -> tuple[NodeID, Path | Exception]:
+        async def download(file: Node) -> tuple[NodeID, Path | Exception]:
             web_url = folder_url + f"/file/{file.id}"
             output_path = base_path / fs.relative_path(file.id)
             try:
@@ -224,7 +224,7 @@ class MegaNzClient(MegaCore):
 
             return file.id, result
 
-        results = await throttled_gather(worker, fs.files_from(root_id))
+        results = await async_map(download, fs.files_from(root_id))
         return DownloadResults.split(dict(results))
 
     async def upload(self, file_path: str | PathLike[str], dest_node_id: NodeID | None = None) -> Node:

{async_mega_py-2.0.3.dev0 → async_mega_py-2.0.4.dev0}/src/mega/progress.py

@@ -3,14 +3,16 @@ from __future__ import annotations
 import asyncio
 import contextlib
 from contextvars import ContextVar
-from typing import TYPE_CHECKING, Any, Literal, Protocol, TypeAlias
+from typing import TYPE_CHECKING, Any, Literal, Protocol, TypeAlias, TypeVar
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator
     from types import TracebackType
 
-    from rich.progress import Progress
+    from rich.progress import Progress, Task
+    from rich.text import Text
 
+    _T = TypeVar("_T")
     ProgressHook: TypeAlias = Callable[[float], None]
 
     class ProgressHookContext(Protocol):
@@ -33,12 +35,13 @@ current_hook: ContextVar[ProgressHook] = ContextVar("current_hook", default=lamb
 
 
 @contextlib.contextmanager
-def set_progress_factory(hook_factory: ProgressHookFactory) -> Generator[None]:
-    token = _PROGRESS_HOOK_FACTORY.set(hook_factory)
+def _enter_context(context_var: ContextVar[_T], value: _T) -> Generator[None]:
+    """Context manager for context vars"""
+    token = context_var.set(value)
     try:
         yield
     finally:
-        _PROGRESS_HOOK_FACTORY.reset(token)
+        context_var.reset(token)
 
 
 @contextlib.contextmanager
@@ -48,12 +51,8 @@ def new_task(description: str, total: float, kind: Literal["UP", "DOWN"]) -> Gen
         yield
         return
 
-    with factory(description, total, kind) as progress_hook:
-        token = current_hook.set(progress_hook)
-        try:
-            yield
-        finally:
-            current_hook.reset(token)
+    with factory(description, total, kind) as new_hook, _enter_context(current_hook, new_hook):
+        yield
 
 
 @contextlib.contextmanager
@@ -66,45 +65,64 @@ def new_progress() -> Generator[None]:
     def hook_factory(*args, **kwargs):
         return _new_rich_task(progress, *args, **kwargs)
 
-    with progress, set_progress_factory(hook_factory):
+    with (
+        progress,
+        _enter_context(_PROGRESS_HOOK_FACTORY, hook_factory),
+    ):
         yield
 
 
-def _truncate_desc(desc: str, length: int = 80, placeholder: str = "...") -> str:
-    if len(desc) <= length:
-        return desc
-
-    return f"{desc[: length - len(placeholder)]}{placeholder}"
-
-
 def _new_rich_progress() -> Progress | None:
     try:
+        from rich import get_console
         from rich.progress import (
             BarColumn,
             DownloadColumn,
             Progress,
             SpinnerColumn,
+            TextColumn,
             TimeRemainingColumn,
             TransferSpeedColumn,
         )
+        from rich.table import Column
     except ImportError:
         return None
 
-    else:
-        return Progress(
-            "[{task.fields[kind]}]",
-            SpinnerColumn(),
-            "{task.description}",
-            BarColumn(bar_width=None),
-            "[progress.percentage]{task.percentage:>6.2f}%",
-            "-",
-            DownloadColumn(),
-            "-",
-            TransferSpeedColumn(),
-            "-",
-            TimeRemainingColumn(compact=True, elapsed_when_finished=True),
-            transient=True,
-        )
+    console = get_console()
+
+    class AutoTruncatedTextColumn(TextColumn):
+        def render(self, task: Task) -> Text:
+            text = super().render(task)
+            width = console.width
+            available_witdh = min((width * 60 // 100), (width - 65))
+            desc_limit = max(available_witdh, 8)
+            text.truncate(desc_limit, overflow="ellipsis")
+            return text
+
+    return Progress(
+        "[{task.fields[kind]}]",
+        SpinnerColumn(),
+        AutoTruncatedTextColumn("{task.description}"),
+        BarColumn(
+            bar_width=None,
+        ),
+        "[progress.percentage]{task.percentage:>6.1f}%",
+        "•",
+        DownloadColumn(
+            table_column=Column(justify="right", no_wrap=True),
+        ),
+        "•",
+        TransferSpeedColumn(table_column=Column(justify="right", no_wrap=True)),
+        "•",
+        TimeRemainingColumn(
+            compact=True,
+            elapsed_when_finished=True,
+            table_column=Column(justify="right", no_wrap=True),
+        ),
+        transient=True,
+        console=console,
+        expand=True,
+    )
 
 
 @contextlib.contextmanager
@@ -114,7 +132,7 @@ def _new_rich_task(
     total: float,
     kind: Literal["UP", "DOWN"],
 ) -> Generator[ProgressHook]:
-    task_id = progress.add_task(_truncate_desc(description), total=total, kind=kind)
+    task_id = progress.add_task(description, total=total, kind=kind)
 
     def progress_hook(advance: float) -> None:
         progress.advance(task_id, advance)

{async_mega_py-2.0.3.dev0 → async_mega_py-2.0.4.dev0}/src/mega/transfer_it.py

@@ -15,7 +15,7 @@ from mega.crypto import b64_to_a32, b64_url_decode, decrypt_attr
 from mega.data_structures import Attributes, Crypto, Node, NodeID, NodeType
 from mega.download import DownloadResults
 from mega.filesystem import FileSystem
-from mega.utils import Site, throttled_gather
+from mega.utils import Site, async_map
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
@@ -107,7 +107,7 @@ class TransferItClient(AbstractApiClient):
         base_path = Path(output_dir or ".") / f"transfer.it ({transfer_id})"
         folder_url = f"https://transfer.it/t/{transfer_id}"
 
-        async def worker(file: Node) -> tuple[NodeID, Path | Exception]:
+        async def download(file: Node) -> tuple[NodeID, Path | Exception]:
             web_url = folder_url + f"#{file.id}"
             output_path = base_path / fs.relative_path(file.id)
             dl_link = self.create_download_url(transfer_id, file)
@@ -123,7 +123,7 @@ class TransferItClient(AbstractApiClient):
 
             return file.id, result
 
-        results = await throttled_gather(worker, fs.files_from(root_id))
+        results = await async_map(download, fs.files_from(root_id))
         return DownloadResults.split(dict(results))
 
     async def _download_file(self, dl_link: str, output_path: str | PathLike[str]) -> Path:

{async_mega_py-2.0.3.dev0 → async_mega_py-2.0.4.dev0}/src/mega/utils.py

@@ -77,7 +77,7 @@ def transform_v1_url(url: yarl.URL) -> yarl.URL:
 
 
 @overload
-async def throttled_gather(
+async def async_map(
     coro_factory: Callable[[_T1], Awaitable[_T2]],
     values: Iterable[_T1],
     *,
@@ -87,7 +87,7 @@ async def throttled_gather(
 
 
 @overload
-async def throttled_gather(
+async def async_map(
     coro_factory: Callable[[_T1], Awaitable[_T2]],
     values: Iterable[_T1],
     *,
@@ -96,7 +96,7 @@ async def throttled_gather(
 ) -> list[_T2]: ...
 
 
-async def throttled_gather(
+async def async_map(
     coro_factory: Callable[[_T1], Awaitable[_T2]],
     values: Iterable[_T1],
     *,