[pornpics] prevent redirect when retrieving gallery page
This commit is contained in:
@@ -20,10 +20,6 @@ class PornpicsExtractor(Extractor):
|
|||||||
root = "https://www.pornpics.com"
|
root = "https://www.pornpics.com"
|
||||||
request_interval = (0.5, 1.5)
|
request_interval = (0.5, 1.5)
|
||||||
|
|
||||||
def __init__(self, match):
|
|
||||||
super().__init__(match)
|
|
||||||
self.item = match.group(1)
|
|
||||||
|
|
||||||
def items(self):
|
def items(self):
|
||||||
for gallery in self.galleries():
|
for gallery in self.galleries():
|
||||||
gallery["_extractor"] = PornpicsGalleryExtractor
|
gallery["_extractor"] = PornpicsGalleryExtractor
|
||||||
@@ -60,12 +56,12 @@ class PornpicsExtractor(Extractor):
|
|||||||
|
|
||||||
class PornpicsGalleryExtractor(PornpicsExtractor, GalleryExtractor):
|
class PornpicsGalleryExtractor(PornpicsExtractor, GalleryExtractor):
|
||||||
"""Extractor for pornpics galleries"""
|
"""Extractor for pornpics galleries"""
|
||||||
pattern = BASE_PATTERN + r"(/galleries/(?:[^/?#]+-)?(\d+))"
|
pattern = BASE_PATTERN + r"/galleries/((?:[^/?#]+-)?(\d+))"
|
||||||
example = "https://www.pornpics.com/galleries/TITLE-12345/"
|
example = "https://www.pornpics.com/galleries/TITLE-12345/"
|
||||||
|
|
||||||
def __init__(self, match):
|
def __init__(self, match):
|
||||||
PornpicsExtractor.__init__(self, match)
|
url = "{}/galleries/{}/".format(self.root, match.group(1))
|
||||||
self.gallery_id = match.group(2)
|
GalleryExtractor.__init__(self, match, url)
|
||||||
|
|
||||||
items = GalleryExtractor.items
|
items = GalleryExtractor.items
|
||||||
|
|
||||||
@@ -73,7 +69,7 @@ class PornpicsGalleryExtractor(PornpicsExtractor, GalleryExtractor):
|
|||||||
extr = text.extract_from(page)
|
extr = text.extract_from(page)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"gallery_id": text.parse_int(self.gallery_id),
|
"gallery_id": text.parse_int(self.groups[1]),
|
||||||
"slug" : extr("/galleries/", "/").rpartition("-")[0],
|
"slug" : extr("/galleries/", "/").rpartition("-")[0],
|
||||||
"title" : text.unescape(extr("<h1>", "<")),
|
"title" : text.unescape(extr("<h1>", "<")),
|
||||||
"channel" : text.split_html(extr(">Channel: ", '</div>')),
|
"channel" : text.split_html(extr(">Channel: ", '</div>')),
|
||||||
@@ -100,7 +96,7 @@ class PornpicsTagExtractor(PornpicsExtractor):
|
|||||||
example = "https://www.pornpics.com/tags/TAGS/"
|
example = "https://www.pornpics.com/tags/TAGS/"
|
||||||
|
|
||||||
def galleries(self):
|
def galleries(self):
|
||||||
url = "{}/tags/{}/".format(self.root, self.item)
|
url = "{}/tags/{}/".format(self.root, self.groups[0])
|
||||||
return self._pagination(url)
|
return self._pagination(url)
|
||||||
|
|
||||||
|
|
||||||
@@ -113,7 +109,7 @@ class PornpicsSearchExtractor(PornpicsExtractor):
|
|||||||
def galleries(self):
|
def galleries(self):
|
||||||
url = self.root + "/search/srch.php"
|
url = self.root + "/search/srch.php"
|
||||||
params = {
|
params = {
|
||||||
"q" : self.item.replace("-", " "),
|
"q" : self.groups[0].replace("-", " "),
|
||||||
"lang" : "en",
|
"lang" : "en",
|
||||||
"offset": 0,
|
"offset": 0,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user