Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

[jpgfish] update domain to 'jpg1.su' (#4494)

Browse Source
This commit is contained in:
Mike Fährmann 2023-09-03 15:03:47 +02:00
parent ceb59e176f
commit 23bac772f2
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/supportedsites.md
View File

@ -435,7 +435,7 @@ Consider all sites to be NSFW unless otherwise known.
</tr>
<tr>
<td>JPG Fish</td>
<td>https://jpeg.pet/</td>
<td>https://jpg1.su/</td>
<td>Albums, individual Images, User Profiles</td>
<td></td>
</tr>

15
gallery_dl/extractor/jpgfish.py
View File

@ -4,18 +4,18 @@
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
"""Extractors for https://jpeg.pet/"""
"""Extractors for https://jpg1.su/"""
from .common import Extractor, Message
from .. import text
BASE_PATTERN = r"(?:https?://)?jpe?g\.(?:pet|fish(?:ing)?|church)"
BASE_PATTERN = r"(?:https?://)?jpe?g\d?\.(?:su|pet|fish(?:ing)?|church)"
class JpgfishExtractor(Extractor):
"""Base class for jpgfish extractors"""
category = "jpgfish"
root = "https://jpeg.pet"
root = "https://jpg1.su"
directory_fmt = ("{category}", "{user}", "{album}",)
archive_fmt = "{id}"
@ -36,7 +36,7 @@ class JpgfishImageExtractor(JpgfishExtractor):
subcategory = "image"
pattern = BASE_PATTERN + r"/img/((?:[^/?#]+\.)?(\w+))"
test = (
("https://jpeg.pet/img/funnymeme.LecXGS", {
("https://jpg1.su/img/funnymeme.LecXGS", {
"pattern": r"https://simp3\.jpg\.church/images/funnymeme\.jpg",
"content": "098e5e9b17ad634358426e0ffd1c93871474d13c",
"keyword": {
@ -52,6 +52,7 @@ class JpgfishImageExtractor(JpgfishExtractor):
"pattern": r"https://simp2\.jpg\.church/hannahowo_00457\.jpg",
"keyword": {"album": "401-500"},
}),
("https://jpeg.pet/img/funnymeme.LecXGS"),
("https://jpg.pet/img/funnymeme.LecXGS"),
("https://jpg.fishing/img/funnymeme.LecXGS"),
("https://jpg.fish/img/funnymeme.LecXGS"),
@ -84,7 +85,7 @@ class JpgfishAlbumExtractor(JpgfishExtractor):
subcategory = "album"
pattern = BASE_PATTERN + r"/a(?:lbum)?/([^/?#]+)(/sub)?"
test = (
("https://jpeg.pet/album/CDilP/?sort=date_desc&page=1", {
("https://jpg1.su/album/CDilP/?sort=date_desc&page=1", {
"count": 2,
}),
("https://jpg.fishing/a/gunggingnsk.N9OOI", {
@ -96,6 +97,7 @@ class JpgfishAlbumExtractor(JpgfishExtractor):
("https://jpg.church/a/hannahowo.aNTdH/sub", {
"count": 606,
}),
("https://jpeg.pet/album/CDilP/?sort=date_desc&page=1"),
("https://jpg.pet/album/CDilP/?sort=date_desc&page=1"),
)
@ -122,12 +124,13 @@ class JpgfishUserExtractor(JpgfishExtractor):
subcategory = "user"
pattern = BASE_PATTERN + r"/(?!img|a(?:lbum)?)([^/?#]+)(/albums)?"
test = (
("https://jpeg.pet/exearco", {
("https://jpg1.su/exearco", {
"count": 3,
}),
("https://jpg.church/exearco/albums", {
"count": 1,
}),
("https://jpeg.pet/exearco"),
("https://jpg.pet/exearco"),
("https://jpg.fishing/exearco"),
("https://jpg.fish/exearco"),