projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[oe1] Simplify (#2646)
[youtube-dl]
/
youtube_dl
/
extractor
/
internetvideoarchive.py
diff --git
a/youtube_dl/extractor/internetvideoarchive.py
b/youtube_dl/extractor/internetvideoarchive.py
index be8e05f539d7f64c301f7a63a488aedbf9d129cd..4ddda2f1bb86dd534f623218b2acd74566d781e1 100644
(file)
--- a/
youtube_dl/extractor/internetvideoarchive.py
+++ b/
youtube_dl/extractor/internetvideoarchive.py
@@
-1,12
+1,10
@@
import re
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
from ..utils import (
compat_urlparse,
compat_urllib_parse,
xpath_with_ns,
from .common import InfoExtractor
from ..utils import (
compat_urlparse,
compat_urllib_parse,
xpath_with_ns,
- determine_ext,
)
)
@@
-43,9
+41,8
@@
class InternetVideoArchiveIE(InfoExtractor):
video_id = query_dic['publishedid'][0]
url = self._build_url(query)
video_id = query_dic['publishedid'][0]
url = self._build_url(query)
- flashconfiguration
_xml = self._download_webpage
(url, video_id,
+ flashconfiguration
= self._download_xml
(url, video_id,
u'Downloading flash configuration')
u'Downloading flash configuration')
- flashconfiguration = xml.etree.ElementTree.fromstring(flashconfiguration_xml.encode('utf-8'))
file_url = flashconfiguration.find('file').text
file_url = file_url.replace('/playlist.aspx', '/mrssplaylist.aspx')
# Replace some of the parameters in the query to get the best quality
file_url = flashconfiguration.find('file').text
file_url = file_url.replace('/playlist.aspx', '/mrssplaylist.aspx')
# Replace some of the parameters in the query to get the best quality
@@
-53,9
+50,8
@@
class InternetVideoArchiveIE(InfoExtractor):
file_url = re.sub(r'(?<=\?)(.+)$',
lambda m: self._clean_query(m.group()),
file_url)
file_url = re.sub(r'(?<=\?)(.+)$',
lambda m: self._clean_query(m.group()),
file_url)
- info
_xml = self._download_webpage
(file_url, video_id,
+ info
= self._download_xml
(file_url, video_id,
u'Downloading video info')
u'Downloading video info')
- info = xml.etree.ElementTree.fromstring(info_xml.encode('utf-8'))
item = info.find('channel/item')
def _bp(p):
item = info.find('channel/item')
def _bp(p):
@@
-66,13
+62,17
@@
class InternetVideoArchiveIE(InfoExtractor):
for content in item.findall(_bp('media:group/media:content')):
attr = content.attrib
f_url = attr['url']
for content in item.findall(_bp('media:group/media:content')):
attr = content.attrib
f_url = attr['url']
+ width = int(attr['width'])
+ bitrate = int(attr['bitrate'])
+ format_id = '%d-%dk' % (width, bitrate)
formats.append({
formats.append({
+ 'format_id': format_id,
'url': f_url,
'url': f_url,
- 'ext': determine_ext(f_url),
- 'width': int(attr['width']),
- 'bitrate': int(attr['bitrate']),
+ 'width': width,
+ 'tbr': bitrate,
})
})
- formats = sorted(formats, key=lambda f: f['bitrate'])
+
+ self._sort_formats(formats)
return {
'id': video_id,
return {
'id': video_id,