diff options
| author |   Unit 193 <unit193@unit193.net> | 2020-12-30 18:41:48 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2020-12-30 18:41:48 -0500 |
| commit | 87a5aa088ce33a1196ff409b76a9ea8233bdc634 (patch) | |
| tree | 7e6155edcc5dd12e40b47ad814b3bc69e65c52fc /gallery_dl/extractor/pornhub.py | |
| parent | 8f7c87a2697113134c311aaeafd9c919555a2741 (diff) | |
New upstream version 1.16.1.upstream/1.16.1
Diffstat (limited to 'gallery_dl/extractor/pornhub.py')
| -rw-r--r-- | gallery_dl/extractor/pornhub.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gallery_dl/extractor/pornhub.py b/gallery_dl/extractor/pornhub.py index 1856c82..61e3d41 100644 --- a/gallery_dl/extractor/pornhub.py +++ b/gallery_dl/extractor/pornhub.py @@ -29,26 +29,26 @@ class PornhubGalleryExtractor(PornhubExtractor): archive_fmt = "{id}" pattern = BASE_PATTERN + r"/album/(\d+)" test = ( - ("https://www.pornhub.com/album/17218841", { + ("https://www.pornhub.com/album/19289801", { "pattern": r"https://\w+.phncdn.com/pics/albums/\d+/\d+/\d+/\d+/", - "count": 81, + "count": 308, "keyword": { - "id": int, - "num": int, - "score": int, - "views": int, + "id" : int, + "num" : int, + "score" : int, + "views" : int, "caption": str, - "user": "Unknown", + "user" : "Danika Mori", "gallery": { - "id" : 17218841, + "id" : 19289801, "score": int, "views": int, "tags" : list, - "title": "Hentai/Ecchi 41", + "title": "Danika Mori Best Moments", }, }, }), - ("https://www.pornhub.com/album/37180171", { + ("https://www.pornhub.com/album/69040172", { "exception": exception.AuthorizationError, }), ) @@ -118,10 +118,10 @@ class PornhubGalleryExtractor(PornhubExtractor): class PornhubUserExtractor(PornhubExtractor): """Extractor for all galleries of a pornhub user""" subcategory = "user" - pattern = (BASE_PATTERN + r"/(users|model)/([^/?#]+)" + pattern = (BASE_PATTERN + r"/(users|model|pornstar)/([^/?#]+)" "(?:/photos(?:/(public|private|favorites))?)?/?$") test = ( - ("https://www.pornhub.com/users/flyings0l0/photos/public", { + ("https://www.pornhub.com/pornstar/danika-mori/photos", { "pattern": PornhubGalleryExtractor.pattern, "count": ">= 6", }), |