New upstream version 2020.07.28

[youtubedl] / youtube_dl / extractor / videodetective.py

diff --git a/youtube_dl/extractor/videodetective.py b/youtube_dl/extractor/videodetective.py
index 265dd5b91fd9e5c4fc5a0cac8a9f36dd36731cfe..fe70db713ea51fabe95912e0574a7eaa66bc8b42 100644 (file)
--- a/youtube_dl/extractor/videodetective.py
+++ b/youtube_dl/extractor/videodetective.py
@@ -1,30 +1,29 @@
-import re
+from __future__ import unicode_literals

 
 from .common import InfoExtractor
 from .internetvideoarchive import InternetVideoArchiveIE
 
 from .common import InfoExtractor
 from .internetvideoarchive import InternetVideoArchiveIE

-from ..utils import (
-    compat_urlparse,
-)

 
 
 class VideoDetectiveIE(InfoExtractor):
 
 
 class VideoDetectiveIE(InfoExtractor):

-    _VALID_URL = r'https?://www\.videodetective\.com/[^/]+/[^/]+/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?videodetective\.com/[^/]+/[^/]+/(?P<id>\d+)'

 
     _TEST = {
 
     _TEST = {

-        u'url': u'http://www.videodetective.com/movies/kick-ass-2/194487',
-        u'file': u'194487.mp4',
-        u'info_dict': {
-            u'title': u'KICK-ASS 2',
-            u'description': u'md5:65ba37ad619165afac7d432eaded6013',
-            u'duration': 135,
+        'url': 'http://www.videodetective.com/movies/kick-ass-2/194487',
+        'info_dict': {
+            'id': '194487',
+            'ext': 'mp4',
+            'title': 'Kick-Ass 2',
+            'description': 'md5:c189d5b7280400630a1d3dd17eaa8d8a',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,

         },
     }
 
     def _real_extract(self, url):
         },
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-        webpage = self._download_webpage(url, video_id)
-        og_video = self._og_search_video_url(webpage)
-        query = compat_urlparse.urlparse(og_video).query
-        return self.url_result(InternetVideoArchiveIE._build_url(query),
+        video_id = self._match_id(url)
+        query = 'customerid=69249&publishedid=' + video_id
+        return self.url_result(
+            InternetVideoArchiveIE._build_json_url(query),

             ie=InternetVideoArchiveIE.ie_key())
             ie=InternetVideoArchiveIE.ie_key())