projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fstirlitz-filmon'
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index e4ee43ee3251284b0fc69cee5f4330634e85fb13..aa235bec1aeef1090c30e7a7b4f4af3cdfece6c2 100644
(file)
--- a/
youtube_dl/extractor/extractors.py
+++ b/
youtube_dl/extractor/extractors.py
@@
-30,7
+30,10
@@
from .aenetworks import (
AENetworksIE,
HistoryTopicIE,
)
AENetworksIE,
HistoryTopicIE,
)
-from .afreecatv import AfreecaTVIE
+from .afreecatv import (
+ AfreecaTVIE,
+ AfreecaTVGlobalIE,
+)
from .airmozilla import AirMozillaIE
from .aljazeera import AlJazeeraIE
from .alphaporno import AlphaPornoIE
from .airmozilla import AirMozillaIE
from .aljazeera import AlJazeeraIE
from .alphaporno import AlphaPornoIE
@@
-38,10
+41,7
@@
from .amcnetworks import AMCNetworksIE
from .animeondemand import AnimeOnDemandIE
from .anitube import AnitubeIE
from .anysex import AnySexIE
from .animeondemand import AnimeOnDemandIE
from .anitube import AnitubeIE
from .anysex import AnySexIE
-from .aol import (
- AolIE,
- AolFeaturesIE,
-)
+from .aol import AolIE
from .allocine import AllocineIE
from .aparat import AparatIE
from .appleconnect import AppleConnectIE
from .allocine import AllocineIE
from .aparat import AparatIE
from .appleconnect import AppleConnectIE
@@
-80,6
+80,10
@@
from .awaan import (
AWAANLiveIE,
AWAANSeasonIE,
)
AWAANLiveIE,
AWAANSeasonIE,
)
+from .azmedien import (
+ AZMedienIE,
+ AZMedienPlaylistIE,
+)
from .azubu import AzubuIE, AzubuLiveIE
from .baidu import BaiduVideoIE
from .bambuser import BambuserIE, BambuserChannelIE
from .azubu import AzubuIE, AzubuLiveIE
from .baidu import BaiduVideoIE
from .bambuser import BambuserIE, BambuserChannelIE
@@
-91,6
+95,7
@@
from .bbc import (
BBCCoUkPlaylistIE,
BBCIE,
)
BBCCoUkPlaylistIE,
BBCIE,
)
+from .beampro import BeamProLiveIE
from .beeg import BeegIE
from .behindkink import BehindKinkIE
from .bellmedia import BellMediaIE
from .beeg import BeegIE
from .behindkink import BehindKinkIE
from .bellmedia import BellMediaIE
@@
-98,7
+103,10
@@
from .beatport import BeatportIE
from .bet import BetIE
from .bigflix import BigflixIE
from .bild import BildIE
from .bet import BetIE
from .bigflix import BigflixIE
from .bild import BildIE
-from .bilibili import BiliBiliIE
+from .bilibili import (
+ BiliBiliIE,
+ BiliBiliBangumiIE,
+)
from .biobiochiletv import BioBioChileTVIE
from .biqle import BIQLEIE
from .bleacherreport import (
from .biobiochiletv import BioBioChileTVIE
from .biqle import BIQLEIE
from .bleacherreport import (
@@
-150,6
+158,7
@@
from .cbsnews import (
)
from .cbssports import CBSSportsIE
from .ccc import CCCIE
)
from .cbssports import CBSSportsIE
from .ccc import CCCIE
+from .ccma import CCMAIE
from .cctv import CCTVIE
from .cda import CDAIE
from .ceskatelevize import CeskaTelevizeIE
from .cctv import CCTVIE
from .cda import CDAIE
from .ceskatelevize import CeskaTelevizeIE
@@
-180,6
+189,7
@@
from .cnn import (
from .coub import CoubIE
from .collegerama import CollegeRamaIE
from .comedycentral import (
from .coub import CoubIE
from .collegerama import CollegeRamaIE
from .comedycentral import (
+ ComedyCentralFullEpisodesIE,
ComedyCentralIE,
ComedyCentralShortnameIE,
ComedyCentralTVIE,
ComedyCentralIE,
ComedyCentralShortnameIE,
ComedyCentralTVIE,
@@
-244,6
+254,7
@@
from .dumpert import DumpertIE
from .defense import DefenseGouvFrIE
from .discovery import DiscoveryIE
from .discoverygo import DiscoveryGoIE
from .defense import DefenseGouvFrIE
from .discovery import DiscoveryIE
from .discoverygo import DiscoveryGoIE
+from .disney import DisneyIE
from .dispeak import DigitallySpeakingIE
from .dropbox import DropboxIE
from .dw import (
from .dispeak import DigitallySpeakingIE
from .dropbox import DropboxIE
from .dw import (
@@
-253,6
+264,7
@@
from .dw import (
from .eagleplatform import EaglePlatformIE
from .ebaumsworld import EbaumsWorldIE
from .echomsk import EchoMskIE
from .eagleplatform import EaglePlatformIE
from .ebaumsworld import EbaumsWorldIE
from .echomsk import EchoMskIE
+from .egghead import EggheadCourseIE
from .ehow import EHowIE
from .eighttracks import EightTracksIE
from .einthusan import EinthusanIE
from .ehow import EHowIE
from .eighttracks import EightTracksIE
from .einthusan import EinthusanIE
@@
-322,7
+334,6
@@
from .francetv import (
)
from .freesound import FreesoundIE
from .freespeech import FreespeechIE
)
from .freesound import FreesoundIE
from .freespeech import FreespeechIE
-from .freevideo import FreeVideoIE
from .funimation import FunimationIE
from .funnyordie import FunnyOrDieIE
from .fusion import FusionIE
from .funimation import FunimationIE
from .funnyordie import FunnyOrDieIE
from .fusion import FusionIE
@@
-372,6
+383,7
@@
from .hgtv import (
)
from .historicfilms import HistoricFilmsIE
from .hitbox import HitboxIE, HitboxLiveIE
)
from .historicfilms import HistoricFilmsIE
from .hitbox import HitboxIE, HitboxLiveIE
+from .hitrecord import HitRecordIE
from .hornbunny import HornBunnyIE
from .hotnewhiphop import HotNewHipHopIE
from .hotstar import HotStarIE
from .hornbunny import HornBunnyIE
from .hotnewhiphop import HotNewHipHopIE
from .hotstar import HotStarIE
@@
-399,6
+411,7
@@
from .imgur import (
ImgurAlbumIE,
)
from .ina import InaIE
ImgurAlbumIE,
)
from .ina import InaIE
+from .inc import IncIE
from .indavideo import (
IndavideoIE,
IndavideoEmbedIE,
from .indavideo import (
IndavideoIE,
IndavideoEmbedIE,
@@
-409,6
+422,7
@@
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 .ivi import (
IviIE,
IviCompilationIE
from .ivi import (
IviIE,
IviCompilationIE
@@
-449,7
+463,10
@@
from .kuwo import (
KuwoMvIE,
)
from .la7 import LA7IE
KuwoMvIE,
)
from .la7 import LA7IE
-from .laola1tv import Laola1TvIE
+from .laola1tv import (
+ Laola1TvEmbedIE,
+ Laola1TvIE,
+)
from .lci import LCIIE
from .lcp import (
LcpPlayIE,
from .lci import LCIIE
from .lcp import (
LcpPlayIE,
@@
-501,6
+518,8
@@
from .mangomolo import (
)
from .matchtv import MatchTVIE
from .mdr import MDRIE
)
from .matchtv import MatchTVIE
from .mdr import MDRIE
+from .meipai import MeipaiIE
+from .melonvod import MelonVODIE
from .meta import METAIE
from .metacafe import MetacafeIE
from .metacritic import MetacriticIE
from .meta import METAIE
from .metacafe import MetacafeIE
from .metacritic import MetacriticIE
@@
-542,6
+561,7
@@
from .mtv import (
MTVVideoIE,
MTVServicesEmbeddedIE,
MTVDEIE,
MTVVideoIE,
MTVServicesEmbeddedIE,
MTVDEIE,
+ MTV81IE,
)
from .muenchentv import MuenchenTVIE
from .musicplayon import MusicPlayOnIE
)
from .muenchentv import MuenchenTVIE
from .musicplayon import MusicPlayOnIE
@@
-591,6
+611,7
@@
from .nextmedia import (
NextMediaIE,
NextMediaActionNewsIE,
AppleDailyIE,
NextMediaIE,
NextMediaActionNewsIE,
AppleDailyIE,
+ NextTVIE,
)
from .nfb import NFBIE
from .nfl import NFLIE
)
from .nfb import NFBIE
from .nfl import NFLIE
@@
-652,6
+673,9
@@
from .nrk import (
NRKPlaylistIE,
NRKSkoleIE,
NRKTVIE,
NRKPlaylistIE,
NRKSkoleIE,
NRKTVIE,
+ NRKTVDirekteIE,
+ NRKTVEpisodesIE,
+ NRKTVSeriesIE,
)
from .ntvde import NTVDeIE
from .ntvru import NTVRuIE
)
from .ntvde import NTVDeIE
from .ntvru import NTVRuIE
@@
-664,6
+688,7
@@
from .nzz import NZZIE
from .odatv import OdaTVIE
from .odnoklassniki import OdnoklassnikiIE
from .oktoberfesttv import OktoberfestTVIE
from .odatv import OdaTVIE
from .odnoklassniki import OdnoklassnikiIE
from .oktoberfesttv import OktoberfestTVIE
+from .ondemandkorea import OnDemandKoreaIE
from .onet import (
OnetIE,
OnetChannelIE,
from .onet import (
OnetIE,
OnetChannelIE,
@@
-694,6
+719,7
@@
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 .piksel import PikselIE
from .pinkbike import PinkbikeIE
from .pladform import PladformIE
from .playfm import PlayFMIE
from .pinkbike import PinkbikeIE
from .pladform import PladformIE
from .playfm import PlayFMIE
@@
-713,6
+739,7
@@
from .polskieradio import (
)
from .porn91 import Porn91IE
from .porncom import PornComIE
)
from .porn91 import Porn91IE
from .porncom import PornComIE
+from .pornflip import PornFlipIE
from .pornhd import PornHdIE
from .pornhub import (
PornHubIE,
from .pornhd import PornHdIE
from .pornhub import (
PornHubIE,
@@
-807,8
+834,6
@@
from .sbs import SBSIE
from .scivee import SciVeeIE
from .screencast import ScreencastIE
from .screencastomatic import ScreencastOMaticIE
from .scivee import SciVeeIE
from .screencast import ScreencastIE
from .screencastomatic import ScreencastOMaticIE
-from .screenjunkies import ScreenJunkiesIE
-from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
from .seeker import SeekerIE
from .senateisvp import SenateISVPIE
from .sendtonews import SendtoNewsIE
from .seeker import SeekerIE
from .senateisvp import SenateISVPIE
from .sendtonews import SendtoNewsIE
@@
-819,7
+844,7
@@
from .shared import (
SharedIE,
VivoIE,
)
SharedIE,
VivoIE,
)
-from .sh
aresix import ShareSix
IE
+from .sh
owroomlive import ShowRoomLive
IE
from .sina import SinaIE
from .sixplay import SixPlayIE
from .skynewsarabia import (
from .sina import SinaIE
from .sixplay import SixPlayIE
from .skynewsarabia import (
@@
-901,6
+926,7
@@
from .teachertube import (
)
from .teachingchannel import TeachingChannelIE
from .teamcoco import TeamcocoIE
)
from .teachingchannel import TeachingChannelIE
from .teamcoco import TeamcocoIE
+from .teamfourstar import TeamFourStarIE
from .techtalks import TechTalksIE
from .ted import TEDIE
from .tele13 import Tele13IE
from .techtalks import TechTalksIE
from .ted import TEDIE
from .tele13 import Tele13IE
@@
-969,6
+995,11
@@
from .tv2 import (
)
from .tv3 import TV3IE
from .tv4 import TV4IE
)
from .tv3 import TV3IE
from .tv4 import TV4IE
+from .tva import TVAIE
+from .tvanouvelles import (
+ TVANouvellesIE,
+ TVANouvellesArticleIE,
+)
from .tvc import (
TVCIE,
TVCArticleIE,
from .tvc import (
TVCIE,
TVCArticleIE,
@@
-997,7
+1028,10
@@
from .twitch import (
TwitchChapterIE,
TwitchVodIE,
TwitchProfileIE,
TwitchChapterIE,
TwitchVodIE,
TwitchProfileIE,
+ TwitchAllVideosIE,
+ TwitchUploadsIE,
TwitchPastBroadcastsIE,
TwitchPastBroadcastsIE,
+ TwitchHighlightsIE,
TwitchStreamIE,
TwitchClipsIE,
)
TwitchStreamIE,
TwitchClipsIE,
)
@@
-1011,6
+1045,7
@@
from .udemy import (
UdemyCourseIE
)
from .udn import UDNEmbedIE
UdemyCourseIE
)
from .udn import UDNEmbedIE
+from .uktvplay import UKTVPlayIE
from .digiteka import DigitekaIE
from .unistra import UnistraIE
from .uol import UOLIE
from .digiteka import DigitekaIE
from .unistra import UnistraIE
from .uol import UOLIE
@@
-1050,6
+1085,7
@@
from .vice import (
from .viceland import VicelandIE
from .vidbit import VidbitIE
from .viddler import ViddlerIE
from .viceland import VicelandIE
from .vidbit import VidbitIE
from .viddler import ViddlerIE
+from .videa import VideaIE
from .videodetective import VideoDetectiveIE
from .videofyme import VideofyMeIE
from .videomega import VideoMegaIE
from .videodetective import VideoDetectiveIE
from .videofyme import VideofyMeIE
from .videomega import VideoMegaIE
@@
-1059,7
+1095,6
@@
from .videomore import (
VideomoreSeasonIE,
)
from .videopremium import VideoPremiumIE
VideomoreSeasonIE,
)
from .videopremium import VideoPremiumIE
-from .videott import VideoTtIE
from .vidio import VidioIE
from .vidme import (
VidmeIE,
from .vidio import VidioIE
from .vidme import (
VidmeIE,
@@
-1094,12
+1129,20
@@
from .viki import (
VikiIE,
VikiChannelIE,
)
VikiIE,
VikiChannelIE,
)
+from .viu import (
+ ViuIE,
+ ViuPlaylistIE,
+ ViuOTTIE,
+)
from .vk import (
VKIE,
VKUserVideosIE,
VKWallPostIE,
)
from .vk import (
VKIE,
VKUserVideosIE,
VKWallPostIE,
)
-from .vlive import VLiveIE
+from .vlive import (
+ VLiveIE,
+ VLiveChannelIE
+)
from .vodlocker import VodlockerIE
from .vodplatform import VODPlatformIE
from .voicerepublic import VoiceRepublicIE
from .vodlocker import VodlockerIE
from .vodplatform import VODPlatformIE
from .voicerepublic import VoiceRepublicIE
@@
-1108,6
+1151,7
@@
from .vporn import VpornIE
from .vrt import VRTIE
from .vube import VubeIE
from .vuclip import VuClipIE
from .vrt import VRTIE
from .vube import VubeIE
from .vuclip import VuClipIE
+from .vvvvid import VVVVIDIE
from .vyborymos import VyboryMosIE
from .vzaar import VzaarIE
from .walla import WallaIE
from .vyborymos import VyboryMosIE
from .vzaar import VzaarIE
from .walla import WallaIE
@@
-1121,6
+1165,10
@@
from .wdr import (
WDRIE,
WDRMobileIE,
)
WDRIE,
WDRMobileIE,
)
+from .webcaster import (
+ WebcasterIE,
+ WebcasterFeedIE,
+)
from .webofstories import (
WebOfStoriesIE,
WebOfStoriesPlaylistIE,
from .webofstories import (
WebOfStoriesIE,
WebOfStoriesPlaylistIE,