[jpgfish] update domain to 'jpg7.cr' (#8530)
This commit is contained in:
@@ -1247,7 +1247,7 @@ Consider all listed sites to potentially be NSFW.
|
||||
</tr>
|
||||
<tr id="jpgfish" title="jpgfish">
|
||||
<td>JPG Fish</td>
|
||||
<td>https://jpg6.su/</td>
|
||||
<td>https://jpg7.cr/</td>
|
||||
<td>Albums, Categories, individual Images, User Profiles, Videos</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
@@ -39,8 +39,8 @@ class CheveretoExtractor(BaseExtractor):
|
||||
|
||||
BASE_PATTERN = CheveretoExtractor.update({
|
||||
"jpgfish": {
|
||||
"root": "https://jpg6.su",
|
||||
"pattern": r"(?:www\.)?jpe?g\d?\.(?:su|pet|fish(?:ing)?|church)",
|
||||
"root": "https://jpg7.cr",
|
||||
"pattern": r"(?:www\.)?jpe?g\d?\.(?:cr|su|pet|fish(?:ing)?|church)",
|
||||
},
|
||||
"imagepond": {
|
||||
"root": "https://imagepond.net",
|
||||
@@ -57,7 +57,7 @@ class CheveretoImageExtractor(CheveretoExtractor):
|
||||
"""Extractor for chevereto images"""
|
||||
subcategory = "image"
|
||||
pattern = rf"{BASE_PATTERN}(/im(?:g|age)/[^/?#]+)"
|
||||
example = "https://jpg2.su/img/TITLE.ID"
|
||||
example = "https://jpg7.cr/img/TITLE.ID"
|
||||
|
||||
def items(self):
|
||||
url = self.root + self.path
|
||||
@@ -134,7 +134,7 @@ class CheveretoAlbumExtractor(CheveretoExtractor):
|
||||
"""Extractor for chevereto albums"""
|
||||
subcategory = "album"
|
||||
pattern = rf"{BASE_PATTERN}(/a(?:lbum)?/[^/?#]+(?:/sub)?)"
|
||||
example = "https://jpg2.su/album/TITLE.ID"
|
||||
example = "https://jpg7.cr/album/TITLE.ID"
|
||||
|
||||
def items(self):
|
||||
url = self.root + self.path
|
||||
@@ -168,7 +168,7 @@ class CheveretoUserExtractor(CheveretoExtractor):
|
||||
"""Extractor for chevereto users"""
|
||||
subcategory = "user"
|
||||
pattern = rf"{BASE_PATTERN}(/[^/?#]+(?:/albums)?)"
|
||||
example = "https://jpg2.su/USER"
|
||||
example = "https://jpg7.cr/USER"
|
||||
|
||||
def items(self):
|
||||
url = self.root + self.path
|
||||
|
||||
@@ -9,10 +9,10 @@ from gallery_dl.extractor import chevereto
|
||||
|
||||
__tests__ = (
|
||||
{
|
||||
"#url" : "https://jpg4.su/img/funnymeme.LecXGS",
|
||||
"#url" : "https://jpg7.cr/img/funnymeme.LecXGS",
|
||||
"#category": ("chevereto", "jpgfish", "image"),
|
||||
"#class" : chevereto.CheveretoImageExtractor,
|
||||
"#results" : "https://simp3.jpg5.su/images/funnymeme.jpg",
|
||||
"#results" : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
|
||||
"#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c",
|
||||
|
||||
"album" : "",
|
||||
@@ -20,7 +20,22 @@ __tests__ = (
|
||||
"extension": "jpg",
|
||||
"filename" : "funnymeme",
|
||||
"id" : "LecXGS",
|
||||
"url" : "https://simp3.jpg5.su/images/funnymeme.jpg",
|
||||
"url" : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
|
||||
"user" : "exearco",
|
||||
},
|
||||
|
||||
{
|
||||
"#url" : "https://jpg4.su/img/funnymeme.LecXGS",
|
||||
"#category": ("chevereto", "jpgfish", "image"),
|
||||
"#class" : chevereto.CheveretoImageExtractor,
|
||||
"#results" : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
|
||||
|
||||
"album" : "",
|
||||
"date" : "dt:2022-06-05 03:24:25",
|
||||
"extension": "jpg",
|
||||
"filename" : "funnymeme",
|
||||
"id" : "LecXGS",
|
||||
"url" : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
|
||||
"user" : "exearco",
|
||||
},
|
||||
|
||||
@@ -29,7 +44,7 @@ __tests__ = (
|
||||
"#comment" : "image ID without name (#8307)",
|
||||
"#category": ("chevereto", "jpgfish", "image"),
|
||||
"#class" : chevereto.CheveretoImageExtractor,
|
||||
"#results" : "https://simp3.jpg5.su/images/funnymeme.jpg",
|
||||
"#results" : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
|
||||
"#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c",
|
||||
|
||||
"album" : "",
|
||||
@@ -37,7 +52,7 @@ __tests__ = (
|
||||
"extension": "jpg",
|
||||
"filename" : "funnymeme",
|
||||
"id" : "LecXGS",
|
||||
"url" : "https://simp3.jpg5.su/images/funnymeme.jpg",
|
||||
"url" : str,
|
||||
"user" : "exearco",
|
||||
},
|
||||
|
||||
@@ -45,7 +60,7 @@ __tests__ = (
|
||||
"#url" : "https://jpg.church/img/auCruA",
|
||||
"#category": ("chevereto", "jpgfish", "image"),
|
||||
"#class" : chevereto.CheveretoImageExtractor,
|
||||
"#pattern" : r"https://simp2\.jpg5\.su/hannahowo_00457\.jpg",
|
||||
"#results" : "https://simp2.selti-delivery.ru/hannahowo_00457.jpg",
|
||||
|
||||
"album": "401-500",
|
||||
"date" : "dt:2022-03-23 13:50:52",
|
||||
|
||||
Reference in New Issue
Block a user