Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4440 from 5moufl/behindkink-fix

Browse Source 
[BehindKink] update
This commit is contained in:
Sergey M. 2014-12-11 19:58:31 +06:00
commit 3bca0409fe
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/behindkink.py
View File

@ -10,15 +10,15 @@ from ..utils import url_basename
class BehindKinkIE(InfoExtractor): class BehindKinkIE(InfoExtractor):
_VALID_URL = r'http://(?:www\.)?behindkink\.com/(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<id>[^/#?_]+)' _VALID_URL = r'http://(?:www\.)?behindkink\.com/(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<id>[^/#?_]+)'
_TEST = { _TEST = {
'url': 'http://www.behindkink.com/2014/08/14/ab1576-performers-voice-finally-heard-the-bill-is-killed/', 'url': 'http://www.behindkink.com/2014/12/05/what-are-you-passionate-about-marley-blaze/',
'md5': '41ad01222b8442089a55528fec43ec01', 'md5': '507b57d8fdcd75a41a9a7bdb7989c762',
'info_dict': { 'info_dict': {
'id': '36370', 'id': '37127',
'ext': 'mp4', 'ext': 'mp4',
'title': 'AB1576 - PERFORMERS VOICE FINALLY HEARD - THE BILL IS KILLED!', 'title': 'What are you passionate about – Marley Blaze',
'description': 'The adult industry voice was finally heard as Assembly Bill 1576 remained\xa0 in suspense today at the Senate Appropriations Hearing. AB1576 was, among other industry damaging issues, a condom mandate...', 'description': 'Getting a better understanding of the talent that comes through the doors of the Armory is one of our missions at Behind Kink. Asking the question what are you passionate about helps us get a littl...',
'upload_date': '20140814', 'upload_date': '20141205',
'thumbnail': 'http://www.behindkink.com/wp-content/uploads/2014/08/36370_AB1576_Win.jpg', 'thumbnail': 'http://www.behindkink.com/wp-content/uploads/2014/12/blaze-1.jpg',
'age_limit': 18, 'age_limit': 18,
} }
} }
@ -34,8 +34,7 @@ class BehindKinkIE(InfoExtractor):
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_url = self._search_regex( video_url = self._search_regex(
r"'file':\s*'([^']+)'", r'<source src="(.*?)" type="video/mp4" />', webpage, 'video URL')
webpage, 'URL base')
video_id = url_basename(video_url) video_id = url_basename(video_url)
video_id = video_id.split('_')[0] video_id = video_id.split('_')[0]