diff options
Diffstat (limited to 'gallery_dl/extractor/aryion.py')
| -rw-r--r-- | gallery_dl/extractor/aryion.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gallery_dl/extractor/aryion.py b/gallery_dl/extractor/aryion.py index ded2ae3..0d0ad70 100644 --- a/gallery_dl/extractor/aryion.py +++ b/gallery_dl/extractor/aryion.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2020 Mike Fährmann +# Copyright 2020-2021 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 @@ -12,7 +12,6 @@ from .common import Extractor, Message from .. import text, util, exception from ..cache import cache - BASE_PATTERN = r"(?:https?://)?(?:www\.)?aryion\.com/g4" @@ -33,6 +32,8 @@ class AryionExtractor(Extractor): self._needle = "class='gallery-item' id='" def login(self): + if self._check_cookies(self.cookienames): + return username, password = self._get_auth_info() if username: self._update_cookies(self._login_impl(username, password)) @@ -73,8 +74,7 @@ class AryionExtractor(Extractor): def _pagination(self, url): while True: page = self.request(url).text - yield from text.extract_iter( - page, self._needle, "'") + yield from text.extract_iter(page, self._needle, "'") pos = page.find("Next >>") if pos < 0: @@ -173,7 +173,7 @@ class AryionGalleryExtractor(AryionExtractor): def skip(self, num): if self.recursive: - num = 0 + return 0 self.offset += num return num @@ -182,7 +182,7 @@ class AryionGalleryExtractor(AryionExtractor): url = "{}/g4/gallery/{}".format(self.root, self.user) return self._pagination(url) else: - self._needle = "class='thumb' href='/g4/view/" + self._needle = "thumb' href='/g4/view/" url = "{}/g4/latest.php?name={}".format(self.root, self.user) return util.advance(self._pagination(url), self.offset) |