Skip to content

Bulk asynchronous downloader for multiple file hosts

feat: add support for subfolders URLs (mega.nz) (#1253)

NTFSvolumeea83261f0146
diff --git a/cyberdrop_dl/crawlers/mega_nz.py b/cyberdrop_dl/crawlers/mega_nz.py
index f5f954b48..94314c671 100644
--- a/cyberdrop_dl/crawlers/mega_nz.py
+++ b/cyberdrop_dl/crawlers/mega_nz.py
@@ -40,6 +40,7 @@ class MegaNzCrawler(Crawler):
"/folder/<folder_id>#<share_key>",
"/F!#<folder_id>!<share_key>",
),
+ "Subfolder": "/folder/<folder_id>#<share_key>/folder/<subfolder_id>",
"**NOTE**": "Downloads can not be resumed. Partial downloads will always be deleted and new downloads will start over",
}
PRIMARY_URL: ClassVar[AbsoluteHttpURL] = PRIMARY_URL
@@ -69,6 +70,7 @@ class MegaNzCrawler(Crawler):
async def fetch(self, scrape_item: ScrapeItem) -> None:
if not self.logged_in:
return
+
if frag := scrape_item.url.fragment: # Mega stores access key in fragment. We can't do anything without the key
# v1 URLs
if frag.count("!") == 2:
@@ -85,8 +87,17 @@ class MegaNzCrawler(Crawler):
# https://mega.nz/folder/oZZxyBrY#oU4jASLPpJVvqGHJIMRcgQ/file/IYZABDGY
# https://mega.nz/folder/oZZxyBrY#oU4jASLPpJVvqGHJIMRcgQ
case ["folder", folder_id]:
- shared_key, _, file_id = frag.partition("/file/")
- return await self.folder(scrape_item, folder_id, shared_key, file_id or None)
+ root_id = file_id = None
+ shared_key, *rest = frag.split("/")
+ if rest:
+ match rest:
+ case ["folder", id_]:
+ root_id = id_
+ case ["file", id_]:
+ file_id = id_
+ case _:
+ raise ValueError
+ return await self.folder(scrape_item, folder_id, shared_key, root_id or None, file_id or None)
# https://mega.nz/file/cH51DYDR#qH7QOfRcM-7N9riZWdSjsRq
case ["file", file_id]:
return await self.file(scrape_item, file_id, frag)
@@ -131,12 +142,17 @@ class MegaNzCrawler(Crawler):
@error_handling_wrapper
async def folder(
- self, scrape_item: ScrapeItem, folder_id: str, shared_key: str, single_file_id: str | None = None
+ self,
+ scrape_item: ScrapeItem,
+ folder_id: str,
+ shared_key: str,
+ root_id: str | None = None,
+ single_file_id: str | None = None,
) -> None:
if single_file_id and await self.check_complete_from_referer(scrape_item.url):
return
nodes = await self.downloader.api.get_nodes_public_folder(folder_id, shared_key)
- root_id = next(iter(nodes))
+ root_id = root_id or next(iter(nodes))
folder_name = nodes[root_id]["attributes"]["n"]
filesystem = await self.downloader.api.build_file_system(nodes, [root_id])
title = self.create_title(folder_name, folder_id)