diff options
Diffstat (limited to 'gallery_dl/extractor/35photo.py')
| -rw-r--r-- | gallery_dl/extractor/35photo.py | 54 |
1 files changed, 39 insertions, 15 deletions
diff --git a/gallery_dl/extractor/35photo.py b/gallery_dl/extractor/35photo.py index d3e9276..e33aa2d 100644 --- a/gallery_dl/extractor/35photo.py +++ b/gallery_dl/extractor/35photo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2019 Mike Fährmann +# Copyright 2019-2020 Mike Fährmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -101,7 +101,7 @@ class _35photoUserExtractor(_35photoExtractor): """Extractor for all images of a user on 35photo.pro""" subcategory = "user" pattern = (r"(?:https?://)?(?:[a-z]+\.)?35photo\.pro" - r"/(?!photo_|genre_|rating/)([^/?&#]+)") + r"/(?!photo_|genre_|tags/|rating/)([^/?&#]+)") test = ( ("https://35photo.pro/liya", { "pattern": r"https://m\d+.35photo.pro/photos_(main|series)/.*.jpg", @@ -137,25 +137,49 @@ class _35photoUserExtractor(_35photoExtractor): }) +class _35photoTagExtractor(_35photoExtractor): + """Extractor for all photos from a tag listing""" + subcategory = "tag" + directory_fmt = ("{category}", "Tags", "{search_tag}") + archive_fmt = "t{search_tag}_{id}_{num}" + pattern = r"(?:https?://)?(?:[a-z]+\.)?35photo\.pro/tags/([^/?&#]+)" + test = ("https://35photo.pro/tags/landscape/", { + "range": "1-25", + "count": 25, + }) + + def __init__(self, match): + _35photoExtractor.__init__(self, match) + self.tag = match.group(1) + + def metadata(self): + return {"search_tag": text.unquote(self.tag).lower()} + + def photos(self): + num = 1 + + while True: + url = "{}/tags/{}/list_{}/".format(self.root, self.tag, num) + page = self.request(url).text + prev = None + + for photo_id in text.extract_iter(page, "35photo.pro/photo_", "/"): + if photo_id != prev: + prev = photo_id + yield photo_id + + if not prev: + return + num += 1 + + class _35photoGenreExtractor(_35photoExtractor): """Extractor for images of a specific genre on 35photo.pro""" subcategory = "genre" directory_fmt = ("{category}", "Genre", "{genre}") archive_fmt = "g{genre_id}_{id}_{num}" pattern = r"(?:https?://)?(?:[a-z]+\.)?35photo\.pro/genre_(\d+)(/new/)?" - test = ( - ("https://35photo.pro/genre_109/", { - "range": "1-30", - }), - ("https://35photo.pro/genre_103/", { - "range": "1-30", - "count": 30, - }), - ("https://35photo.pro/genre_103/new/", { - "range": "1-30", - "count": 30, - }), - ) + test = ("https://35photo.pro/genre_109/",) def __init__(self, match): _35photoExtractor.__init__(self, match) |