summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/xvideos.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2019-07-20 05:51:44 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2019-07-20 05:51:44 -0400
commit2a63a9c9b7032a76894c48ac4d9cea732fcaee49 (patch)
tree3d5f633ff69cd393036a3dabc4d4533c8484f9ad /gallery_dl/extractor/xvideos.py
parent195c45911e79c33cf0bb986721365fb06df5a153 (diff)
New upstream version 1.9.0upstream/1.9.0
Diffstat (limited to 'gallery_dl/extractor/xvideos.py')
-rw-r--r--gallery_dl/extractor/xvideos.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/gallery_dl/extractor/xvideos.py b/gallery_dl/extractor/xvideos.py
index 7eec18b..e253b7f 100644
--- a/gallery_dl/extractor/xvideos.py
+++ b/gallery_dl/extractor/xvideos.py
@@ -18,12 +18,6 @@ class XvideosExtractor(Extractor):
category = "xvideos"
root = "https://www.xvideos.com"
- def get_page(self, url, codes=(403, 404)):
- response = self.request(url, expect=codes)
- if response.status_code in codes:
- raise exception.NotFoundError(self.subcategory)
- return response.text
-
class XvideosGalleryExtractor(XvideosExtractor):
"""Extractor for user profile galleries from xvideos.com"""
@@ -37,7 +31,7 @@ class XvideosGalleryExtractor(XvideosExtractor):
(("https://www.xvideos.com/profiles"
"/pervertedcouple/photos/751031/random_stuff"), {
"url": "4f0d992e5dc39def2c3ac8e099d17bf09e76e3c7",
- "keyword": "8d637b372c6231cc4ada92dd5918db5fdbd06520",
+ "keyword": "65979d63a69576cf692b41d5fbbd995cc40a51b9",
}),
("https://www.xvideos.com/profiles/pervertedcouple/photos/751032/", {
"exception": exception.NotFoundError,
@@ -50,7 +44,7 @@ class XvideosGalleryExtractor(XvideosExtractor):
def items(self):
url = "{}/profiles/{}/photos/{}".format(self.root, self.user, self.gid)
- page = self.get_page(url)
+ page = self.request(url, notfound=self.subcategory).text
data = self.get_metadata(page)
imgs = self.get_images(page)
data["count"] = len(imgs)
@@ -113,7 +107,7 @@ class XvideosUserExtractor(XvideosExtractor):
def items(self):
url = "{}/profiles/{}".format(self.root, self.user)
- page = self.get_page(url)
+ page = self.request(url, notfound=self.subcategory).text
data = json.loads(text.extract(
page, "xv.conf=", ";</script>")[0])["data"]