diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2018-01-14 00:50:11 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2018-01-14 00:50:11 +0100 |
commit | b382d0f71eeece4e6e1cc3662f3c89884d5ac05d (patch) | |
tree | e48661b9f1de2380d4bff94f416624827746abd7 /youtube_dl/extractor/spankbang.py | |
parent | 5020cb7e8233683ef7845fea1233a95f3f775a7b (diff) | |
parent | a86922c4702e2c8538337124c5bf02a4b5f9aa4a (diff) | |
download | youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.zip youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.gz youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.bz2 |
Merge branch 'upstream'
Diffstat (limited to 'youtube_dl/extractor/spankbang.py')
-rw-r--r-- | youtube_dl/extractor/spankbang.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/youtube_dl/extractor/spankbang.py b/youtube_dl/extractor/spankbang.py index 3394c7e..e6c2dcf 100644 --- a/youtube_dl/extractor/spankbang.py +++ b/youtube_dl/extractor/spankbang.py @@ -3,10 +3,11 @@ from __future__ import unicode_literals import re from .common import InfoExtractor +from ..utils import ExtractorError class SpankBangIE(InfoExtractor): - _VALID_URL = r'https?://(?:(?:www|[a-z]{2})\.)?spankbang\.com/(?P<id>[\da-z]+)/video' + _VALID_URL = r'https?://(?:(?:www|m|[a-z]{2})\.)?spankbang\.com/(?P<id>[\da-z]+)/video' _TESTS = [{ 'url': 'http://spankbang.com/3vvn/video/fantasy+solo', 'md5': '1cc433e1d6aa14bc376535b8679302f7', @@ -14,7 +15,7 @@ class SpankBangIE(InfoExtractor): 'id': '3vvn', 'ext': 'mp4', 'title': 'fantasy solo', - 'description': 'Watch fantasy solo free HD porn video - 05 minutes - dillion harper masturbates on a bed free adult movies.', + 'description': 'Watch fantasy solo free HD porn video - 05 minutes - Babe,Masturbation,Solo,Toy - dillion harper masturbates on a bed free adult movies sexy clips.', 'thumbnail': r're:^https?://.*\.jpg$', 'uploader': 'silly2587', 'age_limit': 18, @@ -27,12 +28,20 @@ class SpankBangIE(InfoExtractor): # no uploader 'url': 'http://spankbang.com/lklg/video/sex+with+anyone+wedding+edition+2', 'only_matching': True, + }, { + # mobile page + 'url': 'http://m.spankbang.com/1o2de/video/can+t+remember+her+name', + 'only_matching': True, }] def _real_extract(self, url): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) + if re.search(r'<[^>]+\bid=["\']video_removed', webpage): + raise ExtractorError( + 'Video %s is not available' % video_id, expected=True) + stream_key = self._html_search_regex( r'''var\s+stream_key\s*=\s*['"](.+?)['"]''', webpage, 'stream key') |