projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bilibili' of https://github.com/PeterDing/youtube-dl into PeterDing...
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index 8d88d6cb4f3a2e5649ee6b6d643110a6b750b93f..e47adc26ce1f6af014cb0a3da21b6e9908ebcbb2 100644
(file)
--- a/
youtube_dl/extractor/extractors.py
+++ b/
youtube_dl/extractor/extractors.py
@@
-127,6
+127,7
@@
from .carambatv import (
CarambaTVIE,
CarambaTVPageIE,
)
CarambaTVIE,
CarambaTVPageIE,
)
+from .cartoonnetwork import CartoonNetworkIE
from .cbc import (
CBCIE,
CBCPlayerIE,
from .cbc import (
CBCIE,
CBCPlayerIE,
@@
-193,6
+194,10
@@
from .ctsnews import CtsNewsIE
from .ctv import CTVIE
from .ctvnews import CTVNewsIE
from .cultureunplugged import CultureUnpluggedIE
from .ctv import CTVIE
from .ctvnews import CTVNewsIE
from .cultureunplugged import CultureUnpluggedIE
+from .curiositystream import (
+ CuriosityStreamIE,
+ CuriosityStreamCollectionIE,
+)
from .cwtv import CWTVIE
from .dailymail import DailyMailIE
from .dailymotion import (
from .cwtv import CWTVIE
from .dailymail import DailyMailIE
from .dailymotion import (
@@
-256,13
+261,18
@@
from .espn import ESPNIE
from .esri import EsriVideoIE
from .europa import EuropaIE
from .everyonesmixtape import EveryonesMixtapeIE
from .esri import EsriVideoIE
from .europa import EuropaIE
from .everyonesmixtape import EveryonesMixtapeIE
-from .exfm import ExfmIE
from .expotv import ExpoTVIE
from .extremetube import ExtremeTubeIE
from .eyedotv import EyedoTVIE
from .expotv import ExpoTVIE
from .extremetube import ExtremeTubeIE
from .eyedotv import EyedoTVIE
-from .facebook import FacebookIE
+from .facebook import (
+ FacebookIE,
+ FacebookPluginsVideoIE,
+)
from .faz import FazIE
from .faz import FazIE
-from .fc2 import FC2IE
+from .fc2 import (
+ FC2IE,
+ FC2EmbedIE,
+)
from .fczenit import FczenitIE
from .firstpost import FirstpostIE
from .firsttv import FirstTVIE
from .fczenit import FczenitIE
from .firstpost import FirstpostIE
from .firsttv import FirstTVIE
@@
-277,7
+287,10
@@
from .formula1 import Formula1IE
from .fourtube import FourTubeIE
from .fox import FOXIE
from .foxgay import FoxgayIE
from .fourtube import FourTubeIE
from .fox import FOXIE
from .foxgay import FoxgayIE
-from .foxnews import FoxNewsIE
+from .foxnews import (
+ FoxNewsIE,
+ FoxNewsInsiderIE,
+)
from .foxsports import FoxSportsIE
from .franceculture import FranceCultureIE
from .franceinter import FranceInterIE
from .foxsports import FoxSportsIE
from .franceculture import FranceCultureIE
from .franceinter import FranceInterIE
@@
-314,6
+327,7
@@
from .globo import (
GloboIE,
GloboArticleIE,
)
GloboIE,
GloboArticleIE,
)
+from .go import GoIE
from .godtube import GodTubeIE
from .godtv import GodTVIE
from .golem import GolemIE
from .godtube import GodTubeIE
from .godtv import GodTVIE
from .golem import GolemIE
@@
-485,6
+499,7
@@
from .motherless import MotherlessIE
from .motorsport import MotorsportIE
from .movieclips import MovieClipsIE
from .moviezine import MoviezineIE
from .motorsport import MotorsportIE
from .movieclips import MovieClipsIE
from .moviezine import MoviezineIE
+from .movingimage import MovingImageIE
from .msn import MSNIE
from .mtv import (
MTVIE,
from .msn import MSNIE
from .mtv import (
MTVIE,
@@
-553,7
+568,10
@@
from .nick import (
NickDeIE,
)
from .niconico import NiconicoIE, NiconicoPlaylistIE
NickDeIE,
)
from .niconico import NiconicoIE, NiconicoPlaylistIE
-from .ninecninemedia import NineCNineMediaIE
+from .ninecninemedia import (
+ NineCNineMediaStackIE,
+ 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
@@
-635,7
+653,6
@@
from .phoenix import PhoenixIE
from .photobucket import PhotobucketIE
from .pinkbike import PinkbikeIE
from .pladform import PladformIE
from .photobucket import PhotobucketIE
from .pinkbike import PinkbikeIE
from .pladform import PladformIE
-from .played import PlayedIE
from .playfm import PlayFMIE
from .plays import PlaysTVIE
from .playtvak import PlaytvakIE
from .playfm import PlayFMIE
from .plays import PlaysTVIE
from .playtvak import PlaytvakIE
@@
-803,7
+820,6
@@
from .srgssr import (
SRGSSRPlayIE,
)
from .srmediathek import SRMediathekIE
SRGSSRPlayIE,
)
from .srmediathek import SRMediathekIE
-from .ssa import SSAIE
from .stanfordoc import StanfordOpenClassroomIE
from .steam import SteamIE
from .streamable import StreamableIE
from .stanfordoc import StanfordOpenClassroomIE
from .steam import SteamIE
from .streamable import StreamableIE
@@
-823,6
+839,7
@@
from .tagesschau import (
TagesschauIE,
)
from .tass import TassIE
TagesschauIE,
)
from .tass import TassIE
+from .tbs import TBSIE
from .tdslifeway import TDSLifewayIE
from .teachertube import (
TeacherTubeIE,
from .tdslifeway import TDSLifewayIE
from .teachertube import (
TeacherTubeIE,
@@
-865,10
+882,6
@@
from .tnaflix import (
MovieFapIE,
)
from .toggle import ToggleIE
MovieFapIE,
)
from .toggle import ToggleIE
-from .thvideo import (
- THVideoIE,
- THVideoPlaylistIE
-)
from .toutv import TouTvIE
from .toypics import ToypicsUserIE, ToypicsIE
from .traileraddict import TrailerAddictIE
from .toutv import TouTvIE
from .toypics import ToypicsUserIE, ToypicsIE
from .traileraddict import TrailerAddictIE
@@
-903,6
+916,7
@@
from .tvc import (
)
from .tvigle import TvigleIE
from .tvland import TVLandIE
)
from .tvigle import TvigleIE
from .tvland import TVLandIE
+from .tvnoe import TVNoeIE
from .tvp import (
TVPEmbedIE,
TVPIE,
from .tvp import (
TVPEmbedIE,
TVPIE,