aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--youtube_dl/extractor/gametrailers.py16
-rw-r--r--youtube_dl/extractor/mtv.py18
2 files changed, 26 insertions, 8 deletions
diff --git a/youtube_dl/extractor/gametrailers.py b/youtube_dl/extractor/gametrailers.py
index d82a5d4b2..c1fdd770e 100644
--- a/youtube_dl/extractor/gametrailers.py
+++ b/youtube_dl/extractor/gametrailers.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
import re
from .mtv import MTVServicesInfoExtractor
@@ -6,12 +8,12 @@ from .mtv import MTVServicesInfoExtractor
class GametrailersIE(MTVServicesInfoExtractor):
_VALID_URL = r'http://www\.gametrailers\.com/(?P<type>videos|reviews|full-episodes)/(?P<id>.*?)/(?P<title>.*)'
_TEST = {
- u'url': u'http://www.gametrailers.com/videos/zbvr8i/mirror-s-edge-2-e3-2013--debut-trailer',
- u'file': u'70e9a5d7-cf25-4a10-9104-6f3e7342ae0d.mp4',
- u'md5': u'4c8e67681a0ea7ec241e8c09b3ea8cf7',
- u'info_dict': {
- u'title': u'E3 2013: Debut Trailer',
- u'description': u'Faith is back! Check out the World Premiere trailer for Mirror\'s Edge 2 straight from the EA Press Conference at E3 2013!',
+ 'url': 'http://www.gametrailers.com/videos/zbvr8i/mirror-s-edge-2-e3-2013--debut-trailer',
+ 'file': '70e9a5d7-cf25-4a10-9104-6f3e7342ae0d.mp4',
+ 'md5': '4c8e67681a0ea7ec241e8c09b3ea8cf7',
+ 'info_dict': {
+ 'title': 'Mirror\'s Edge 2|E3 2013: Debut Trailer',
+ 'description': 'Faith is back! Check out the World Premiere trailer for Mirror\'s Edge 2 straight from the EA Press Conference at E3 2013!',
},
}
@@ -23,5 +25,5 @@ class GametrailersIE(MTVServicesInfoExtractor):
webpage = self._download_webpage(url, video_id)
mgid = self._search_regex([r'data-video="(?P<mgid>mgid:.*?)"',
r'data-contentId=\'(?P<mgid>mgid:.*?)\''],
- webpage, u'mgid')
+ webpage, 'mgid')
return self._get_videos_info(mgid)
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index 127fbeb4e..af889a8af 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -6,11 +6,13 @@ from .common import InfoExtractor
from ..utils import (
compat_urllib_parse,
ExtractorError,
+ find_xpath_attr,
fix_xml_ampersands,
url_basename,
RegexNotFoundError,
)
+
def _media_xml_tag(tag):
return '{http://search.yahoo.com/mrss/}%s' % tag
@@ -65,6 +67,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
mediagen_url = re.sub(r'&[^=]*?={.*?}(?=(&|$))', '', mediagen_url)
if 'acceptMethods' not in mediagen_url:
mediagen_url += '&acceptMethods=fms'
+
mediagen_doc = self._download_xml(mediagen_url, video_id,
'Downloading video urls')
@@ -74,8 +77,21 @@ class MTVServicesInfoExtractor(InfoExtractor):
else:
description = None
+ title_el = None
+ if title_el is None:
+ title_el = find_xpath_attr(
+ itemdoc, './/{http://search.yahoo.com/mrss/}category',
+ 'scheme', 'urn:mtvn:video_title')
+ if title_el is None:
+ title_el = itemdoc.find('.//{http://search.yahoo.com/mrss/}title')
+ if title_el is None:
+ title_el = itemdoc.find('.//title')
+ title = title_el.text
+ if title is None:
+ raise ExtractorError('Could not find video title')
+
return {
- 'title': itemdoc.find('title').text,
+ 'title': title,
'formats': self._extract_video_formats(mediagen_doc),
'id': video_id,
'thumbnail': self._get_thumbnail_url(uri, itemdoc),