From 8b16846cd189363122148c3ab2f948f9a24f440c Mon Sep 17 00:00:00 2001 From: msrimat Date: Sun, 8 Dec 2019 18:44:46 -0500 Subject: [PATCH 1/2] Update extractors.py --- youtube_dl/extractor/extractors.py | 344 +++++++++++------------------ 1 file changed, 134 insertions(+), 210 deletions(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index fd93730fa..ec3222532 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -18,10 +18,9 @@ from .acast import ( ACastIE, ACastChannelIE, ) +from .addanime import AddAnimeIE from .adn import ADNIE -from .adobeconnect import AdobeConnectIE from .adobetv import ( - AdobeTVEmbedIE, AdobeTVIE, AdobeTVShowIE, AdobeTVChannelIE, @@ -39,11 +38,12 @@ from .alphaporno import AlphaPornoIE from .amcnetworks import AMCNetworksIE from .americastestkitchen import AmericasTestKitchenIE from .animeondemand import AnimeOnDemandIE +from .anitube import AnitubeIE from .anvato import AnvatoIE +from .anysex import AnySexIE 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 ( @@ -53,13 +53,21 @@ from .appletrailers import ( from .archiveorg import ArchiveOrgIE from .arkena import ArkenaIE from .ard import ( - ARDBetaMediathekIE, ARDIE, ARDMediathekIE, ) from .arte import ( + ArteTvIE, ArteTVPlus7IE, + ArteTVCreativeIE, + ArteTVConcertIE, + ArteTVInfoIE, + ArteTVFutureIE, + ArteTVCinemaIE, + ArteTVDDCIE, + ArteTVMagazineIE, ArteTVEmbedIE, + TheOperaPlatformIE, ArteTVPlaylistIE, ) from .asiancrush import ( @@ -78,8 +86,13 @@ from .awaan import ( AWAANLiveIE, AWAANSeasonIE, ) -from .azmedien import AZMedienIE +from .azmedien import ( + AZMedienIE, + AZMedienPlaylistIE, + AZMedienShowPlaylistIE, +) from .baidu import BaiduVideoIE +from .bambuser import BambuserIE, BambuserChannelIE from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE from .bbc import ( BBCCoUkIE, @@ -97,20 +110,13 @@ from .behindkink import BehindKinkIE from .bellmedia import BellMediaIE from .beatport import BeatportIE from .bet import BetIE -from .bfi import BFIPlayerIE from .bigflix import BigflixIE from .bild import BildIE from .bilibili import ( BiliBiliIE, BiliBiliBangumiIE, - BilibiliAudioIE, - BilibiliAudioAlbumIE, ) from .biobiochiletv import BioBioChileTVIE -from .bitchute import ( - BitChuteIE, - BitChuteChannelIE, -) from .biqle import BIQLEIE from .bleacherreport import ( BleacherReportIE, @@ -131,7 +137,6 @@ from .brightcove import ( BrightcoveLegacyIE, BrightcoveNewIE, ) -from .businessinsider import BusinessInsiderIE from .buzzfeed import BuzzFeedIE from .byutv import BYUtvIE from .c56 import C56IE @@ -139,8 +144,6 @@ from .camdemy import ( CamdemyIE, CamdemyFolderIE ) -from .cammodels import CamModelsIE -from .camtube import CamTubeIE from .camwithher import CamWithHerIE from .canalplus import CanalplusIE from .canalc2 import Canalc2IE @@ -165,15 +168,11 @@ from .cbs import CBSIE from .cbslocal import CBSLocalIE from .cbsinteractive import CBSInteractiveIE from .cbsnews import ( - CBSNewsEmbedIE, CBSNewsIE, CBSNewsLiveVideoIE, ) from .cbssports import CBSSportsIE -from .ccc import ( - CCCIE, - CCCPlaylistIE, -) +from .ccc import CCCIE from .ccma import CCMAIE from .cctv import CCTVIE from .cda import CDAIE @@ -190,26 +189,17 @@ from .chirbit import ( ChirbitProfileIE, ) from .cinchcast import CinchcastIE -from .cinemax import CinemaxIE -from .ciscolive import ( - CiscoLiveSessionIE, - CiscoLiveSearchIE, -) from .cjsw import CJSWIE from .cliphunter import CliphunterIE from .clippit import ClippitIE 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 .cnbc import ( - CNBCIE, - CNBCVideoIE, -) +from .cnbc import CNBCIE from .cnn import ( CNNIE, CNNBlogsIE, @@ -223,16 +213,17 @@ from .comedycentral import ( ComedyCentralTVIE, ToshIE, ) +from .comcarcoff import ComCarCoffIE from .commonmistakes import CommonMistakesIE, UnicodeBOMIE from .commonprotocols import ( MmsIE, RtmpIE, ) from .condenast import CondeNastIE -from .contv import CONtvIE from .corus import CorusIE from .cracked import CrackedIE from .crackle import CrackleIE +from .criterion import CriterionIE from .crooksandliars import CrooksAndLiarsIE from .crunchyroll import ( CrunchyrollIE, @@ -253,6 +244,10 @@ from .dailymotion import ( DailymotionPlaylistIE, DailymotionUserIE, ) +from .daisuki import ( + DaisukiMottoIE, + DaisukiMottoPlaylistIE, +) from .daum import ( DaumIE, DaumClipIE, @@ -271,7 +266,14 @@ from .douyutv import ( DouyuShowIE, DouyuTVIE, ) -from .dplay import DPlayIE +from .dplay import ( + DPlayIE, + DPlayItIE, +) +from .dramafever import ( + DramaFeverIE, + DramaFeverSeriesIE, +) from .dreisat import DreiSatIE from .drbonanza import DRBonanzaIE from .drtuber import DrTuberIE @@ -279,7 +281,6 @@ from .drtv import ( DRTVIE, DRTVLiveIE, ) -from .dtube import DTubeIE from .dvtv import DVTVIE from .dumpert import DumpertIE from .defense import DefenseGouvFrIE @@ -328,7 +329,6 @@ from .esri import EsriVideoIE 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 ( @@ -350,6 +350,7 @@ from .firsttv import FirstTVIE from .fivemin import FiveMinIE from .fivetv import FiveTVIE from .flickr import FlickrIE +from .flipagram import FlipagramIE from .folketinget import FolketingetIE from .footyroom import FootyRoomIE from .formula1 import Formula1IE @@ -360,14 +361,12 @@ from .fourtube import ( FuxIE, ) from .fox import FOXIE -from .fox9 import ( - FOX9IE, - FOX9NewsIE, -) +from .fox9 import FOX9IE from .foxgay import FoxgayIE from .foxnews import ( FoxNewsIE, FoxNewsArticleIE, + FoxNewsInsiderIE, ) from .foxsports import FoxSportsIE from .franceculture import FranceCultureIE @@ -377,7 +376,6 @@ from .francetv import ( FranceTVSiteIE, FranceTVEmbedIE, FranceTVInfoIE, - FranceTVInfoSportIE, FranceTVJeunesseIE, GenerationWhatIE, CultureboxIE, @@ -385,17 +383,19 @@ from .francetv import ( 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 FunkIE +from .funk import ( + FunkMixIE, + FunkChannelIE, +) +from .funnyordie import FunnyOrDieIE from .fusion import FusionIE from .fxnetworks import FXNetworksIE -from .gaia import GaiaIE from .gameinformer import GameInformerIE +from .gameone import ( + GameOneIE, + GameOnePlaylistIE, +) from .gamespot import GameSpotIE from .gamestar import GameStarIE from .gaskrank import GaskrankIE @@ -411,6 +411,7 @@ from .globo import ( GloboArticleIE, ) from .go import GoIE +from .go90 import Go90IE from .godtube import GodTubeIE from .golem import GolemIE from .googledrive import GoogleDriveIE @@ -419,14 +420,17 @@ from .googlesearch import GoogleSearchIE from .goshgay import GoshgayIE from .gputechconf import GPUTechConfIE from .groupon import GrouponIE -from .hbo import HBOIE +from .hark import HarkIE +from .hbo import ( + HBOIE, + HBOEpisodeIE, +) from .hearthisat import HearThisAtIE from .heise import HeiseIE from .hellporno import HellPornoIE from .helsinki import HelsinkiIE from .hentaistigma import HentaiStigmaIE from .hgtv import HGTVComShowIE -from .hketv import HKETVIE from .hidive import HiDiveIE from .historicfilms import HistoricFilmsIE from .hitbox import HitboxIE, HitboxLiveIE @@ -445,11 +449,9 @@ from .hrti import ( ) from .huajiao import HuajiaoIE from .huffpost import HuffPostIE -from .hungama import ( - HungamaIE, - HungamaSongIE, -) from .hypem import HypemIE +from .ibm_think import IbmThinkPlaylistIE +from .iconosquare import IconosquareIE from .ign import ( IGNIE, OneUPIE, @@ -462,26 +464,21 @@ from .imdb import ( from .imgur import ( ImgurIE, ImgurAlbumIE, - ImgurGalleryIE, ) from .ina import InaIE from .inc import IncIE -from .indavideo import IndavideoEmbedIE -from .infoq import InfoQIE -from .instagram import ( - InstagramIE, - InstagramUserIE, - InstagramTagIE, +from .indavideo import ( + IndavideoIE, + IndavideoEmbedIE, ) +from .infoq import InfoQIE +from .instagram import InstagramIE, InstagramUserIE from .internazionale import InternazionaleIE from .internetvideoarchive import InternetVideoArchiveIE from .iprima import IPrimaIE from .iqiyi import IqiyiIE from .ir90tv import Ir90TvIE -from .itv import ( - ITVIE, - ITVBTCCIE, -) +from .itv import ITVIE from .ivi import ( IviIE, IviCompilationIE @@ -508,9 +505,9 @@ from .keezmovies import KeezMoviesIE from .ketnet import KetnetIE from .khanacademy import KhanAcademyIE from .kickstarter import KickStarterIE -from .kinja import KinjaEmbedIE -from .kinopoisk import KinoPoiskIE +from .keek import KeekIE from .konserthusetplay import KonserthusetPlayIE +from .kontrtube import KontrTubeIE from .krasview import KrasViewIE from .ku6 import Ku6IE from .kusi import KUSIIE @@ -526,7 +523,6 @@ from .la7 import LA7IE from .laola1tv import ( Laola1TvEmbedIE, Laola1TvIE, - EHFTVIE, ITTFIE, ) from .lci import LCIIE @@ -534,12 +530,8 @@ from .lcp import ( LcpPlayIE, LcpIE, ) +from .learnr import LearnrIE from .lecture2go import Lecture2GoIE -from .lecturio import ( - LecturioIE, - LecturioCourseIE, - LecturioDeCourseIE, -) from .leeco import ( LeIE, LePlaylistIE, @@ -560,13 +552,7 @@ from .limelight import ( LimelightChannelListIE, ) from .line import LineTVIE -from .linkedin import ( - LinkedInLearningIE, - LinkedInLearningCourseIE, -) -from .linuxacademy import LinuxAcademyIE from .litv import LiTVIE -from .livejournal import LiveJournalIE from .liveleak import ( LiveLeakIE, LiveLeakEmbedIE, @@ -585,30 +571,24 @@ from .lynda import ( LyndaCourseIE ) from .m6 import M6IE +from .macgamestore import MacGameStoreIE from .mailru import ( MailRuIE, MailRuMusicIE, MailRuMusicSearchIE, ) -from .malltv import MallTVIE +from .makerschannel import MakersChannelIE +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 .mediaset import MediasetIE -from .mediasite import ( - MediasiteIE, - MediasiteCatalogIE, - MediasiteNamedCatalogIE, -) +from .mediasite import MediasiteIE from .medici import MediciIE from .megaphone import MegaphoneIE from .meipai import MeipaiIE @@ -623,21 +603,24 @@ from .microsoftvirtualacademy import ( MicrosoftVirtualAcademyIE, MicrosoftVirtualAcademyCourseIE, ) +from .minhateca import MinhatecaIE from .ministrygrid import MinistryGridIE from .minoto import MinotoIE from .miomio import MioMioIE -from .mit import TechTVMITIE, OCWMITIE +from .mit import TechTVMITIE, MITIE, OCWMITIE from .mitele import MiTeleIE from .mixcloud import ( MixcloudIE, MixcloudUserIE, MixcloudPlaylistIE, + MixcloudStreamIE, ) from .mlb import MLBIE from .mnet import MnetIE from .moevideo import MoeVideoIE from .mofosex import MofosexIE from .mojvideo import MojvideoIE +from .moniker import MonikerIE from .morningstar import MorningstarIE from .motherless import ( MotherlessIE, @@ -653,11 +636,11 @@ from .mtv import ( MTVVideoIE, MTVServicesEmbeddedIE, MTVDEIE, - MTVJapanIE, + MTV81IE, ) 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 ( @@ -667,7 +650,8 @@ from .myvi import ( from .myvidster import MyVidsterIE from .nationalgeographic import ( NationalGeographicVideoIE, - NationalGeographicTVIE, + NationalGeographicIE, + NationalGeographicEpisodeGuideIE, ) from .naver import NaverIE from .nba import NBAIE @@ -678,7 +662,6 @@ from .nbc import ( NBCOlympicsIE, NBCOlympicsStreamIE, NBCSportsIE, - NBCSportsStreamIE, NBCSportsVPlayerIE, ) from .ndr import ( @@ -715,9 +698,15 @@ from .nexx import ( NexxIE, NexxEmbedIE, ) +from .nfb import NFBIE from .nfl import NFLIE from .nhk import NhkVodIE -from .nhl import NHLIE +from .nhl import ( + NHLVideocenterIE, + NHLNewsIE, + NHLVideocenterCategoryIE, + NHLIE, +) from .nick import ( NickIE, NickBrIE, @@ -726,7 +715,10 @@ from .nick import ( NickRuIE, ) 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 @@ -737,9 +729,13 @@ from .nonktube import NonkTubeIE from .noovo import NoovoIE from .normalboots import NormalbootsIE from .nosvideo import NosVideoIE -from .nova import ( - NovaEmbedIE, - NovaIE, +from .nova import NovaIE +from .novamov import ( + AuroraVidIE, + CloudTimeIE, + NowVideoIE, + VideoWeedIE, + WholeCloudIE, ) from .nowness import ( NownessIE, @@ -765,13 +761,9 @@ from .nrk import ( NRKSkoleIE, NRKTVIE, NRKTVDirekteIE, - NRKTVEpisodeIE, NRKTVEpisodesIE, - NRKTVSeasonIE, NRKTVSeriesIE, ) -from .nrl import NRLTVIE -from .ntvcojp import NTVCoJpCUIE from .ntvde import NTVDeIE from .ntvru import NTVRuIE from .nytimes import ( @@ -795,6 +787,7 @@ from .ooyala import ( OoyalaIE, OoyalaExternalIE, ) +from .openload import OpenloadIE from .ora import OraTVIE from .orf import ( ORFTVthekIE, @@ -803,7 +796,6 @@ from .orf import ( ORFOE1IE, ORFIPTVIE, ) -from .outsidetv import OutsideTVIE from .packtpub import ( PacktPubIE, PacktPubCourseIE, @@ -814,7 +806,6 @@ from .parliamentliveuk import ParliamentLiveUKIE 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 ( @@ -831,12 +822,7 @@ from .picarto import ( from .piksel import PikselIE from .pinkbike import PinkbikeIE from .pladform import PladformIE -from .platzi import ( - PlatziIE, - PlatziCourseIE, -) from .playfm import PlayFMIE -from .playplustv import PlayPlusTVIE from .plays import PlaysTVIE from .playtvak import PlaytvakIE from .playvid import PlayvidIE @@ -854,21 +840,19 @@ from .polskieradio import ( from .popcorntv import PopcornTVIE from .porn91 import Porn91IE from .porncom import PornComIE +from .pornflip import PornFlipIE from .pornhd import PornHdIE from .pornhub import ( PornHubIE, - PornHubUserIE, - PornHubPagedVideoListIE, - PornHubUserVideosUploadIE, + PornHubPlaylistIE, + PornHubUserVideosIE, ) 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 .prosiebensat1 import ProSiebenSat1IE from .puls4 import Puls4IE from .pyvideo import PyvideoIE @@ -897,16 +881,10 @@ from .rai import ( RaiPlayPlaylistIE, RaiIE, ) -from .raywenderlich import ( - RayWenderlichIE, - RayWenderlichCourseIE, -) +from .raywenderlich import RayWenderlichIE from .rbmaradio import RBMARadioIE from .rds import RDSIE -from .redbulltv import ( - RedBullTVIE, - RedBullTVRrnContentIE, -) +from .redbulltv import RedBullTVIE from .reddit import ( RedditIE, RedditRIE, @@ -920,6 +898,10 @@ from .rentv import ( from .restudy import RestudyIE from .reuters import ReutersIE from .reverbnation import ReverbNationIE +from .revision3 import ( + Revision3EmbedIE, + Revision3IE, +) from .rice import RICEIE from .rmcdecouverte import RMCDecouverteIE from .ro220 import Ro220IE @@ -941,7 +923,9 @@ from .rts import RTSIE from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE from .rtvnh import RTVNHIE from .rtvs import RTVSIE +from .rudo import RudoIE from .ruhd import RUHDIE +from .ruleporn import RulePornIE from .rutube import ( RutubeIE, RutubeChannelIE, @@ -964,13 +948,10 @@ from .sbs import SBSIE from .screencast import ScreencastIE from .screencastomatic import ScreencastOMaticIE from .scrippsnetworks import ScrippsNetworksWatchIE -from .scte import ( - SCTEIE, - SCTECourseIE, -) from .seeker import SeekerIE from .senateisvp import SenateISVPIE from .sendtonews import SendtoNewsIE +from .servingsys import ServingSysIE from .servus import ServusIE from .sevenplus import SevenPlusIE from .sexu import SexuIE @@ -994,10 +975,7 @@ from .skynewsarabia import ( SkyNewsArabiaIE, SkyNewsArabiaArticleIE, ) -from .sky import ( - SkyNewsIE, - SkySportsIE, -) +from .skysports import SkySportsIE from .slideshare import SlideshareIE from .slideslive import SlidesLiveIE from .slutload import SlutloadIE @@ -1011,7 +989,6 @@ from .snotr import SnotrIE from .sohu import SohuIE from .sonyliv import SonyLIVIE from .soundcloud import ( - SoundcloudEmbedIE, SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE, @@ -1030,20 +1007,14 @@ from .southpark import ( SouthParkEsIE, SouthParkNlIE ) -from .spankbang import ( - SpankBangIE, - SpankBangPlaylistIE, -) +from .spankbang import SpankBangIE from .spankwire import SpankwireIE from .spiegel import SpiegelIE, SpiegelArticleIE from .spiegeltv import SpiegeltvIE -from .spike import ( - BellatorIE, - ParamountNetworkIE, -) +from .spike import SpikeIE from .stitcher import StitcherIE from .sport5 import Sport5IE -from .sportbox import SportBoxIE +from .sportbox import SportBoxEmbedIE from .sportdeutschland import SportDeutschlandIE from .springboardplatform import SpringboardPlatformIE from .sprout import SproutIE @@ -1055,19 +1026,14 @@ from .srmediathek import SRMediathekIE from .stanfordoc import StanfordOpenClassroomIE from .steam import SteamIE from .streamable import StreamableIE +from .streamango import StreamangoIE from .streamcloud import StreamcloudIE from .streamcz import StreamCZIE from .streetvoice import StreetVoiceIE from .stretchinternet import StretchInternetIE -from .stv import STVPlayerIE from .sunporno import SunPornoIE -from .sverigesradio import ( - SverigesRadioEpisodeIE, - SverigesRadioPublicationIE, -) from .svt import ( SVTIE, - SVTPageIE, SVTPlayIE, SVTSeriesIE, ) @@ -1082,20 +1048,14 @@ from .tass import TassIE from .tastytrade import TastyTradeIE from .tbs import TBSIE from .tdslifeway import TDSLifewayIE -from .teachable import ( - TeachableIE, - TeachableCourseIE, -) from .teachertube import ( TeacherTubeIE, TeacherTubeUserIE, ) from .teachingchannel import TeachingChannelIE from .teamcoco import TeamcocoIE -from .teamtreehouse import TeamTreeHouseIE from .techtalks import TechTalksIE from .ted import TEDIE -from .tele5 import Tele5IE from .tele13 import Tele13IE from .telebruxelles import TeleBruxellesIE from .telecinco import TelecincoIE @@ -1103,14 +1063,12 @@ from .telegraaf import TelegraafIE from .telemb import TeleMBIE from .telequebec import ( TeleQuebecIE, - TeleQuebecSquatIE, TeleQuebecEmissionIE, TeleQuebecLiveIE, ) from .teletask import TeleTaskIE from .telewebion import TelewebionIE from .tennistv import TennisTVIE -from .tenplay import TenPlayIE from .testurl import TestURLIE from .tf1 import TF1IE from .tfo import TFOIE @@ -1127,10 +1085,6 @@ from .thisamericanlife import ThisAmericanLifeIE from .thisav import ThisAVIE from .thisoldhouse import ThisOldHouseIE from .threeqsdn import ThreeQSDNIE -from .tiktok import ( - TikTokIE, - TikTokUserIE, -) from .tinypic import TinyPicIE from .tmz import ( TMZIE, @@ -1149,7 +1103,6 @@ from .toutv import TouTvIE from .toypics import ToypicsUserIE, ToypicsIE from .traileraddict import TrailerAddictIE from .trilulilu import TriluliluIE -from .trunews import TruNewsIE from .trutv import TruTVIE from .tube8 import Tube8IE from .tubitv import TubiTvIE @@ -1163,13 +1116,13 @@ from .tunein import ( ) from .tunepk import TunePkIE from .turbo import TurboIE +from .tutv import TutvIE from .tv2 import ( TV2IE, TV2ArticleIE, - KatsomoIE, ) -from .tv2dk import TV2DKIE from .tv2hu import TV2HuIE +from .tv3 import TV3IE from .tv4 import TV4IE from .tv5mondeplus import TV5MondePlusIE from .tva import TVAIE @@ -1184,31 +1137,26 @@ from .tvc import ( from .tvigle import TvigleIE from .tvland import TVLandIE from .tvn24 import TVN24IE -from .tvnet import TVNetIE from .tvnoe import TVNoeIE from .tvnow import ( TVNowIE, - TVNowNewIE, - TVNowSeasonIE, - TVNowAnnualIE, + TVNowListIE, TVNowShowIE, ) from .tvp import ( TVPEmbedIE, TVPIE, - TVPWebsiteIE, + TVPSeriesIE, ) from .tvplay import ( TVPlayIE, ViafreeIE, - TVPlayHomeIE, ) from .tvplayer import TVPlayerIE from .tweakers import TweakersIE from .twentyfourvideo import TwentyFourVideoIE from .twentymin import TwentyMinutenIE from .twentythreevideo import TwentyThreeVideoIE -from .twitcasting import TwitCastingIE from .twitch import ( TwitchVideoIE, TwitchChapterIE, @@ -1225,23 +1173,15 @@ from .twitter import ( TwitterCardIE, TwitterIE, TwitterAmplifyIE, - TwitterBroadcastIE, ) from .udemy import ( UdemyIE, UdemyCourseIE ) from .udn import UDNEmbedIE -from .ufctv import ( - UFCTVIE, - UFCArabiaIE, -) +from .ufctv import UFCTVIE from .uktvplay import UKTVPlayIE from .digiteka import DigitekaIE -from .dlive import ( - DLiveVODIE, - DLiveStreamIE, -) from .umg import UMGDeIE from .unistra import UnistraIE from .unity import UnityIE @@ -1250,6 +1190,10 @@ from .uplynk import ( UplynkIE, UplynkPreplayIE, ) +from .upskill import ( + UpskillIE, + UpskillCourseIE, +) from .urort import UrortIE from .urplay import URPlayIE from .usanetwork import USANetworkIE @@ -1263,6 +1207,7 @@ from .varzesh3 import Varzesh3IE from .vbox7 import Vbox7IE from .veehd import VeeHDIE from .veoh import VeohIE +from .vessel import VesselIE from .vesti import VestiIE from .vevo import ( VevoIE, @@ -1284,11 +1229,13 @@ from .viddler import ViddlerIE from .videa import VideaIE from .videodetective import VideoDetectiveIE from .videofyme import VideofyMeIE +from .videomega import VideoMegaIE from .videomore import ( VideomoreIE, VideomoreVideoIE, VideomoreSeasonIE, ) +from .videopremium import VideoPremiumIE from .videopress import VideoPressIE from .vidio import VidioIE from .vidlii import VidLiiIE @@ -1303,6 +1250,7 @@ from .viewlift import ( ViewLiftIE, ViewLiftEmbedIE, ) +from .viewster import ViewsterIE from .viidea import ViideaIE from .vimeo import ( VimeoIE, @@ -1314,7 +1262,6 @@ from .vimeo import ( VimeoReviewIE, VimeoUserIE, VimeoWatchLaterIE, - VHXEmbedIE, ) from .vimple import VimpleIE from .vine import ( @@ -1325,7 +1272,6 @@ from .viki import ( VikiIE, VikiChannelIE, ) -from .viqeo import ViqeoIE from .viu import ( ViuIE, ViuPlaylistIE, @@ -1350,6 +1296,7 @@ from .voxmedia import ( VoxMediaVolumeIE, VoxMediaIE, ) +from .vporn import VpornIE from .vrt import VRTIE from .vrak import VrakIE from .vrv import ( @@ -1363,7 +1310,6 @@ from .vuclip import VuClipIE from .vvvvid import VVVVIDIE from .vyborymos import VyboryMosIE from .vzaar import VzaarIE -from .wakanim import WakanimIE from .walla import WallaIE from .washingtonpost import ( WashingtonPostIE, @@ -1387,24 +1333,27 @@ from .webofstories import ( WebOfStoriesPlaylistIE, ) from .weibo import ( - WeiboIE, + WeiboIE, WeiboMobileIE ) from .weiqitv import WeiqiTVIE +from .wimp import WimpIE from .wistia import WistiaIE from .worldstarhiphop import WorldStarHipHopIE +from .wrzuta import ( + WrzutaIE, + WrzutaPlaylistIE, +) from .wsj import ( WSJIE, WSJArticleIE, ) -from .wwe import WWEIE from .xbef import XBefIE from .xboxclips import XboxClipsIE from .xfileshare import XFileShareIE from .xhamster import ( XHamsterIE, XHamsterEmbedIE, - XHamsterUserIE, ) from .xiami import ( XiamiSongIE, @@ -1426,17 +1375,13 @@ from .xxxymovies import XXXYMoviesIE from .yahoo import ( YahooIE, YahooSearchIE, - YahooGyaOPlayerIE, - YahooGyaOIE, - YahooJapanNewsIE, ) -from .yandexdisk import YandexDiskIE from .yandexmusic import ( YandexMusicTrackIE, YandexMusicAlbumIE, YandexMusicPlaylistIE, ) -from .yandexvideo import YandexVideoIE +from .yandexdisk import YandexDiskIE from .yapfiles import YapFilesIE from .yesjapan import YesJapanIE from .yinyuetai import YinYueTaiIE @@ -1452,7 +1397,6 @@ from .younow import ( YouNowMomentIE, ) from .youporn import YouPornIE -from .yourporn import YourPornIE from .yourupload import YourUploadIE from .youtube import ( YoutubeIE, @@ -1475,25 +1419,5 @@ from .youtube import ( ) from .zapiks import ZapiksIE from .zaq1 import Zaq1IE -from .zattoo import ( - BBVTVIE, - EinsUndEinsTVIE, - EWETVIE, - GlattvisionTVIE, - MNetTVIE, - MyVisionTVIE, - NetPlusIE, - OsnatelTVIE, - QuantumTVIE, - QuicklineIE, - QuicklineLiveIE, - SaltTVIE, - SAKTVIE, - VTXTVIE, - WalyTVIE, - ZattooIE, - ZattooLiveIE, -) from .zdf import ZDFIE, ZDFChannelIE from .zingmp3 import ZingMp3IE -from .zype import ZypeIE From 6352304f39bc0bdac1bc9827939383782bd6ac80 Mon Sep 17 00:00:00 2001 From: msrimat Date: Sun, 8 Dec 2019 18:46:02 -0500 Subject: [PATCH 2/2] Create ibmThink.py [ibmThink] for school project, attempted to implement ibm Think 2020 extraction access --- youtube_dl/extractor/ibmThink.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 youtube_dl/extractor/ibmThink.py diff --git a/youtube_dl/extractor/ibmThink.py b/youtube_dl/extractor/ibmThink.py new file mode 100644 index 000000000..daa0e8dee --- /dev/null +++ b/youtube_dl/extractor/ibmThink.py @@ -0,0 +1,30 @@ +# coding: utf-8 +from __future__ import unicode_literals + +import re + +from .common import InfoExtractor +from .generic import GenericIE + + +class IbmThinkPlaylistIE(InfoExtractor): + IE_DESC = 'IBM Think Playlist' + IE_NAME = 'IBMThink:playlist' + _VALID_URL = r'https?://(?:www\.)?ibm\.com/events/think/watch/playlist/(?P[0-9]+)/?' + _TESTS = [{ + 'url': 'https://www.ibm.com/events/think/watch/playlist/468067/', + 'info_dict': { + 'id': '468067', + 'title': 'Think 2020', + 'description': 'Keynotes' + }, + 'playlist_mincount': 5 + }] + + def _real_extract(self, url): + playlist_id = self._match_id(url) + webpage = self._download_webpage(url, playlist_id) + entries = [self.url_result(m, GenericIE.ie_key()) for m in re.findall(r'', webpage)] + title = self._html_search_regex(r'.+?\s\|\s.+?\s\|\s(.+?)', webpage, 'title', fatal=False) + description = self._og_search_description(webpage) + return self.playlist_result(entries, playlist_id, title, description)