|
@@ -1,25 +1,28 @@
|
|
|
# encoding: utf-8
|
|
|
+
|
|
|
+from __future__ import unicode_literals
|
|
|
+
|
|
|
import re
|
|
|
|
|
|
from .common import InfoExtractor
|
|
|
from ..utils import (
|
|
|
compat_urllib_parse,
|
|
|
- determine_ext,
|
|
|
)
|
|
|
|
|
|
|
|
|
class DaumIE(InfoExtractor):
|
|
|
_VALID_URL = r'https?://(?:m\.)?tvpot\.daum\.net/.*?clipid=(?P<id>\d+)'
|
|
|
- IE_NAME = u'daum.net'
|
|
|
+ IE_NAME = 'daum.net'
|
|
|
|
|
|
_TEST = {
|
|
|
- u'url': u'http://tvpot.daum.net/clip/ClipView.do?clipid=52554690',
|
|
|
- u'file': u'52554690.mp4',
|
|
|
- u'info_dict': {
|
|
|
- u'title': u'DOTA 2GETHER 시즌2 6회 - 2부',
|
|
|
- u'description': u'DOTA 2GETHER 시즌2 6회 - 2부',
|
|
|
- u'upload_date': u'20130831',
|
|
|
- u'duration': 3868,
|
|
|
+ 'url': 'http://tvpot.daum.net/clip/ClipView.do?clipid=52554690',
|
|
|
+ 'info_dict': {
|
|
|
+ 'id': '52554690',
|
|
|
+ 'ext': 'mp4',
|
|
|
+ 'title': 'DOTA 2GETHER 시즌2 6회 - 2부',
|
|
|
+ 'description': 'DOTA 2GETHER 시즌2 6회 - 2부',
|
|
|
+ 'upload_date': '20130831',
|
|
|
+ 'duration': 3868,
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -30,14 +33,14 @@ class DaumIE(InfoExtractor):
|
|
|
webpage = self._download_webpage(canonical_url, video_id)
|
|
|
full_id = self._search_regex(
|
|
|
r'<iframe src="http://videofarm.daum.net/controller/video/viewer/Video.html\?.*?vid=(.+?)[&"]',
|
|
|
- webpage, u'full id')
|
|
|
+ webpage, 'full id')
|
|
|
query = compat_urllib_parse.urlencode({'vid': full_id})
|
|
|
info = self._download_xml(
|
|
|
'http://tvpot.daum.net/clip/ClipInfoXml.do?' + query, video_id,
|
|
|
- u'Downloading video info')
|
|
|
+ 'Downloading video info')
|
|
|
urls = self._download_xml(
|
|
|
'http://videofarm.daum.net/controller/api/open/v1_2/MovieData.apixml?' + query,
|
|
|
- video_id, u'Downloading video formats info')
|
|
|
+ video_id, 'Downloading video formats info')
|
|
|
|
|
|
self.to_screen(u'%s: Getting video urls' % video_id)
|
|
|
formats = []
|
|
@@ -53,7 +56,6 @@ class DaumIE(InfoExtractor):
|
|
|
format_url = url_doc.find('result/url').text
|
|
|
formats.append({
|
|
|
'url': format_url,
|
|
|
- 'ext': determine_ext(format_url),
|
|
|
'format_id': profile,
|
|
|
})
|
|
|
|