Merge pull request #8348 from remitamine/dfxp2srt-text

[youtube-dl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 2c56797a50a833bb6783c946e2aa776cf9c87e07..e61a88de7dd4516b7628b776a5041fa98260eaaa 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -15,7 +15,7 @@ from .adobetv import (
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

-from .ae import AEIE
+from .aenetworks import AENetworksIE

 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE


@@ -42,6 +42,7 @@ from .arte import (
     ArteTVCreativeIE,
     ArteTVConcertIE,
     ArteTVFutureIE,
     ArteTVCreativeIE,
     ArteTVConcertIE,
     ArteTVFutureIE,

+    ArteTVCinemaIE,

     ArteTVDDCIE,
     ArteTVEmbedIE,
 )
     ArteTVDDCIE,
     ArteTVEmbedIE,
 )


@@ -49,7 +50,7 @@ from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .audimedia import AudiMediaIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .atttechchannel import ATTTechChannelIE
 from .audimedia import AudiMediaIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE

-from .azubu import AzubuIE
+from .azubu import AzubuIE, AzubuLiveIE

 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE


@@ -141,6 +142,8 @@ from .dailymotion import (
 from .daum import (
     DaumIE,
     DaumClipIE,
 from .daum import (
     DaumIE,
     DaumClipIE,

+    DaumPlaylistIE,
+    DaumUserIE,

 )
 from .dbtv import DBTVIE
 from .dcn import (
 )
 from .dbtv import DBTVIE
 from .dcn import (


@@ -195,7 +198,10 @@ from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE

-from .facebook import FacebookIE
+from .facebook import (
+    FacebookIE,
+    FacebookPostIE,
+)

 from .faz import FazIE
 from .fc2 import FC2IE
 from .fczenit import FczenitIE
 from .faz import FazIE
 from .fc2 import FC2IE
 from .fczenit import FczenitIE


@@ -333,10 +339,12 @@ from .kuwo import (
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .lecture2go import Lecture2GoIE
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .lecture2go import Lecture2GoIE

+from .lemonde import LemondeIE

 from .letv import (
     LetvIE,
     LetvTvIE,
 from .letv import (
     LetvIE,
     LetvTvIE,

-    LetvPlaylistIE
+    LetvPlaylistIE,
+    LetvCloudIE,

 )
 from .libsyn import LibsynIE
 from .lifenews import (
 )
 from .libsyn import LibsynIE
 from .lifenews import (


@@ -355,6 +363,7 @@ from .livestream import (
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE

+from .lovehomeporn import LoveHomePornIE

 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,
 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,


@@ -365,6 +374,7 @@ from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .makertv import MakerTVIE
 from .malemotion import MalemotionIE
 from .mailru import MailRuIE
 from .makertv import MakerTVIE
 from .malemotion import MalemotionIE

+from .matchtv import MatchTVIE

 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE


@@ -475,6 +485,7 @@ from .npo import (
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,

+    SchoolTVIE,

     VPROIE,
     WNLIE
 )
     VPROIE,
     WNLIE
 )


@@ -577,6 +588,7 @@ from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 from .rtvnh import RTVNHIE
 from .ruhd import RUHDIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 from .rtvnh import RTVNHIE
 from .ruhd import RUHDIE

+from .ruleporn import RulePornIE

 from .rutube import (
     RutubeIE,
     RutubeChannelIE,
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,


@@ -723,6 +735,7 @@ from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE

+from .trollvids import TrollvidsIE

 from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE


@@ -777,7 +790,7 @@ from .udemy import (
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE

-from .ultimedia import UltimediaIE
+from .digiteka import DigitekaIE

 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE


@@ -856,6 +869,7 @@ from .webofstories import (
     WebOfStoriesPlaylistIE,
 )
 from .weibo import WeiboIE
     WebOfStoriesPlaylistIE,
 )
 from .weibo import WeiboIE

+from .weiqitv import WeiqiTVIE

 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE