[silverpic] force '.net' TLD & fix extraction
This commit is contained in:
@@ -2075,7 +2075,7 @@ Consider all listed sites to potentially be NSFW.
|
||||
</tr>
|
||||
<tr id="silverpic" title="silverpic">
|
||||
<td>SilverPic.com</td>
|
||||
<td>https://silverpic.com/</td>
|
||||
<td>https://silverpic.net/</td>
|
||||
<td>individual Images</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
@@ -465,14 +465,16 @@ class ImgdriveImageExtractor(ImagehostImageExtractor):
|
||||
class SilverpicImageExtractor(ImagehostImageExtractor):
|
||||
"""Extractor for single images from silverpic.com"""
|
||||
category = "silverpic"
|
||||
pattern = (r"(?:https?://)?((?:www\.)?silverpic\.com"
|
||||
r"/([a-z0-9]{10,})/[\S]+\.html)")
|
||||
example = "https://silverpic.com/a1b2c3d4f5g6/NAME.EXT.html"
|
||||
root = "https://silverpic.net"
|
||||
_params = "complex"
|
||||
pattern = (r"(?:https?://)?(?:www\.)?silverpic\.(?:net|com)"
|
||||
r"(/([a-z0-9]{10,})/[\S]+\.html)")
|
||||
example = "https://silverpic.net/a1b2c3d4f5g6/NAME.EXT.html"
|
||||
|
||||
def get_info(self, page):
|
||||
url, pos = text.extract(page, '<img src="/img/', '"')
|
||||
alt, pos = text.extract(page, 'alt="', '"', pos)
|
||||
return f"https://silverpic.com/img/{url}", alt
|
||||
return f"{self.root}/img/{url}", alt
|
||||
|
||||
def metadata(self, page):
|
||||
pos = page.find('<img src="/img/')
|
||||
|
||||
@@ -9,10 +9,10 @@ from gallery_dl.extractor import imagehosts
|
||||
|
||||
__tests__ = (
|
||||
{
|
||||
"#url" : "https://www.silverpic.com/8k562jyix8xq/jxU_0001.JPG.html",
|
||||
"#url" : "https://www.silverpic.net/8k562jyix8xq/jxU_0001.JPG.html",
|
||||
"#category": ("imagehost", "silverpic", "image"),
|
||||
"#class" : imagehosts.SilverpicImageExtractor,
|
||||
"#results" : "https://silverpic.com/img/z7esmp7eor37ssodt4ptpxbzoy/jxU_0001.JPG",
|
||||
"#results" : "https://silverpic.net/img/z7esmp7eor37ssodt4ptpxbzoy/jxU_0001.JPG",
|
||||
|
||||
"filename" : "jxU_0001",
|
||||
"extension": "jpg",
|
||||
@@ -21,4 +21,11 @@ __tests__ = (
|
||||
"height" : 5616,
|
||||
},
|
||||
|
||||
{
|
||||
"#url" : "https://www.silverpic.com/8k562jyix8xq/jxU_0001.JPG.html",
|
||||
"#category": ("imagehost", "silverpic", "image"),
|
||||
"#class" : imagehosts.SilverpicImageExtractor,
|
||||
"#results" : "https://silverpic.net/img/z7esmp7eor37ssodt4ptpxbzoy/jxU_0001.JPG",
|
||||
},
|
||||
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user