github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update extractor test results

Browse Source
This commit is contained in:
Mike Fährmann
2021-02-27 21:01:29 +01:00
parent 1bd3d7cfb0
commit 3df527ee2c
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gallery_dl/extractor/erome.py
View File

@@ -50,7 +50,8 @@ class EromeExtractor(Extractor):
for data["num"], group in enumerate(util.advance(groups, 1), 1): for data["num"], group in enumerate(util.advance(groups, 1), 1):
url = (text.extract(group, '<source src="', '"')[0] or url = (text.extract(group, '<source src="', '"')[0] or
text.extract(group, 'data-src="', '"')[0]) text.extract(group, 'data-src="', '"')[0])
yield Message.Url, url, text.nameext_from_url(url, data) if url:
yield Message.Url, url, text.nameext_from_url(url, data)
def albums(self): def albums(self):
return () return ()
@@ -84,14 +85,14 @@ class EromeAlbumExtractor(EromeExtractor):
"""Extractor for albums on erome.com""" """Extractor for albums on erome.com"""
subcategory = "album" subcategory = "album"
pattern = BASE_PATTERN + r"/a/(\w+)" pattern = BASE_PATTERN + r"/a/(\w+)"
test = ("https://www.erome.com/a/UHUX1B73", { test = ("https://www.erome.com/a/KandxY7y", {
"pattern": r"https://s\d+\.erome\.com/342/UHUX1B73/\w+", "pattern": r"https://s\d+\.erome\.com/355/KandxY7y/\w+",
"count": 5, "count": 26,
"keyword": { "keyword": {
"album_id": "UHUX1B73", "album_id": "KandxY7y",
"num": int, "num": int,
"title": "Ryan Ryans", "title": "Therealbrittfitt",
"user": "gutiquq", "user": "pokow",
}, },
}) })

4
gallery_dl/extractor/gelbooru_v02.py
View File

@@ -72,7 +72,7 @@ class GelbooruV02TagExtractor(GelbooruV02Extractor):
pattern = BASE_PATTERN + r"/index\.php\?page=post&s=list&tags=([^&#]+)" pattern = BASE_PATTERN + r"/index\.php\?page=post&s=list&tags=([^&#]+)"
test = ( test = (
("https://rule34.xxx/index.php?page=post&s=list&tags=danraku", { ("https://rule34.xxx/index.php?page=post&s=list&tags=danraku", {
"content": "0a3aa1e302bd4ed0599305cd4c225ca8d28249b2", "content": "97e4bbf86c3860be18de384d02d544251afe1d45",
"pattern": r"https?://.*rule34\.xxx/images/\d+/[0-9a-f]+\.jpg", "pattern": r"https?://.*rule34\.xxx/images/\d+/[0-9a-f]+\.jpg",
"count": 1, "count": 1,
}), }),
@@ -155,7 +155,7 @@ class GelbooruV02PostExtractor(GelbooruV02Extractor):
pattern = BASE_PATTERN + r"/index\.php\?page=post&s=view&id=(\d+)" pattern = BASE_PATTERN + r"/index\.php\?page=post&s=view&id=(\d+)"
test = ( test = (
("https://rule34.xxx/index.php?page=post&s=view&id=1995545", { ("https://rule34.xxx/index.php?page=post&s=view&id=1995545", {
"content": "0a3aa1e302bd4ed0599305cd4c225ca8d28249b2", "content": "97e4bbf86c3860be18de384d02d544251afe1d45",
"options": (("tags", True),), "options": (("tags", True),),
"keyword": { "keyword": {
"tags_artist": "danraku", "tags_artist": "danraku",

2
gallery_dl/extractor/imgur.py
View File

@@ -166,8 +166,6 @@ class ImgurAlbumExtractor(ImgurExtractor):
"privacy" : "private", "privacy" : "private",
"score" : int, "score" : int,
"title" : "138", "title" : "138",
"topic" : "",
"topic_id" : 0,
"upvote_count" : int, "upvote_count" : int,
"url" : "https://imgur.com/a/TcBmP", "url" : "https://imgur.com/a/TcBmP",
"view_count" : int, "view_count" : int,

9
gallery_dl/extractor/reactor.py
View File

@@ -232,11 +232,11 @@ class JoyreactorSearchExtractor(ReactorSearchExtractor):
category = "joyreactor" category = "joyreactor"
pattern = JR_BASE_PATTERN + r"/search(?:/|\?q=)([^/?#]+)" pattern = JR_BASE_PATTERN + r"/search(?:/|\?q=)([^/?#]+)"
test = ( test = (
("http://joyreactor.cc/search/Cirno", { ("http://joyreactor.cc/search/Nature", {
"range": "1-25", "range": "1-25",
"count": ">= 20", "count": ">= 20",
}), }),
("http://joyreactor.com/search?q=Cirno", { ("http://joyreactor.com/search?q=Nature", {
"range": "1-25", "range": "1-25",
"count": ">= 20", "count": ">= 20",
}), }),
@@ -306,10 +306,7 @@ class PornreactorSearchExtractor(ReactorSearchExtractor):
category = "pornreactor" category = "pornreactor"
pattern = PR_BASE_PATTERN + r"/search(?:/|\?q=)([^/?#]+)" pattern = PR_BASE_PATTERN + r"/search(?:/|\?q=)([^/?#]+)"
test = ( test = (
("http://pornreactor.cc/search?q=ecchi+hentai", { ("http://pornreactor.cc/search?q=ecchi+hentai"),
"range": "1-25",
"count": ">= 25",
}),
("http://fapreactor.com/search/ecchi+hentai"), ("http://fapreactor.com/search/ecchi+hentai"),
) )

6
gallery_dl/extractor/unsplash.py
View File

@@ -122,7 +122,7 @@ class UnsplashImageExtractor(UnsplashExtractor):
"total_photos": int, "total_photos": int,
"twitter_username": None, "twitter_username": None,
"updated_at": str, "updated_at": str,
"username": "johnwestrock" "username": "davehoefler",
}, },
"views": int, "views": int,
"width": 4480, "width": 4480,
@@ -138,7 +138,7 @@ class UnsplashUserExtractor(UnsplashExtractor):
"""Extractor for all photos of an unsplash user""" """Extractor for all photos of an unsplash user"""
subcategory = "user" subcategory = "user"
pattern = BASE_PATTERN + r"/@(\w+)/?$" pattern = BASE_PATTERN + r"/@(\w+)/?$"
test = ("https://unsplash.com/@johnwestrock", { test = ("https://unsplash.com/@davehoefler", {
"pattern": r"https://images\.unsplash\.com/(photo-\d+-\w+" "pattern": r"https://images\.unsplash\.com/(photo-\d+-\w+"
r"|reserve/[^/?#]+)\?ixid=\w+&ixlib=rb-1\.2\.1$", r"|reserve/[^/?#]+)\?ixid=\w+&ixlib=rb-1\.2\.1$",
"range": "1-30", "range": "1-30",
@@ -155,7 +155,7 @@ class UnsplashFavoriteExtractor(UnsplashExtractor):
"""Extractor for all likes of an unsplash user""" """Extractor for all likes of an unsplash user"""
subcategory = "favorite" subcategory = "favorite"
pattern = BASE_PATTERN + r"/@(\w+)/likes" pattern = BASE_PATTERN + r"/@(\w+)/likes"
test = ("https://unsplash.com/@johnwestrock/likes", { test = ("https://unsplash.com/@davehoefler/likes", {
"pattern": r"https://images\.unsplash\.com/(photo-\d+-\w+" "pattern": r"https://images\.unsplash\.com/(photo-\d+-\w+"
r"|reserve/[^/?#]+)\?ixid=\w+&ixlib=rb-1\.2\.1$", r"|reserve/[^/?#]+)\?ixid=\w+&ixlib=rb-1\.2\.1$",
"range": "1-30", "range": "1-30",