diff options
| author |   Unit 193 <unit193@unit193.net> | 2023-01-30 04:40:57 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2023-01-30 04:40:57 -0500 |
| commit | 919f8ba16a7b82ba1099bd25b2c61c7881a05aa2 (patch) | |
| tree | 50eb34c3286538164a2f2b7048d110dc89b2a971 /gallery_dl/extractor/sankaku.py | |
| parent | f1051085013c0d702ef974b9b27ea43b3fc73259 (diff) | |
New upstream version 1.24.5.upstream/1.24.5
Diffstat (limited to 'gallery_dl/extractor/sankaku.py')
| -rw-r--r-- | gallery_dl/extractor/sankaku.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py index 7013f1b..ea4cf43 100644 --- a/gallery_dl/extractor/sankaku.py +++ b/gallery_dl/extractor/sankaku.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2014-2022 Mike Fährmann +# Copyright 2014-2023 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 @@ -80,15 +80,19 @@ class SankakuTagExtractor(SankakuExtractor): subcategory = "tag" directory_fmt = ("{category}", "{search_tags}") archive_fmt = "t_{search_tags}_{id}" - pattern = BASE_PATTERN + r"/\?([^#]*)" + pattern = BASE_PATTERN + r"/?\?([^#]*)" test = ( ("https://sankaku.app/?tags=bonocho", { "count": 5, "pattern": r"https://s\.sankakucomplex\.com/data/[^/]{2}/[^/]{2}" - r"/[^/]{32}\.\w+\?e=\d+&(expires=\d+&)?m=[^&#]+", + r"/[0-9a-f]{32}\.\w+\?e=\d+&(expires=\d+&)?m=[^&#]+", }), ("https://beta.sankakucomplex.com/?tags=bonocho"), ("https://chan.sankakucomplex.com/?tags=bonocho"), + ("https://black.sankakucomplex.com/?tags=bonocho"), + ("https://white.sankakucomplex.com/?tags=bonocho"), + ("https://sankaku.app/ja?tags=order%3Apopularity"), + ("https://sankaku.app/no/?tags=order%3Apopularity"), # error on five or more tags ("https://chan.sankakucomplex.com/?tags=bonocho+a+b+c+d", { "options": (("username", None),), |