From: 5moufl Date: Mon, 15 Sep 2014 13:09:17 +0000 (+0200) Subject: [BehindKink] Minor fixes X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=6d1f2431bd3ac1bd7d59c01747c190f42656f383;p=youtube-dl [BehindKink] Minor fixes - fix _VALID_URL regex - remove unnecessary variable - remove second call of report_extraction --- diff --git a/youtube_dl/extractor/behindkink.py b/youtube_dl/extractor/behindkink.py index f0a86fda3..12f13aae9 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,8 +31,7 @@ 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( @@ -41,7 +40,6 @@ class BehindKinkIE(InfoExtractor): video_id = url_basename(video_url) video_id = video_id.split('_')[0] - self.report_extraction(video_id) return { 'id': video_id,