]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[daum.net] Move the request to ClipInfoXml.do
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 30 Jan 2016 08:23:37 +0000 (16:23 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 30 Jan 2016 08:23:37 +0000 (16:23 +0800)
To reduce the number of wasted requests

youtube_dl/extractor/daum.py

index 567abdc3904c1f4317c557ef4f07415f1dee89b4..543eb5c3a78e6c5c8ed9a5da7ce95f5a951e688b 100644 (file)
@@ -49,9 +49,6 @@ class DaumIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         query = compat_urllib_parse.urlencode({'vid': video_id})
-        info = self._download_xml(
-            'http://tvpot.daum.net/clip/ClipInfoXml.do?' + query, video_id,
-            'Downloading video info')
         movie_data = self._download_json(
             'http://videofarm.daum.net/controller/api/closed/v1_2/IntegratedMovieData.json?' + query,
             video_id, 'Downloading video formats info')
@@ -60,6 +57,10 @@ class DaumIE(InfoExtractor):
         if not movie_data.get('output_list', {}).get('output_list') and re.match(r'^\d+$', video_id):
             return self.url_result('http://tvpot.daum.net/clip/ClipView.do?clipid=%s' % video_id)
 
+        info = self._download_xml(
+            'http://tvpot.daum.net/clip/ClipInfoXml.do?' + query, video_id,
+            'Downloading video info')
+
         formats = []
         for format_el in movie_data['output_list']['output_list']:
             profile = format_el['profile']