async-mega-py 2.0.4.dev0__tar.gz → 2.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
-Name: async-mega-py
-Version: 2.0.4.dev0
+Name: async-mega.py
+Version: 2.1.0
 Summary: Python library for the Mega.nz and Transfer.it API
 Keywords: api,downloader,mega,mega.nz,transfer.it
 Author: NTFSvolume
@@ -23,21 +23,18 @@ Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python
 Requires-Dist: aiohttp>=3.11.18
 Requires-Dist: aiolimiter>=1.2.1
-Requires-Dist: pycryptodome==3.19.0
-Requires-Dist: async-mega-py[default] ; extra == 'cli'
-Requires-Dist: typer-slim>=0.21.1 ; extra == 'cli'
-Requires-Dist: python-dotenv>=1.2.1 ; extra == 'default'
-Requires-Dist: rich>=14.0.0 ; extra == 'default'
+Requires-Dist: pycryptodome>=3.20.0
+Requires-Dist: cyclopts>=4.10.1 ; extra == 'cli'
+Requires-Dist: python-dotenv>=1.2.1 ; extra == 'cli'
 Requires-Python: >=3.11
 Project-URL: Homepage, https://github.com/NTFSvolume/mega.py
 Provides-Extra: cli
-Provides-Extra: default
 Description-Content-Type: text/markdown
 
 # Async Mega.py
 
 [![PyPI - Version](https://img.shields.io/pypi/v/async-mega-py)](https://pypi.org/project/async-mega-py/)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/async-mega-py)](https://pypi.org/project/async-mega-py/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/async-mega-py?style=flat)](https://pypi.org/project/async-mega-py/)
 [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/NTFSvolume/mega.py/actions/workflows/ruff.yml)
 [![GitHub License](https://img.shields.io/github/license/NTFSvolume/mega.py)](https://github.com/NTFSvolume/mega.py/blob/master/LICENSE)
 [![CI](https://github.com/NTFSvolume/mega.py/actions/workflows/ci.yml/badge.svg)](https://github.com/NTFSvolume/mega.py/actions/workflows/ci.yml)
@@ -99,14 +96,10 @@ Login should always be the first thing you do. Almost all operations require a v
 ```python
 from mega.client import MegaNzClient
 
-async with MegaNzClient() as mega:
-    await mega.login() # login using a temporary anonymous account
-
-# Also works without using it as a context manager,
+# Also works without using it as a context manager, but you have the responsability to close the session at the end
 mega = MegaNzClient()
-await mega.login()
-# but you have the responsability to close the session
-# mega.close()  
+await mega.login() # login using a temporary anonymous account
+# await mega.close()  
 
 ```
 
@@ -133,19 +126,27 @@ contact = "test@mega.nz"
 await mega.add_contact(contact)
 await mega.remove_contact(contact)
 
+async def view_paths():
+    fs = await mega.get_filesystem()
+    print (fs.paths.values())
+
 # Create a folder
 await mega.create_folder('new_folder')
 await mega.create_folder('new_folder/sub_folder/subsub_folder')
+await view_paths()
 
 # Rename a file or a folder
 folder = await mega.find('new_folder/sub_folder/subsub_folder')
 await mega.rename(folder, new_name='my_new_name')
+await view_paths()
 
-# Delete or destroy folder
-
-await mega.delete(folder.id) # Send this node to the trash bin (still counts towards your quota)
-await mega.destroy(folder.id) # This removes it completely from your account
+# Send this node to the trash bin (still counts towards your quota)
+await mega.delete(folder.id)
+await view_paths()
 
+# This removes it completely from your account
+await mega.destroy(folder.id)
+await view_paths()
 ```
 
 ### Upload / Downloads
@@ -154,29 +155,29 @@ await mega.destroy(folder.id) # This removes it completely from your account
 # Upload a file, and get its public link
 my_real_file = '/home/user/myfile.doc' # Change this to a real file path!
 uploaded_file = await mega.upload(my_real_file) # Upload returns the Node that represents the file you just uploaded
-await mega.export(uploaded_file)
+await mega.export(uploaded_file) # This only works with real accounts. Temp accounts can't create public links
 
 # Download a file from your account
 output_dir = "my downloads"
 await mega.download(uploaded_file, output_dir)
 
 # Download a public file
-url = "https://mega.nz/#!hYVmXKqL!r0d0-WRnFwulR_shhuEDwrY1Vo103-am1MyUy8oV6Ps"
-public_handle, public_key = mega.parse_file_url(url)  
+file_url = "https://mega.nz/file/vJ9EBJBC#vA1XpbngXcnN7lqXEWGQFPDc5ZlG6yltCHwGN-0O2LQ"
+public_handle, public_key = mega.parse_file_url(file_url)  
 await mega.download_public_file(public_handle, public_key, output_dir)
 
 # Download a public folder
-url = "https://mega.co.nz/#F!utYjgSTQ!OM4U3V5v_W4N5edSo0wolg1D5H0fwSrLD3oLnLuS9pc"
-public_handle, public_key, selected_node = mega.parse_folder_url(url)
-success, fails = await mega.download_public_folder(public_handle, public_key, output_dir, selected_node)
-print(f"Download of '{url!s}' finished. Successful downloads {len(success)}, failed {len(fails)}")
+folder_url = "https://mega.nz/folder/CJ8y1SDJ#KX8YfTd526P4o_hDH02jLQ"
+public_handle, public_key, selected_node = mega.parse_folder_url(folder_url)
+results = await mega.download_public_folder(public_handle, public_key, output_dir, selected_node)
+for node_id, result in results.items():
+    print ((node_id, result))
 
 # Import a file from URL
-url = "https://mega.nz/#!hYVmXKqL!r0d0-WRnFwulR_shhuEDwrY1Vo103-am1MyUy8oV6Ps"
-public_handle, public_key = mega.parse_file_url(url)
+public_handle, public_key = mega.parse_file_url(file_url)
 await mega.import_public_file(public_handle, public_key, dest_node_id=folder.id)
 
-# How do you know if an URL is a file or folder? call the more generic parse_url method
+# How do you know if an URL is a file or folder?
 result = mega.parse_url(url)
 print (result.is_folder)
 ```
@@ -185,10 +186,8 @@ print (result.is_folder)
 > You can show a progress bar on the terminal for each download/upload by calling them within the `progress_bar` context manager (needs optional dependency `rich` to be installed):
 
 ```python
-url = "https://mega.co.nz/#F!utYjgSTQ!OM4U3V5v_W4N5edSo0wolg1D5H0fwSrLD3oLnLuS9pc"
-public_handle, public_key = mega.parse_folder_url(url)
 with mega.progress_bar:  
-    success, fails = await mega.download_public_folder(public_handle, public_key, output_dir)
+    results = await mega.download_public_folder(public_handle, public_key, output_dir / "with_bar")
 ```
 
 ## The filesystem object
@@ -277,12 +276,11 @@ The output will be:
 
 ```python
 # Get the path to a node
-path = fs.absolute_path("0fPFklV3")
-# Should be: /tests/scripts/notes.txt
+fs.absolute_path("0fPFklV3") # /tests/scripts/notes.txt
 
 # Find a node by its *exact* path
 result = fs.find("/tests/scripts/notes.txt")
-assert result.id == "0fPFklV3"
+print (result.id) # "0fPFklV3"
 
 ```
 
@@ -293,7 +291,7 @@ list(fs.deleted)
 # List all the children of a folder (resursive)
 folder = fs.find("/tests")
 for node in fs.iterdir(folder.id, recursive=True):
-    print(fs.absolute_path(node))
+    print(fs.absolute_path(node.id))
 
 ```
 Output will be:
@@ -306,7 +304,9 @@ Output will be:
     "/tests/scripts",
     "/tests/scripts/notes.txt",
     "/tests/scripts/script.js",
-    "/tests/scripts/styles.css"
+    "/tests/scripts/styles.css",
+    "/tests/setup.sh",
+    "/tests/utils.py",
 ]
 ```
 
@@ -324,7 +324,7 @@ dict(fs.search("/tests/logo.png"))
 ## Transfer.it
 
 > [!NOTE]
-> The `transfer.it` client does not support uploads (yet!)
+> The `transfer.it` client does not support uploads yet (PRs welcome)
 
 ```python
 from mega.transfer_it import TransferItClient
@@ -335,8 +335,8 @@ async with TransferItClient() as client:
     # but it does not have root, inbox or trash_bin nodes
     fs = await client.get_filesystem(transfer_id)
     output_dir = "My downloads"
-    success, fails = await client.download_transfer(transfer_id, output_dir)
-    logger.info(f"Download of '{url!s}' finished. Successful downloads {len(success)}, failed {len(fails)}")
+    results = await client.download_transfer(transfer_id, output_dir)
+    print (results)
 ```
 
 ## CLI
@@ -371,6 +371,6 @@ Usage: mega-py [OPTIONS] COMMAND [ARGS]...
 ```
 
 > [!TIP]
-> The CLI app does *not* accept login credentials, but you can still use your account by setting up the `MEGA_NZ_EMAIL` and `MEGA_NZ_PASSWORD` enviroment variables
+> The CLI app does *not* accept login credentials, but you can still use your account by setting up the `MEGA_EMAIL` and `MEGA_PWD` enviroment variables
 >
 > It will also read them from an `.env` file (if found)

{async_mega_py-2.0.4.dev0 → async_mega_py-2.1.0}/README.md

@@ -1,7 +1,7 @@
 # Async Mega.py
 
 [![PyPI - Version](https://img.shields.io/pypi/v/async-mega-py)](https://pypi.org/project/async-mega-py/)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/async-mega-py)](https://pypi.org/project/async-mega-py/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/async-mega-py?style=flat)](https://pypi.org/project/async-mega-py/)
 [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/NTFSvolume/mega.py/actions/workflows/ruff.yml)
 [![GitHub License](https://img.shields.io/github/license/NTFSvolume/mega.py)](https://github.com/NTFSvolume/mega.py/blob/master/LICENSE)
 [![CI](https://github.com/NTFSvolume/mega.py/actions/workflows/ci.yml/badge.svg)](https://github.com/NTFSvolume/mega.py/actions/workflows/ci.yml)
@@ -63,14 +63,10 @@ Login should always be the first thing you do. Almost all operations require a v
 ```python
 from mega.client import MegaNzClient
 
-async with MegaNzClient() as mega:
-    await mega.login() # login using a temporary anonymous account
-
-# Also works without using it as a context manager,
+# Also works without using it as a context manager, but you have the responsability to close the session at the end
 mega = MegaNzClient()
-await mega.login()
-# but you have the responsability to close the session
-# mega.close()  
+await mega.login() # login using a temporary anonymous account
+# await mega.close()  
 
 ```
 
@@ -97,19 +93,27 @@ contact = "test@mega.nz"
 await mega.add_contact(contact)
 await mega.remove_contact(contact)
 
+async def view_paths():
+    fs = await mega.get_filesystem()
+    print (fs.paths.values())
+
 # Create a folder
 await mega.create_folder('new_folder')
 await mega.create_folder('new_folder/sub_folder/subsub_folder')
+await view_paths()
 
 # Rename a file or a folder
 folder = await mega.find('new_folder/sub_folder/subsub_folder')
 await mega.rename(folder, new_name='my_new_name')
+await view_paths()
 
-# Delete or destroy folder
-
-await mega.delete(folder.id) # Send this node to the trash bin (still counts towards your quota)
-await mega.destroy(folder.id) # This removes it completely from your account
+# Send this node to the trash bin (still counts towards your quota)
+await mega.delete(folder.id)
+await view_paths()
 
+# This removes it completely from your account
+await mega.destroy(folder.id)
+await view_paths()
 ```
 
 ### Upload / Downloads
@@ -118,29 +122,29 @@ await mega.destroy(folder.id) # This removes it completely from your account
 # Upload a file, and get its public link
 my_real_file = '/home/user/myfile.doc' # Change this to a real file path!
 uploaded_file = await mega.upload(my_real_file) # Upload returns the Node that represents the file you just uploaded
-await mega.export(uploaded_file)
+await mega.export(uploaded_file) # This only works with real accounts. Temp accounts can't create public links
 
 # Download a file from your account
 output_dir = "my downloads"
 await mega.download(uploaded_file, output_dir)
 
 # Download a public file
-url = "https://mega.nz/#!hYVmXKqL!r0d0-WRnFwulR_shhuEDwrY1Vo103-am1MyUy8oV6Ps"
-public_handle, public_key = mega.parse_file_url(url)  
+file_url = "https://mega.nz/file/vJ9EBJBC#vA1XpbngXcnN7lqXEWGQFPDc5ZlG6yltCHwGN-0O2LQ"
+public_handle, public_key = mega.parse_file_url(file_url)  
 await mega.download_public_file(public_handle, public_key, output_dir)
 
 # Download a public folder
-url = "https://mega.co.nz/#F!utYjgSTQ!OM4U3V5v_W4N5edSo0wolg1D5H0fwSrLD3oLnLuS9pc"
-public_handle, public_key, selected_node = mega.parse_folder_url(url)
-success, fails = await mega.download_public_folder(public_handle, public_key, output_dir, selected_node)
-print(f"Download of '{url!s}' finished. Successful downloads {len(success)}, failed {len(fails)}")
+folder_url = "https://mega.nz/folder/CJ8y1SDJ#KX8YfTd526P4o_hDH02jLQ"
+public_handle, public_key, selected_node = mega.parse_folder_url(folder_url)
+results = await mega.download_public_folder(public_handle, public_key, output_dir, selected_node)
+for node_id, result in results.items():
+    print ((node_id, result))
 
 # Import a file from URL
-url = "https://mega.nz/#!hYVmXKqL!r0d0-WRnFwulR_shhuEDwrY1Vo103-am1MyUy8oV6Ps"
-public_handle, public_key = mega.parse_file_url(url)
+public_handle, public_key = mega.parse_file_url(file_url)
 await mega.import_public_file(public_handle, public_key, dest_node_id=folder.id)
 
-# How do you know if an URL is a file or folder? call the more generic parse_url method
+# How do you know if an URL is a file or folder?
 result = mega.parse_url(url)
 print (result.is_folder)
 ```
@@ -149,10 +153,8 @@ print (result.is_folder)
 > You can show a progress bar on the terminal for each download/upload by calling them within the `progress_bar` context manager (needs optional dependency `rich` to be installed):
 
 ```python
-url = "https://mega.co.nz/#F!utYjgSTQ!OM4U3V5v_W4N5edSo0wolg1D5H0fwSrLD3oLnLuS9pc"
-public_handle, public_key = mega.parse_folder_url(url)
 with mega.progress_bar:  
-    success, fails = await mega.download_public_folder(public_handle, public_key, output_dir)
+    results = await mega.download_public_folder(public_handle, public_key, output_dir / "with_bar")
 ```
 
 ## The filesystem object
@@ -241,12 +243,11 @@ The output will be:
 
 ```python
 # Get the path to a node
-path = fs.absolute_path("0fPFklV3")
-# Should be: /tests/scripts/notes.txt
+fs.absolute_path("0fPFklV3") # /tests/scripts/notes.txt
 
 # Find a node by its *exact* path
 result = fs.find("/tests/scripts/notes.txt")
-assert result.id == "0fPFklV3"
+print (result.id) # "0fPFklV3"
 
 ```
 
@@ -257,7 +258,7 @@ list(fs.deleted)
 # List all the children of a folder (resursive)
 folder = fs.find("/tests")
 for node in fs.iterdir(folder.id, recursive=True):
-    print(fs.absolute_path(node))
+    print(fs.absolute_path(node.id))
 
 ```
 Output will be:
@@ -270,7 +271,9 @@ Output will be:
     "/tests/scripts",
     "/tests/scripts/notes.txt",
     "/tests/scripts/script.js",
-    "/tests/scripts/styles.css"
+    "/tests/scripts/styles.css",
+    "/tests/setup.sh",
+    "/tests/utils.py",
 ]
 ```
 
@@ -288,7 +291,7 @@ dict(fs.search("/tests/logo.png"))
 ## Transfer.it
 
 > [!NOTE]
-> The `transfer.it` client does not support uploads (yet!)
+> The `transfer.it` client does not support uploads yet (PRs welcome)
 
 ```python
 from mega.transfer_it import TransferItClient
@@ -299,8 +302,8 @@ async with TransferItClient() as client:
     # but it does not have root, inbox or trash_bin nodes
     fs = await client.get_filesystem(transfer_id)
     output_dir = "My downloads"
-    success, fails = await client.download_transfer(transfer_id, output_dir)
-    logger.info(f"Download of '{url!s}' finished. Successful downloads {len(success)}, failed {len(fails)}")
+    results = await client.download_transfer(transfer_id, output_dir)
+    print (results)
 ```
 
 ## CLI
@@ -335,6 +338,6 @@ Usage: mega-py [OPTIONS] COMMAND [ARGS]...
 ```
 
 > [!TIP]
-> The CLI app does *not* accept login credentials, but you can still use your account by setting up the `MEGA_NZ_EMAIL` and `MEGA_NZ_PASSWORD` enviroment variables
+> The CLI app does *not* accept login credentials, but you can still use your account by setting up the `MEGA_EMAIL` and `MEGA_PWD` enviroment variables
 >
 > It will also read them from an `.env` file (if found)

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

@@ -20,7 +20,7 @@ classifiers = [
 dependencies = [
     "aiohttp>=3.11.18",
     "aiolimiter>=1.2.1",
-    "pycryptodome==3.19.0"
+    "pycryptodome>=3.20.0"
 ]
 description = "Python library for the Mega.nz and Transfer.it API"
 keywords = [
@@ -34,21 +34,17 @@ license = "Apache-2.0"
 license-files = ["LICENSE"]
 readme = "README.md"
 requires-python = ">=3.11"
-version = "2.0.4.dev"
+version = "2.1.0"
 
 [project.optional-dependencies]
 cli = [
-    "async-mega-py[default]",
-    "typer-slim>=0.21.1"
-]
-default = [
-    "python-dotenv>=1.2.1",
-    "rich>=14.0.0"
+    "cyclopts>=4.10.1",
+    "python-dotenv>=1.2.1"
 ]
 
 [project.scripts]
-async-mega-py = "mega.cli:main"
-mega-py = "mega.cli:main"
+async-mega-py = "mega.__main__:app.meta"
+mega-py = "mega.__main__:app.meta"
 
 [project.urls]
 Homepage = "https://github.com/NTFSvolume/mega.py"
@@ -123,17 +119,12 @@ module-name = "mega"
 
 [build-system]
 build-backend = "uv_build"
-requires = ["uv_build>=0.8.17,<0.9.0"]
+requires = ["uv_build<=0.10.11"]
 
 [dependency-groups]
 dev = [
-    "coverage[toml]>=7.7.0",
-    "pre-commit>=4.5.0",
+    "prek>=0.3.6",
     "pytest-asyncio>=0.25.0",
-    "pytest-cov>=6.0.0",
     "pytest>=8.3.5",
-    "requests-mock>=1.12.1",
-    "rich>=14.0.0",
-    "ruff>=0.13.1",
-    "typing-extensions>=4.15.0"
+    "ruff==0.15.6"
 ]

async_mega_py-2.0.4.dev0/src/mega/cli/__init__.py → async_mega_py-2.1.0/src/mega/__main__.py

@@ -6,12 +6,11 @@ import logging
 from pathlib import Path
 from typing import TYPE_CHECKING, Annotated
 
-import typer
 import yarl
+from cyclopts import App, Parameter
 
-from mega import __version__, env, progress
+from mega import __version__, env
 from mega.api import LOG_HTTP_TRAFFIC
-from mega.cli.app import CLIApp
 from mega.client import MegaNzClient
 from mega.transfer_it import TransferItClient
 from mega.utils import Site, setup_logger
@@ -21,14 +20,26 @@ if TYPE_CHECKING:
 
 
 logger = logging.getLogger("mega")
+CWD = Path.cwd()
+
+app = App(
+    help=(
+        "CLI app for the [bold black]Mega.nz[/bold black] and [bold black]Transfer.it[/bold black].\n"
+        f"Set [bold green]{env.EMAIL.name}[/bold green] and [bold green]{env.PASSWORD.name}[/bold green]\n"
+        "enviroment variables to use them as credentials for Mega"
+    ),
+    help_format="rich",
+    version=__version__,
+)
 
 
+@app.meta.default
 def verbose(
+    *tokens: Annotated[str, Parameter(show=False, allow_leading_hyphen=True)],
     verbose: Annotated[
         int,
-        typer.Option(
-            "-v",
-            "--verbose",
+        Parameter(
+            name=["-v", "--verbose"],
             count=True,
             help="Increase verbosity (-v shows debug logs,  -vv shows HTTP traffic)",
         ),
@@ -39,18 +50,7 @@ def verbose(
 
     level = logging.DEBUG if verbose else logging.INFO
     setup_logger(level)
-
-
-app = CLIApp(
-    add_completion=False,
-    callback=verbose,
-    help=(
-        "CLI app for the [bold black]Mega.nz[/bold black] and [bold black]Transfer.it[/bold black].\n"
-        f"Set [bold green]{env.NAMES.EMAIL}[/bold green] and [bold green]{env.NAMES.PASSWORD}[/bold green] enviroment variables to use them as credentials for Mega"
-    ),
-    epilog=f"v{__version__}",
-)
-CWD = Path.cwd()
+    app(tokens)
 
 
 @contextlib.asynccontextmanager
@@ -63,7 +63,7 @@ async def connect() -> AsyncGenerator[MegaNzClient]:
 
 async def transfer_it(url: str, output_dir: Path) -> None:
     async with TransferItClient() as client:
-        with progress.new_progress():
+        with client.progress_bar:
             transfer_id = client.parse_url(url)
             logger.info(f"Downloading '{url}'")
             results = await client.download_transfer(transfer_id, output_dir)
@@ -75,6 +75,7 @@ async def transfer_it(url: str, output_dir: Path) -> None:
 @app.command()
 async def download(url: str, output_dir: Path = CWD) -> None:
     """Download a public file or folder by its URL (transfer.it / mega.nz)"""
+
     site = Site(yarl.URL(url).origin())
     if site is Site.TRANSFER_IT:
         return await transfer_it(url, output_dir)
@@ -82,13 +83,15 @@ async def download(url: str, output_dir: Path = CWD) -> None:
     async with connect() as mega:
         parsed_url = mega.parse_url(url)
         if parsed_url.is_folder:
-            return await download_folder(mega, url, output_dir)
-        await download_file(mega, url, output_dir)
+            await download_folder(mega, url, output_dir)
+        else:
+            await download_file(mega, url, output_dir)
 
 
 @app.command()
 async def dump(output_dir: Path = CWD) -> None:
     """Dump a copy of your filesystem to disk"""
+
     async with connect() as mega:
         fs = await mega.get_filesystem()
         out = output_dir / "filesystem.json"
@@ -100,6 +103,7 @@ async def dump(output_dir: Path = CWD) -> None:
 @app.command()
 async def stats() -> None:
     """Show account stats"""
+
     async with connect() as mega:
         stats = await mega.get_account_stats()
         logger.info(f"Account stats for {env.EMAIL or 'TEMP ACCOUNT'}:")
@@ -113,10 +117,19 @@ async def stats() -> None:
 @app.command()
 async def upload(file_path: Path) -> None:
     """Upload a file to your account"""
+
     async with connect() as mega:
+        if not env.EMAIL:
+            logger.warning("Files uploaded by a temp account can not be exported")
+
         folder = await mega.create_folder("uploaded by mega.py")
         logger.info(f'Uploading "{file_path!s}"')
         file = await mega.upload(file_path, folder.id)
+        path = (await mega.get_filesystem()).absolute_path(file.id)
+        logger.info(f'File uploaded to your cloud. Path = "{path}"')
+        if not env.EMAIL:
+            return
+
         link = await mega.export(file)
         logger.info(f'Public link for "{file_path!s}": {link}')
 
@@ -135,5 +148,5 @@ async def download_folder(mega: MegaNzClient, url: str, output: Path) -> None:
     logger.info(f"Download of '{url}' finished. Successful = {len(results.success)}, failed = {len(results.fails)}")
 
 
-def main() -> None:
-    app()
+if __name__ == "__main__":
+    app.meta()

{async_mega_py-2.0.4.dev0 → async_mega_py-2.1.0}/src/mega/api.py

@@ -14,7 +14,7 @@ import aiohttp
 import yarl
 from aiolimiter import AsyncLimiter
 
-from mega.crypto import generate_hashcash_token
+from mega.crypto import generate_hashcash
 from mega.errors import RequestError, RetryRequestError
 from mega.utils import random_id, random_u32int
 
@@ -38,10 +38,10 @@ def retry(
     exceptions: Sequence[type[Exception]] | type[Exception],
     attempts: int = 10,
     delay: float = 0.5,
-    min_delay: float = 2.0,
     max_delay: float = 30.0,
     backoff: int = 2,
 ) -> Callable[[Callable[_P, Coroutine[None, None, _R]]], Callable[_P, Coroutine[None, None, _R]]]:
+    min_delay: float = 2.0
     if not isinstance(exceptions, Sequence):
         exceptions = [exceptions]
 
@@ -86,7 +86,6 @@ class MegaAPI:
         self.__session = session
         self._auto_close_session = session is None
         self._rate_limiter = AsyncLimiter(100, 60)
-        logger.disabled = not LOG_HTTP_TRAFFIC.get()
 
     @property
     def entrypoint(self) -> yarl.URL:
@@ -148,7 +147,7 @@ class MegaAPI:
                         msg = f"Login failed. Mega requested a proof of work with xhashcash: {xhashcash_challenge}"
                         raise RequestError(msg)
 
-                    headers["X-Hashcash"] = await asyncio.to_thread(generate_hashcash_token, xhashcash_challenge)
+                    headers["X-Hashcash"] = await asyncio.to_thread(generate_hashcash, xhashcash_challenge)
                     continue
 
                 return await self._parse_response(resp)
@@ -176,8 +175,9 @@ class MegaAPI:
         **kwargs: Any,
     ) -> AsyncGenerator[aiohttp.ClientResponse]:
         kwargs["headers"] = _DEFAULT_HEADERS | (headers or {})
-        params = ", ".join(f"{name} = {value!r}" for name, value in kwargs.items())
-        logger.debug(f"Making {method} request to {url!s} with {params}")
+        if LOG_HTTP_TRAFFIC.get():
+            params = ", ".join(f"{name} = {value!r}" for name, value in kwargs.items())
+            logger.debug(f"Making {method} request to {url!s} with {params}")
         async with self._rate_limiter, self._session.request(method, url, **kwargs) as resp:
             yield resp
 
@@ -185,7 +185,8 @@ class MegaAPI:
     async def _parse_response(response: aiohttp.ClientResponse) -> Any:
         json_resp = await response.json()
         resp = json_resp
-        logger.debug(f"Got response [{response.status}] json={json_resp!r}")
+        if LOG_HTTP_TRAFFIC.get():
+            logger.debug(f"Got response [{response.status}] json={json_resp!r}")
 
         if isinstance(json_resp, list) and len(json_resp) == 1:
             resp = json_resp[0]
@@ -197,13 +198,13 @@ class MegaAPI:
             if resp == -3:
                 msg = "Request failed, retrying"
                 logger.warning(msg)
-                raise RetryRequestError()
+                raise RetryRequestError
             raise RequestError(resp)
 
         return resp
 
 
-class AbstractApiClient:
+class APIContextManager:
     __slots__ = ("_api",)
 
     def __init__(self, session: aiohttp.ClientSession | None = None) -> None:
@@ -215,5 +216,7 @@ class AbstractApiClient:
     async def __aexit__(self, *_) -> None:
         await self.close()
 
-    async def close(self) -> None:
+    async def aclose(self) -> None:
         await self._api.close()
+
+    close = aclose