Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[tvc] Refactor extractor names

pull/5961/head
Sergey M․ 2015-06-12 16:24:13 +06:00
parent 494f20cbdc
commit 954c1d0529
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/__init__.py
View File

@ -586,7 +586,7 @@ from .tv2 import (
from .tv4 import TV4IE from .tv4 import TV4IE
from .tvc import ( from .tvc import (
TVCIE, TVCIE,
TVCEmbedIE, TVCArticleIE,
) )
from .tvigle import TvigleIE from .tvigle import TvigleIE
from .tvp import TvpIE, TvpSeriesIE from .tvp import TvpIE, TvpSeriesIE

4
youtube_dl/extractor/generic.py
View File

@ -34,7 +34,7 @@ from .brightcove import BrightcoveIE
from .nbc import NBCSportsVPlayerIE from .nbc import NBCSportsVPlayerIE
from .ooyala import OoyalaIE from .ooyala import OoyalaIE
from .rutv import RUTVIE from .rutv import RUTVIE
from .tvc import TVCEmbedIE from .tvc import TVCIE
from .sportbox import SportBoxEmbedIE from .sportbox import SportBoxEmbedIE
from .smotri import SmotriIE from .smotri import SmotriIE
from .condenast import CondeNastIE from .condenast import CondeNastIE
@ -1303,7 +1303,7 @@ class GenericIE(InfoExtractor):
return self.url_result(rutv_url, 'RUTV') return self.url_result(rutv_url, 'RUTV')
# Look for embedded TVC player # Look for embedded TVC player
rutv_url = TVCEmbedIE._extract_url(webpage) rutv_url = TVCIE._extract_url(webpage)
if rutv_url: if rutv_url:
return self.url_result(rutv_url, 'TVCEmbed') return self.url_result(rutv_url, 'TVCEmbed')

4
youtube_dl/extractor/tvc.py
View File

@ -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+)' _VALID_URL = r'http://(?:www\.)?tvc\.ru/video/iframe/id/(?P<id>\d+)'
_TEST = { _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', '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',
@ -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>[^?#]+)' _VALID_URL = r'http://(?:www\.)?tvc\.ru/(?!video/iframe/id/)(?P<id>[^?#]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.tvc.ru/channel/brand/id/29/show/episodes/episode_id/39702/', 'url': 'http://www.tvc.ru/channel/brand/id/29/show/episodes/episode_id/39702/',