|
@ -49,9 +49,6 @@ class DaumIE(InfoExtractor): |
|
|
def _real_extract(self, url): |
|
|
def _real_extract(self, url): |
|
|
video_id = self._match_id(url) |
|
|
video_id = self._match_id(url) |
|
|
query = compat_urllib_parse.urlencode({'vid': video_id}) |
|
|
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( |
|
|
movie_data = self._download_json( |
|
|
'http://videofarm.daum.net/controller/api/closed/v1_2/IntegratedMovieData.json?' + query, |
|
|
'http://videofarm.daum.net/controller/api/closed/v1_2/IntegratedMovieData.json?' + query, |
|
|
video_id, 'Downloading video formats info') |
|
|
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): |
|
|
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) |
|
|
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 = [] |
|
|
formats = [] |
|
|
for format_el in movie_data['output_list']['output_list']: |
|
|
for format_el in movie_data['output_list']['output_list']: |
|
|
profile = format_el['profile'] |
|
|
profile = format_el['profile'] |
|
|