X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftvland.py;h=b73279dec8f433163e4d5d272e25e794c2fa74a8;hb=3aac9b2fb1a103f1d350ba10060e59bb04a6a2e8;hp=7f049e0764d91e6365365645770f57b6468f48be;hpb=91e274546c4492dfa8f216f311356f641859a7cc;p=youtube-dl diff --git a/youtube_dl/extractor/tvland.py b/youtube_dl/extractor/tvland.py index 7f049e076..b73279dec 100644 --- a/youtube_dl/extractor/tvland.py +++ b/youtube_dl/extractor/tvland.py @@ -1,13 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -from .mtv import MTVIE +from .mtv import MTVServicesInfoExtractor -class TVLandIE(MTVIE): +class TVLandIE(MTVServicesInfoExtractor): IE_NAME = 'tvland.com' _VALID_URL = r'https?://(?:www\.)?tvland\.com/(?:video-clips|episodes)/(?P[^/?#.]+)' - _FEED_URL = 'http://www.tvland.com/feeds/mrss/?uri=' + _FEED_URL = 'http://www.tvland.com/feeds/mrss/' _TESTS = [{ 'url': 'http://www.tvland.com/episodes/hqhps2/everybody-loves-raymond-the-invasion-ep-048', 'playlist': [ @@ -62,9 +62,3 @@ class TVLandIE(MTVIE): 'description': 'md5:7d192f56ca8d958645c83f0de8ef0269' }, }] - - def _real_extract(self, url): - video_id = self._match_id(url) - webpage = self._download_webpage(url, video_id) - mgid = self._search_regex(r'data-mgid="([^"]+)"', webpage, 'mgid') - return self._get_videos_info_from_url(self._FEED_URL + mgid, video_id)