diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-01-02 21:09:28 +0600 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-01-02 21:09:28 +0600 |
| commit | 644096b15c8af723d06635dceb72754b5b929127 (patch) | |
| tree | c437a873007d073415a48f06b79d80de5afddc60 | |
| parent | 15cebcc3632f68e66c2a7fecb48b99a75ce63ac1 (diff) | |
| parent | 5b9aefef773463977504081faa1db88bd0e94300 (diff) | |
Merge pull request #4615 from dwemthy/https_xhamster
[xhamster] Add HTTPS support
| -rw-r--r-- | youtube_dl/extractor/xhamster.py | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 6b37bcbc9..519bfc191 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -14,7 +14,7 @@ from ..utils import ( class XHamsterIE(InfoExtractor): """Information Extractor for xHamster""" - _VALID_URL = r'http://(?:.+?\.)?xhamster\.com/movies/(?P<id>[0-9]+)/(?P<seo>.+?)\.html(?:\?.*)?' + _VALID_URL = r'(?P<proto>https?)://(?:.+?\.)?xhamster\.com/movies/(?P<id>[0-9]+)/(?P<seo>.+?)\.html(?:\?.*)?' _TESTS = [ { 'url': 'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html', @@ -39,6 +39,30 @@ class XHamsterIE(InfoExtractor): 'duration': 200, 'age_limit': 18, } + }, + { + 'url': 'https://xhamster.com/movies/2272726/amber_slayed_by_the_knight.html', + 'info_dict': { + 'id': '2272726', + 'ext': 'mp4', + 'title': 'Amber slayed by the Knight', + 'upload_date': '20131009', + 'uploader_id': 'amberblank', + 'duration': 149, + 'age_limit': 18, + } + }, + { + "url": "https://xhamster.com/movies/1444747/hotkinkyjo_amp_asian_girl_elbow_deep_anal_fisting_and_footing.html", + 'info_dict': { + "id": "1444747", + 'ext': 'mp4', + "title": "HOTKINKYJO & ASIAN GIRL ELBOW DEEP ANAL FISTING AND FOOTING", + "upload_date": "20120922", + "uploader_id": "alex1981", + "duration": 80, + "age_limit": 18, + } } ] @@ -57,7 +81,8 @@ class XHamsterIE(InfoExtractor): video_id = mobj.group('id') seo = mobj.group('seo') - mrss_url = 'http://xhamster.com/movies/%s/%s.html' % (video_id, seo) + proto = mobj.group('proto') + mrss_url = '%s://xhamster.com/movies/%s/%s.html' % (proto, video_id, seo) webpage = self._download_webpage(mrss_url, video_id) title = self._html_search_regex(r'<title>(?P<title>.+?) - xHamster\.com</title>', webpage, 'title') |