diff options
| author | Sergey M․ <dstftw@gmail.com> | 2016-07-02 02:11:07 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-07-02 02:11:07 +0700 |
| commit | bc4b2d75ba5b8fbd2ac9d42f0fb7a4fcd2ea3038 (patch) | |
| tree | 9f8693bf7e6e76047d75293b8fe770addb413854 /youtube_dl/extractor/pornhub.py | |
| parent | 35fc3021ba6e1e0d7b7d400fdaccc709546a4bc5 (diff) | |
| download | youtube-dl-bc4b2d75ba5b8fbd2ac9d42f0fb7a4fcd2ea3038.tar.xz | |
[pornhub] Add support for thumbzilla (Closes #8696)
Diffstat (limited to 'youtube_dl/extractor/pornhub.py')
| -rw-r--r-- | youtube_dl/extractor/pornhub.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index 77182bf07..c76afe1c4 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -25,7 +25,15 @@ from ..aes import ( class PornHubIE(InfoExtractor): - _VALID_URL = r'https?://(?:[a-z]+\.)?pornhub\.com/(?:view_video\.php\?viewkey=|embed/)(?P<id>[0-9a-z]+)' + IE_DESC = 'PornHub and Thumbzilla' + _VALID_URL = r'''(?x) + https?:// + (?: + (?:[a-z]+\.)?pornhub\.com/(?:view_video\.php\?viewkey=|embed/)| + (?:www\.)?thumbzilla\.com/video/ + ) + (?P<id>[0-9a-z]+) + ''' _TESTS = [{ 'url': 'http://www.pornhub.com/view_video.php?viewkey=648719015', 'md5': '1e19b41231a02eba417839222ac9d58e', @@ -74,6 +82,9 @@ class PornHubIE(InfoExtractor): # removed by uploader 'url': 'http://www.pornhub.com/view_video.php?viewkey=ph572716d15a111', 'only_matching': True, + }, { + 'url': 'https://www.thumbzilla.com/video/ph56c6114abd99a/horny-girlfriend-sex', + 'only_matching': True, }] @classmethod |