summary refs log tree commit diff
diff options
context:
space:
mode:
author5moufl <malouito@gmail.com>2014-09-15 15:09:17 +0200
committer5moufl <malouito@gmail.com>2014-09-15 15:09:17 +0200
commit6d1f2431bd3ac1bd7d59c01747c190f42656f383 (patch)
tree9f61157a20828046d93ddfa7ad75c16b79ebde47
parent2bca84e345b3f64f832128dbe24b3384e7ec9751 (diff)
downloadyoutube-dl-6d1f2431bd3ac1bd7d59c01747c190f42656f383.tar.gz
youtube-dl-6d1f2431bd3ac1bd7d59c01747c190f42656f383.tar.xz
youtube-dl-6d1f2431bd3ac1bd7d59c01747c190f42656f383.zip
[BehindKink] Minor fixes
 - fix _VALID_URL regex
 - remove unnecessary variable
 - remove second call of report_extraction
-rw-r--r--youtube_dl/extractor/behindkink.py6
1 files changed, 2 insertions, 4 deletions
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<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 = {
         '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,