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

[mastodon] changes/improvements based on foolfuuka/-slide

Browse Source
This commit is contained in:
Mike Fährmann
2019-02-04 12:57:56 +01:00
parent 12ff750111
commit ccb95d0ba4
1 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
gallery_dl/extractor/mastodon.py
View File

@@ -20,11 +20,11 @@ class MastodonExtractor(Extractor):
filename_fmt = "{category}_{id}_{media[id]}.{extension}" filename_fmt = "{category}_{id}_{media[id]}.{extension}"
archive_fmt = "{media[id]}" archive_fmt = "{media[id]}"
instance = None instance = None
root = None
def __init__(self, match): def __init__(self, match):
Extractor.__init__(self) Extractor.__init__(self)
self.instance = match.group(1) self.api = MastodonAPI(self)
self.api = MastodonAPI(self, self.instance)
def config(self, key, default=None, *, sentinel=object()): def config(self, key, default=None, *, sentinel=object()):
value = Extractor.config(self, key, sentinel) value = Extractor.config(self, key, sentinel)
@@ -64,7 +64,7 @@ class MastodonUserExtractor(MastodonExtractor):
def __init__(self, match): def __init__(self, match):
MastodonExtractor.__init__(self, match) MastodonExtractor.__init__(self, match)
self.account_name = match.group(2) self.account_name = match.group(1)
def statuses(self): def statuses(self):
results = self.api.account_search("@" + self.account_name, 1) results = self.api.account_search("@" + self.account_name, 1)
@@ -82,7 +82,7 @@ class MastodonStatusExtractor(MastodonExtractor):
def __init__(self, match): def __init__(self, match):
MastodonExtractor.__init__(self, match) MastodonExtractor.__init__(self, match)
self.status_id = match.group(2) self.status_id = match.group(1)
def statuses(self): def statuses(self):
return (self.api.status(self.status_id),) return (self.api.status(self.status_id),)
@@ -95,11 +95,14 @@ class MastodonAPI():
https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md
""" """
def __init__(self, extractor, instance, access_token=None): def __init__(self, extractor, access_token=None):
self.instance = instance self.root = extractor.root
self.extractor = extractor self.extractor = extractor
self.headers = {"Authorization": "Bearer {}".format(
extractor.config("access-token", access_token))} if not access_token:
access_token = extractor.config(
"access-token", extractor.access_token)
self.headers = {"Authorization": "Bearer {}".format(access_token)}
def account_search(self, query, limit=40): def account_search(self, query, limit=40):
"""Search for content""" """Search for content"""
@@ -117,13 +120,13 @@ class MastodonAPI():
return self._call("statuses/" + status_id) return self._call("statuses/" + status_id)
def _call(self, endpoint, params=None): def _call(self, endpoint, params=None):
url = "https://{}/api/v1/{}".format(self.instance, endpoint) url = "{}/api/v1/{}".format(self.root, endpoint)
response = self.extractor.request( response = self.extractor.request(
url, params=params, headers=self.headers) url, params=params, headers=self.headers)
return self._parse(response) return self._parse(response)
def _pagination(self, endpoint, params): def _pagination(self, endpoint, params):
url = "https://{}/api/v1/{}".format(self.instance, endpoint) url = "{}/api/v1/{}".format(self.root, endpoint)
while url: while url:
response = self.extractor.request( response = self.extractor.request(
url, params=params, headers=self.headers) url, params=params, headers=self.headers)
@@ -142,43 +145,59 @@ def generate_extractors():
"""Dynamically generate Extractor classes for Mastodon instances""" """Dynamically generate Extractor classes for Mastodon instances"""
symtable = globals() symtable = globals()
mastodon = config.get(("extractor", "mastodon")) extractors = config.get(("extractor", "mastodon"))
if extractors:
EXTRACTORS.update(extractors)
config.set(("extractor", "mastodon"), EXTRACTORS)
if not mastodon: for instance, info in EXTRACTORS.items():
mastodon = {}
config.set(("extractor", "mastodon"), mastodon)
if "pawoo.net" not in mastodon:
mastodon["pawoo.net"] = {
"category" : "pawoo",
"access-token" : "286462927198d0cf3e24683e91c8259a"
"ac4367233064e0570ca18df2ac65b226",
"client-id" : "97b142b6904abf97a1068d51a7bc2f2f"
"cf9323cef81f13cb505415716dba7dac",
"client-secret": "e45bef4bad45b38abf7d9ef88a646b73"
"75e7fb2532c31a026327a93549236481",
}
for instance, info in mastodon.items():
if not isinstance(info, dict): if not isinstance(info, dict):
continue continue
class UserExtractor(MastodonUserExtractor): category = info.get("category") or instance.replace(".", "")
pattern = [r"(?:https?://)?({})/@([^/?&#]+)(?:/media)?/?$".format( root = info.get("root") or "https://" + instance
re.escape(instance))] name = info.get("name") or category
token = info.get("access-token")
pattern = info.get("pattern") or re.escape(instance)
class StatusExtractor(MastodonStatusExtractor): class Extr(MastodonUserExtractor):
pattern = [r"(?:https?://)?({})/@[^/?&#]+/(\d+)".format( pass
re.escape(instance))]
category = info.get("category", instance) Extr.__name__ = Extr.__qualname__ = name + "UserExtractor"
name = re.sub(r"[^A-Za-z]+", "", category).capitalize() Extr.__doc__ = "Extractor for all images of a user on " + instance
Extr.category = category
Extr.instance = instance
Extr.pattern = [r"(?:https?://)?" + pattern +
r"/@([^/?&#]+)(?:/media)?/?$"]
Extr.root = root
Extr.access_token = token
symtable[Extr.__name__] = Extr
for extr in (UserExtractor, StatusExtractor): class Extr(MastodonStatusExtractor):
extr.category = category pass
extr.__name__ = name + extr.__name__
extr.__doc__ = "{} on {}".format(extr.__base__.__doc__, instance) Extr.__name__ = Extr.__qualname__ = name + "StatusExtractor"
symtable[extr.__name__] = extr Extr.__doc__ = "Extractor for all images of a user on " + instance
Extr.category = category
Extr.instance = instance
Extr.pattern = [r"(?:https?://)?" + pattern + r"/@[^/?&#]+/(\d+)"]
Extr.root = root
Extr.access_token = token
symtable[Extr.__name__] = Extr
EXTRACTORS = {
"pawoo.net": {
"category" : "pawoo",
"access-token" : "286462927198d0cf3e24683e91c8259a"
"ac4367233064e0570ca18df2ac65b226",
"client-id" : "97b142b6904abf97a1068d51a7bc2f2f"
"cf9323cef81f13cb505415716dba7dac",
"client-secret": "e45bef4bad45b38abf7d9ef88a646b73"
"75e7fb2532c31a026327a93549236481",
},
}
generate_extractors() generate_extractors()