diff options
Diffstat (limited to 'hypervideo_dl/extractor/mtv.py')
| -rw-r--r-- | hypervideo_dl/extractor/mtv.py | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/hypervideo_dl/extractor/mtv.py b/hypervideo_dl/extractor/mtv.py index be5de0a..d91be62 100644 --- a/hypervideo_dl/extractor/mtv.py +++ b/hypervideo_dl/extractor/mtv.py @@ -1,13 +1,7 @@ -# coding: utf-8 -from __future__ import unicode_literals - import re from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_xpath, -) +from ..compat import compat_str from ..utils import ( ExtractorError, find_xpath_attr, @@ -108,8 +102,6 @@ class MTVServicesInfoExtractor(InfoExtractor): }]) except (KeyError, TypeError): raise ExtractorError('Invalid rendition field.') - if formats: - self._sort_formats(formats) return formats def _extract_subtitles(self, mdoc, mtvn_id): @@ -167,9 +159,9 @@ class MTVServicesInfoExtractor(InfoExtractor): itemdoc, './/{http://search.yahoo.com/mrss/}category', 'scheme', 'urn:mtvn:video_title') if title_el is None: - title_el = itemdoc.find(compat_xpath('.//{http://search.yahoo.com/mrss/}title')) + title_el = itemdoc.find('.//{http://search.yahoo.com/mrss/}title') if title_el is None: - title_el = itemdoc.find(compat_xpath('.//title')) + title_el = itemdoc.find('.//title') if title_el.text is None: title_el = None @@ -208,8 +200,6 @@ class MTVServicesInfoExtractor(InfoExtractor): if not formats: return None - self._sort_formats(formats) - return { 'title': title, 'formats': formats, @@ -337,6 +327,7 @@ class MTVServicesInfoExtractor(InfoExtractor): class MTVServicesEmbeddedIE(MTVServicesInfoExtractor): IE_NAME = 'mtvservices:embedded' _VALID_URL = r'https?://media\.mtvnservices\.com/embed/(?P<mgid>.+?)(\?|/|$)' + _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//media\.mtvnservices\.com/embed/.+?)\1'] _TEST = { # From http://www.thewrap.com/peter-dinklage-sums-up-game-of-thrones-in-45-seconds-video/ @@ -352,13 +343,6 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor): }, } - @staticmethod - def _extract_url(webpage): - mobj = re.search( - r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//media\.mtvnservices\.com/embed/.+?)\1', webpage) - if mobj: - return mobj.group('url') - def _get_feed_url(self, uri, url=None): video_id = self._id_from_uri(uri) config = self._download_json( @@ -548,7 +532,7 @@ class MTVItaliaIE(MTVServicesInfoExtractor): } -class MTVItaliaProgrammaIE(MTVItaliaIE): +class MTVItaliaProgrammaIE(MTVItaliaIE): # XXX: Do not subclass from concrete IE IE_NAME = 'mtv.it:programma' _VALID_URL = r'https?://(?:www\.)?mtv\.it/(?:programmi|playlist)/(?P<id>[0-9a-z]+)' _TESTS = [{ |