projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ca0e7a2
)
[daum] Support non-numeric video IDs (Fixes #3749)
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 15 Sep 2014 13:25:35 +0000
(15:25 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 15 Sep 2014 13:25:35 +0000
(15:25 +0200)
youtube_dl/extractor/daum.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/daum.py
b/youtube_dl/extractor/daum.py
index 6033cd94a1b251d66e7a3f80034bc58b79fa4b55..45d66e2e663fa376cec8f4fc7931e84006ee30b9 100644
(file)
--- a/
youtube_dl/extractor/daum.py
+++ b/
youtube_dl/extractor/daum.py
@@
-11,10
+11,10
@@
from ..utils import (
class DaumIE(InfoExtractor):
class DaumIE(InfoExtractor):
- _VALID_URL = r'https?://(?:m\.)?tvpot\.daum\.net/
.*?clipid=(?P<id>\d
+)'
+ _VALID_URL = r'https?://(?:m\.)?tvpot\.daum\.net/
(?:v/|.*?clipid=)(?P<id>[^?#&]
+)'
IE_NAME = 'daum.net'
IE_NAME = 'daum.net'
- _TEST
=
{
+ _TEST
S = [
{
'url': 'http://tvpot.daum.net/clip/ClipView.do?clipid=52554690',
'info_dict': {
'id': '52554690',
'url': 'http://tvpot.daum.net/clip/ClipView.do?clipid=52554690',
'info_dict': {
'id': '52554690',
@@
-24,11
+24,17
@@
class DaumIE(InfoExtractor):
'upload_date': '20130831',
'duration': 3868,
},
'upload_date': '20130831',
'duration': 3868,
},
- }
+ }, {
+ 'url': 'http://tvpot.daum.net/v/vab4dyeDBysyBssyukBUjBz',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://tvpot.daum.net/v/07dXWRka62Y%24',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group(
1
)
+ video_id = mobj.group(
'id'
)
canonical_url = 'http://tvpot.daum.net/v/%s' % video_id
webpage = self._download_webpage(canonical_url, video_id)
full_id = self._search_regex(
canonical_url = 'http://tvpot.daum.net/v/%s' % video_id
webpage = self._download_webpage(canonical_url, video_id)
full_id = self._search_regex(
@@
-42,7
+48,6
@@
class DaumIE(InfoExtractor):
'http://videofarm.daum.net/controller/api/open/v1_2/MovieData.apixml?' + query,
video_id, 'Downloading video formats info')
'http://videofarm.daum.net/controller/api/open/v1_2/MovieData.apixml?' + query,
video_id, 'Downloading video formats info')
- self.to_screen(u'%s: Getting video urls' % video_id)
formats = []
for format_el in urls.findall('result/output_list/output_list'):
profile = format_el.attrib['profile']
formats = []
for format_el in urls.findall('result/output_list/output_list'):
profile = format_el.attrib['profile']
@@
-52,7
+57,7
@@
class DaumIE(InfoExtractor):
})
url_doc = self._download_xml(
'http://videofarm.daum.net/controller/api/open/v1_2/MovieLocation.apixml?' + format_query,
})
url_doc = self._download_xml(
'http://videofarm.daum.net/controller/api/open/v1_2/MovieLocation.apixml?' + format_query,
- video_id, note=
Fals
e)
+ video_id, note=
'Downloading video data for %s format' % profil
e)
format_url = url_doc.find('result/url').text
formats.append({
'url': format_url,
format_url = url_doc.find('result/url').text
formats.append({
'url': format_url,