[downloader/http] Simplify

[youtube-dl] / youtube_dl / extractor / tvc.py

diff --git a/youtube_dl/extractor/tvc.py b/youtube_dl/extractor/tvc.py
index 756fec7329c3adeb3dc74c947beaab5157d9ea1c..3a4f393fcf6d79f3f42970db7aab853d5efedf84 100644 (file)
--- a/youtube_dl/extractor/tvc.py
+++ b/youtube_dl/extractor/tvc.py
@@ -10,7 +10,7 @@ from ..utils import (
 )
 
 
-class TVCEmbedIE(InfoExtractor):
+class TVCIE(InfoExtractor):
     _VALID_URL = r'http://(?:www\.)?tvc\.ru/video/iframe/id/(?P<id>\d+)'
     _TEST = {
         'url': 'http://www.tvc.ru/video/iframe/id/74622/isPlay/false/id_stat/channel/?acc_video_id=/channel/brand/id/17/show/episodes/episode_id/39702',
@@ -27,7 +27,7 @@ class TVCEmbedIE(InfoExtractor):
     @classmethod
     def _extract_url(cls, webpage):
         mobj = re.search(
-            r'<iframe[^>]+?src=(["\'])(?P<url>(?:http://)?(?:www\.)?tvc\.ru/video/iframe/id/[^"]+)\1', webpage)
+            r'<iframe[^>]+?src=(["\'])(?P<url>(?:http:)?//(?:www\.)?tvc\.ru/video/iframe/id/[^"]+)\1', webpage)
         if mobj:
             return mobj.group('url')
 
@@ -63,7 +63,7 @@ class TVCEmbedIE(InfoExtractor):
         }
 
 
-class TVCIE(InfoExtractor):
+class TVCArticleIE(InfoExtractor):
     _VALID_URL = r'http://(?:www\.)?tvc\.ru/(?!video/iframe/id/)(?P<id>[^?#]+)'
     _TESTS = [{
         'url': 'http://www.tvc.ru/channel/brand/id/29/show/episodes/episode_id/39702/',
@@ -101,7 +101,7 @@ class TVCIE(InfoExtractor):
         webpage = self._download_webpage(url, self._match_id(url))
         return {
             '_type': 'url_transparent',
-            'ie_key': 'TVCEmbed',
+            'ie_key': 'TVC',
             'url': self._og_search_video_url(webpage),
             'title': clean_html(self._og_search_title(webpage)),
             'description': clean_html(self._og_search_description(webpage)),