From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 30 Jan 2016 08:23:37 +0000 (+0800)
Subject: [daum.net] Move the request to ClipInfoXml.do
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=06ffa3348590f9aa6ddca7ca8f78424c49314560;p=youtube-dl

[daum.net] Move the request to ClipInfoXml.do

To reduce the number of wasted requests
---

diff --git a/youtube_dl/extractor/daum.py b/youtube_dl/extractor/daum.py
index 567abdc39..543eb5c3a 100644
--- a/youtube_dl/extractor/daum.py
+++ b/youtube_dl/extractor/daum.py
@@ -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']