mirror of
https://github.com/mikf/gallery-dl.git
synced 2024-11-23 11:12:40 +01:00
96fcff182c
* Generic extractor, see issue #683 * Fix failed test_names test, no subcategory needed * Prefix directory_fmt with "generic" * Relax regex (would break some urls) * Flake8 compliance * pattern: don't require a scheme This fixes a bug when we force the generic extractor on urls without a scheme (that are allowed by all other extractors). * Fix using g: and r: on urls without http(s) scheme Almost all extractors accept urls without an initial http(s) scheme. Many extractors also allow for generic subdomains in their "pattern" variable; some of them implement this with the regex character class "[^.]+" (everything but a dot). This leads to a problem when the extractor is given a url starting with g: or r: (to force using the generic or recursive extractor) and without the http(s) scheme: e.g. with "r:foobar.tumblr.com" the "r:" is wrongly considered part of the subdomain. This commit fixes the bug, replacing the too generic "[^.]+" with the more specific "[\w-]+" (letters, digits and "-", the only characters allowed in domain names), which is already used by some extractors. * Relax imageurl_pattern_ext: allow relative urls * First round of small suggested changes * Support image urls starting with "//" * self.baseurl: remove trailing slash * Relax regexp (didn't catch some image urls) * Some fixes and cleanup * Fix domain pattern; option to enable extractor Fixed the domain section for "pattern", to pass "test_add" and "test_add_module" tests. Added the "enabled" configuration option (default False) to enable the generic extractor. Using "g(eneric):URL" forces using the extractor.
156 lines
5.3 KiB
Python
156 lines
5.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Copyright 2019-2021 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
|
|
# published by the Free Software Foundation.
|
|
|
|
"""Extractors for https://www.pornhub.com/"""
|
|
|
|
from .common import Extractor, Message
|
|
from .. import text, exception
|
|
|
|
|
|
BASE_PATTERN = r"(?:https?://)?(?:[\w-]+\.)?pornhub\.com"
|
|
|
|
|
|
class PornhubExtractor(Extractor):
|
|
"""Base class for pornhub extractors"""
|
|
category = "pornhub"
|
|
root = "https://www.pornhub.com"
|
|
|
|
|
|
class PornhubGalleryExtractor(PornhubExtractor):
|
|
"""Extractor for image galleries on pornhub.com"""
|
|
subcategory = "gallery"
|
|
directory_fmt = ("{category}", "{user}", "{gallery[id]} {gallery[title]}")
|
|
filename_fmt = "{num:>03}_{id}.{extension}"
|
|
archive_fmt = "{id}"
|
|
pattern = BASE_PATTERN + r"/album/(\d+)"
|
|
test = (
|
|
("https://www.pornhub.com/album/19289801", {
|
|
"pattern": r"https://\w+.phncdn.com/pics/albums/\d+/\d+/\d+/\d+/",
|
|
"count": ">= 300",
|
|
"keyword": {
|
|
"id" : int,
|
|
"num" : int,
|
|
"score" : int,
|
|
"views" : int,
|
|
"caption": str,
|
|
"user" : "Danika Mori",
|
|
"gallery": {
|
|
"id" : 19289801,
|
|
"score": int,
|
|
"views": int,
|
|
"tags" : list,
|
|
"title": "Danika Mori Best Moments",
|
|
},
|
|
},
|
|
}),
|
|
("https://www.pornhub.com/album/69040172", {
|
|
"exception": exception.AuthorizationError,
|
|
}),
|
|
)
|
|
|
|
def __init__(self, match):
|
|
PornhubExtractor.__init__(self, match)
|
|
self.gallery_id = match.group(1)
|
|
self._first = None
|
|
|
|
def items(self):
|
|
data = self.metadata()
|
|
yield Message.Directory, data
|
|
for num, image in enumerate(self.images(), 1):
|
|
url = image["url"]
|
|
image.update(data)
|
|
image["num"] = num
|
|
yield Message.Url, url, text.nameext_from_url(url, image)
|
|
|
|
def metadata(self):
|
|
url = "{}/album/{}".format(
|
|
self.root, self.gallery_id)
|
|
extr = text.extract_from(self.request(url).text)
|
|
|
|
title = extr("<title>", "</title>")
|
|
score = extr('<div id="albumGreenBar" style="width:', '"')
|
|
views = extr('<div id="viewsPhotAlbumCounter">', '<')
|
|
tags = extr('<div id="photoTagsBox"', '<script')
|
|
self._first = extr('<a href="/photo/', '"')
|
|
title, _, user = title.rpartition(" - ")
|
|
|
|
return {
|
|
"user" : text.unescape(user[:-14]),
|
|
"gallery": {
|
|
"id" : text.parse_int(self.gallery_id),
|
|
"title": text.unescape(title),
|
|
"score": text.parse_int(score.partition("%")[0]),
|
|
"views": text.parse_int(views.partition(" ")[0]),
|
|
"tags" : text.split_html(tags)[2:],
|
|
},
|
|
}
|
|
|
|
def images(self):
|
|
url = "{}/album/show_album_json?album={}".format(
|
|
self.root, self.gallery_id)
|
|
response = self.request(url)
|
|
|
|
if response.content == b"Permission denied":
|
|
raise exception.AuthorizationError()
|
|
images = response.json()
|
|
key = end = self._first
|
|
|
|
while True:
|
|
img = images[key]
|
|
yield {
|
|
"url" : img["img_large"],
|
|
"caption": img["caption"],
|
|
"id" : text.parse_int(img["id"]),
|
|
"views" : text.parse_int(img["times_viewed"]),
|
|
"score" : text.parse_int(img["vote_percent"]),
|
|
}
|
|
key = img["next"]
|
|
if key == end:
|
|
return
|
|
|
|
|
|
class PornhubUserExtractor(PornhubExtractor):
|
|
"""Extractor for all galleries of a pornhub user"""
|
|
subcategory = "user"
|
|
pattern = (BASE_PATTERN + r"/(users|model|pornstar)/([^/?#]+)"
|
|
"(?:/photos(?:/(public|private|favorites))?)?/?$")
|
|
test = (
|
|
("https://www.pornhub.com/pornstar/danika-mori/photos", {
|
|
"pattern": PornhubGalleryExtractor.pattern,
|
|
"count": ">= 6",
|
|
}),
|
|
("https://www.pornhub.com/users/flyings0l0/"),
|
|
("https://www.pornhub.com/users/flyings0l0/photos/public"),
|
|
("https://www.pornhub.com/users/flyings0l0/photos/private"),
|
|
("https://www.pornhub.com/users/flyings0l0/photos/favorites"),
|
|
("https://www.pornhub.com/model/bossgirl/photos"),
|
|
)
|
|
|
|
def __init__(self, match):
|
|
PornhubExtractor.__init__(self, match)
|
|
self.type, self.user, self.cat = match.groups()
|
|
|
|
def items(self):
|
|
url = "{}/{}/{}/photos/{}/ajax".format(
|
|
self.root, self.type, self.user, self.cat or "public")
|
|
params = {"page": 1}
|
|
headers = {
|
|
"Referer": url[:-5],
|
|
"X-Requested-With": "XMLHttpRequest",
|
|
}
|
|
|
|
data = {"_extractor": PornhubGalleryExtractor}
|
|
while True:
|
|
page = self.request(
|
|
url, method="POST", headers=headers, params=params).text
|
|
if not page:
|
|
return
|
|
for gid in text.extract_iter(page, 'id="albumphoto', '"'):
|
|
yield Message.Queue, self.root + "/album/" + gid, data
|
|
params["page"] += 1
|