diff --git a/gallery_dl/extractor/bunkr.py b/gallery_dl/extractor/bunkr.py index 76cc1f11..32fa9c86 100644 --- a/gallery_dl/extractor/bunkr.py +++ b/gallery_dl/extractor/bunkr.py @@ -161,6 +161,7 @@ class BunkrAlbumExtractor(LolisafeAlbumExtractor): text.extr(page, '", " | Bunkr<")) + fallback = text.extr(page, 'property="og:url" content="', '"') if not file_url: webpage_url = text.unescape(text.rextract( @@ -172,6 +173,7 @@ class BunkrAlbumExtractor(LolisafeAlbumExtractor): "file" : text.unescape(file_url), "name" : text.unescape(file_name), "id_url" : webpage_url.rpartition("/")[2], + "_fallback" : (fallback,) if fallback else (), "_http_headers" : {"Referer": response.url}, "_http_validate": self._validate, } diff --git a/test/results/bunkr.py b/test/results/bunkr.py index ce83d23b..9b6d79bf 100644 --- a/test/results/bunkr.py +++ b/test/results/bunkr.py @@ -12,7 +12,7 @@ __tests__ = ( "#url" : "https://bunkr.sk/a/Lktg9Keq", "#category": ("lolisafe", "bunkr", "album"), "#class" : bunkr.BunkrAlbumExtractor, - "#urls" : "https://brg-bk.cdn.gigachad-cdn.ru/test-%E3%83%86%E3%82%B9%E3%83%88-%22%26%3E-QjgneIQv.png", + "#urls" : "https://brg-bk.cdn.gigachad-cdn.ru/test-%E3%83%86%E3%82%B9%E3%83%88-%22%26%3E-QjgneIQv.png?n=test-%E3%83%86%E3%82%B9%E3%83%88-%22%26%3E.png", "#sha1_content": "0c8768055e4e20e7c7259608b67799171b691140", "album_id" : "Lktg9Keq", @@ -20,7 +20,7 @@ __tests__ = ( "album_size" : "182 bytes", "count" : 1, "extension" : "png", - "file" : "https://brg-bk.cdn.gigachad-cdn.ru/test-%E3%83%86%E3%82%B9%E3%83%88-%22%26%3E-QjgneIQv.png", + "file" : str, "filename" : "test-ใƒ†ใ‚นใƒˆ-\"&>-QjgneIQv", "id" : "QjgneIQv", "id_url" : "1044478", @@ -217,12 +217,12 @@ __tests__ = ( "#url" : "https://bunkrrr.org/d/dJuETSzKLrUps", "#category": ("lolisafe", "bunkr", "media"), "#class" : bunkr.BunkrMediaExtractor, - "#urls" : "https://brg-bk.cdn.gigachad-cdn.ru/file-r5fmwjdd.zip", + "#urls" : "https://brg-bk.cdn.gigachad-cdn.ru/file-r5fmwjdd.zip?n=file.zip", "#sha1_content": "102ddd7894fe39b3843098fc51f972a0af938f45", "count" : 1, "extension": "zip", - "file" : "https://brg-bk.cdn.gigachad-cdn.ru/file-r5fmwjdd.zip", + "file" : "https://brg-bk.cdn.gigachad-cdn.ru/file-r5fmwjdd.zip?n=file.zip", "filename" : "file-r5fmwjdd", "id" : "r5fmwjdd", "id_url" : "38792076", @@ -251,4 +251,25 @@ __tests__ = ( "extension": "mp4", }, +{ + "#url" : "https://bunkr.site/f/JEn5iQgYVYJfi", + "#comment" : "403 error for main 'brg-bk.cdn.gigachad-cdn.ru' URL (#6732 #6972)", + "#category": ("lolisafe", "bunkr", "media"), + "#class" : bunkr.BunkrMediaExtractor, + "#urls" : "https://brg-bk.cdn.gigachad-cdn.ru/IMG_47272f2c698d257fd22f4300ae98ec35929b-iEYVkLPQ.jpg?n=IMG_47272f2c698d257fd22f4300ae98ec35929b.jpg", + "#sha1_content": "f1c839743563828b250e48d485933a735a508527", + + "_fallback": ( + "https://i-burger.bunkr.ru/IMG_47272f2c698d257fd22f4300ae98ec35929b-iEYVkLPQ.jpg", + ), + "_http_headers": { + "Referer": "https://get.bunkrr.su/file/29682239", + }, + "extension": "jpg", + "filename" : "IMG_47272f2c698d257fd22f4300ae98ec35929b-iEYVkLPQ", + "id" : "iEYVkLPQ", + "id_url" : "29682239", + "name" : "IMG_47272f2c698d257fd22f4300ae98ec35929b", +}, + )