async-mega-py 2.2.1__tar.gz → 2.2.2__tar.gz

{async_mega_py-2.2.1 → async_mega_py-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: async-mega.py
-Version: 2.2.1
+Version: 2.2.2
 Summary: Python library for the Mega.nz and Transfer.it API
 Keywords: api,downloader,mega,mega.nz,transfer.it
 Author: NTFSvolume
@@ -79,7 +79,7 @@ Please check [`src/mega/data_structures.py`](src/mega/data_structures.py) for de
 > [!TIP]
 > You can run the commands bellow in an interactive python (the asyncio REPL). Try them in real time as is, using `async/await` keywords!
 >
-> ```uv run -p3.12 --with async-mega-py python -m asyncio```
+> `uv run -p3.12 --with async-mega-py python -m asyncio`
 
 ```python
 from mega.client import MegaNzClient
@@ -99,7 +99,7 @@ from mega.client import MegaNzClient
 # 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() # login using a temporary anonymous account
-# await mega.close()  
+# await mega.close()
 
 ```
 
@@ -163,7 +163,7 @@ await mega.download(uploaded_file, output_dir)
 
 # Download a public file
 file_url = "https://mega.nz/file/vJ9EBJBC#vA1XpbngXcnN7lqXEWGQFPDc5ZlG6yltCHwGN-0O2LQ"
-public_handle, public_key = mega.parse_file_url(file_url)  
+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
@@ -186,7 +186,7 @@ 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
-with mega.progress_bar:  
+with mega.progress_bar:
     results = await mega.download_public_folder(public_handle, public_key, output_dir / "with_bar")
 ```
 
@@ -264,16 +264,14 @@ The output will be:
 
 ```json
 {
-    "oImwb6nN": "/tests/script.js",
-    "FIXitv4F": "/tests/scripts",
-    "0fPFklV3": "/tests/scripts/notes.txt",
-    "l9zkz1GU": "/tests/scripts/script.js",
-    "E4LqT4EF": "/tests/scripts/styles.css",
+  "oImwb6nN": "/tests/script.js",
+  "FIXitv4F": "/tests/scripts",
+  "0fPFklV3": "/tests/scripts/notes.txt",
+  "l9zkz1GU": "/tests/scripts/script.js",
+  "E4LqT4EF": "/tests/scripts/styles.css"
 }
 ```
 
-
-
 ```python
 # Get the path to a node
 fs.absolute_path("0fPFklV3") # /tests/scripts/notes.txt
@@ -294,24 +292,25 @@ for node in fs.iterdir(folder.id, recursive=True):
     print(fs.absolute_path(node.id))
 
 ```
+
 Output will be:
 
 ```json
 [
-    "/tests/logo.png",
-    "/tests/logo.png",
-    "/tests/script.js",
-    "/tests/scripts",
-    "/tests/scripts/notes.txt",
-    "/tests/scripts/script.js",
-    "/tests/scripts/styles.css",
-    "/tests/setup.sh",
-    "/tests/utils.py",
+  "/tests/logo.png",
+  "/tests/logo.png",
+  "/tests/script.js",
+  "/tests/scripts",
+  "/tests/scripts/notes.txt",
+  "/tests/scripts/script.js",
+  "/tests/scripts/styles.css",
+  "/tests/setup.sh",
+  "/tests/utils.py"
 ]
 ```
 
 > [!IMPORTANT]  
-> Mega's filesystem is *not* POSIX-compliant: multiple nodes may have the same path.
+> Mega's filesystem is _not_ POSIX-compliant: multiple nodes may have the same path.
 >
 > If 2 nodes have the same path, `find` will throw an error.
 
@@ -352,10 +351,10 @@ mega-py --help
 ```
 
 ```powershell
-Usage: mega-py [OPTIONS] COMMAND [ARGS]...  
+Usage: mega-py [OPTIONS] COMMAND [ARGS]...
 
- CLI app for the Mega.nz and Transfer.it. Set MEGA_NZ_EMAIL and MEGA_NZ_PASSWORD  
- enviroment variables to use them as credentials for Mega  
+ CLI app for the Mega.nz and Transfer.it. Set MEGA_EMAIL and MEGA_PWD
+ enviroment variables to use them as credentials for Mega
 
 ╭─ Options ──────────────────────────────────────────────────────────────────────╮
 │ --verbose  -v               Increase verbosity (-v shows debug logs,  -vv      │
@@ -371,6 +370,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_EMAIL` and `MEGA_PWD` 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.2.1 → async_mega_py-2.2.2}/README.md

@@ -46,7 +46,7 @@ Please check [`src/mega/data_structures.py`](src/mega/data_structures.py) for de
 > [!TIP]
 > You can run the commands bellow in an interactive python (the asyncio REPL). Try them in real time as is, using `async/await` keywords!
 >
-> ```uv run -p3.12 --with async-mega-py python -m asyncio```
+> `uv run -p3.12 --with async-mega-py python -m asyncio`
 
 ```python
 from mega.client import MegaNzClient
@@ -66,7 +66,7 @@ from mega.client import MegaNzClient
 # 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() # login using a temporary anonymous account
-# await mega.close()  
+# await mega.close()
 
 ```
 
@@ -130,7 +130,7 @@ await mega.download(uploaded_file, output_dir)
 
 # Download a public file
 file_url = "https://mega.nz/file/vJ9EBJBC#vA1XpbngXcnN7lqXEWGQFPDc5ZlG6yltCHwGN-0O2LQ"
-public_handle, public_key = mega.parse_file_url(file_url)  
+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
@@ -153,7 +153,7 @@ 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
-with mega.progress_bar:  
+with mega.progress_bar:
     results = await mega.download_public_folder(public_handle, public_key, output_dir / "with_bar")
 ```
 
@@ -231,16 +231,14 @@ The output will be:
 
 ```json
 {
-    "oImwb6nN": "/tests/script.js",
-    "FIXitv4F": "/tests/scripts",
-    "0fPFklV3": "/tests/scripts/notes.txt",
-    "l9zkz1GU": "/tests/scripts/script.js",
-    "E4LqT4EF": "/tests/scripts/styles.css",
+  "oImwb6nN": "/tests/script.js",
+  "FIXitv4F": "/tests/scripts",
+  "0fPFklV3": "/tests/scripts/notes.txt",
+  "l9zkz1GU": "/tests/scripts/script.js",
+  "E4LqT4EF": "/tests/scripts/styles.css"
 }
 ```
 
-
-
 ```python
 # Get the path to a node
 fs.absolute_path("0fPFklV3") # /tests/scripts/notes.txt
@@ -261,24 +259,25 @@ for node in fs.iterdir(folder.id, recursive=True):
     print(fs.absolute_path(node.id))
 
 ```
+
 Output will be:
 
 ```json
 [
-    "/tests/logo.png",
-    "/tests/logo.png",
-    "/tests/script.js",
-    "/tests/scripts",
-    "/tests/scripts/notes.txt",
-    "/tests/scripts/script.js",
-    "/tests/scripts/styles.css",
-    "/tests/setup.sh",
-    "/tests/utils.py",
+  "/tests/logo.png",
+  "/tests/logo.png",
+  "/tests/script.js",
+  "/tests/scripts",
+  "/tests/scripts/notes.txt",
+  "/tests/scripts/script.js",
+  "/tests/scripts/styles.css",
+  "/tests/setup.sh",
+  "/tests/utils.py"
 ]
 ```
 
 > [!IMPORTANT]  
-> Mega's filesystem is *not* POSIX-compliant: multiple nodes may have the same path.
+> Mega's filesystem is _not_ POSIX-compliant: multiple nodes may have the same path.
 >
 > If 2 nodes have the same path, `find` will throw an error.
 
@@ -319,10 +318,10 @@ mega-py --help
 ```
 
 ```powershell
-Usage: mega-py [OPTIONS] COMMAND [ARGS]...  
+Usage: mega-py [OPTIONS] COMMAND [ARGS]...
 
- CLI app for the Mega.nz and Transfer.it. Set MEGA_NZ_EMAIL and MEGA_NZ_PASSWORD  
- enviroment variables to use them as credentials for Mega  
+ CLI app for the Mega.nz and Transfer.it. Set MEGA_EMAIL and MEGA_PWD
+ enviroment variables to use them as credentials for Mega
 
 ╭─ Options ──────────────────────────────────────────────────────────────────────╮
 │ --verbose  -v               Increase verbosity (-v shows debug logs,  -vv      │
@@ -338,6 +337,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_EMAIL` and `MEGA_PWD` 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.2.1 → async_mega_py-2.2.2}/pyproject.toml

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

{async_mega_py-2.2.1 → async_mega_py-2.2.2}/src/mega/data_structures.py

@@ -13,7 +13,7 @@ import dataclasses
 import time
 from enum import IntEnum
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, ClassVar, Final, Self, TypeAlias, TypedDict
+from typing import TYPE_CHECKING, Any, ClassVar, Final, Literal, Self, TypeAlias, TypedDict
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
@@ -67,7 +67,7 @@ class NodeSerialized(TypedDict):
     h: NodeID  # ID
     p: NodeID  # Parent ID
     u: NotRequired[UserID]  # Owner (user ID), not present in transfer.it nodes
-    t: ReadOnly[NodeType]
+    t: ReadOnly[Literal[0, 1, 2, 3, 4, 5]]  # Node type
     a: str  # Serialized attributes
     ts: TimeStamp  # creation date
 
@@ -76,6 +76,7 @@ class NodeSerialized(TypedDict):
     sk: NotRequired[str]  # Share key, only present present in shared (public) files / folder
 
     s: NotRequired[int]  # size (files only)
+    fa: NotRequired[str]  # additional file attributes for multimedia files (ex: thumbail)
 
 
 class OwnerKeys(TypedDict):
@@ -267,6 +268,7 @@ class Node(_DictDumper):
             keys: dict[str, str] = {}
 
         size = node.get("s")
+
         return Node(
             id=node["h"],
             parent_id=node["p"],

{async_mega_py-2.2.1 → async_mega_py-2.2.2}/src/mega/vault.py

@@ -50,12 +50,14 @@ class MegaVault:
 
         # files shared with me
         elif node.owner in self._shared_keys:
-            real_node_id, share_key = next(p for p in self._shared_keys[node.owner].items() if p[0] in node.keys)
+            real_node_id = next(node_id for node_id in node.keys if node_id in self._shared_keys[node.owner])
+            share_key = self._shared_keys[node.owner][real_node_id]
             full_key = decrypt_key(b64_to_a32(node.keys[real_node_id]), share_key)
 
         # public files/folders
         elif share_key := self._shared_keys[_EXPORTED].get(node.id):
-            encrypted_key = b64_to_a32(next(iter(node.keys.values())))
+            real_node_id = next(node_id for node_id in node.keys if node_id in self._shared_keys[_EXPORTED])
+            encrypted_key = b64_to_a32(node.keys[real_node_id])
             full_key = decrypt_key(encrypted_key, share_key)
 
         else: