1
0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-25 04:02:32 +01:00

[redgifs] fix syntax for older Python versions

and update docs/supportedsites
This commit is contained in:
Mike Fährmann 2023-02-18 13:07:40 +01:00
parent b28bd9789e
commit 884f1848d6
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
3 changed files with 14 additions and 11 deletions

View File

@ -718,7 +718,7 @@ Consider all sites to be NSFW unless otherwise known.
<tr>
<td>RedGIFs</td>
<td>https://redgifs.com/</td>
<td>individual Images, Search Results, User Profiles</td>
<td>Collections, individual Images, Search Results, User Profiles</td>
<td></td>
</tr>
<tr>

View File

@ -93,7 +93,7 @@ class RedgifsCollectionExtractor(RedgifsExtractor):
"""Extractor for an individual user collection"""
subcategory = "collection"
directory_fmt = ("{category}", "{userName}", "{folderName}")
archive_fmt = "{collection_id}_{id}"
archive_fmt = "{folderId}_{id}"
pattern = (r"(?:https?://)?(?:www\.)?redgifs\.com/users"
r"/([^/?#]+)/collections/([^/?#]+)")
test = (
@ -114,11 +114,9 @@ class RedgifsCollectionExtractor(RedgifsExtractor):
self.collection_id = match.group(2)
def metadata(self):
return {
"collection_id": self.collection_id,
"userName": self.key,
**self.api.collection_getInfo(self.key, self.collection_id),
}
data = {"userName": self.key}
data.update(self.api.collection_info(self.key, self.collection_id))
return data
def gifs(self):
return self.api.collection(self.key, self.collection_id)
@ -191,6 +189,8 @@ class RedgifsImageExtractor(RedgifsExtractor):
class RedgifsAPI():
"""https://api.redgifs.com/docs/index.html"""
API_ROOT = "https://api.redgifs.com"
def __init__(self, extractor):
@ -212,15 +212,15 @@ class RedgifsAPI():
params = {"order": order}
return self._pagination(endpoint, params)
def collection_getInfo(self, user, collection_id):
endpoint = "/v2/users/{}/collections/{}".format(user, collection_id)
return self._call(endpoint)
def collection(self, user, collection_id):
endpoint = "/v2/users/{}/collections/{}/gifs".format(
user, collection_id)
return self._pagination(endpoint)
def collection_info(self, user, collection_id):
endpoint = "/v2/users/{}/collections/{}".format(user, collection_id)
return self._call(endpoint)
def collections(self, user):
endpoint = "/v2/users/{}/collections".format(user)
return self._pagination(endpoint, key="collections")

View File

@ -212,6 +212,9 @@ SUBCATEGORY_MAP = {
"reddit": {
"home": "Home Feed",
},
"redgifs": {
"collections": "",
},
"sankaku": {
"books": "Book Searches",
},