projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8765151
)
[mtv] imporove duration extraction
author
remitamine
<remitamine@gmail.com>
Fri, 19 Feb 2016 19:56:45 +0000
(20:56 +0100)
committer
remitamine
<remitamine@gmail.com>
Fri, 19 Feb 2016 19:56:45 +0000
(20:56 +0100)
youtube_dl/extractor/mtv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mtv.py
b/youtube_dl/extractor/mtv.py
index 56ddcbbf303b1eb1fee3b6f7cc19fba0cbc4c973..ed068365d3d4936d35e2e62146f1dcbec750728b 100644
(file)
--- a/
youtube_dl/extractor/mtv.py
+++ b/
youtube_dl/extractor/mtv.py
@@
-111,7
+111,8
@@
class MTVServicesInfoExtractor(InfoExtractor):
uri = itemdoc.find('guid').text
video_id = self._id_from_uri(uri)
self.report_extraction(video_id)
uri = itemdoc.find('guid').text
video_id = self._id_from_uri(uri)
self.report_extraction(video_id)
- mediagen_url = itemdoc.find('%s/%s' % (_media_xml_tag('group'), _media_xml_tag('content'))).attrib['url']
+ content_el = itemdoc.find('%s/%s' % (_media_xml_tag('group'), _media_xml_tag('content')))
+ mediagen_url = content_el.attrib['url']
# Remove the templates, like &device={device}
mediagen_url = re.sub(r'&[^=]*?={.*?}(?=(&|$))', '', mediagen_url)
if 'acceptMethods' not in mediagen_url:
# Remove the templates, like &device={device}
mediagen_url = re.sub(r'&[^=]*?={.*?}(?=(&|$))', '', mediagen_url)
if 'acceptMethods' not in mediagen_url:
@@
-159,9
+160,6
@@
class MTVServicesInfoExtractor(InfoExtractor):
if mtvn_id_node is not None:
mtvn_id = mtvn_id_node.text
if mtvn_id_node is not None:
mtvn_id = mtvn_id_node.text
- content_el = find_xpath_attr(itemdoc, self._xpath_ns('.//content', 'http://search.yahoo.com/mrss/'), 'duration')
- duration = float_or_none(content_el.attrib.get('duration')) if content_el is not None else None
-
return {
'title': title,
'formats': self._extract_video_formats(mediagen_doc, mtvn_id),
return {
'title': title,
'formats': self._extract_video_formats(mediagen_doc, mtvn_id),
@@
-169,7
+167,7
@@
class MTVServicesInfoExtractor(InfoExtractor):
'id': video_id,
'thumbnail': self._get_thumbnail_url(uri, itemdoc),
'description': description,
'id': video_id,
'thumbnail': self._get_thumbnail_url(uri, itemdoc),
'description': description,
- 'duration':
duration
,
+ 'duration':
float_or_none(content_el.attrib.get('duration'))
,
}
def _get_feed_query(self, uri):
}
def _get_feed_query(self, uri):