projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb4b345
)
[daum.net] Fixes #8331
author
ping
<liping.ong@gmail.com>
Wed, 27 Jan 2016 04:48:00 +0000
(12:48 +0800)
committer
ping
<liping.ong@gmail.com>
Wed, 27 Jan 2016 04:48:00 +0000
(12:48 +0800)
youtube_dl/extractor/daum.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/daum.py
b/youtube_dl/extractor/daum.py
index f08f5715770f8f55f14e1b11bfae41e3f485888b..c84302c435b9b5ce410f89ce4a3277a6d205593b 100644
(file)
--- a/
youtube_dl/extractor/daum.py
+++ b/
youtube_dl/extractor/daum.py
@@
-2,6
+2,8
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
+import re
+
from .common import InfoExtractor
from ..compat import compat_urllib_parse
from ..utils import (
from .common import InfoExtractor
from ..compat import compat_urllib_parse
from ..utils import (
@@
-28,6
+30,15
@@
class DaumIE(InfoExtractor):
'comment_count': int,
},
}, {
'comment_count': int,
},
}, {
+ 'url': 'http://m.tvpot.daum.net/v/65139429',
+ 'info_dict': {
+ 'id': '65139429',
+ 'ext': 'mp4',
+ 'title': 'md5:a100d65d09cec246d8aa9bde7de45aed',
+ 'description': 'md5:79794514261164ff27e36a21ad229fc5',
+ 'upload_date': '20150604',
+ 'duration': 154
+ }, }, {
'url': 'http://tvpot.daum.net/v/07dXWRka62Y%24',
'only_matching': True,
}]
'url': 'http://tvpot.daum.net/v/07dXWRka62Y%24',
'only_matching': True,
}]
@@
-42,6
+53,10
@@
class DaumIE(InfoExtractor):
'http://videofarm.daum.net/controller/api/closed/v1_2/IntegratedMovieData.json?' + query,
video_id, 'Downloading video formats info')
'http://videofarm.daum.net/controller/api/closed/v1_2/IntegratedMovieData.json?' + query,
video_id, 'Downloading video formats info')
+ # For urls like http://m.tvpot.daum.net/v/65139429, where the video_id is really a clipid
+ 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)
+
formats = []
for format_el in movie_data['output_list']['output_list']:
profile = format_el['profile']
formats = []
for format_el in movie_data['output_list']['output_list']:
profile = format_el['profile']
@@
-76,7
+91,7
@@
class DaumIE(InfoExtractor):
class DaumClipIE(InfoExtractor):
class DaumClipIE(InfoExtractor):
- _VALID_URL = r'https?://(?:m\.)?tvpot\.daum\.net/(?:clip/ClipView.
do
|mypot/View.do)\?.*?clipid=(?P<id>\d+)'
+ _VALID_URL = r'https?://(?:m\.)?tvpot\.daum\.net/(?:clip/ClipView.
(?:do|tv)
|mypot/View.do)\?.*?clipid=(?P<id>\d+)'
IE_NAME = 'daum.net:clip'
_TESTS = [{
IE_NAME = 'daum.net:clip'
_TESTS = [{
@@
-90,6
+105,9
@@
class DaumClipIE(InfoExtractor):
'duration': 3868,
'view_count': int,
},
'duration': 3868,
'view_count': int,
},
+ }, {
+ 'url': 'http://m.tvpot.daum.net/clip/ClipView.tv?clipid=54999425',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):