projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:rg3/youtube-dl into weibo
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index 09b20a39ae90f8af32c1102968d8814c8de64c5b..e863f03ab6e94302d844b81fa201c581ef53f6f1 100644
(file)
--- a/
youtube_dl/extractor/extractors.py
+++ b/
youtube_dl/extractor/extractors.py
@@
-127,7
+127,10
@@
from .bloomberg import BloombergIE
from .bokecc import BokeCCIE
from .bostonglobe import BostonGlobeIE
from .bpb import BpbIE
from .bokecc import BokeCCIE
from .bostonglobe import BostonGlobeIE
from .bpb import BpbIE
-from .br import BRIE
+from .br import (
+ BRIE,
+ BRMediathekIE,
+)
from .bravotv import BravoTVIE
from .breakcom import BreakIE
from .brightcove import (
from .bravotv import BravoTVIE
from .breakcom import BreakIE
from .brightcove import (
@@
-135,10
+138,7
@@
from .brightcove import (
BrightcoveNewIE,
)
from .buzzfeed import BuzzFeedIE
BrightcoveNewIE,
)
from .buzzfeed import BuzzFeedIE
-from .byutv import (
- BYUtvIE,
- BYUtvEventIE,
-)
+from .byutv import BYUtvIE
from .c56 import C56IE
from .camdemy import (
CamdemyIE,
from .c56 import C56IE
from .camdemy import (
CamdemyIE,
@@
-150,6
+150,7
@@
from .canalc2 import Canalc2IE
from .canvas import (
CanvasIE,
CanvasEenIE,
from .canvas import (
CanvasIE,
CanvasEenIE,
+ VrtNUIE,
)
from .carambatv import (
CarambaTVIE,
)
from .carambatv import (
CarambaTVIE,
@@
-242,11
+243,10
@@
from .dailymotion import (
DailymotionIE,
DailymotionPlaylistIE,
DailymotionUserIE,
DailymotionIE,
DailymotionPlaylistIE,
DailymotionUserIE,
- DailymotionCloudIE,
)
from .daisuki import (
)
from .daisuki import (
- DaisukiIE,
- DaisukiPlaylistIE,
+ Daisuki
Motto
IE,
+ Daisuki
Motto
PlaylistIE,
)
from .daum import (
DaumIE,
)
from .daum import (
DaumIE,
@@
-308,9
+308,10
@@
from .ehow import EHowIE
from .eighttracks import EightTracksIE
from .einthusan import EinthusanIE
from .eitb import EitbIE
from .eighttracks import EightTracksIE
from .einthusan import EinthusanIE
from .eitb import EitbIE
-from .ellentv import (
- EllenTVIE,
- EllenTVClipsIE,
+from .ellentube import (
+ EllenTubeIE,
+ EllenTubeVideoIE,
+ EllenTubePlaylistIE,
)
from .elpais import ElPaisIE
from .embedly import EmbedlyIE
)
from .elpais import ElPaisIE
from .embedly import EmbedlyIE
@@
-321,6
+322,7
@@
from .escapist import EscapistIE
from .espn import (
ESPNIE,
ESPNArticleIE,
from .espn import (
ESPNIE,
ESPNArticleIE,
+ FiveThirtyEightIE,
)
from .esri import EsriVideoIE
from .etonline import ETOnlineIE
)
from .esri import EsriVideoIE
from .etonline import ETOnlineIE
@@
-343,11
+345,9
@@
from .filmon import (
FilmOnIE,
FilmOnChannelIE,
)
FilmOnIE,
FilmOnChannelIE,
)
-from .firstpost import FirstpostIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
from .fivetv import FiveTVIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
from .fivetv import FiveTVIE
-from .fktv import FKTVIE
from .flickr import FlickrIE
from .flipagram import FlipagramIE
from .folketinget import FolketingetIE
from .flickr import FlickrIE
from .flipagram import FlipagramIE
from .folketinget import FolketingetIE
@@
-374,7
+374,7
@@
from .francetv import (
FranceTVIE,
FranceTVEmbedIE,
FranceTVInfoIE,
FranceTVIE,
FranceTVEmbedIE,
FranceTVInfoIE,
- Generation
Quoi
IE,
+ Generation
What
IE,
CultureboxIE,
)
from .freesound import FreesoundIE
CultureboxIE,
)
from .freesound import FreesoundIE
@@
-390,7
+390,6
@@
from .gameone import (
GameOneIE,
GameOnePlaylistIE,
)
GameOneIE,
GameOnePlaylistIE,
)
-from .gamersyde import GamersydeIE
from .gamespot import GameSpotIE
from .gamestar import GameStarIE
from .gaskrank import GaskrankIE
from .gamespot import GameSpotIE
from .gamestar import GameStarIE
from .gaskrank import GaskrankIE
@@
-431,7
+430,10
@@
from .hitbox import HitboxIE, HitboxLiveIE
from .hitrecord import HitRecordIE
from .hornbunny import HornBunnyIE
from .hotnewhiphop import HotNewHipHopIE
from .hitrecord import HitRecordIE
from .hornbunny import HornBunnyIE
from .hotnewhiphop import HotNewHipHopIE
-from .hotstar import HotStarIE
+from .hotstar import (
+ HotStarIE,
+ HotStarPlaylistIE,
+)
from .howcast import HowcastIE
from .howstuffworks import HowStuffWorksIE
from .hrti import (
from .howcast import HowcastIE
from .howstuffworks import HowStuffWorksIE
from .hrti import (
@@
-568,6
+570,7
@@
from .mangomolo import (
MangomoloLiveIE,
)
from .manyvids import ManyVidsIE
MangomoloLiveIE,
)
from .manyvids import ManyVidsIE
+from .massengeschmacktv import MassengeschmackTVIE
from .matchtv import MatchTVIE
from .mdr import MDRIE
from .mediaset import MediasetIE
from .matchtv import MatchTVIE
from .mdr import MDRIE
from .mediaset import MediasetIE
@@
-623,7
+626,6
@@
from .mwave import MwaveIE, MwaveMeetGreetIE
from .myspace import MySpaceIE, MySpaceAlbumIE
from .myspass import MySpassIE
from .myvi import MyviIE
from .myspace import MySpaceIE, MySpaceAlbumIE
from .myspass import MySpassIE
from .myvi import MyviIE
-from .myvideo import MyVideoIE
from .myvidster import MyVidsterIE
from .nationalgeographic import (
NationalGeographicVideoIE,
from .myvidster import MyVidsterIE
from .nationalgeographic import (
NationalGeographicVideoIE,
@@
-685,6
+687,7
@@
from .nhl import (
)
from .nick import (
NickIE,
)
from .nick import (
NickIE,
+ NickBrIE,
NickDeIE,
NickNightIE,
NickRuIE,
NickDeIE,
NickNightIE,
NickRuIE,
@@
-717,10
+720,6
@@
from .nowness import (
NownessPlaylistIE,
NownessSeriesIE,
)
NownessPlaylistIE,
NownessSeriesIE,
)
-from .nowtv import (
- NowTVIE,
- NowTVListIE,
-)
from .noz import NozIE
from .npo import (
AndereTijdenIE,
from .noz import NozIE
from .npo import (
AndereTijdenIE,
@@
-786,6
+785,7
@@
from .patreon import PatreonIE
from .pbs import PBSIE
from .pearvideo import PearVideoIE
from .people import PeopleIE
from .pbs import PBSIE
from .pearvideo import PearVideoIE
from .people import PeopleIE
+from .performgroup import PerformGroupIE
from .periscope import (
PeriscopeIE,
PeriscopeUserIE,
from .periscope import (
PeriscopeIE,
PeriscopeUserIE,
@@
-852,6
+852,7
@@
from .radiofrance import RadioFranceIE
from .rai import (
RaiPlayIE,
RaiPlayLiveIE,
from .rai import (
RaiPlayIE,
RaiPlayLiveIE,
+ RaiPlayPlaylistIE,
RaiIE,
)
from .rbmaradio import RBMARadioIE
RaiIE,
)
from .rbmaradio import RBMARadioIE
@@
-926,8
+927,12
@@
from .senateisvp import SenateISVPIE
from .sendtonews import SendtoNewsIE
from .servingsys import ServingSysIE
from .servus import ServusIE
from .sendtonews import SendtoNewsIE
from .servingsys import ServingSysIE
from .servus import ServusIE
+from .sevenplus import SevenPlusIE
from .sexu import SexuIE
from .sexu import SexuIE
-from .shahid import ShahidIE
+from .shahid import (
+ ShahidIE,
+ ShahidShowIE,
+)
from .shared import (
SharedIE,
VivoIE,
from .shared import (
SharedIE,
VivoIE,
@@
-995,6
+1000,7
@@
from .streamango import StreamangoIE
from .streamcloud import StreamcloudIE
from .streamcz import StreamCZIE
from .streetvoice import StreetVoiceIE
from .streamcloud import StreamcloudIE
from .streamcz import StreamCZIE
from .streetvoice import StreetVoiceIE
+from .stretchinternet import StretchInternetIE
from .sunporno import SunPornoIE
from .svt import (
SVTIE,
from .sunporno import SunPornoIE
from .svt import (
SVTIE,
@@
-1097,6
+1103,10
@@
from .tvigle import TvigleIE
from .tvland import TVLandIE
from .tvn24 import TVN24IE
from .tvnoe import TVNoeIE
from .tvland import TVLandIE
from .tvn24 import TVN24IE
from .tvnoe import TVNoeIE
+from .tvnow import (
+ TVNowIE,
+ TVNowListIE,
+)
from .tvp import (
TVPEmbedIE,
TVPIE,
from .tvp import (
TVPEmbedIE,
TVPIE,
@@
-1110,10
+1120,6
@@
from .tvplayer import TVPlayerIE
from .tweakers import TweakersIE
from .twentyfourvideo import TwentyFourVideoIE
from .twentymin import TwentyMinutenIE
from .tweakers import TweakersIE
from .twentyfourvideo import TwentyFourVideoIE
from .twentymin import TwentyMinutenIE
-from .twentytwotracks import (
- TwentyTwoTracksIE,
- TwentyTwoTracksGenreIE
-)
from .twitch import (
TwitchVideoIE,
TwitchChapterIE,
from .twitch import (
TwitchVideoIE,
TwitchChapterIE,
@@
-1138,6
+1144,7
@@
from .udemy import (
from .udn import UDNEmbedIE
from .uktvplay import UKTVPlayIE
from .digiteka import DigitekaIE
from .udn import UDNEmbedIE
from .uktvplay import UKTVPlayIE
from .digiteka import DigitekaIE
+from .umg import UMGDeIE
from .unistra import UnistraIE
from .unity import UnityIE
from .uol import UOLIE
from .unistra import UnistraIE
from .unity import UnityIE
from .uol import UOLIE
@@
-1285,6
+1292,10
@@
from .webofstories import (
WebOfStoriesIE,
WebOfStoriesPlaylistIE,
)
WebOfStoriesIE,
WebOfStoriesPlaylistIE,
)
+from .weibo import (
+ WeiboIE,
+ WeiboMobileIE
+)
from .weiqitv import WeiqiTVIE
from .wimp import WimpIE
from .wistia import WistiaIE
from .weiqitv import WeiqiTVIE
from .wimp import WimpIE
from .wistia import WistiaIE
@@
-1335,6
+1346,11
@@
from .youku import (
YoukuIE,
YoukuShowIE,
)
YoukuIE,
YoukuShowIE,
)
+from .younow import (
+ YouNowLiveIE,
+ YouNowChannelIE,
+ YouNowMomentIE,
+)
from .youporn import YouPornIE
from .yourupload import YourUploadIE
from .youtube import (
from .youporn import YouPornIE
from .yourupload import YourUploadIE
from .youtube import (