diff options
Diffstat (limited to 'gallery_dl/extractor/erome.py')
| -rw-r--r-- | gallery_dl/extractor/erome.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gallery_dl/extractor/erome.py b/gallery_dl/extractor/erome.py index 55549de..7582528 100644 --- a/gallery_dl/extractor/erome.py +++ b/gallery_dl/extractor/erome.py @@ -23,12 +23,8 @@ class EromeExtractor(Extractor): archive_fmt = "{album_id}_{num}" root = "https://www.erome.com" - def __init__(self, match): - Extractor.__init__(self, match) - self.item = match.group(1) - self.__cookies = True - def items(self): + self.__cookies = True for album_id in self.albums(): url = "{}/a/{}".format(self.root, album_id) @@ -66,8 +62,9 @@ class EromeExtractor(Extractor): "user" : text.unquote(user), "count" : len(urls), "date" : date, - "tags" : [t.replace("+", " ") - for t in text.extract_iter(tags, "?q=", '"')], + "tags" : ([t.replace("+", " ") + for t in text.extract_iter(tags, "?q=", '"')] + if tags else ()), "_http_headers": {"Referer": url}, } @@ -110,7 +107,7 @@ class EromeAlbumExtractor(EromeExtractor): example = "https://www.erome.com/a/ID" def albums(self): - return (self.item,) + return (self.groups[0],) class EromeUserExtractor(EromeExtractor): @@ -119,18 +116,18 @@ class EromeUserExtractor(EromeExtractor): example = "https://www.erome.com/USER" def albums(self): - url = "{}/{}".format(self.root, self.item) + url = "{}/{}".format(self.root, self.groups[0]) return self._pagination(url, {}) class EromeSearchExtractor(EromeExtractor): subcategory = "search" - pattern = BASE_PATTERN + r"/search\?q=([^&#]+)" + pattern = BASE_PATTERN + r"/search/?\?(q=[^#]+)" example = "https://www.erome.com/search?q=QUERY" def albums(self): url = self.root + "/search" - params = {"q": text.unquote(self.item)} + params = text.parse_query(self.groups[0]) return self._pagination(url, params) |