projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vevo] Sort formats (Fixes #3399)
[youtube-dl]
/
youtube_dl
/
extractor
/
trilulilu.py
diff --git
a/youtube_dl/extractor/trilulilu.py
b/youtube_dl/extractor/trilulilu.py
index 0bf028f6195ba56be22e059bdc83d23cbabff59b..d64aaa41f690956b08211ed4fe07e1bc27267641 100644
(file)
--- a/
youtube_dl/extractor/trilulilu.py
+++ b/
youtube_dl/extractor/trilulilu.py
@@
-1,6
+1,5
@@
import json
import re
import json
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
from .common import InfoExtractor
@@
-36,12
+35,10
@@
class TriluliluIE(InfoExtractor):
format_url = (u'http://fs%(server)s.trilulilu.ro/%(hash)s/'
u'video-formats2' % log)
format_url = (u'http://fs%(server)s.trilulilu.ro/%(hash)s/'
u'video-formats2' % log)
- format_
str = self._download_webpage
(
+ format_
doc = self._download_xml
(
format_url, video_id,
note=u'Downloading formats',
errnote=u'Error while downloading formats')
format_url, video_id,
note=u'Downloading formats',
errnote=u'Error while downloading formats')
-
- format_doc = xml.etree.ElementTree.fromstring(format_str)
video_url_template = (
u'http://fs%(server)s.trilulilu.ro/stream.php?type=video'
video_url_template = (
u'http://fs%(server)s.trilulilu.ro/stream.php?type=video'
@@
-58,7
+55,7
@@
class TriluliluIE(InfoExtractor):
for fnode in format_doc.findall('./formats/format')
]
for fnode in format_doc.findall('./formats/format')
]
-
info =
{
+
return
{
'_type': 'video',
'id': video_id,
'formats': formats,
'_type': 'video',
'id': video_id,
'formats': formats,
@@
-67,7
+64,3
@@
class TriluliluIE(InfoExtractor):
'thumbnail': thumbnail,
}
'thumbnail': thumbnail,
}
- # TODO: Remove when #980 has been merged
- info.update(formats[-1])
-
- return info