X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fbehindkink.py;h=31fdc0dcc0614babf4ff3b48186566904cfcc57a;hb=f46a8702ccfcb221b3e01ca95553be92af3f8f4e;hp=f0a86fda3807ac2472505b11e9cc43e17fe7b3c4;hpb=2bca84e345b3f64f832128dbe24b3384e7ec9751;p=youtube-dl diff --git a/youtube_dl/extractor/behindkink.py b/youtube_dl/extractor/behindkink.py index f0a86fda3..31fdc0dcc 100644 --- a/youtube_dl/extractor/behindkink.py +++ b/youtube_dl/extractor/behindkink.py @@ -8,7 +8,7 @@ from ..utils import url_basename class BehindKinkIE(InfoExtractor): - _VALID_URL = r'(?:http://)(?:www\.)?behindkink\.com/(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/(?P[^/?_]+)' + _VALID_URL = r'http://(?:www\.)?behindkink\.com/(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/(?P[^/#?_]+)' _TEST = { 'url': 'http://www.behindkink.com/2014/08/14/ab1576-performers-voice-finally-heard-the-bill-is-killed/', 'md5': '41ad01222b8442089a55528fec43ec01', @@ -31,17 +31,14 @@ class BehindKinkIE(InfoExtractor): day = mobj.group('day') upload_date = year + month + day - webpage_url = 'http://www.behindkink.com/' + year + '/' + month + '/' + day + '/' + display_id - webpage = self._download_webpage(webpage_url, display_id) + webpage = self._download_webpage(url, display_id) - self.report_extraction(display_id) video_url = self._search_regex( r"'file':\s*'([^']+)'", webpage, 'URL base') video_id = url_basename(video_url) video_id = video_id.split('_')[0] - self.report_extraction(video_id) return { 'id': video_id,