Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
fix: filename decoding (bunkr) (#1721)
NTFSvolume2d4046cd4669
diff --git a/cyberdrop_dl/crawlers/bunkrr.py b/cyberdrop_dl/crawlers/bunkrr.pyindex e9a40946d..883d1d79c 100644--- a/cyberdrop_dl/crawlers/bunkrr.py+++ b/cyberdrop_dl/crawlers/bunkrr.py@@ -53,15 +53,10 @@ def _make_album_parser() -> Callable[[str], Generator[File]]:def translate(text: str) -> str:return pattern.sub(lambda m: translation_map[m.group(0)], text.replace("\\'", "'")).strip()- def fix_unicode(value: object) -> Any:- if type(value) is str:- return value.encode("raw_unicode_escape").decode("utf-8")- return value-def decode(content: str) -> Generator[File]:file: dict[str, Any]for file in json.loads(content):- yield File(**{name: fix_unicode(value) for name, value in file.items()})+ yield File(**file)def parse(album_js: str) -> Generator[File]:content = translate(album_js[album_js.find("=") + 1 : album_js.rfind("];")])diff --git a/tests/crawlers/test_bunkr.py b/tests/crawlers/test_bunkr.pyindex 1fc8c6688..2cc88711d 100644--- a/tests/crawlers/test_bunkr.py+++ b/tests/crawlers/test_bunkr.py@@ -36,7 +36,7 @@ def test_album_parser() -> None:{id: 25960332,name: "c44e4c1a-90d5-4eba-8a58-f71fe3dfaa4f-md4d01c011ab729eda-ZEpjlipI.jpg",- original: "2023-02-04 - Position ð\u009f\u0094\u009e BONUS.mp4.jpg",+ original: "2023-02-04 - Position 🔞 BONUS.mp4.jpg",slug: "tR69eocGrklcG",type: "image/jpeg",extension: "Image",diff --git a/tests/crawlers/test_cases/bunkr.py b/tests/crawlers/test_cases/bunkr.pyindex 50d0427db..94f0ab023 100644--- a/tests/crawlers/test_cases/bunkr.py+++ b/tests/crawlers/test_cases/bunkr.py@@ -54,6 +54,98 @@ TEST_CASES = [}],),+ (+ "https://bunkr.cr/a/bFfln2uj",+ [+ {+ "url": "re:/Laura-Perea-en-modo-Perra-l0dNCH9E.mp4?n=Laura+Perea+en+modo+Perra.mp4",+ "filename": "Laura Perea en modo Perra.mp4",+ "debrid_link": None,+ "original_filename": "Laura Perea en modo Perra.mp4",+ "referer": "https://bunkr.site/f/Laura-Perea-en-modo-Perra-l0dNCH9E.mp4",+ "album_id": "bFfln2uj",+ "uploaded_at": 1670173480,+ "download_folder": "re:Nicol Loveee Laura Perea (Bunkr)",+ },+ {+ "url": "re:/Laura-Perea-en-la-habitaciA%CC%83%C2%B3n-5XMNsggv.mp4?n=Laura+Perea+en+la+habitaci%C3%83%C2%B3n.mp4",+ "filename": "Laura Perea en la habitación.mp4",+ },+ {+ "url": "re:/Laura-Perea-Desnuda-bailando-CoucD4Q3.mp4?n=Laura+Perea+Desnuda+bailando.mp4",+ "filename": "Laura Perea Desnuda bailando.mp4",+ },+ {+ "url": "re:/Laura-Perea-en-el-BaA%CC%83%C2%B1o-QPKeEVzQ.mp4?n=Laura+Perea+en+el+Ba%C3%83%C2%B1o.mp4",+ "filename": "Laura Perea en el Baño.mp4",+ },+ {+ "url": "re:/Laura-Perea-movimeintos-Eroticos-uJCgmC0C.mp4?n=Laura+Perea+movimeintos+Eroticos.mp4",+ "filename": "Laura Perea movimeintos Eroticos.mp4",+ },+ ],+ 5,+ ),+ (+ "https://bunkr.cr/a/A3k5ktj4",+ [+ {+ "url": "re:https://c3mb.scdn.st/IMG_2395_sdr-eKRnKxc6.mp4?n=IMG_2395_sdr.mp4",+ "filename": "IMG_2395_sdr.mp4",+ "debrid_link": None,+ "original_filename": "IMG_2395_sdr.mp4",+ "referer": "https://bunkr.site/f/8mmIR3VQIRy2g",+ "album_id": "A3k5ktj4",+ "uploaded_at": 1682086399,+ "download_folder": "re:Nicol Loveee (Bunkr)",+ },+ {+ "url": "re:https://c1fr.scdn.st/Nicol-Loveee-MundoX---Dulces-Mun%CC%83ecas-Traviesas-3-L9Dr07Fl.mp4?n=Nicol+Loveee+MundoX+-+Dulces+Mu%C3%B1ecas+Traviesas+3.mp4",+ "filename": "Nicol Loveee MundoX - Dulces Muñecas Traviesas 3.mp4",+ },+ {+ "url": "re:https://c4ta.scdn.st/IMG_0789-VJJEJJFF.mp4?n=IMG_0789.mp4",+ "filename": "IMG_0789.mp4",+ },+ {+ "url": "re:https://par1.scdn.st/IMG_0658-v3T9XRib.MOV?n=IMG_0658.MOV",+ "filename": "IMG_0658.mov",+ },+ {+ "url": "re:https://c4ta.scdn.st/IMG_3422-FiKTxDks.MOV?n=IMG_3422.MOV",+ "filename": "IMG_3422.mov",+ },+ {+ "url": "re:https://c1fr.scdn.st/Nicol-Lovee-aka-Laura-Perea-806756813332-D0iwlxIQ.mp4",+ "filename": "Nicol Lovee aka Laura Perea 806756813332.mp4",+ },+ {+ "url": "re:https://c3mb.scdn.st/IMG_2395_hdr-16K2UV5i.MOV?n=IMG_2395_hdr.MOV",+ "filename": "IMG_2395_hdr.mov",+ "original_filename": "IMG_2395_hdr.MOV",+ },+ {+ "url": "re:https://c1fr.scdn.st/Nicol-Loveee---We-Fuck-This-Argentina-(8361360)-(2021)-1080p-UDXu4F9w.mp4",+ "filename": "Nicol Loveee - We Fuck This Argentina (8361360) (2021) 1080p.mp4",+ },+ {+ "url": "re:https://c4ta.scdn.st/IMG_3417-LSSAnhjf.MOV?n=IMG_3417.MOV",+ "filename": "IMG_3417.mov",+ "original_filename": "IMG_3417.MOV",+ },+ {+ "url": "re:https://c1fr.scdn.st/IMG_2241-viJXLJYt.MP4?n=IMG_2241.MP4",+ "filename": "IMG_2241.mp4",+ "original_filename": "IMG_2241.MP4",+ },+ {+ "url": "re:https://par1.scdn.st/Nicol-Loveee-Shush_1080p-KMDcQu6l.mp4?n=Nicol-Loveee-Shush_1080p.mp4",+ "filename": "Nicol-Loveee-Shush_1080p.mp4",+ "original_filename": "Nicol-Loveee-Shush_1080p.mp4",+ },+ ],+ 11,+ ),("https://burger.bunkr.ru/9861917.mp4-PTaiPNai-CaBcktkP.mp4",[@@ -95,6 +187,31 @@ TEST_CASES = [[],141,),- ("https://bunkr.ws/a/z5Xt6NqH", [], 3),+ (+ "https://bunkr.ws/a/z5Xt6NqH",+ [+ {+ "url": "https://c1be.scdn.st/acba241d-c1e8-40c3-aa73-94daf75fcd13.jpg?n='%22'.jpg",+ "filename": ".jpg",+ "debrid_link": None,+ "original_filename": "'\"'.jpg",+ "referer": "https://bunkr.site/f/Nzt1ID7lsgwR4",+ "album_id": "z5Xt6NqH",+ "uploaded_at": 1756986657,+ "download_folder": "re:filename (Bunkr)",+ },+ {+ "url": "https://c2ck.scdn.st/e997f757-61dc-45be-bd61-b6998d813beb.jpg?n=%F0%9F%98%83.jpg",+ "filename": "😃.jpg",+ "original_filename": "😃.jpg",+ },+ {+ "url": "https://c2ck.scdn.st/72f1e20b-72a5-43b0-8ab2-472016e1d767.mp4?n=filename:+!%22%23$%25%26'()*%2B,-.0123456789:%3B%3C%3D%3E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D.mp4",+ "filename": "filename !#$%&()+,-.0123456789;=@ABCDEFGHIJKLMNOPQRSTUVWXYZ[].mp4",+ "original_filename": "filename: !\"#$%&'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\].mp4",+ },+ ],+ 3,+ ),("https://bunkr.ws/a/aJHkJf3L", [], 172),]