Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 18:53:21 +01:00
Code Issues Releases Wiki Activity

[imgur] add 'search' extractor (#934)

Browse Source
This commit is contained in:
Mike Fährmann 2020-08-26 22:26:48 +02:00
parent e4bbc1fb5c
commit ab1af66a97
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/supportedsites.rst
View File

@ -156,7 +156,7 @@ Turboimagehost https://www.turboimagehost.com/ individual Images
.. |flickr-C| replace:: Albums, Favorites, Galleries, Groups, individual Images, Search Results, User Profiles
.. |furaffinity-C| replace:: Favorites, Galleries, Posts, Scraps, Search Results, User Profiles
.. |hentaifoundry-C| replace:: Favorites, individual Images, Popular Images, Recent Images, Scraps, User Profiles
.. |imgur-C| replace:: Albums, Favorites, Galleries, individual Images, Subreddits, User Profiles
.. |imgur-C| replace:: Albums, Favorites, Galleries, individual Images, Search Results, Subreddits, Tag Searches, User Profiles
.. |instagram-C| replace:: Channels, individual Images, Saved Posts, Stories, Tag Searches, User Profiles
.. |newgrounds-C| replace:: Art, Audio, Favorites, individual Images, Media Files, Movies, User Profiles
.. |nijie-C| replace:: Doujin, Favorites, individual Images, User Profiles

31
gallery_dl/extractor/imgur.py
View File

@ -59,7 +59,7 @@ class ImgurImageExtractor(ImgurExtractor):
subcategory = "image"
filename_fmt = "{category}_{id}{title:?_//}.{extension}"
archive_fmt = "{id}"
pattern = BASE_PATTERN + r"/(?!gallery)(\w{7}|\w{5})[sbtmlh]?\.?"
pattern = BASE_PATTERN + r"/(?!gallery|search)(\w{7}|\w{5})[sbtmlh]?\.?"
test = (
("https://imgur.com/21yMxCS", {
"url": "6f2dcfb86815bdd72808c313e5f715610bc7b9b2",
@ -318,6 +318,21 @@ class ImgurTagExtractor(ImgurExtractor):
return self._items_queue(self.api.gallery_tag(self.key))
class ImgurSearchExtractor(ImgurExtractor):
"""Extractor for imgur search results"""
subcategory = "search"
pattern = BASE_PATTERN + r"/search(?:/[^?&#]+)?/?\?q=([^&#]+)"
test = ("https://imgur.com/search?q=cute+cat", {
"range": "1-100",
"count": 100,
"pattern": r"https?://(i.imgur.com|imgur.com/a)/[\w.]+",
})
def items(self):
key = text.unquote(self.key.replace("+", " "))
return self._items_queue(self.api.gallery_search(key))
class ImgurAPI():
"""Interface for the Imgur API
@ -334,6 +349,11 @@ class ImgurAPI():
endpoint = "account/{}/gallery_favorites".format(account)
return self._pagination(endpoint)
def gallery_search(self, query):
endpoint = "gallery/search"
params = {"q": query}
return self._pagination(endpoint, params)
def account_submissions(self, account):
endpoint = "account/{}/submissions".format(account)
return self._pagination(endpoint)
@ -352,10 +372,11 @@ class ImgurAPI():
def image(self, image_hash):
return self._call("image/" + image_hash)
def _call(self, endpoint):
def _call(self, endpoint, params=None):
try:
return self.extractor.request(
"https://api.imgur.com/3/" + endpoint, headers=self.headers,
"https://api.imgur.com/3/" + endpoint,
params=params, headers=self.headers,
).json()["data"]
except exception.HttpError as exc:
if exc.status != 403 or b"capacity" not in exc.response.content:
@ -363,11 +384,11 @@ class ImgurAPI():
self.extractor.sleep(seconds=600)
return self._call(endpoint)
def _pagination(self, endpoint, key=None):
def _pagination(self, endpoint, params=None, key=None):
num = 0
while True:
data = self._call("{}/{}".format(endpoint, num))
data = self._call("{}/{}".format(endpoint, num), params)
if key:
data = data[key]
if not data: