diff options
Diffstat (limited to 'gallery_dl/extractor/reactor.py')
| -rw-r--r-- | gallery_dl/extractor/reactor.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gallery_dl/extractor/reactor.py b/gallery_dl/extractor/reactor.py index 483a5ba..8e974d2 100644 --- a/gallery_dl/extractor/reactor.py +++ b/gallery_dl/extractor/reactor.py @@ -38,7 +38,7 @@ class ReactorExtractor(BaseExtractor): def items(self): data = self.metadata() - yield Message.Directory, data + yield Message.Directory, "", data for post in self.posts(): for image in self._parse_post(post): url = image["url"] @@ -97,7 +97,7 @@ class ReactorExtractor(BaseExtractor): return num = 0 - date = text.parse_datetime(data["datePublished"]) + date = self.parse_datetime_iso(data["datePublished"]) user = data["author"]["name"] description = text.unescape(data["description"]) title, _, tags = text.unescape(data["headline"]).partition(" / ") @@ -171,7 +171,7 @@ class ReactorTagExtractor(ReactorExtractor): subcategory = "tag" directory_fmt = ("{category}", "{search_tags}") archive_fmt = "{search_tags}_{post_id}_{num}" - pattern = BASE_PATTERN + r"/tag/([^/?#]+)(?:/[^/?#]+)?" + pattern = rf"{BASE_PATTERN}/tag/([^/?#]+)(?:/[^/?#]+)?" example = "http://reactor.cc/tag/TAG" def __init__(self, match): @@ -187,7 +187,7 @@ class ReactorSearchExtractor(ReactorExtractor): subcategory = "search" directory_fmt = ("{category}", "search", "{search_tags}") archive_fmt = "s_{search_tags}_{post_id}_{num}" - pattern = BASE_PATTERN + r"/search(?:/|\?q=)([^/?#]+)" + pattern = rf"{BASE_PATTERN}/search(?:/|\?q=)([^/?#]+)" example = "http://reactor.cc/search?q=QUERY" def __init__(self, match): @@ -202,7 +202,7 @@ class ReactorUserExtractor(ReactorExtractor): """Extractor for all posts of a user on *reactor.cc sites""" subcategory = "user" directory_fmt = ("{category}", "user", "{user}") - pattern = BASE_PATTERN + r"/user/([^/?#]+)" + pattern = rf"{BASE_PATTERN}/user/([^/?#]+)" example = "http://reactor.cc/user/USER" def __init__(self, match): @@ -216,7 +216,7 @@ class ReactorUserExtractor(ReactorExtractor): class ReactorPostExtractor(ReactorExtractor): """Extractor for single posts on *reactor.cc sites""" subcategory = "post" - pattern = BASE_PATTERN + r"/post/(\d+)" + pattern = rf"{BASE_PATTERN}/post/(\d+)" example = "http://reactor.cc/post/12345" def __init__(self, match): @@ -228,6 +228,6 @@ class ReactorPostExtractor(ReactorExtractor): pos = post.find('class="uhead">') for image in self._parse_post(post[pos:]): if image["num"] == 1: - yield Message.Directory, image + yield Message.Directory, "", image url = image["url"] yield Message.Url, url, text.nameext_from_url(url, image) |