Merge branch 'master' into c13cl

* implementing PR suggestions
* removing c13cl extractor in favor of RudoVideo with _EMBED_REGEX
* supporting VODs and Podcasts from rudo.video
* supporting embeded youtube
* adding tests

supportedsites.md

@@ -1,4 +1,6 @@
 # Supported sites
+ - **0000studio:archive**
+ - **0000studio:clip**
  - **17live**
  - **17live:clip**
  - **1News**: 1news.co.nz article videos
@@ -7,6 +9,7 @@
  - **23video**
  - **247sports**
  - **24tv.ua**
+ - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
  - **4tube**
@@ -47,18 +50,15 @@
  - **afreecatv**: [*afreecatv*](## "netrc machine") afreecatv.com
  - **afreecatv:live**: [*afreecatv*](## "netrc machine") afreecatv.com
  - **afreecatv:user**
+ - **AirMozilla**
  - **AirTV**
  - **AitubeKZVideo**
  - **AliExpressLive**
  - **AlJazeera**
  - **Allocine**
- - **Allstar**
- - **AllstarProfile**
  - **AlphaPorno**
  - **Alsace20TV**
  - **Alsace20TVEmbed**
- - **altcensored**
- - **altcensored:channel**
  - **Alura**: [*alura*](## "netrc machine")
  - **AluraCourse**: [*aluracourse*](## "netrc machine")
  - **Amara**
@@ -79,7 +79,7 @@
  - **ant1newsgr:embed**: ant1news.gr embedded videos
  - **antenna:watch**: antenna.gr and ant1news.gr videos
  - **Anvato**
- - **aol.com**: Yahoo screen and movies (**Currently broken**)
+ - **aol.com**: Yahoo screen and movies
  - **APA**
  - **Aparat**
  - **AppleConnect**
@@ -100,6 +100,7 @@
  - **ArteTVPlaylist**
  - **AtresPlayer**: [*atresplayer*](## "netrc machine")
  - **AtScaleConfEvent**
+ - **ATTTechChannel**
  - **ATVAt**
  - **AudiMedia**
  - **AudioBoom**
@@ -139,12 +140,12 @@
  - **BeatBumpVideo**
  - **Beatport**
  - **Beeg**
- - **BehindKink**: (**Currently broken**)
+ - **BehindKink**
  - **Bellator**
  - **BellMedia**
  - **BerufeTV**
- - **Bet**: (**Currently broken**)
+ - **Bet**
- - **bfi:player**: (**Currently broken**)
+ - **bfi:player**
  - **bfmtv**
  - **bfmtv:article**
  - **bfmtv:live**
@@ -161,8 +162,6 @@
  - **BiliBiliBangumi**
  - **BiliBiliBangumiMedia**
  - **BiliBiliBangumiSeason**
- - **BilibiliCheese**
- - **BilibiliCheeseSeason**
  - **BilibiliCollectionList**
  - **BilibiliFavoritesList**
  - **BiliBiliPlayer**
@@ -177,8 +176,11 @@
  - **BiliLive**
  - **BioBioChileTV**
  - **Biography**
+ - **BIQLE**
  - **BitChute**
  - **BitChuteChannel**
+ - **bitwave:replay**
+ - **bitwave:stream**
  - **BlackboardCollaborate**
  - **BleacherReport**
  - **BleacherReportCMS**
@@ -191,7 +193,7 @@
  - **Box**
  - **BoxCastVideo**
  - **Bpb**: Bundeszentrale für politische Bildung
- - **BR**: Bayerischer Rundfunk (**Currently broken**)
+ - **BR**: Bayerischer Rundfunk
  - **BrainPOP**: [*brainpop*](## "netrc machine")
  - **BrainPOPELL**: [*brainpop*](## "netrc machine")
  - **BrainPOPEsp**: [*brainpop*](## "netrc machine") BrainPOP Español
@@ -199,18 +201,19 @@
  - **BrainPOPIl**: [*brainpop*](## "netrc machine") BrainPOP Hebrew
  - **BrainPOPJr**: [*brainpop*](## "netrc machine")
  - **BravoTV**
+ - **Break**
  - **BreitBart**
  - **brightcove:legacy**
  - **brightcove:new**
  - **Brilliantpala:Classes**: [*brilliantpala*](## "netrc machine") VoD on classes.brilliantpala.org
  - **Brilliantpala:Elearn**: [*brilliantpala*](## "netrc machine") VoD on elearn.brilliantpala.org
+ - **BRMediathek**: Bayerischer Rundfunk Mediathek
  - **bt:article**: Bergens Tidende Articles
  - **bt:vestlendingen**: Bergens Tidende - Vestlendingen
  - **Bundesliga**
  - **BusinessInsider**
  - **BuzzFeed**
- - **BYUtv**: (**Currently broken**)
+ - **BYUtv**
- - **C13Cl**
  - **CableAV**
  - **Callin**
  - **Caltrans**
@@ -222,11 +225,14 @@
  - **CamModels**
  - **Camsoda**
  - **CamtasiaEmbed**
+ - **CamWithHer**
  - **Canal1**
  - **CanalAlpha**
  - **canalc2.tv**
  - **Canalplus**: mycanal.fr and piwiplus.fr
  - **CaracolTvPlay**: [*caracoltv-play*](## "netrc machine")
+ - **CarambaTV**
+ - **CarambaTVPage**
  - **CartoonNetwork**
  - **cbc.ca**
  - **cbc.ca:player**
@@ -248,12 +254,16 @@
  - **Cellebrite**
  - **CeskaTelevize**
  - **CGTN**
+ - **channel9**: Channel 9
  - **CharlieRose**
  - **Chaturbate**
  - **Chilloutzone**
  - **Chingari**
  - **ChingariUser**
+ - **chirbit**
+ - **chirbit:profile**
  - **cielotv.it**
+ - **Cinchcast**
  - **Cinemax**
  - **CinetecaMilano**
  - **Cineverse**
@@ -266,12 +276,14 @@
  - **cliphunter**
  - **Clippit**
  - **ClipRs**
+ - **Clipsyndicate**
  - **ClipYouEmbed**
  - **CloserToTruth**
  - **CloudflareStream**
- - **Clubic**: (**Currently broken**)
+ - **Cloudy**
+ - **Clubic**
  - **Clyp**
- - **cmt.com**: (**Currently broken**)
+ - **cmt.com**
  - **CNBC**
  - **CNBCVideo**
  - **CNN**
@@ -316,6 +328,7 @@
  - **CybraryCourse**: [*cybrary*](## "netrc machine")
  - **DacastPlaylist**
  - **DacastVOD**
+ - **Daftsex**
  - **DagelijkseKost**: dagelijksekost.een.be
  - **DailyMail**
  - **dailymotion**: [*dailymotion*](## "netrc machine")
@@ -334,12 +347,13 @@
  - **DctpTv**
  - **DeezerAlbum**
  - **DeezerPlaylist**
+ - **defense.gouv.fr**
  - **democracynow**
  - **DestinationAmerica**
  - **DetikEmbed**
  - **DeuxM**
  - **DeuxMNews**
- - **DHM**: Filmarchiv - Deutsches Historisches Museum (**Currently broken**)
+ - **DHM**: Filmarchiv - Deutsches Historisches Museum
  - **Digg**
  - **DigitalConcertHall**: [*digitalconcerthall*](## "netrc machine") DigitalConcertHall extractor
  - **DigitallySpeaking**
@@ -359,6 +373,7 @@
  - **dlf:corpus**: DLF Multi-feed Archives
  - **dlive:stream**
  - **dlive:vod**
+ - **Dotsub**
  - **Douyin**
  - **DouyuShow**
  - **DouyuTV**: 斗鱼直播
@@ -377,25 +392,32 @@
  - **duboku**: www.duboku.io
  - **duboku:list**: www.duboku.io entire series
  - **Dumpert**
- - **Duoplay**
  - **dvtv**: http://video.aktualne.cz/
  - **dw**
  - **dw:article**
  - **EaglePlatform**
  - **EbaumsWorld**
  - **Ebay**
+ - **EchoMsk**
  - **egghead:course**: egghead.io course
  - **egghead:lesson**: egghead.io lesson
+ - **ehftv**
+ - **eHow**
  - **EinsUndEinsTV**: [*1und1tv*](## "netrc machine")
  - **EinsUndEinsTVLive**: [*1und1tv*](## "netrc machine")
  - **EinsUndEinsTVRecordings**: [*1und1tv*](## "netrc machine")
  - **Einthusan**
  - **eitb.tv**
+ - **ElevenSports**
+ - **EllenTube**
+ - **EllenTubePlaylist**
+ - **EllenTubeVideo**
  - **Elonet**
  - **ElPais**: El País
  - **ElTreceTV**: El Trece TV (Argentina)
  - **Embedly**
  - **EMPFlix**
+ - **Engadget**
  - **Epicon**
  - **EpiconSeries**
  - **eplus:inbound**: e+ (イープラス) overseas
@@ -407,9 +429,11 @@
  - **ertflix**: ERTFLIX videos
  - **ertflix:codename**: ERTFLIX videos by codename
  - **ertwebtv:embed**: ert.gr webtv embedded videos
+ - **Escapist**
  - **ESPN**
  - **ESPNArticle**
  - **ESPNCricInfo**
+ - **EsriVideo**
  - **EttuTv**
  - **Europa**
  - **EuroParlWebstream**
@@ -419,7 +443,9 @@
  - **EWETV**: [*ewetv*](## "netrc machine")
  - **EWETVLive**: [*ewetv*](## "netrc machine")
  - **EWETVRecordings**: [*ewetv*](## "netrc machine")
+ - **ExpoTV**
  - **Expressen**
+ - **ExtremeTube**
  - **EyedoTV**
  - **facebook**: [*facebook*](## "netrc machine")
  - **facebook:reel**
@@ -439,8 +465,6 @@
  - **FiveThirtyEight**
  - **FiveTV**
  - **Flickr**
- - **Floatplane**
- - **FloatplaneChannel**
  - **Folketinget**: Folketinget (ft.dk; Danish parliament)
  - **FoodNetwork**
  - **FootyRoom**
@@ -448,6 +472,7 @@
  - **FOX**
  - **FOX9**
  - **FOX9News**
+ - **Foxgay**
  - **foxnews**: Fox News and Fox Business Video
  - **foxnews:article**
  - **FoxNewsVideo**
@@ -471,6 +496,7 @@
  - **funimation:show**: [*funimation*](## "netrc machine")
  - **Funk**
  - **Funker530**
+ - **Fusion**
  - **Fux**
  - **FuyinTV**
  - **Gab**
@@ -492,11 +518,11 @@
  - **gem.cbc.ca**: [*cbcgem*](## "netrc machine")
  - **gem.cbc.ca:live**
  - **gem.cbc.ca:playlist**
- - **generic**: Generic downloader that works on some sites
  - **Genius**
  - **GeniusLyrics**
  - **Gettr**
  - **GettrStreaming**
+ - **Gfycat**
  - **GiantBomb**
  - **Giga**
  - **GlattvisionTV**: [*glattvisiontv*](## "netrc machine")
@@ -538,6 +564,7 @@
  - **HearThisAt**
  - **Heise**
  - **HellPorno**
+ - **Helsinki**: helsinki.fi
  - **hetklokhuis**
  - **hgtv.com:show**
  - **HGTVDe**
@@ -546,6 +573,8 @@
  - **HistoricFilms**
  - **history:player**
  - **history:topic**: History.com Topic
+ - **hitbox**
+ - **hitbox:live**
  - **HitRecord**
  - **hketv**: 香港教育局教育電視 (HKETV) Educational Television, Hong Kong Educational Bureau
  - **HollywoodReporter**
@@ -556,6 +585,8 @@
  - **hotstar:playlist**
  - **hotstar:season**
  - **hotstar:series**
+ - **Howcast**
+ - **HowStuffWorks**
  - **hrfernsehen**
  - **HRTi**: [*hrti*](## "netrc machine")
  - **HRTiPlaylist**: [*hrti*](## "netrc machine")
@@ -607,6 +638,7 @@
  - **IsraelNationalNews**
  - **ITProTV**
  - **ITProTVCourse**
+ - **ITTF**
  - **ITV**
  - **ITVBTCC**
  - **ivi**: ivi.ru
@@ -638,6 +670,7 @@
  - **Karaoketv**
  - **KarriereVideos**
  - **Katsomo**
+ - **KeezMovies**
  - **KelbyOne**
  - **Ketnet**
  - **khanacademy**
@@ -665,6 +698,8 @@
  - **la7.it**
  - **la7.it:​pod:episode**
  - **la7.it:podcast**
+ - **laola1tv**
+ - **laola1tv:embed**
  - **LastFM**
  - **LastFMPlaylist**
  - **LastFMUser**
@@ -698,6 +733,7 @@
  - **LinkedIn**: [*linkedin*](## "netrc machine")
  - **linkedin:learning**: [*linkedin*](## "netrc machine")
  - **linkedin:​learning:course**: [*linkedin*](## "netrc machine")
+ - **LinuxAcademy**: [*linuxacademy*](## "netrc machine")
  - **Liputan6**
  - **ListenNotes**
  - **LiTV**
@@ -715,6 +751,7 @@
  - **Lumni**
  - **lynda**: [*lynda*](## "netrc machine") lynda.com videos
  - **lynda:course**: [*lynda*](## "netrc machine") lynda.com online courses
+ - **m6**
  - **MagellanTV**
  - **MagentaMusik360**
  - **mailru**: Видео@Mail.Ru
@@ -756,8 +793,11 @@
  - **megatvcom:embed**: megatv.com embedded videos
  - **Meipai**: 美拍
  - **MelonVOD**
+ - **META**
+ - **metacafe**
  - **Metacritic**
  - **mewatch**
+ - **Mgoon**
  - **MiaoPai**
  - **MicrosoftEmbed**
  - **microsoftstream**: Microsoft Stream
@@ -770,6 +810,7 @@
  - **minds:group**
  - **MinistryGrid**
  - **Minoto**
+ - **miomio.tv**
  - **mirrativ**
  - **mirrativ:user**
  - **MirrorCoUK**
@@ -784,10 +825,14 @@
  - **MLBTV**: [*mlb*](## "netrc machine")
  - **MLBVideo**
  - **MLSSoccer**
+ - **Mnet**
  - **MNetTV**: [*mnettv*](## "netrc machine")
  - **MNetTVLive**: [*mnettv*](## "netrc machine")
  - **MNetTVRecordings**: [*mnettv*](## "netrc machine")
  - **MochaVideo**
+ - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
+ - **Mofosex**
+ - **MofosexEmbed**
  - **Mojvideo**
  - **Monstercat**
  - **MonsterSirenHypergryphMusic**
@@ -798,12 +843,13 @@
  - **Motorsport**: motorsport.com
  - **MotorTrend**
  - **MotorTrendOnDemand**
+ - **MovieClips**
  - **MovieFap**
  - **Moviepilot**
  - **MoviewPlay**
  - **Moviezine**
  - **MovingImage**
- - **MSN**: (**Currently broken**)
+ - **MSN**
  - **mtg**: MTG services
  - **mtv**
  - **mtv.de**
@@ -825,13 +871,18 @@
  - **MusicdexSong**
  - **mva**: Microsoft Virtual Academy videos
  - **mva:course**: Microsoft Virtual Academy courses
+ - **Mwave**
+ - **MwaveMeetGreet**
  - **Mxplayer**
  - **MxplayerShow**
+ - **MyChannels**
  - **MySpace**
  - **MySpace:album**
  - **MySpass**
+ - **Myvi**
  - **MyVideoGe**
  - **MyVidster**
+ - **MyviEmbed**
  - **Mzaalo**
  - **n-tv.de**
  - **N1Info:article**
@@ -863,7 +914,6 @@
  - **NDTV**
  - **Nebula**: [*watchnebula*](## "netrc machine")
  - **nebula:channel**: [*watchnebula*](## "netrc machine")
- - **nebula:class**: [*watchnebula*](## "netrc machine")
  - **nebula:subscriptions**: [*watchnebula*](## "netrc machine")
  - **NekoHacker**
  - **NerdCubedFeed**
@@ -885,6 +935,7 @@
  - **Newgrounds:playlist**
  - **Newgrounds:user**
  - **NewsPicks**
+ - **Newstube**
  - **Newsy**
  - **NextMedia**: 蘋果日報
  - **NextMediaActionNews**: 蘋果日報 - 動新聞
@@ -910,6 +961,7 @@
  - **nick.de**
  - **nickelodeon:br**
  - **nickelodeonru**
+ - **nicknight**
  - **niconico**: [*niconico*](## "netrc machine") ニコニコ動画
  - **niconico:history**: NicoNico user history or likes. Requires cookies.
  - **niconico:live**: ニコニコ生放送
@@ -932,7 +984,9 @@
  - **NonkTube**
  - **NoodleMagazine**
  - **Noovo**
+ - **Normalboots**
  - **NOSNLArticle**
+ - **NosVideo**
  - **Nova**: TN.cz, Prásk.tv, Nova.cz, Novaplus.cz, FANDA.tv, Krásná.cz and Doma.cz
  - **NovaEmbed**
  - **NovaPlay**
@@ -955,7 +1009,7 @@
  - **NRKTVEpisodes**
  - **NRKTVSeason**
  - **NRKTVSeries**
- - **NRLTV**: (**Currently broken**)
+ - **NRLTV**
  - **ntv.ru**
  - **NubilesPorn**: [*nubiles-porn*](## "netrc machine")
  - **Nuvid**
@@ -983,6 +1037,8 @@
  - **onet.tv:channel**
  - **OnetMVP**
  - **OnionStudios**
+ - **Ooyala**
+ - **OoyalaExternal**
  - **Opencast**
  - **OpencastPlaylist**
  - **openrec**
@@ -1004,6 +1060,7 @@
  - **PalcoMP3:artist**
  - **PalcoMP3:song**
  - **PalcoMP3:video**
+ - **pandora.tv**: 판도라TV
  - **Panopto**
  - **PanoptoList**
  - **PanoptoPlaylist**
@@ -1025,6 +1082,7 @@
  - **PeerTube:Playlist**
  - **peloton**: [*peloton*](## "netrc machine")
  - **peloton:live**: Peloton Live
+ - **People**
  - **PerformGroup**
  - **periscope**: Periscope
  - **periscope:user**: Periscope user videos
@@ -1046,11 +1104,14 @@
  - **PlanetMarathi**
  - **Platzi**: [*platzi*](## "netrc machine")
  - **PlatziCourse**: [*platzi*](## "netrc machine")
+ - **play.fm**
  - **player.sky.it**
  - **PlayPlusTV**: [*playplustv*](## "netrc machine")
  - **PlayStuff**
+ - **PlaysTV**
  - **PlaySuisse**
  - **Playtvak**: Playtvak.cz, iDNES.cz and Lidovky.cz
+ - **Playvid**
  - **PlayVids**
  - **Playwire**
  - **pluralsight**: [*pluralsight*](## "netrc machine")
@@ -1075,8 +1136,11 @@
  - **Popcorntimes**
  - **PopcornTV**
  - **Pornbox**
+ - **PornCom**
  - **PornerBros**
+ - **Pornez**
  - **PornFlip**
+ - **PornHd**
  - **PornHub**: [*pornhub*](## "netrc machine") PornHub and Thumbzilla
  - **PornHubPagedVideoList**: [*pornhub*](## "netrc machine")
  - **PornHubPlaylist**: [*pornhub*](## "netrc machine")
@@ -1118,6 +1182,7 @@
  - **Radiko**
  - **RadikoRadio**
  - **radio.de**
+ - **radiobremen**
  - **radiocanada**
  - **radiocanada:audiovideo**
  - **RadioComercial**
@@ -1157,6 +1222,7 @@
  - **RCTIPlusSeries**
  - **RCTIPlusTV**
  - **RDS**: RDS.ca
+ - **Recurbate**
  - **RedBull**
  - **RedBullEmbed**
  - **RedBullTV**
@@ -1173,6 +1239,7 @@
  - **Reuters**
  - **ReverbNation**
  - **RheinMainTV**
+ - **RICE**
  - **RMCDecouverte**
  - **RockstarGames**
  - **Rokfin**: [*rokfin*](## "netrc machine")
@@ -1193,6 +1260,8 @@
  - **rtl.lu:tele-vod**
  - **rtl.nl**: rtl.nl and rtlxl.nl
  - **rtl2**
+ - **rtl2:you**
+ - **rtl2:​you:series**
  - **RTLLuLive**
  - **RTLLuRadio**
  - **RTNews**
@@ -1207,9 +1276,10 @@
  - **rtve.es:infantil**: RTVE infantil
  - **rtve.es:live**: RTVE.es live streams
  - **rtve.es:television**
+ - **RTVNH**
  - **RTVS**
  - **rtvslo.si**
- - **RudoVideo**
+ - **RUHD**
  - **Rule34Video**
  - **Rumble**
  - **RumbleChannel**
@@ -1256,8 +1326,8 @@
  - **ScrippsNetworks**
  - **scrippsnetworks:watch**
  - **Scrolller**
- - **SCTE**: [*scte*](## "netrc machine") (**Currently broken**)
+ - **SCTE**: [*scte*](## "netrc machine")
- - **SCTECourse**: [*scte*](## "netrc machine") (**Currently broken**)
+ - **SCTECourse**: [*scte*](## "netrc machine")
  - **Seeker**
  - **SenalColombiaLive**
  - **SenateGov**
@@ -1269,6 +1339,7 @@
  - **SeznamZpravyArticle**
  - **Shahid**: [*shahid*](## "netrc machine")
  - **ShahidShow**
+ - **Shared**: shared.sx
  - **ShareVideosEmbed**
  - **ShemarooMe**
  - **ShowRoomLive**
@@ -1320,6 +1391,7 @@
  - **SovietsClosetPlaylist**
  - **SpankBang**
  - **SpankBangPlaylist**
+ - **Spankwire**
  - **Spiegel**
  - **Sport5**
  - **SportBox**
@@ -1332,7 +1404,7 @@
  - **SpreakerShowPage**
  - **SpringboardPlatform**
  - **Sprout**
- - **sr:mediathek**: Saarländischer Rundfunk (**Currently broken**)
+ - **sr:mediathek**: Saarländischer Rundfunk
  - **SRGSSR**
  - **SRGSSRPlay**: srf.ch, rts.ch, rsi.ch, rtr.ch and swissinfo.ch play sites
  - **StacommuLive**: [*stacommu*](## "netrc machine")
@@ -1349,6 +1421,7 @@
  - **StoryFireSeries**
  - **StoryFireUser**
  - **Streamable**
+ - **streamcloud.eu**
  - **StreamCZ**
  - **StreamFF**
  - **StreetVoice**
@@ -1364,6 +1437,7 @@
  - **SVTPlay**: SVT Play and Öppet arkiv
  - **SVTSeries**
  - **SwearnetEpisode**
+ - **SWRMediathek**
  - **Syfy**
  - **SYVDK**
  - **SztvHu**
@@ -1382,6 +1456,7 @@
  - **TeachingChannel**
  - **Teamcoco**
  - **TeamTreeHouse**: [*teamtreehouse*](## "netrc machine")
+ - **TechTalks**
  - **techtv.mit.edu**
  - **TedEmbed**
  - **TedPlaylist**
@@ -1411,8 +1486,6 @@
  - **TFO**
  - **theatercomplextown:ppv**: [*theatercomplextown*](## "netrc machine")
  - **theatercomplextown:vod**: [*theatercomplextown*](## "netrc machine")
- - **TheGuardianPodcast**
- - **TheGuardianPodcastPlaylist**
  - **TheHoleTv**
  - **TheIntercept**
  - **ThePlatform**
@@ -1433,23 +1506,27 @@
  - **tiktok:sound**: (**Currently broken**)
  - **tiktok:tag**: (**Currently broken**)
  - **tiktok:user**: (**Currently broken**)
+ - **tinypic**: tinypic.com videos
  - **TLC**
  - **TMZ**
  - **TNAFlix**
  - **TNAFlixNetworkEmbed**
  - **toggle**
  - **toggo**
+ - **Tokentube**
+ - **Tokentube:channel**
  - **tokfm:audition**
  - **tokfm:podcast**
  - **ToonGoggles**
  - **tou.tv**: [*toutv*](## "netrc machine")
- - **Toypics**: Toypics video (**Currently broken**)
+ - **Toypics**: Toypics video
- - **ToypicsUser**: Toypics user profile (**Currently broken**)
+ - **ToypicsUser**: Toypics user profile
  - **TrailerAddict**: (**Currently broken**)
  - **TravelChannel**
  - **Triller**: [*triller*](## "netrc machine")
  - **TrillerShort**
  - **TrillerUser**: [*triller*](## "netrc machine")
+ - **Trilulilu**
  - **Trovo**
  - **TrovoChannelClip**: All Clips of a trovo.live channel; "trovoclip:" prefix
  - **TrovoChannelVod**: All VODs of a trovo.live channel; "trovovod:" prefix
@@ -1459,7 +1536,7 @@
  - **TruNews**
  - **Truth**
  - **TruTV**
- - **Tube8**: (**Currently broken**)
+ - **Tube8**
  - **TubeTuGraz**: [*tubetugraz*](## "netrc machine") tube.tugraz.at
  - **TubeTuGrazSeries**: [*tubetugraz*](## "netrc machine")
  - **TubiTv**: [*tubitv*](## "netrc machine")
@@ -1468,6 +1545,7 @@
  - **TuneInPodcast**
  - **TuneInPodcastEpisode**
  - **TuneInStation**
+ - **TunePk**
  - **Turbo**
  - **tv.dfb.de**
  - **TV2**
@@ -1491,7 +1569,14 @@
  - **TVIPlayer**
  - **tvland.com**
  - **TVN24**
+ - **TVNet**
  - **TVNoe**
+ - **TVNow**
+ - **TVNowAnnual**
+ - **TVNowFilm**
+ - **TVNowNew**
+ - **TVNowSeason**
+ - **TVNowShow**
  - **tvopengr:embed**: tvopen.gr embedded videos
  - **tvopengr:watch**: tvopen.gr (and ethnos.gr) videos
  - **tvp**: Telewizja Polska
@@ -1529,6 +1614,7 @@
  - **umg:de**: Universal Music Deutschland
  - **Unistra**
  - **Unity**
+ - **UnscriptedNewsVideo**
  - **uol.com.br**
  - **uplynk**
  - **uplynk:preplay**
@@ -1543,6 +1629,7 @@
  - **Utreon**
  - **Varzesh3**
  - **Vbox7**
+ - **VeeHD**
  - **Veo**
  - **Veoh**
  - **veoh:user**
@@ -1555,6 +1642,7 @@
  - **vice**
  - **vice:article**
  - **vice:show**
+ - **Vidbit**
  - **Viddler**
  - **Videa**
  - **video.arnes.si**: Arnes Video
@@ -1576,7 +1664,6 @@
  - **VidioLive**: [*vidio*](## "netrc machine")
  - **VidioPremier**: [*vidio*](## "netrc machine")
  - **VidLii**
- - **Vidly**
  - **viewlift**
  - **viewlift:embed**
  - **Viidea**
@@ -1596,6 +1683,7 @@
  - **Vimm:stream**
  - **ViMP**
  - **ViMP:Playlist**
+ - **Vimple**: Vimple - one-click video hosting
  - **Vine**
  - **vine:user**
  - **Viqeo**
@@ -1603,6 +1691,7 @@
  - **viu:ott**: [*viu*](## "netrc machine")
  - **viu:playlist**
  - **ViuOTTIndonesia**
+ - **Vivo**: vivo.sx
  - **vk**: [*vk*](## "netrc machine") VK
  - **vk:uservideos**: [*vk*](## "netrc machine") VK - User's Videos
  - **vk:wallpost**: [*vk*](## "netrc machine")
@@ -1610,27 +1699,37 @@
  - **VKPlayLive**
  - **vm.tiktok**
  - **Vocaroo**
+ - **Vodlocker**
  - **VODPl**
  - **VODPlatform**
+ - **VoiceRepublic**
  - **voicy**
  - **voicy:channel**
  - **VolejTV**
- - **Voot**: [*voot*](## "netrc machine") (**Currently broken**)
+ - **Voot**: [*voot*](## "netrc machine")
- - **VootSeries**: [*voot*](## "netrc machine") (**Currently broken**)
+ - **VootSeries**: [*voot*](## "netrc machine")
  - **VoxMedia**
  - **VoxMediaVolume**
  - **vpro**: npo.nl, ntr.nl, omroepwnl.nl, zapp.nl and npo3.nl
  - **vqq:series**
  - **vqq:video**
+ - **Vrak**
  - **VRT**: VRT NWS, Flanders News, Flandern Info and Sporza
  - **VrtNU**: [*vrtnu*](## "netrc machine") VRT MAX
+ - **vrv**: [*vrv*](## "netrc machine")
+ - **vrv:series**
+ - **VShare**
  - **VTM**
  - **VTXTV**: [*vtxtv*](## "netrc machine")
  - **VTXTVLive**: [*vtxtv*](## "netrc machine")
  - **VTXTVRecordings**: [*vtxtv*](## "netrc machine")
  - **VuClip**
+ - **Vupload**
  - **VVVVID**
  - **VVVVIDShow**
+ - **VyboryMos**
+ - **Vzaar**
+ - **Wakanim**
  - **Walla**
  - **WalyTV**: [*walytv*](## "netrc machine")
  - **WalyTVLive**: [*walytv*](## "netrc machine")
@@ -1641,7 +1740,9 @@
  - **washingtonpost**
  - **washingtonpost:article**
  - **wat.tv**
+ - **WatchBox**
  - **WatchESPN**
+ - **WatchIndianPorn**: Watch Indian Porn
  - **WDR**
  - **wdr:mobile**: (**Currently broken**)
  - **WDRElefant**
@@ -1669,6 +1770,7 @@
  - **whowatch**
  - **Whyp**
  - **wikimedia.org**
+ - **Willow**
  - **Wimbledon**
  - **WimTV**
  - **WinSportsVideo**
@@ -1693,6 +1795,7 @@
  - **wykop:post**
  - **wykop:​post:comment**
  - **Xanimu**
+ - **XBef**
  - **XboxClips**
  - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, WolfStream, XVideoSharing
  - **XHamster**
@@ -1704,6 +1807,9 @@
  - **XMinus**
  - **XNXX**
  - **Xstream**
+ - **XTube**
+ - **XTubeUser**: XTube user profile
+ - **Xuite**: 隨意窩Xuite影音
  - **XVideos**
  - **xvideos:quickies**
  - **XXXYMovies**
@@ -1720,7 +1826,10 @@
  - **YapFiles**
  - **Yappy**
  - **YappyProfile**
+ - **YesJapan**
+ - **yinyuetai:video**: 音悦Tai
  - **YleAreena**
+ - **Ynet**
  - **YouJizz**
  - **youku**: 优酷
  - **youku:show**
@@ -1768,9 +1877,6 @@
  - **zingmp3:chart-home**
  - **zingmp3:chart-music-video**
  - **zingmp3:hub**
- - **zingmp3:liveradio**
- - **zingmp3:podcast**
- - **zingmp3:podcast-episode**
  - **zingmp3:user**
  - **zingmp3:week-chart**
  - **zoom**

yt_dlp/__init__.py

@@ -73,14 +73,16 @@ def _exit(status=0, *args):
 
 
 def get_urls(urls, batchfile, verbose):
-    # Batch file verification
+    """
+    @param verbose      -1: quiet, 0: normal, 1: verbose
+    """
     batch_urls = []
     if batchfile is not None:
         try:
             batch_urls = read_batch_urls(
-                read_stdin('URLs') if batchfile == '-'
+                read_stdin(None if verbose == -1 else 'URLs') if batchfile == '-'
                 else open(expand_path(batchfile), encoding='utf-8', errors='ignore'))
-            if verbose:
+            if verbose == 1:
                 write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
         except OSError:
             _exit(f'ERROR: batch file {batchfile} could not be read')
@@ -721,7 +723,7 @@ ParsedOptions = collections.namedtuple('ParsedOptions', ('parser', 'options', 'u
 def parse_options(argv=None):
     """@returns ParsedOptions(parser, opts, urls, ydl_opts)"""
     parser, opts, urls = parseOpts(argv)
-    urls = get_urls(urls, opts.batchfile, opts.verbose)
+    urls = get_urls(urls, opts.batchfile, -1 if opts.quiet and not opts.verbose else opts.verbose)
 
     set_compat_opts(opts)
     try:

yt_dlp/extractor/_extractors.py

@@ -278,7 +278,6 @@ from .businessinsider import BusinessInsiderIE
 from .bundesliga import BundesligaIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
-from .c13cl import C13ClIE
 from .c56 import C56IE
 from .cableav import CableAVIE
 from .callin import CallinIE
@@ -1644,7 +1643,7 @@ from .rumble import (
     RumbleIE,
     RumbleChannelIE,
 )
-from .rudovideo import RudoVideoIE
+from .rudovideo import RudoVideoLiveIE
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,

yt_dlp/extractor/c13cl.py

@@ -1,13 +0,0 @@
-from .common import InfoExtractor
-
-
-class C13ClIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?13\.cl/en-vivo'
-
-    def _real_extract(self, url):
-        display_id = 'C13'
-        webpage = self._download_webpage(url, display_id)
-
-        stream_url = self._search_regex(r'<div\s+.*id=(?:"|\')player(?:"|\')[^>]+><iframe\s+.*src=(?:"|\')([^?]+)', webpage, 'stream_url')
-
-        return self.url_result(stream_url, display_id=display_id, url_transparent=True)

yt_dlp/extractor/rudovideo.py

@@ -1,31 +1,116 @@
 from .common import InfoExtractor
-from ..utils import ExtractorError, traverse_obj
+from ..utils import ExtractorError, traverse_obj, js_to_json, update_url_query
 
 
-class RudoVideoIE(InfoExtractor):
+class RudoVideoLiveIE(InfoExtractor):
-    _VALID_URL = r'https?://rudo\.video/live/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://rudo\.video/(?P<type>live|vod|podcast)/(?P<id>[^/?]+)'
+    _EMBED_REGEX = [r'<iframe[^>]+src=[\'"](?P<url>(?:https?:)//rudo\.video/(?:live|vod|podcast)/[^\'"]+)']
+    _TESTS = [{
+        'url': 'https://rudo.video/podcast/cz2wrUy8l0o',
+        'md5': '28ed82b477708dc5e12e072da2449221',
+        'info_dict': {
+            'id': 'cz2wrUy8l0o',
+            'title': 'Diego Cabot',
+            'ext': 'mp4',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/podcast/bQkt07',
+        'md5': '36b22a9863de0f47f00fc7532a32a898',
+        'info_dict': {
+            'id': 'bQkt07',
+            'title': 'Tubular Bells',
+            'ext': 'mp4',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/vod/bN5AaJ',
+        'md5': '01324a329227e2591530ecb4f555c881',
+        'info_dict': {
+            'id': 'bN5AaJ',
+            'title': 'Ucrania 19.03',
+            'creator': 'La Tercera',
+            'ext': 'mp4',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/live/bbtv',
+        'info_dict': {
+            'id': 'bbtv',
+            'ext': 'mp4',
+            'creator': 'BioBioTV',
+            'live_status': 'is_live',
+            'title': r're:^LIVE BBTV\s\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}$',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/live/c13',
+        'info_dict': {
+            'id': 'c13',
+            'title': 'CANAL13',
+            'ext': 'mp4',
+        },
+        'skip': 'Geo-restricted to Chile',
+    }, {
+        'url': 'https://rudo.video/live/t13-13cl',
+        'info_dict': {
+            'id': 't13-13cl',
+            'title': 'T13',
+            'ext': 'mp4',
+        },
+        'skip': 'Geo-restricted to Chile',
+    }]
+
+    def get_title(self, webpage):
+        title = self._search_regex(r'var\s+titleVideo\s*=\s*[\'"]([^\'"]+)', webpage, 'title', default=None)
+        if title is None:
+            title = self._search_regex(r'<meta[^>]+property=[\'"]og:title[\'"]\s+content=[\'"]([^\'"]+)', webpage, 'title', fatal=False)
+        return title
+
+    def get_thumbnail(self, webpage):
+        thumbnail = self._search_regex(r'var\s+posterIMG\s*=\s*[\'"]([^?\'"]+)', webpage, 'thumbnail', default=None)
+        if thumbnail is None:
+            thumbnail = self._search_regex(r'<meta[^>]+property=[\'"]og:image[\'"]\s+content=[\'"]([^\'"]+)', webpage, 'thumbnail', default=None)
+        return thumbnail
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        type = self._match_valid_url(url).group('type')
         webpage = self._download_webpage(url, video_id)
 
-        if "Streaming is not available in your area." in webpage:
+        if 'Streaming is not available in your area.' in webpage:
             self.raise_geo_restricted()
 
-        stream_url = self._search_regex(r'var\s+streamURL\s*=\s*\'([^?\']+)', webpage, "streamUrl")
+        stream_url = self._search_regex(r'var\s+streamURL\s*=\s*[\'"]([^?\'"]+)', webpage, 'streamUrl', default=None)
-        token_array_string = self._search_regex(r'<script>var\s+_\$_[a-zA-Z0-9]+\s*=\s*(\[[^]]+\])', webpage, 'token_array', default=None)
+        source_url = self._search_regex(r'<source[^>]+src=[\'"]([^\'"]+)', webpage, 'sourceUrl', default=None)
-        if token_array_string:
+        youtube_url = self._search_regex(r'file:\s*[\'"]((?:https?:)//(?:www\.)?youtube.com[^\'"]+)', webpage, 'youtubeUrl', default=None)
-            token_array_string = token_array_string.replace("x", "u00")
+        if stream_url is None:
-            token_array = self._parse_json(token_array_string, video_id)
+            if source_url is not None:
+                stream_url = source_url
+            elif youtube_url is not None:
+                return self.url_result(youtube_url, display_id=video_id)
+            else:
+                raise ExtractorError('Unable to extract stream url')
+
+        title = self.get_title(webpage)
+        thumbnail = self.get_thumbnail(webpage)
+        is_live = None
+        if type == 'live':
+            is_live = True
+
+        token_array = self._search_json(r'<script>var\s+_\$_[a-zA-Z0-9]+\s*=', webpage, 'access token array', video_id,
+                                        contains_pattern=r'\[(?s:.+)\]', default=None, transform_source=js_to_json)
+        if token_array:
             if len(token_array) != 9:
                 raise ExtractorError('Couldnt get access token array', video_id=video_id)
-            access_token_webpage = self._download_webpage(token_array[0], video_id)
+            access_token = self._download_json(token_array[0], video_id, note='Downloading access token')
-            access_token = self._parse_json(access_token_webpage, video_id)
+            stream_url = update_url_query(stream_url, {'auth-token': traverse_obj(access_token, ('data', 'authToken'))})
-            if "data" not in access_token or token_array[3] not in access_token.get("data"):
-                raise ExtractorError('Couldnt get access token', video_id=video_id)
-            query_string = token_array[5] + traverse_obj(access_token, ("data", token_array[3]))
-            stream_url = f'{stream_url}{query_string}'
 
-        return self.url_result(
+        return {
-            stream_url,
+            'id': video_id,
-            display_id=video_id, url_transparent=True)
+            'title': title,
+            'formats': self._extract_m3u8_formats(stream_url, video_id, live=True),
+            'is_live': is_live,
+            'creator': self._search_regex(r'var\s+videoAuthor\s*=\s*[\'"]([^?\'"]+)', webpage, "videoAuthor", default=None),
+            'thumbnail': thumbnail,
+        }

yt_dlp/extractor/youtube.py

@@ -428,7 +428,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
         r'(?:www\.)?piped\.adminforge\.de',
         r'(?:www\.)?watch\.whatevertinfoil\.de',
         r'(?:www\.)?piped\.qdi\.fi',
-        r'(?:www\.)?piped\.video',
+        r'(?:(?:www|cf)\.)?piped\.video',
         r'(?:www\.)?piped\.aeong\.one',
         r'(?:www\.)?piped\.moomoo\.me',
         r'(?:www\.)?piped\.chauvet\.pro',

yt_dlp/utils/_utils.py

@@ -4789,8 +4789,9 @@ def parse_http_range(range):
 
 
 def read_stdin(what):
-    eof = 'Ctrl+Z' if compat_os_name == 'nt' else 'Ctrl+D'
+    if what:
-    write_string(f'Reading {what} from STDIN - EOF ({eof}) to end:\n')
+        eof = 'Ctrl+Z' if compat_os_name == 'nt' else 'Ctrl+D'
+        write_string(f'Reading {what} from STDIN - EOF ({eof}) to end:\n')
     return sys.stdin
 
 

yt_dlp/webvtt.py

@@ -95,6 +95,7 @@ _REGEX_TS = re.compile(r'''(?x)
 _REGEX_EOF = re.compile(r'\Z')
 _REGEX_NL = re.compile(r'(?:\r\n|[\r\n]|$)')
 _REGEX_BLANK = re.compile(r'(?:\r\n|[\r\n])+')
+_REGEX_OPTIONAL_WHITESPACE = re.compile(r'[ \t]*')
 
 
 def _parse_ts(ts):
@@ -285,6 +286,7 @@ class CueBlock(Block):
         m1 = parser.consume(_REGEX_TS)
         if not m1:
             return None
+        parser.consume(_REGEX_OPTIONAL_WHITESPACE)
         m2 = parser.consume(cls._REGEX_SETTINGS)
         if not parser.consume(_REGEX_NL):
             return None