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 9898b9803563669f2854680692e6dc1894041aab..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 (
@@
-246,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 (
@@
-255,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
@@
-289,6
+299,10
@@
from .fc2 import (
FC2EmbedIE,
)
from .fczenit import FczenitIE
FC2EmbedIE,
)
from .fczenit import FczenitIE
+from .filmon import (
+ FilmOnIE,
+ FilmOnChannelIE,
+)
from .firstpost import FirstpostIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
from .firstpost import FirstpostIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
@@
-369,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
@@
-396,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,
@@
-406,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
@@
-544,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
@@
-593,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
@@
-655,6
+674,8
@@
from .nrk import (
NRKSkoleIE,
NRKTVIE,
NRKTVDirekteIE,
NRKSkoleIE,
NRKTVIE,
NRKTVDirekteIE,
+ NRKTVEpisodesIE,
+ NRKTVSeriesIE,
)
from .ntvde import NTVDeIE
from .ntvru import NTVRuIE
)
from .ntvde import NTVDeIE
from .ntvru import NTVRuIE
@@
-718,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,
@@
-812,7
+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 .seeker import SeekerIE
from .senateisvp import SenateISVPIE
from .sendtonews import SendtoNewsIE
from .seeker import SeekerIE
from .senateisvp import SenateISVPIE
from .sendtonews import SendtoNewsIE
@@
-823,7
+844,6
@@
from .shared import (
SharedIE,
VivoIE,
)
SharedIE,
VivoIE,
)
-from .sharesix import ShareSixIE
from .showroomlive import ShowRoomLiveIE
from .sina import SinaIE
from .sixplay import SixPlayIE
from .showroomlive import ShowRoomLiveIE
from .sina import SinaIE
from .sixplay import SixPlayIE
@@
-975,6
+995,7
@@
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 .tvanouvelles import (
TVANouvellesIE,
TVANouvellesArticleIE,
@@
-1064,10
+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,
- VideaEmbedIE,
-)
+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
@@
-1077,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,
@@
-1122,7
+1139,10
@@
from .vk import (
VKUserVideosIE,
VKWallPostIE,
)
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