diff --git a/gallery_dl/extractor/bunkr.py b/gallery_dl/extractor/bunkr.py index 4e0fe4e2..3e124525 100644 --- a/gallery_dl/extractor/bunkr.py +++ b/gallery_dl/extractor/bunkr.py @@ -22,13 +22,14 @@ else: BASE_PATTERN = ( r"(?:bunkr:(?:https?://)?([^/?#]+)|" r"(?:https?://)?(?:app\.)?(bunkr+" - r"\.(?:s[kiu]|[cf]i|p[hks]|ru|la|is|to|a[cx]" + r"\.(?:s[kiu]|c[ir]|fi|p[hks]|ru|la|is|to|a[cx]" r"|black|cat|media|red|site|ws|org)))" ) DOMAINS = [ "bunkr.ac", "bunkr.ci", + "bunkr.cr", "bunkr.fi", "bunkr.ph", "bunkr.pk", diff --git a/test/results/bunkr.py b/test/results/bunkr.py index 5035c823..4c732a9e 100644 --- a/test/results/bunkr.py +++ b/test/results/bunkr.py @@ -29,23 +29,21 @@ __tests__ = ( { "#url" : "https://bunkr.is/a/iXTTc1o2", - "#comment" : "cdn4", "#category": ("lolisafe", "bunkr", "album"), "#class" : bunkr.BunkrAlbumExtractor, "#urls" : ( "https://i-milkshake.bunkr.ru/image-sZrQUeOx.jpg?download=true", - "https://burger.bunkr.ru/video-gLn1hgpw.mp4", ), "#sha1_content": "caf7c3d3439d94e83b3c24ddaf5a3a48aa057519", "album_id" : "iXTTc1o2", "album_name" : "test2", - "album_size" : "561.6 KB", - "count" : 2, - "filename" : r"re:video-gLn1hgpw|image-sZrQUeOx", - "id" : r"re:gLn1hgpw|sZrQUeOx", - "name" : r"re:video|image", - "num" : range(1, 2), + "album_size" : "534.6 KB", + "count" : 1, + "filename" : r"image-sZrQUeOx", + "id" : r"sZrQUeOx", + "name" : r"image", + "num" : 1, }, { @@ -57,6 +55,11 @@ __tests__ = ( "#count" : 7, }, +{ + "#url" : "https://bunkr.ph/a/Lktg9Keq", + "#class" : bunkr.BunkrAlbumExtractor, +}, + { "#url" : "https://bunkr.ps/a/Lktg9Keq", "#class" : bunkr.BunkrAlbumExtractor, @@ -85,6 +88,12 @@ __tests__ = ( "#class" : bunkr.BunkrAlbumExtractor, }, +{ + "#url" : "https://bunkr.cr/a/Lktg9Keq", + "#category": ("lolisafe", "bunkr", "album"), + "#class" : bunkr.BunkrAlbumExtractor, +}, + { "#url" : "https://bunkr.fi/a/Lktg9Keq", "#category": ("lolisafe", "bunkr", "album"), diff --git a/test/results/imgspice.py b/test/results/imgspice.py index b2691b6a..c90393c7 100644 --- a/test/results/imgspice.py +++ b/test/results/imgspice.py @@ -9,12 +9,15 @@ from gallery_dl.extractor import imagehosts __tests__ = ( { - "#url" : "https://imgspice.com/nwfwtpyog50y/test.png.html", + "#url" : "https://imgspice.com/q1taxkhxprrn/58410038_cal022jsp_308191001.jpg.html", "#category": ("imagehost", "imgspice", "image"), "#class" : imagehosts.ImgspiceImageExtractor, - "#sha1_url" : "b8c30a8f51ee1012959a4cfd46197fabf14de984", - "#sha1_metadata": "100e310a19a2fa22d87e1bbc427ecb9f6501e0c0", - "#sha1_content" : "0c8768055e4e20e7c7259608b67799171b691140", + "#urls" : "https://img30.imgspice.com/i/03792/q1taxkhxprrn.jpg", + "#sha1_content" : "f1de8e58a7c2ef747a206a38f96c5623b8a83edc", + + "extension": "jpg", + "filename" : "58410038_cal022jsp_308191001", + "token" : "q1taxkhxprrn", }, )