projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cnbc] Simplify extraction (closes #14280, closes #17110)
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index e3a67cc5bd0b3ffa6888e0e08eb851412898db1f..d96e23905d1ef7093d93b51fef7a69708f3df8d8 100644
(file)
--- a/
youtube_dl/extractor/extractors.py
+++ b/
youtube_dl/extractor/extractors.py
@@
-44,6
+44,7
@@
from .anysex import AnySexIE
from .aol import AolIE
from .allocine import AllocineIE
from .aliexpress import AliExpressLiveIE
from .aol import AolIE
from .allocine import AllocineIE
from .aliexpress import AliExpressLiveIE
+from .apa import APAIE
from .aparat import AparatIE
from .appleconnect import AppleConnectIE
from .appletrailers import (
from .aparat import AparatIE
from .appleconnect import AppleConnectIE
from .appletrailers import (
@@
-53,6
+54,7
@@
from .appletrailers import (
from .archiveorg import ArchiveOrgIE
from .arkena import ArkenaIE
from .ard import (
from .archiveorg import ArchiveOrgIE
from .arkena import ArkenaIE
from .ard import (
+ ARDBetaMediathekIE,
ARDIE,
ARDMediathekIE,
)
ARDIE,
ARDMediathekIE,
)
@@
-117,6
+119,10
@@
from .bilibili import (
BiliBiliBangumiIE,
)
from .biobiochiletv import BioBioChileTVIE
BiliBiliBangumiIE,
)
from .biobiochiletv import BioBioChileTVIE
+from .bitchute import (
+ BitChuteIE,
+ BitChuteChannelIE,
+)
from .biqle import BIQLEIE
from .bleacherreport import (
BleacherReportIE,
from .biqle import BIQLEIE
from .bleacherreport import (
BleacherReportIE,
@@
-137,6
+143,7
@@
from .brightcove import (
BrightcoveLegacyIE,
BrightcoveNewIE,
)
BrightcoveLegacyIE,
BrightcoveNewIE,
)
+from .businessinsider import BusinessInsiderIE
from .buzzfeed import BuzzFeedIE
from .byutv import BYUtvIE
from .c56 import C56IE
from .buzzfeed import BuzzFeedIE
from .byutv import BYUtvIE
from .c56 import C56IE
@@
-144,6
+151,8
@@
from .camdemy import (
CamdemyIE,
CamdemyFolderIE
)
CamdemyIE,
CamdemyFolderIE
)
+from .cammodels import CamModelsIE
+from .camtube import CamTubeIE
from .camwithher import CamWithHerIE
from .canalplus import CanalplusIE
from .canalc2 import Canalc2IE
from .camwithher import CamWithHerIE
from .canalplus import CanalplusIE
from .canalc2 import Canalc2IE
@@
-195,11
+204,15
@@
from .clippit import ClippitIE
from .cliprs import ClipRsIE
from .clipsyndicate import ClipsyndicateIE
from .closertotruth import CloserToTruthIE
from .cliprs import ClipRsIE
from .clipsyndicate import ClipsyndicateIE
from .closertotruth import CloserToTruthIE
+from .cloudflarestream import CloudflareStreamIE
from .cloudy import CloudyIE
from .clubic import ClubicIE
from .clyp import ClypIE
from .cmt import CMTIE
from .cloudy import CloudyIE
from .clubic import ClubicIE
from .clyp import ClypIE
from .cmt import CMTIE
-from .cnbc import CNBCIE
+from .cnbc import (
+ CNBCIE,
+ CNBCVideoIE,
+)
from .cnn import (
CNNIE,
CNNBlogsIE,
from .cnn import (
CNNIE,
CNNBlogsIE,
@@
-281,6
+294,7
@@
from .drtv import (
DRTVIE,
DRTVLiveIE,
)
DRTVIE,
DRTVLiveIE,
)
+from .dtube import DTubeIE
from .dvtv import DVTVIE
from .dumpert import DumpertIE
from .defense import DefenseGouvFrIE
from .dvtv import DVTVIE
from .dumpert import DumpertIE
from .defense import DefenseGouvFrIE
@@
-326,10
+340,10
@@
from .espn import (
FiveThirtyEightIE,
)
from .esri import EsriVideoIE
FiveThirtyEightIE,
)
from .esri import EsriVideoIE
-from .etonline import ETOnlineIE
from .europa import EuropaIE
from .everyonesmixtape import EveryonesMixtapeIE
from .expotv import ExpoTVIE
from .europa import EuropaIE
from .everyonesmixtape import EveryonesMixtapeIE
from .expotv import ExpoTVIE
+from .expressen import ExpressenIE
from .extremetube import ExtremeTubeIE
from .eyedotv import EyedoTVIE
from .facebook import (
from .extremetube import ExtremeTubeIE
from .eyedotv import EyedoTVIE
from .facebook import (
@@
-367,7
+381,6
@@
from .foxgay import FoxgayIE
from .foxnews import (
FoxNewsIE,
FoxNewsArticleIE,
from .foxnews import (
FoxNewsIE,
FoxNewsArticleIE,
- FoxNewsInsiderIE,
)
from .foxsports import FoxSportsIE
from .franceculture import FranceCultureIE
)
from .foxsports import FoxSportsIE
from .franceculture import FranceCultureIE
@@
-377,6
+390,7
@@
from .francetv import (
FranceTVSiteIE,
FranceTVEmbedIE,
FranceTVInfoIE,
FranceTVSiteIE,
FranceTVEmbedIE,
FranceTVInfoIE,
+ FranceTVInfoSportIE,
FranceTVJeunesseIE,
GenerationWhatIE,
CultureboxIE,
FranceTVJeunesseIE,
GenerationWhatIE,
CultureboxIE,
@@
-384,6
+398,11
@@
from .francetv import (
from .freesound import FreesoundIE
from .freespeech import FreespeechIE
from .freshlive import FreshLiveIE
from .freesound import FreesoundIE
from .freespeech import FreespeechIE
from .freshlive import FreshLiveIE
+from .frontendmasters import (
+ FrontendMastersIE,
+ FrontendMastersLessonIE,
+ FrontendMastersCourseIE
+)
from .funimation import FunimationIE
from .funk import (
FunkMixIE,
from .funimation import FunimationIE
from .funk import (
FunkMixIE,
@@
-467,10
+486,7
@@
from .imgur import (
)
from .ina import InaIE
from .inc import IncIE
)
from .ina import InaIE
from .inc import IncIE
-from .indavideo import (
- IndavideoIE,
- IndavideoEmbedIE,
-)
+from .indavideo import IndavideoEmbedIE
from .infoq import InfoQIE
from .instagram import InstagramIE, InstagramUserIE
from .internazionale import InternazionaleIE
from .infoq import InfoQIE
from .instagram import InstagramIE, InstagramUserIE
from .internazionale import InternazionaleIE
@@
-478,7
+494,10
@@
from .internetvideoarchive import InternetVideoArchiveIE
from .iprima import IPrimaIE
from .iqiyi import IqiyiIE
from .ir90tv import Ir90TvIE
from .iprima import IPrimaIE
from .iqiyi import IqiyiIE
from .ir90tv import Ir90TvIE
-from .itv import ITVIE
+from .itv import (
+ ITVIE,
+ ITVBTCCIE,
+)
from .ivi import (
IviIE,
IviCompilationIE
from .ivi import (
IviIE,
IviCompilationIE
@@
-505,6
+524,7
@@
from .keezmovies import KeezMoviesIE
from .ketnet import KetnetIE
from .khanacademy import KhanAcademyIE
from .kickstarter import KickStarterIE
from .ketnet import KetnetIE
from .khanacademy import KhanAcademyIE
from .kickstarter import KickStarterIE
+from .kinopoisk import KinoPoiskIE
from .keek import KeekIE
from .konserthusetplay import KonserthusetPlayIE
from .kontrtube import KontrTubeIE
from .keek import KeekIE
from .konserthusetplay import KonserthusetPlayIE
from .kontrtube import KontrTubeIE
@@
-577,13
+597,16
@@
from .mailru import (
MailRuMusicIE,
MailRuMusicSearchIE,
)
MailRuMusicIE,
MailRuMusicSearchIE,
)
-from .makerschannel import MakersChannelIE
from .makertv import MakerTVIE
from .mangomolo import (
MangomoloVideoIE,
MangomoloLiveIE,
)
from .manyvids import ManyVidsIE
from .makertv import MakerTVIE
from .mangomolo import (
MangomoloVideoIE,
MangomoloLiveIE,
)
from .manyvids import ManyVidsIE
+from .markiza import (
+ MarkizaIE,
+ MarkizaPageIE,
+)
from .massengeschmacktv import MassengeschmackTVIE
from .matchtv import MatchTVIE
from .mdr import MDRIE
from .massengeschmacktv import MassengeschmackTVIE
from .matchtv import MatchTVIE
from .mdr import MDRIE
@@
-620,7
+643,6
@@
from .mnet import MnetIE
from .moevideo import MoeVideoIE
from .mofosex import MofosexIE
from .mojvideo import MojvideoIE
from .moevideo import MoeVideoIE
from .mofosex import MofosexIE
from .mojvideo import MojvideoIE
-from .moniker import MonikerIE
from .morningstar import MorningstarIE
from .motherless import (
MotherlessIE,
from .morningstar import MorningstarIE
from .motherless import (
MotherlessIE,
@@
-641,6
+663,7
@@
from .mtv import (
from .muenchentv import MuenchenTVIE
from .musicplayon import MusicPlayOnIE
from .mwave import MwaveIE, MwaveMeetGreetIE
from .muenchentv import MuenchenTVIE
from .musicplayon import MusicPlayOnIE
from .mwave import MwaveIE, MwaveMeetGreetIE
+from .mychannels import MyChannelsIE
from .myspace import MySpaceIE, MySpaceAlbumIE
from .myspass import MySpassIE
from .myvi import (
from .myspace import MySpaceIE, MySpaceAlbumIE
from .myspass import MySpassIE
from .myvi import (
@@
-662,6
+685,7
@@
from .nbc import (
NBCOlympicsIE,
NBCOlympicsStreamIE,
NBCSportsIE,
NBCOlympicsIE,
NBCOlympicsStreamIE,
NBCSportsIE,
+ NBCSportsStreamIE,
NBCSportsVPlayerIE,
)
from .ndr import (
NBCSportsVPlayerIE,
)
from .ndr import (
@@
-701,12
+725,7
@@
from .nexx import (
from .nfb import NFBIE
from .nfl import NFLIE
from .nhk import NhkVodIE
from .nfb import NFBIE
from .nfl import NFLIE
from .nhk import NhkVodIE
-from .nhl import (
- NHLVideocenterIE,
- NHLNewsIE,
- NHLVideocenterCategoryIE,
- NHLIE,
-)
+from .nhl import NHLIE
from .nick import (
NickIE,
NickBrIE,
from .nick import (
NickIE,
NickBrIE,
@@
-715,10
+734,7
@@
from .nick import (
NickRuIE,
)
from .niconico import NiconicoIE, NiconicoPlaylistIE
NickRuIE,
)
from .niconico import NiconicoIE, NiconicoPlaylistIE
-from .ninecninemedia import (
- NineCNineMediaStackIE,
- NineCNineMediaIE,
-)
+from .ninecninemedia import NineCNineMediaIE
from .ninegag import NineGagIE
from .ninenow import NineNowIE
from .nintendo import NintendoIE
from .ninegag import NineGagIE
from .ninenow import NineNowIE
from .nintendo import NintendoIE
@@
-729,7
+745,10
@@
from .nonktube import NonkTubeIE
from .noovo import NoovoIE
from .normalboots import NormalbootsIE
from .nosvideo import NosVideoIE
from .noovo import NoovoIE
from .normalboots import NormalbootsIE
from .nosvideo import NosVideoIE
-from .nova import NovaIE
+from .nova import (
+ NovaEmbedIE,
+ NovaIE,
+)
from .novamov import (
AuroraVidIE,
CloudTimeIE,
from .novamov import (
AuroraVidIE,
CloudTimeIE,
@@
-761,7
+780,9
@@
from .nrk import (
NRKSkoleIE,
NRKTVIE,
NRKTVDirekteIE,
NRKSkoleIE,
NRKTVIE,
NRKTVDirekteIE,
+ NRKTVEpisodeIE,
NRKTVEpisodesIE,
NRKTVEpisodesIE,
+ NRKTVSeasonIE,
NRKTVSeriesIE,
)
from .ntvde import NTVDeIE
NRKTVSeriesIE,
)
from .ntvde import NTVDeIE
@@
-806,6
+827,7
@@
from .parliamentliveuk import ParliamentLiveUKIE
from .patreon import PatreonIE
from .pbs import PBSIE
from .pearvideo import PearVideoIE
from .patreon import PatreonIE
from .pbs import PBSIE
from .pearvideo import PearVideoIE
+from .peertube import PeerTubeIE
from .people import PeopleIE
from .performgroup import PerformGroupIE
from .periscope import (
from .people import PeopleIE
from .performgroup import PerformGroupIE
from .periscope import (
@@
-815,6
+837,10
@@
from .periscope import (
from .philharmoniedeparis import PhilharmonieDeParisIE
from .phoenix import PhoenixIE
from .photobucket import PhotobucketIE
from .philharmoniedeparis import PhilharmonieDeParisIE
from .phoenix import PhoenixIE
from .photobucket import PhotobucketIE
+from .picarto import (
+ PicartoIE,
+ PicartoVodIE,
+)
from .piksel import PikselIE
from .pinkbike import PinkbikeIE
from .pladform import PladformIE
from .piksel import PikselIE
from .pinkbike import PinkbikeIE
from .pladform import PladformIE
@@
-846,6
+872,10
@@
from .pornhub import (
from .pornotube import PornotubeIE
from .pornovoisines import PornoVoisinesIE
from .pornoxo import PornoXOIE
from .pornotube import PornotubeIE
from .pornovoisines import PornoVoisinesIE
from .pornoxo import PornoXOIE
+from .puhutv import (
+ PuhuTVIE,
+ PuhuTVSerieIE,
+)
from .presstv import PressTVIE
from .primesharetv import PrimeShareTVIE
from .promptfile import PromptFileIE
from .presstv import PressTVIE
from .primesharetv import PrimeShareTVIE
from .promptfile import PromptFileIE
@@
-877,7
+907,10
@@
from .rai import (
RaiPlayPlaylistIE,
RaiIE,
)
RaiPlayPlaylistIE,
RaiIE,
)
-from .raywenderlich import RayWenderlichIE
+from .raywenderlich import (
+ RayWenderlichIE,
+ RayWenderlichCourseIE,
+)
from .rbmaradio import RBMARadioIE
from .rds import RDSIE
from .redbulltv import RedBullTVIE
from .rbmaradio import RBMARadioIE
from .rds import RDSIE
from .redbulltv import RedBullTVIE
@@
-1007,10
+1040,13
@@
from .spankbang import SpankBangIE
from .spankwire import SpankwireIE
from .spiegel import SpiegelIE, SpiegelArticleIE
from .spiegeltv import SpiegeltvIE
from .spankwire import SpankwireIE
from .spiegel import SpiegelIE, SpiegelArticleIE
from .spiegeltv import SpiegeltvIE
-from .spike import SpikeIE
+from .spike import (
+ BellatorIE,
+ ParamountNetworkIE,
+)
from .stitcher import StitcherIE
from .sport5 import Sport5IE
from .stitcher import StitcherIE
from .sport5 import Sport5IE
-from .sportbox import SportBox
Embed
IE
+from .sportbox import SportBoxIE
from .sportdeutschland import SportDeutschlandIE
from .springboardplatform import SpringboardPlatformIE
from .sprout import SproutIE
from .sportdeutschland import SportDeutschlandIE
from .springboardplatform import SpringboardPlatformIE
from .sprout import SproutIE
@@
-1030,7
+1066,9
@@
from .stretchinternet import StretchInternetIE
from .sunporno import SunPornoIE
from .svt import (
SVTIE,
from .sunporno import SunPornoIE
from .svt import (
SVTIE,
+ SVTPageIE,
SVTPlayIE,
SVTPlayIE,
+ SVTSeriesIE,
)
from .swrmediathek import SWRMediathekIE
from .syfy import SyfyIE
)
from .swrmediathek import SWRMediathekIE
from .syfy import SyfyIE
@@
-1051,6
+1089,7
@@
from .teachingchannel import TeachingChannelIE
from .teamcoco import TeamcocoIE
from .techtalks import TechTalksIE
from .ted import TEDIE
from .teamcoco import TeamcocoIE
from .techtalks import TechTalksIE
from .ted import TEDIE
+from .tele5 import Tele5IE
from .tele13 import Tele13IE
from .telebruxelles import TeleBruxellesIE
from .telecinco import TelecincoIE
from .tele13 import Tele13IE
from .telebruxelles import TeleBruxellesIE
from .telecinco import TelecincoIE
@@
-1117,7
+1156,6
@@
from .tv2 import (
TV2ArticleIE,
)
from .tv2hu import TV2HuIE
TV2ArticleIE,
)
from .tv2hu import TV2HuIE
-from .tv3 import TV3IE
from .tv4 import TV4IE
from .tv5mondeplus import TV5MondePlusIE
from .tva import TVAIE
from .tv4 import TV4IE
from .tv5mondeplus import TV5MondePlusIE
from .tva import TVAIE
@@
-1132,11
+1170,12
@@
from .tvc import (
from .tvigle import TvigleIE
from .tvland import TVLandIE
from .tvn24 import TVN24IE
from .tvigle import TvigleIE
from .tvland import TVLandIE
from .tvn24 import TVN24IE
+from .tvnet import TVNetIE
from .tvnoe import TVNoeIE
from .tvnow import (
TVNowIE,
TVNowListIE,
from .tvnoe import TVNoeIE
from .tvnow import (
TVNowIE,
TVNowListIE,
- TVNow
ListChannel
IE,
+ TVNow
Show
IE,
)
from .tvp import (
TVPEmbedIE,
)
from .tvp import (
TVPEmbedIE,
@@
-1146,6
+1185,7
@@
from .tvp import (
from .tvplay import (
TVPlayIE,
ViafreeIE,
from .tvplay import (
TVPlayIE,
ViafreeIE,
+ TVPlayHomeIE,
)
from .tvplayer import TVPlayerIE
from .tweakers import TweakersIE
)
from .tvplayer import TVPlayerIE
from .tweakers import TweakersIE
@@
-1267,6
+1307,7
@@
from .viki import (
VikiIE,
VikiChannelIE,
)
VikiIE,
VikiChannelIE,
)
+from .viqeo import ViqeoIE
from .viu import (
ViuIE,
ViuPlaylistIE,
from .viu import (
ViuIE,
ViuPlaylistIE,
@@
-1392,6
+1433,7
@@
from .younow import (
YouNowMomentIE,
)
from .youporn import YouPornIE
YouNowMomentIE,
)
from .youporn import YouPornIE
+from .yourporn import YourPornIE
from .yourupload import YourUploadIE
from .youtube import (
YoutubeIE,
from .yourupload import YourUploadIE
from .youtube import (
YoutubeIE,
@@
-1414,5
+1456,23
@@
from .youtube import (
)
from .zapiks import ZapiksIE
from .zaq1 import Zaq1IE
)
from .zapiks import ZapiksIE
from .zaq1 import Zaq1IE
+from .zattoo import (
+ BBVTVIE,
+ EinsUndEinsTVIE,
+ EWETVIE,
+ GlattvisionTVIE,
+ MNetTVIE,
+ MyVisionTVIE,
+ NetPlusIE,
+ OsnatelTVIE,
+ QuantumTVIE,
+ QuicklineIE,
+ QuicklineLiveIE,
+ SAKTVIE,
+ VTXTVIE,
+ WalyTVIE,
+ ZattooIE,
+ ZattooLiveIE,
+)
from .zdf import ZDFIE, ZDFChannelIE
from .zingmp3 import ZingMp3IE
from .zdf import ZDFIE, ZDFChannelIE
from .zingmp3 import ZingMp3IE