From 7a5c1cfe93924351387b44919b3c0b2f66c4b883 Mon Sep 17 00:00:00 2001 From: Pccode66 <49125134+Pccode66@users.noreply.github.com> Date: Wed, 24 Feb 2021 15:45:56 -0300 Subject: [PATCH] Completely change project name to yt-dlp (#85) * All modules and binary names are changed * All documentation references changed * yt-dlp no longer loads youtube-dlc config files * All URLs changed to point to organization account Co-authored-by: Pccode66 Co-authored-by: pukkandan --- .github/ISSUE_TEMPLATE/1_broken_site.md | 12 +- .../ISSUE_TEMPLATE/2_site_support_request.md | 8 +- .../ISSUE_TEMPLATE/3_site_feature_request.md | 6 +- .github/ISSUE_TEMPLATE/4_bug_report.md | 14 +- .github/ISSUE_TEMPLATE/5_feature_request.md | 6 +- .github/ISSUE_TEMPLATE/6_question.md | 8 +- .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md | 12 +- .../2_site_support_request.md | 8 +- .../3_site_feature_request.md | 6 +- .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md | 14 +- .../ISSUE_TEMPLATE_tmpl/5_feature_request.md | 6 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/build.yml | 52 +++---- .gitignore | 8 +- Changelog.md | 12 +- MANIFEST.in | 6 +- Makefile | 86 +++++------ README.md | 134 +++++++++--------- devscripts/bash-completion.in | 4 +- devscripts/bash-completion.py | 6 +- devscripts/buildserver.py | 4 +- devscripts/check-porn.py | 4 +- devscripts/create-github-release.py | 6 +- devscripts/fish-completion.in | 2 +- devscripts/fish-completion.py | 10 +- devscripts/generate_aes_testdata.py | 4 +- devscripts/gh-pages/add-version.py | 6 +- devscripts/gh-pages/update-feed.py | 10 +- devscripts/gh-pages/update-sites.py | 6 +- devscripts/make_contributing.py | 2 +- devscripts/make_issue_template.py | 6 +- devscripts/make_lazy_extractors.py | 4 +- devscripts/make_supportedsites.py | 6 +- devscripts/prepare_manpage.py | 6 +- devscripts/release.sh | 22 +-- devscripts/show-downloads-statistics.py | 10 +- devscripts/update-version.py | 8 +- devscripts/zsh-completion.in | 6 +- devscripts/zsh-completion.py | 6 +- docs/Makefile | 8 +- docs/conf.py | 14 +- docs/index.rst | 23 +++ docs/module_guide.rst | 9 +- pyinst.py | 20 +-- setup.cfg | 2 +- setup.py | 30 ++-- test/helper.py | 10 +- test/test_InfoExtractor.py | 8 +- test/test_YoutubeDL.py | 12 +- test/test_YoutubeDLCookieJar.py | 2 +- test/test_aes.py | 4 +- test/test_age_restriction.py | 2 +- test/test_all_urls.py | 2 +- test/test_cache.py | 2 +- test/test_compat.py | 14 +- test/test_download.py | 12 +- test/test_downloader_http.py | 8 +- test/test_execution.py | 10 +- test/test_http.py | 4 +- test/test_iqiyi_sdk_interpreter.py | 2 +- test/test_jsinterp.py | 2 +- test/test_netrc.py | 2 +- test/test_options.py | 2 +- test/test_overwrites.py | 4 +- test/test_post_hooks.py | 6 +- test/test_postprocessors.py | 2 +- test/test_socks.py | 2 +- test/test_subtitles.py | 2 +- test/test_swfinterp.py | 2 +- test/test_update.py.disabled | 2 +- test/test_utils.py | 14 +- test/test_verbose_output.py | 8 +- test/test_write_annotations.py | 8 +- test/test_youtube_lists.py | 2 +- test/test_youtube_signature.py | 4 +- tox.ini | 2 +- youtube-dlc.cmd | 1 - youtube-dlc.sh | 2 - yt-dlp.cmd | 1 + yt-dlp.sh | 2 + yt-dlp.sublime-project | 18 --- {youtube_dlc => yt_dlp}/YoutubeDL.py | 12 +- {youtube_dlc => yt_dlp}/__init__.py | 4 +- {youtube_dlc => yt_dlp}/__main__.py | 8 +- {youtube_dlc => yt_dlp}/aes.py | 0 {youtube_dlc => yt_dlp}/cache.py | 2 +- {youtube_dlc => yt_dlp}/compat.py | 2 +- .../downloader/__init__.py | 0 {youtube_dlc => yt_dlp}/downloader/common.py | 2 +- {youtube_dlc => yt_dlp}/downloader/dash.py | 0 .../downloader/external.py | 0 {youtube_dlc => yt_dlp}/downloader/f4m.py | 0 .../downloader/fragment.py | 4 +- {youtube_dlc => yt_dlp}/downloader/hls.py | 0 {youtube_dlc => yt_dlp}/downloader/http.py | 0 {youtube_dlc => yt_dlp}/downloader/ism.py | 0 .../downloader/niconico.py | 0 {youtube_dlc => yt_dlp}/downloader/rtmp.py | 0 {youtube_dlc => yt_dlp}/downloader/rtsp.py | 0 .../downloader/youtube_live_chat.py | 0 {youtube_dlc => yt_dlp}/extractor/__init__.py | 0 {youtube_dlc => yt_dlp}/extractor/abc.py | 0 {youtube_dlc => yt_dlp}/extractor/abcnews.py | 0 {youtube_dlc => yt_dlp}/extractor/abcotvs.py | 0 .../extractor/academicearth.py | 0 {youtube_dlc => yt_dlp}/extractor/acast.py | 0 {youtube_dlc => yt_dlp}/extractor/adn.py | 0 .../extractor/adobeconnect.py | 0 .../extractor/adobepass.py | 0 {youtube_dlc => yt_dlp}/extractor/adobetv.py | 0 .../extractor/adultswim.py | 0 .../extractor/aenetworks.py | 0 .../extractor/afreecatv.py | 0 .../extractor/airmozilla.py | 0 .../extractor/aliexpress.py | 0 .../extractor/aljazeera.py | 0 {youtube_dlc => yt_dlp}/extractor/allocine.py | 0 .../extractor/alphaporno.py | 0 {youtube_dlc => yt_dlp}/extractor/alura.py | 0 {youtube_dlc => yt_dlp}/extractor/amara.py | 0 .../extractor/amcnetworks.py | 0 .../extractor/americastestkitchen.py | 0 {youtube_dlc => yt_dlp}/extractor/amp.py | 0 {youtube_dlc => yt_dlp}/extractor/animelab.py | 0 .../extractor/animeondemand.py | 0 {youtube_dlc => yt_dlp}/extractor/anvato.py | 2 +- .../anvato_token_generator/__init__.py | 0 .../anvato_token_generator/common.py | 0 .../extractor/anvato_token_generator/nfl.py | 0 {youtube_dlc => yt_dlp}/extractor/aol.py | 0 {youtube_dlc => yt_dlp}/extractor/apa.py | 0 {youtube_dlc => yt_dlp}/extractor/aparat.py | 0 .../extractor/appleconnect.py | 0 .../extractor/applepodcasts.py | 0 .../extractor/appletrailers.py | 2 +- .../extractor/archiveorg.py | 0 .../extractor/arcpublishing.py | 0 {youtube_dlc => yt_dlp}/extractor/ard.py | 0 {youtube_dlc => yt_dlp}/extractor/arkena.py | 0 {youtube_dlc => yt_dlp}/extractor/arte.py | 0 .../extractor/asiancrush.py | 0 .../extractor/atresplayer.py | 0 .../extractor/atttechchannel.py | 0 {youtube_dlc => yt_dlp}/extractor/atvat.py | 0 .../extractor/audimedia.py | 0 .../extractor/audioboom.py | 0 .../extractor/audiomack.py | 0 {youtube_dlc => yt_dlp}/extractor/audius.py | 0 {youtube_dlc => yt_dlp}/extractor/awaan.py | 0 {youtube_dlc => yt_dlp}/extractor/aws.py | 0 {youtube_dlc => yt_dlp}/extractor/azmedien.py | 0 {youtube_dlc => yt_dlp}/extractor/baidu.py | 0 {youtube_dlc => yt_dlp}/extractor/bandcamp.py | 0 {youtube_dlc => yt_dlp}/extractor/bbc.py | 0 {youtube_dlc => yt_dlp}/extractor/beatport.py | 0 {youtube_dlc => yt_dlp}/extractor/beeg.py | 0 .../extractor/behindkink.py | 0 .../extractor/bellmedia.py | 0 {youtube_dlc => yt_dlp}/extractor/bet.py | 0 {youtube_dlc => yt_dlp}/extractor/bfi.py | 0 {youtube_dlc => yt_dlp}/extractor/bfmtv.py | 0 {youtube_dlc => yt_dlp}/extractor/bibeltv.py | 0 {youtube_dlc => yt_dlp}/extractor/bigflix.py | 0 {youtube_dlc => yt_dlp}/extractor/bild.py | 0 {youtube_dlc => yt_dlp}/extractor/bilibili.py | 2 +- .../extractor/biobiochiletv.py | 0 {youtube_dlc => yt_dlp}/extractor/biqle.py | 0 {youtube_dlc => yt_dlp}/extractor/bitchute.py | 0 {youtube_dlc => yt_dlp}/extractor/bitwave.py | 0 .../extractor/bleacherreport.py | 0 {youtube_dlc => yt_dlp}/extractor/blinkx.py | 0 .../extractor/bloomberg.py | 0 {youtube_dlc => yt_dlp}/extractor/bokecc.py | 0 .../extractor/bongacams.py | 0 .../extractor/bostonglobe.py | 0 {youtube_dlc => yt_dlp}/extractor/box.py | 0 {youtube_dlc => yt_dlp}/extractor/bpb.py | 0 {youtube_dlc => yt_dlp}/extractor/br.py | 0 {youtube_dlc => yt_dlp}/extractor/bravotv.py | 0 {youtube_dlc => yt_dlp}/extractor/breakcom.py | 0 .../extractor/brightcove.py | 0 .../extractor/businessinsider.py | 0 {youtube_dlc => yt_dlp}/extractor/buzzfeed.py | 0 {youtube_dlc => yt_dlp}/extractor/byutv.py | 0 {youtube_dlc => yt_dlp}/extractor/c56.py | 0 {youtube_dlc => yt_dlp}/extractor/camdemy.py | 0 .../extractor/cammodels.py | 0 {youtube_dlc => yt_dlp}/extractor/camtube.py | 0 .../extractor/camwithher.py | 0 {youtube_dlc => yt_dlp}/extractor/canalc2.py | 0 .../extractor/canalplus.py | 0 {youtube_dlc => yt_dlp}/extractor/canvas.py | 0 .../extractor/carambatv.py | 0 .../extractor/cartoonnetwork.py | 0 {youtube_dlc => yt_dlp}/extractor/cbc.py | 0 {youtube_dlc => yt_dlp}/extractor/cbs.py | 0 .../extractor/cbsinteractive.py | 0 {youtube_dlc => yt_dlp}/extractor/cbslocal.py | 0 {youtube_dlc => yt_dlp}/extractor/cbsnews.py | 0 .../extractor/cbssports.py | 0 {youtube_dlc => yt_dlp}/extractor/ccc.py | 0 {youtube_dlc => yt_dlp}/extractor/ccma.py | 0 {youtube_dlc => yt_dlp}/extractor/cctv.py | 0 {youtube_dlc => yt_dlp}/extractor/cda.py | 0 .../extractor/ceskatelevize.py | 0 {youtube_dlc => yt_dlp}/extractor/channel9.py | 0 .../extractor/charlierose.py | 0 .../extractor/chaturbate.py | 0 .../extractor/chilloutzone.py | 0 {youtube_dlc => yt_dlp}/extractor/chirbit.py | 0 .../extractor/cinchcast.py | 0 {youtube_dlc => yt_dlp}/extractor/cinemax.py | 0 .../extractor/ciscolive.py | 0 {youtube_dlc => yt_dlp}/extractor/cjsw.py | 0 .../extractor/cliphunter.py | 0 {youtube_dlc => yt_dlp}/extractor/clippit.py | 0 {youtube_dlc => yt_dlp}/extractor/cliprs.py | 0 .../extractor/clipsyndicate.py | 0 .../extractor/closertotruth.py | 0 .../extractor/cloudflarestream.py | 0 {youtube_dlc => yt_dlp}/extractor/cloudy.py | 0 {youtube_dlc => yt_dlp}/extractor/clubic.py | 0 {youtube_dlc => yt_dlp}/extractor/clyp.py | 0 {youtube_dlc => yt_dlp}/extractor/cmt.py | 0 {youtube_dlc => yt_dlp}/extractor/cnbc.py | 0 {youtube_dlc => yt_dlp}/extractor/cnn.py | 0 .../extractor/comedycentral.py | 0 {youtube_dlc => yt_dlp}/extractor/common.py | 4 +- .../extractor/commonmistakes.py | 4 +- .../extractor/commonprotocols.py | 0 .../extractor/condenast.py | 0 {youtube_dlc => yt_dlp}/extractor/contv.py | 0 {youtube_dlc => yt_dlp}/extractor/corus.py | 0 {youtube_dlc => yt_dlp}/extractor/coub.py | 0 {youtube_dlc => yt_dlp}/extractor/cracked.py | 0 {youtube_dlc => yt_dlp}/extractor/crackle.py | 0 .../extractor/crooksandliars.py | 0 .../extractor/crunchyroll.py | 0 {youtube_dlc => yt_dlp}/extractor/cspan.py | 0 {youtube_dlc => yt_dlp}/extractor/ctsnews.py | 0 {youtube_dlc => yt_dlp}/extractor/ctv.py | 0 {youtube_dlc => yt_dlp}/extractor/ctvnews.py | 0 .../extractor/cultureunplugged.py | 0 .../extractor/curiositystream.py | 0 {youtube_dlc => yt_dlp}/extractor/cwtv.py | 0 .../extractor/dailymail.py | 0 .../extractor/dailymotion.py | 0 {youtube_dlc => yt_dlp}/extractor/daum.py | 0 {youtube_dlc => yt_dlp}/extractor/dbtv.py | 0 {youtube_dlc => yt_dlp}/extractor/dctp.py | 0 {youtube_dlc => yt_dlp}/extractor/deezer.py | 0 {youtube_dlc => yt_dlp}/extractor/defense.py | 0 .../extractor/democracynow.py | 0 {youtube_dlc => yt_dlp}/extractor/dfb.py | 0 {youtube_dlc => yt_dlp}/extractor/dhm.py | 0 {youtube_dlc => yt_dlp}/extractor/digg.py | 0 {youtube_dlc => yt_dlp}/extractor/digiteka.py | 0 .../extractor/discovery.py | 0 .../extractor/discoverygo.py | 0 .../extractor/discoverynetworks.py | 0 .../extractor/discoveryvr.py | 0 {youtube_dlc => yt_dlp}/extractor/disney.py | 0 {youtube_dlc => yt_dlp}/extractor/dispeak.py | 0 {youtube_dlc => yt_dlp}/extractor/dlive.py | 0 .../extractor/doodstream.py | 0 {youtube_dlc => yt_dlp}/extractor/dotsub.py | 0 {youtube_dlc => yt_dlp}/extractor/douyutv.py | 0 {youtube_dlc => yt_dlp}/extractor/dplay.py | 0 .../extractor/drbonanza.py | 0 {youtube_dlc => yt_dlp}/extractor/dreisat.py | 0 {youtube_dlc => yt_dlp}/extractor/dropbox.py | 4 +- {youtube_dlc => yt_dlp}/extractor/drtuber.py | 0 {youtube_dlc => yt_dlp}/extractor/drtv.py | 0 {youtube_dlc => yt_dlp}/extractor/dtube.py | 0 {youtube_dlc => yt_dlp}/extractor/duboku.py | 0 {youtube_dlc => yt_dlp}/extractor/dumpert.py | 0 {youtube_dlc => yt_dlp}/extractor/dvtv.py | 0 {youtube_dlc => yt_dlp}/extractor/dw.py | 0 .../extractor/eagleplatform.py | 0 .../extractor/ebaumsworld.py | 0 {youtube_dlc => yt_dlp}/extractor/echomsk.py | 0 {youtube_dlc => yt_dlp}/extractor/egghead.py | 0 {youtube_dlc => yt_dlp}/extractor/ehow.py | 0 .../extractor/eighttracks.py | 22 +-- .../extractor/einthusan.py | 0 {youtube_dlc => yt_dlp}/extractor/eitb.py | 0 .../extractor/ellentube.py | 0 {youtube_dlc => yt_dlp}/extractor/elonet.py | 0 {youtube_dlc => yt_dlp}/extractor/elpais.py | 0 {youtube_dlc => yt_dlp}/extractor/embedly.py | 0 {youtube_dlc => yt_dlp}/extractor/engadget.py | 0 {youtube_dlc => yt_dlp}/extractor/eporner.py | 0 .../extractor/eroprofile.py | 0 {youtube_dlc => yt_dlp}/extractor/escapist.py | 0 {youtube_dlc => yt_dlp}/extractor/espn.py | 0 {youtube_dlc => yt_dlp}/extractor/esri.py | 0 {youtube_dlc => yt_dlp}/extractor/europa.py | 0 .../extractor/everyonesmixtape.py | 0 {youtube_dlc => yt_dlp}/extractor/expotv.py | 0 .../extractor/expressen.py | 0 .../extractor/extractors.py | 0 .../extractor/extremetube.py | 0 {youtube_dlc => yt_dlp}/extractor/eyedotv.py | 0 {youtube_dlc => yt_dlp}/extractor/facebook.py | 0 {youtube_dlc => yt_dlp}/extractor/faz.py | 0 {youtube_dlc => yt_dlp}/extractor/fc2.py | 0 {youtube_dlc => yt_dlp}/extractor/fczenit.py | 0 {youtube_dlc => yt_dlp}/extractor/filmon.py | 0 {youtube_dlc => yt_dlp}/extractor/filmweb.py | 0 {youtube_dlc => yt_dlp}/extractor/firsttv.py | 0 {youtube_dlc => yt_dlp}/extractor/fivemin.py | 0 {youtube_dlc => yt_dlp}/extractor/fivetv.py | 0 {youtube_dlc => yt_dlp}/extractor/flickr.py | 0 .../extractor/folketinget.py | 0 .../extractor/footyroom.py | 0 {youtube_dlc => yt_dlp}/extractor/formula1.py | 0 {youtube_dlc => yt_dlp}/extractor/fourtube.py | 0 {youtube_dlc => yt_dlp}/extractor/fox.py | 0 {youtube_dlc => yt_dlp}/extractor/fox9.py | 0 {youtube_dlc => yt_dlp}/extractor/foxgay.py | 0 {youtube_dlc => yt_dlp}/extractor/foxnews.py | 0 .../extractor/foxsports.py | 0 .../extractor/franceculture.py | 0 .../extractor/franceinter.py | 0 {youtube_dlc => yt_dlp}/extractor/francetv.py | 0 .../extractor/freesound.py | 0 .../extractor/freespeech.py | 0 .../extractor/freshlive.py | 0 .../extractor/frontendmasters.py | 0 {youtube_dlc => yt_dlp}/extractor/fujitv.py | 0 .../extractor/funimation.py | 0 {youtube_dlc => yt_dlp}/extractor/funk.py | 0 {youtube_dlc => yt_dlp}/extractor/fusion.py | 0 .../extractor/fxnetworks.py | 0 {youtube_dlc => yt_dlp}/extractor/gaia.py | 0 .../extractor/gameinformer.py | 0 {youtube_dlc => yt_dlp}/extractor/gamespot.py | 0 {youtube_dlc => yt_dlp}/extractor/gamestar.py | 0 {youtube_dlc => yt_dlp}/extractor/gaskrank.py | 0 {youtube_dlc => yt_dlp}/extractor/gazeta.py | 0 {youtube_dlc => yt_dlp}/extractor/gdcvault.py | 0 {youtube_dlc => yt_dlp}/extractor/gedi.py | 0 {youtube_dlc => yt_dlp}/extractor/generic.py | 10 +- {youtube_dlc => yt_dlp}/extractor/gfycat.py | 0 .../extractor/giantbomb.py | 0 {youtube_dlc => yt_dlp}/extractor/giga.py | 0 {youtube_dlc => yt_dlp}/extractor/gigya.py | 0 {youtube_dlc => yt_dlp}/extractor/glide.py | 0 {youtube_dlc => yt_dlp}/extractor/globo.py | 0 {youtube_dlc => yt_dlp}/extractor/go.py | 0 {youtube_dlc => yt_dlp}/extractor/godtube.py | 0 {youtube_dlc => yt_dlp}/extractor/golem.py | 0 .../extractor/googledrive.py | 0 .../extractor/googlepodcasts.py | 0 .../extractor/googlesearch.py | 0 {youtube_dlc => yt_dlp}/extractor/goshgay.py | 0 .../extractor/gputechconf.py | 0 {youtube_dlc => yt_dlp}/extractor/groupon.py | 0 {youtube_dlc => yt_dlp}/extractor/hbo.py | 0 .../extractor/hearthisat.py | 0 {youtube_dlc => yt_dlp}/extractor/heise.py | 0 .../extractor/hellporno.py | 0 {youtube_dlc => yt_dlp}/extractor/helsinki.py | 0 .../extractor/hentaistigma.py | 0 {youtube_dlc => yt_dlp}/extractor/hgtv.py | 0 {youtube_dlc => yt_dlp}/extractor/hidive.py | 0 .../extractor/historicfilms.py | 0 {youtube_dlc => yt_dlp}/extractor/hitbox.py | 0 .../extractor/hitrecord.py | 0 {youtube_dlc => yt_dlp}/extractor/hketv.py | 0 .../extractor/hornbunny.py | 0 .../extractor/hotnewhiphop.py | 0 {youtube_dlc => yt_dlp}/extractor/hotstar.py | 0 {youtube_dlc => yt_dlp}/extractor/howcast.py | 0 .../extractor/howstuffworks.py | 0 .../extractor/hrfensehen.py | 2 +- {youtube_dlc => yt_dlp}/extractor/hrti.py | 0 {youtube_dlc => yt_dlp}/extractor/huajiao.py | 0 {youtube_dlc => yt_dlp}/extractor/huffpost.py | 0 {youtube_dlc => yt_dlp}/extractor/hungama.py | 0 {youtube_dlc => yt_dlp}/extractor/hypem.py | 0 {youtube_dlc => yt_dlp}/extractor/ign.py | 0 {youtube_dlc => yt_dlp}/extractor/iheart.py | 0 {youtube_dlc => yt_dlp}/extractor/imdb.py | 0 .../extractor/imggaming.py | 0 {youtube_dlc => yt_dlp}/extractor/imgur.py | 4 +- {youtube_dlc => yt_dlp}/extractor/ina.py | 0 {youtube_dlc => yt_dlp}/extractor/inc.py | 0 .../extractor/indavideo.py | 0 {youtube_dlc => yt_dlp}/extractor/infoq.py | 0 .../extractor/instagram.py | 0 .../extractor/internazionale.py | 0 .../extractor/internetvideoarchive.py | 0 {youtube_dlc => yt_dlp}/extractor/iprima.py | 0 {youtube_dlc => yt_dlp}/extractor/iqiyi.py | 0 {youtube_dlc => yt_dlp}/extractor/ir90tv.py | 0 {youtube_dlc => yt_dlp}/extractor/itv.py | 0 {youtube_dlc => yt_dlp}/extractor/ivi.py | 2 +- {youtube_dlc => yt_dlp}/extractor/ivideon.py | 0 {youtube_dlc => yt_dlp}/extractor/iwara.py | 0 {youtube_dlc => yt_dlp}/extractor/izlesene.py | 0 {youtube_dlc => yt_dlp}/extractor/jamendo.py | 0 .../extractor/jeuxvideo.py | 0 {youtube_dlc => yt_dlp}/extractor/joj.py | 0 {youtube_dlc => yt_dlp}/extractor/jove.py | 0 .../extractor/jwplatform.py | 0 {youtube_dlc => yt_dlp}/extractor/kakao.py | 0 {youtube_dlc => yt_dlp}/extractor/kaltura.py | 0 .../extractor/kanalplay.py | 0 {youtube_dlc => yt_dlp}/extractor/kankan.py | 0 .../extractor/karaoketv.py | 0 .../extractor/karrierevideos.py | 0 .../extractor/keezmovies.py | 0 {youtube_dlc => yt_dlp}/extractor/ketnet.py | 0 .../extractor/khanacademy.py | 0 .../extractor/kickstarter.py | 0 {youtube_dlc => yt_dlp}/extractor/kinja.py | 0 .../extractor/kinopoisk.py | 0 .../extractor/konserthusetplay.py | 0 {youtube_dlc => yt_dlp}/extractor/krasview.py | 0 {youtube_dlc => yt_dlp}/extractor/ku6.py | 0 {youtube_dlc => yt_dlp}/extractor/kusi.py | 0 {youtube_dlc => yt_dlp}/extractor/kuwo.py | 0 {youtube_dlc => yt_dlp}/extractor/la7.py | 0 {youtube_dlc => yt_dlp}/extractor/laola1tv.py | 0 {youtube_dlc => yt_dlp}/extractor/lbry.py | 0 {youtube_dlc => yt_dlp}/extractor/lci.py | 0 {youtube_dlc => yt_dlp}/extractor/lcp.py | 0 .../extractor/lecture2go.py | 0 {youtube_dlc => yt_dlp}/extractor/lecturio.py | 0 {youtube_dlc => yt_dlp}/extractor/leeco.py | 0 {youtube_dlc => yt_dlp}/extractor/lego.py | 0 {youtube_dlc => yt_dlp}/extractor/lemonde.py | 0 {youtube_dlc => yt_dlp}/extractor/lenta.py | 0 .../extractor/libraryofcongress.py | 0 {youtube_dlc => yt_dlp}/extractor/libsyn.py | 0 {youtube_dlc => yt_dlp}/extractor/lifenews.py | 0 .../extractor/limelight.py | 0 {youtube_dlc => yt_dlp}/extractor/line.py | 0 {youtube_dlc => yt_dlp}/extractor/linkedin.py | 0 .../extractor/linuxacademy.py | 0 {youtube_dlc => yt_dlp}/extractor/litv.py | 0 .../extractor/livejournal.py | 0 {youtube_dlc => yt_dlp}/extractor/liveleak.py | 0 .../extractor/livestream.py | 0 {youtube_dlc => yt_dlp}/extractor/lnkgo.py | 0 .../extractor/localnews8.py | 0 .../extractor/lovehomeporn.py | 0 {youtube_dlc => yt_dlp}/extractor/lrt.py | 0 {youtube_dlc => yt_dlp}/extractor/lynda.py | 0 {youtube_dlc => yt_dlp}/extractor/m6.py | 0 .../extractor/magentamusik360.py | 0 {youtube_dlc => yt_dlp}/extractor/mailru.py | 0 {youtube_dlc => yt_dlp}/extractor/malltv.py | 0 .../extractor/mangomolo.py | 0 {youtube_dlc => yt_dlp}/extractor/manyvids.py | 0 {youtube_dlc => yt_dlp}/extractor/markiza.py | 0 .../extractor/massengeschmacktv.py | 0 {youtube_dlc => yt_dlp}/extractor/matchtv.py | 0 {youtube_dlc => yt_dlp}/extractor/mdr.py | 0 {youtube_dlc => yt_dlp}/extractor/medaltv.py | 0 .../extractor/medialaan.py | 0 {youtube_dlc => yt_dlp}/extractor/mediaset.py | 0 .../extractor/mediasite.py | 0 {youtube_dlc => yt_dlp}/extractor/medici.py | 0 .../extractor/megaphone.py | 0 {youtube_dlc => yt_dlp}/extractor/meipai.py | 0 {youtube_dlc => yt_dlp}/extractor/melonvod.py | 0 {youtube_dlc => yt_dlp}/extractor/meta.py | 0 {youtube_dlc => yt_dlp}/extractor/metacafe.py | 0 .../extractor/metacritic.py | 0 {youtube_dlc => yt_dlp}/extractor/mgoon.py | 0 {youtube_dlc => yt_dlp}/extractor/mgtv.py | 0 {youtube_dlc => yt_dlp}/extractor/miaopai.py | 0 .../extractor/microsoftvirtualacademy.py | 0 {youtube_dlc => yt_dlp}/extractor/mildom.py | 0 {youtube_dlc => yt_dlp}/extractor/minds.py | 0 .../extractor/ministrygrid.py | 0 {youtube_dlc => yt_dlp}/extractor/minoto.py | 0 {youtube_dlc => yt_dlp}/extractor/miomio.py | 0 {youtube_dlc => yt_dlp}/extractor/mit.py | 0 {youtube_dlc => yt_dlp}/extractor/mitele.py | 0 {youtube_dlc => yt_dlp}/extractor/mixcloud.py | 0 {youtube_dlc => yt_dlp}/extractor/mlb.py | 0 {youtube_dlc => yt_dlp}/extractor/mnet.py | 0 {youtube_dlc => yt_dlp}/extractor/moevideo.py | 0 {youtube_dlc => yt_dlp}/extractor/mofosex.py | 0 {youtube_dlc => yt_dlp}/extractor/mojvideo.py | 0 .../extractor/morningstar.py | 0 .../extractor/motherless.py | 0 .../extractor/motorsport.py | 0 .../extractor/movieclips.py | 0 .../extractor/moviezine.py | 0 .../extractor/movingimage.py | 0 {youtube_dlc => yt_dlp}/extractor/msn.py | 0 {youtube_dlc => yt_dlp}/extractor/mtv.py | 0 .../extractor/muenchentv.py | 0 {youtube_dlc => yt_dlp}/extractor/mwave.py | 0 .../extractor/mychannels.py | 0 {youtube_dlc => yt_dlp}/extractor/myspace.py | 0 {youtube_dlc => yt_dlp}/extractor/myspass.py | 0 {youtube_dlc => yt_dlp}/extractor/myvi.py | 0 .../extractor/myvideoge.py | 0 .../extractor/myvidster.py | 0 .../extractor/nationalgeographic.py | 0 {youtube_dlc => yt_dlp}/extractor/naver.py | 0 {youtube_dlc => yt_dlp}/extractor/nba.py | 0 {youtube_dlc => yt_dlp}/extractor/nbc.py | 0 {youtube_dlc => yt_dlp}/extractor/ndr.py | 0 {youtube_dlc => yt_dlp}/extractor/ndtv.py | 0 .../extractor/nerdcubed.py | 0 .../extractor/neteasemusic.py | 0 {youtube_dlc => yt_dlp}/extractor/netzkino.py | 0 .../extractor/newgrounds.py | 0 {youtube_dlc => yt_dlp}/extractor/newstube.py | 0 .../extractor/nextmedia.py | 0 {youtube_dlc => yt_dlp}/extractor/nexx.py | 0 {youtube_dlc => yt_dlp}/extractor/nfl.py | 0 {youtube_dlc => yt_dlp}/extractor/nhk.py | 0 {youtube_dlc => yt_dlp}/extractor/nhl.py | 0 {youtube_dlc => yt_dlp}/extractor/nick.py | 0 {youtube_dlc => yt_dlp}/extractor/niconico.py | 0 .../extractor/ninecninemedia.py | 0 {youtube_dlc => yt_dlp}/extractor/ninegag.py | 0 {youtube_dlc => yt_dlp}/extractor/ninenow.py | 0 {youtube_dlc => yt_dlp}/extractor/nintendo.py | 0 {youtube_dlc => yt_dlp}/extractor/nitter.py | 0 .../extractor/njpwworld.py | 0 .../extractor/nobelprize.py | 0 {youtube_dlc => yt_dlp}/extractor/noco.py | 0 {youtube_dlc => yt_dlp}/extractor/nonktube.py | 0 {youtube_dlc => yt_dlp}/extractor/noovo.py | 0 .../extractor/normalboots.py | 0 {youtube_dlc => yt_dlp}/extractor/nosvideo.py | 0 {youtube_dlc => yt_dlp}/extractor/nova.py | 0 {youtube_dlc => yt_dlp}/extractor/nowness.py | 2 +- {youtube_dlc => yt_dlp}/extractor/noz.py | 0 {youtube_dlc => yt_dlp}/extractor/npo.py | 0 {youtube_dlc => yt_dlp}/extractor/npr.py | 0 {youtube_dlc => yt_dlp}/extractor/nrk.py | 0 {youtube_dlc => yt_dlp}/extractor/nrl.py | 0 {youtube_dlc => yt_dlp}/extractor/ntvcojp.py | 0 {youtube_dlc => yt_dlp}/extractor/ntvde.py | 0 {youtube_dlc => yt_dlp}/extractor/ntvru.py | 0 {youtube_dlc => yt_dlp}/extractor/nuevo.py | 0 {youtube_dlc => yt_dlp}/extractor/nuvid.py | 0 {youtube_dlc => yt_dlp}/extractor/nytimes.py | 0 {youtube_dlc => yt_dlp}/extractor/nzz.py | 0 {youtube_dlc => yt_dlp}/extractor/odatv.py | 0 .../extractor/odnoklassniki.py | 0 .../extractor/oktoberfesttv.py | 0 {youtube_dlc => yt_dlp}/extractor/once.py | 0 .../extractor/ondemandkorea.py | 0 {youtube_dlc => yt_dlp}/extractor/onet.py | 0 .../extractor/onionstudios.py | 0 {youtube_dlc => yt_dlp}/extractor/ooyala.py | 0 {youtube_dlc => yt_dlp}/extractor/openload.py | 0 {youtube_dlc => yt_dlp}/extractor/ora.py | 0 {youtube_dlc => yt_dlp}/extractor/orf.py | 0 .../extractor/outsidetv.py | 0 {youtube_dlc => yt_dlp}/extractor/packtpub.py | 0 .../extractor/pandoratv.py | 0 .../extractor/parliamentliveuk.py | 0 {youtube_dlc => yt_dlp}/extractor/patreon.py | 0 {youtube_dlc => yt_dlp}/extractor/pbs.py | 0 .../extractor/pearvideo.py | 0 {youtube_dlc => yt_dlp}/extractor/peertube.py | 0 {youtube_dlc => yt_dlp}/extractor/people.py | 0 .../extractor/performgroup.py | 0 .../extractor/periscope.py | 0 .../extractor/philharmoniedeparis.py | 0 {youtube_dlc => yt_dlp}/extractor/phoenix.py | 0 .../extractor/photobucket.py | 0 {youtube_dlc => yt_dlp}/extractor/picarto.py | 0 {youtube_dlc => yt_dlp}/extractor/piksel.py | 0 {youtube_dlc => yt_dlp}/extractor/pinkbike.py | 0 .../extractor/pinterest.py | 0 {youtube_dlc => yt_dlp}/extractor/pladform.py | 0 {youtube_dlc => yt_dlp}/extractor/platzi.py | 0 {youtube_dlc => yt_dlp}/extractor/playfm.py | 0 .../extractor/playplustv.py | 0 {youtube_dlc => yt_dlp}/extractor/plays.py | 0 {youtube_dlc => yt_dlp}/extractor/playtvak.py | 0 {youtube_dlc => yt_dlp}/extractor/playvid.py | 0 {youtube_dlc => yt_dlp}/extractor/playwire.py | 0 .../extractor/pluralsight.py | 0 .../extractor/podomatic.py | 0 {youtube_dlc => yt_dlp}/extractor/pokemon.py | 0 .../extractor/polskieradio.py | 0 .../extractor/popcorntimes.py | 0 .../extractor/popcorntv.py | 0 {youtube_dlc => yt_dlp}/extractor/porn91.py | 0 {youtube_dlc => yt_dlp}/extractor/porncom.py | 0 {youtube_dlc => yt_dlp}/extractor/pornhd.py | 0 {youtube_dlc => yt_dlp}/extractor/pornhub.py | 0 .../extractor/pornotube.py | 0 .../extractor/pornovoisines.py | 0 {youtube_dlc => yt_dlp}/extractor/pornoxo.py | 0 {youtube_dlc => yt_dlp}/extractor/presstv.py | 0 .../extractor/prosiebensat1.py | 0 {youtube_dlc => yt_dlp}/extractor/puhutv.py | 0 {youtube_dlc => yt_dlp}/extractor/puls4.py | 0 {youtube_dlc => yt_dlp}/extractor/pyvideo.py | 0 {youtube_dlc => yt_dlp}/extractor/qqmusic.py | 0 {youtube_dlc => yt_dlp}/extractor/r7.py | 0 .../extractor/radiobremen.py | 0 .../extractor/radiocanada.py | 0 {youtube_dlc => yt_dlp}/extractor/radiode.py | 0 .../extractor/radiofrance.py | 0 .../extractor/radiojavan.py | 0 {youtube_dlc => yt_dlp}/extractor/rai.py | 0 .../extractor/raywenderlich.py | 0 .../extractor/rbmaradio.py | 0 {youtube_dlc => yt_dlp}/extractor/rcs.py | 0 {youtube_dlc => yt_dlp}/extractor/rds.py | 0 .../extractor/redbulltv.py | 0 {youtube_dlc => yt_dlp}/extractor/reddit.py | 0 {youtube_dlc => yt_dlp}/extractor/redtube.py | 0 {youtube_dlc => yt_dlp}/extractor/regiotv.py | 0 {youtube_dlc => yt_dlp}/extractor/rentv.py | 0 {youtube_dlc => yt_dlp}/extractor/restudy.py | 0 {youtube_dlc => yt_dlp}/extractor/reuters.py | 0 .../extractor/reverbnation.py | 0 {youtube_dlc => yt_dlp}/extractor/rice.py | 0 .../extractor/rmcdecouverte.py | 0 {youtube_dlc => yt_dlp}/extractor/ro220.py | 0 .../extractor/rockstargames.py | 0 .../extractor/roosterteeth.py | 0 .../extractor/rottentomatoes.py | 0 {youtube_dlc => yt_dlp}/extractor/roxwel.py | 0 {youtube_dlc => yt_dlp}/extractor/rozhlas.py | 0 {youtube_dlc => yt_dlp}/extractor/rtbf.py | 0 {youtube_dlc => yt_dlp}/extractor/rte.py | 0 {youtube_dlc => yt_dlp}/extractor/rtl2.py | 0 {youtube_dlc => yt_dlp}/extractor/rtlnl.py | 0 {youtube_dlc => yt_dlp}/extractor/rtp.py | 0 {youtube_dlc => yt_dlp}/extractor/rts.py | 0 {youtube_dlc => yt_dlp}/extractor/rtve.py | 0 {youtube_dlc => yt_dlp}/extractor/rtvnh.py | 0 {youtube_dlc => yt_dlp}/extractor/rtvs.py | 0 {youtube_dlc => yt_dlp}/extractor/ruhd.py | 0 {youtube_dlc => yt_dlp}/extractor/rumble.py | 0 {youtube_dlc => yt_dlp}/extractor/rutube.py | 0 {youtube_dlc => yt_dlp}/extractor/rutv.py | 0 {youtube_dlc => yt_dlp}/extractor/ruutu.py | 0 {youtube_dlc => yt_dlp}/extractor/ruv.py | 0 {youtube_dlc => yt_dlp}/extractor/safari.py | 0 {youtube_dlc => yt_dlp}/extractor/sapo.py | 0 {youtube_dlc => yt_dlp}/extractor/savefrom.py | 0 {youtube_dlc => yt_dlp}/extractor/sbs.py | 0 .../extractor/screencast.py | 0 .../extractor/screencastomatic.py | 0 .../extractor/scrippsnetworks.py | 0 {youtube_dlc => yt_dlp}/extractor/scte.py | 0 {youtube_dlc => yt_dlp}/extractor/seeker.py | 0 .../extractor/senateisvp.py | 0 .../extractor/sendtonews.py | 0 {youtube_dlc => yt_dlp}/extractor/servus.py | 0 .../extractor/sevenplus.py | 0 {youtube_dlc => yt_dlp}/extractor/sexu.py | 0 .../extractor/seznamzpravy.py | 0 {youtube_dlc => yt_dlp}/extractor/shahid.py | 0 {youtube_dlc => yt_dlp}/extractor/shared.py | 0 .../extractor/showroomlive.py | 0 .../extractor/simplecast.py | 0 {youtube_dlc => yt_dlp}/extractor/sina.py | 0 {youtube_dlc => yt_dlp}/extractor/sixplay.py | 0 {youtube_dlc => yt_dlp}/extractor/sky.py | 0 {youtube_dlc => yt_dlp}/extractor/skyit.py | 0 .../extractor/skylinewebcams.py | 0 .../extractor/skynewsarabia.py | 0 .../extractor/slideshare.py | 0 .../extractor/slideslive.py | 0 {youtube_dlc => yt_dlp}/extractor/slutload.py | 0 {youtube_dlc => yt_dlp}/extractor/snotr.py | 0 {youtube_dlc => yt_dlp}/extractor/sohu.py | 2 +- {youtube_dlc => yt_dlp}/extractor/sonyliv.py | 0 .../extractor/soundcloud.py | 2 +- .../extractor/soundgasm.py | 0 .../extractor/southpark.py | 0 .../extractor/spankbang.py | 0 .../extractor/spankwire.py | 0 {youtube_dlc => yt_dlp}/extractor/spiegel.py | 0 .../extractor/spiegeltv.py | 0 {youtube_dlc => yt_dlp}/extractor/spike.py | 0 {youtube_dlc => yt_dlp}/extractor/sport5.py | 0 {youtube_dlc => yt_dlp}/extractor/sportbox.py | 0 .../extractor/sportdeutschland.py | 0 {youtube_dlc => yt_dlp}/extractor/spotify.py | 0 {youtube_dlc => yt_dlp}/extractor/spreaker.py | 0 .../extractor/springboardplatform.py | 0 {youtube_dlc => yt_dlp}/extractor/sprout.py | 0 {youtube_dlc => yt_dlp}/extractor/srgssr.py | 0 .../extractor/srmediathek.py | 0 .../extractor/stanfordoc.py | 0 {youtube_dlc => yt_dlp}/extractor/steam.py | 0 {youtube_dlc => yt_dlp}/extractor/stitcher.py | 0 .../extractor/storyfire.py | 0 .../extractor/streamable.py | 0 .../extractor/streamcloud.py | 4 +- {youtube_dlc => yt_dlp}/extractor/streamcz.py | 0 .../extractor/streetvoice.py | 0 .../extractor/stretchinternet.py | 0 {youtube_dlc => yt_dlp}/extractor/stv.py | 0 {youtube_dlc => yt_dlp}/extractor/sunporno.py | 0 .../extractor/sverigesradio.py | 0 {youtube_dlc => yt_dlp}/extractor/svt.py | 0 .../extractor/swrmediathek.py | 0 {youtube_dlc => yt_dlp}/extractor/syfy.py | 0 {youtube_dlc => yt_dlp}/extractor/sztvhu.py | 0 .../extractor/tagesschau.py | 0 {youtube_dlc => yt_dlp}/extractor/tass.py | 0 .../extractor/tastytrade.py | 0 {youtube_dlc => yt_dlp}/extractor/tbs.py | 0 .../extractor/tdslifeway.py | 0 .../extractor/teachable.py | 0 .../extractor/teachertube.py | 0 .../extractor/teachingchannel.py | 0 {youtube_dlc => yt_dlp}/extractor/teamcoco.py | 0 .../extractor/teamtreehouse.py | 0 .../extractor/techtalks.py | 0 {youtube_dlc => yt_dlp}/extractor/ted.py | 0 {youtube_dlc => yt_dlp}/extractor/tele13.py | 0 {youtube_dlc => yt_dlp}/extractor/tele5.py | 0 .../extractor/telebruxelles.py | 0 .../extractor/telecinco.py | 0 .../extractor/telegraaf.py | 0 {youtube_dlc => yt_dlp}/extractor/telemb.py | 0 .../extractor/telequebec.py | 0 {youtube_dlc => yt_dlp}/extractor/teletask.py | 0 .../extractor/telewebion.py | 0 {youtube_dlc => yt_dlp}/extractor/tennistv.py | 0 {youtube_dlc => yt_dlp}/extractor/tenplay.py | 0 {youtube_dlc => yt_dlp}/extractor/testurl.py | 0 {youtube_dlc => yt_dlp}/extractor/tf1.py | 0 {youtube_dlc => yt_dlp}/extractor/tfo.py | 0 .../extractor/theintercept.py | 0 .../extractor/theplatform.py | 0 {youtube_dlc => yt_dlp}/extractor/thescene.py | 0 {youtube_dlc => yt_dlp}/extractor/thestar.py | 0 {youtube_dlc => yt_dlp}/extractor/thesun.py | 0 .../extractor/theweatherchannel.py | 0 .../extractor/thisamericanlife.py | 0 {youtube_dlc => yt_dlp}/extractor/thisav.py | 0 .../extractor/thisoldhouse.py | 0 {youtube_dlc => yt_dlp}/extractor/thisvid.py | 0 .../extractor/threeqsdn.py | 0 {youtube_dlc => yt_dlp}/extractor/tiktok.py | 0 {youtube_dlc => yt_dlp}/extractor/tinypic.py | 0 {youtube_dlc => yt_dlp}/extractor/tmz.py | 0 {youtube_dlc => yt_dlp}/extractor/tnaflix.py | 0 {youtube_dlc => yt_dlp}/extractor/toggle.py | 0 {youtube_dlc => yt_dlp}/extractor/tonline.py | 0 .../extractor/toongoggles.py | 0 {youtube_dlc => yt_dlp}/extractor/toutv.py | 0 {youtube_dlc => yt_dlp}/extractor/toypics.py | 0 .../extractor/traileraddict.py | 0 .../extractor/trilulilu.py | 0 {youtube_dlc => yt_dlp}/extractor/trovo.py | 0 .../extractor/trovolive.py | 0 {youtube_dlc => yt_dlp}/extractor/trunews.py | 0 {youtube_dlc => yt_dlp}/extractor/trutv.py | 0 {youtube_dlc => yt_dlp}/extractor/tube8.py | 0 {youtube_dlc => yt_dlp}/extractor/tubitv.py | 0 {youtube_dlc => yt_dlp}/extractor/tudou.py | 0 {youtube_dlc => yt_dlp}/extractor/tumblr.py | 0 {youtube_dlc => yt_dlp}/extractor/tunein.py | 0 {youtube_dlc => yt_dlp}/extractor/tunepk.py | 0 {youtube_dlc => yt_dlp}/extractor/turbo.py | 0 {youtube_dlc => yt_dlp}/extractor/turner.py | 0 {youtube_dlc => yt_dlp}/extractor/tv2.py | 0 {youtube_dlc => yt_dlp}/extractor/tv2dk.py | 0 {youtube_dlc => yt_dlp}/extractor/tv2hu.py | 0 {youtube_dlc => yt_dlp}/extractor/tv4.py | 0 .../extractor/tv5mondeplus.py | 0 {youtube_dlc => yt_dlp}/extractor/tv5unis.py | 0 {youtube_dlc => yt_dlp}/extractor/tva.py | 0 .../extractor/tvanouvelles.py | 0 {youtube_dlc => yt_dlp}/extractor/tvc.py | 0 {youtube_dlc => yt_dlp}/extractor/tver.py | 0 {youtube_dlc => yt_dlp}/extractor/tvigle.py | 0 {youtube_dlc => yt_dlp}/extractor/tvland.py | 0 {youtube_dlc => yt_dlp}/extractor/tvn24.py | 0 {youtube_dlc => yt_dlp}/extractor/tvnet.py | 0 {youtube_dlc => yt_dlp}/extractor/tvnoe.py | 0 {youtube_dlc => yt_dlp}/extractor/tvnow.py | 0 {youtube_dlc => yt_dlp}/extractor/tvp.py | 0 {youtube_dlc => yt_dlp}/extractor/tvplay.py | 0 {youtube_dlc => yt_dlp}/extractor/tvplayer.py | 0 {youtube_dlc => yt_dlp}/extractor/tweakers.py | 0 .../extractor/twentyfourvideo.py | 0 .../extractor/twentymin.py | 0 .../extractor/twentythreevideo.py | 0 .../extractor/twitcasting.py | 0 {youtube_dlc => yt_dlp}/extractor/twitch.py | 0 {youtube_dlc => yt_dlp}/extractor/twitter.py | 0 {youtube_dlc => yt_dlp}/extractor/udemy.py | 2 +- {youtube_dlc => yt_dlp}/extractor/udn.py | 0 {youtube_dlc => yt_dlp}/extractor/ufctv.py | 0 {youtube_dlc => yt_dlp}/extractor/uktvplay.py | 0 {youtube_dlc => yt_dlp}/extractor/umg.py | 0 {youtube_dlc => yt_dlp}/extractor/unistra.py | 0 {youtube_dlc => yt_dlp}/extractor/unity.py | 0 {youtube_dlc => yt_dlp}/extractor/uol.py | 0 {youtube_dlc => yt_dlp}/extractor/uplynk.py | 0 {youtube_dlc => yt_dlp}/extractor/urort.py | 0 {youtube_dlc => yt_dlp}/extractor/urplay.py | 0 .../extractor/usanetwork.py | 0 {youtube_dlc => yt_dlp}/extractor/usatoday.py | 0 {youtube_dlc => yt_dlp}/extractor/ustream.py | 0 {youtube_dlc => yt_dlp}/extractor/ustudio.py | 0 {youtube_dlc => yt_dlp}/extractor/varzesh3.py | 0 {youtube_dlc => yt_dlp}/extractor/vbox7.py | 0 {youtube_dlc => yt_dlp}/extractor/veehd.py | 0 {youtube_dlc => yt_dlp}/extractor/veoh.py | 0 {youtube_dlc => yt_dlp}/extractor/vesti.py | 0 {youtube_dlc => yt_dlp}/extractor/vevo.py | 0 {youtube_dlc => yt_dlp}/extractor/vgtv.py | 0 {youtube_dlc => yt_dlp}/extractor/vh1.py | 0 {youtube_dlc => yt_dlp}/extractor/vice.py | 0 {youtube_dlc => yt_dlp}/extractor/vidbit.py | 0 {youtube_dlc => yt_dlp}/extractor/viddler.py | 0 {youtube_dlc => yt_dlp}/extractor/videa.py | 0 .../extractor/videodetective.py | 0 .../extractor/videofyme.py | 0 .../extractor/videomore.py | 0 .../extractor/videopress.py | 0 {youtube_dlc => yt_dlp}/extractor/vidio.py | 0 {youtube_dlc => yt_dlp}/extractor/vidlii.py | 0 {youtube_dlc => yt_dlp}/extractor/vidme.py | 0 {youtube_dlc => yt_dlp}/extractor/vidzi.py | 2 +- {youtube_dlc => yt_dlp}/extractor/vier.py | 0 {youtube_dlc => yt_dlp}/extractor/viewlift.py | 0 {youtube_dlc => yt_dlp}/extractor/viidea.py | 0 {youtube_dlc => yt_dlp}/extractor/viki.py | 0 {youtube_dlc => yt_dlp}/extractor/vimeo.py | 2 +- {youtube_dlc => yt_dlp}/extractor/vimple.py | 0 {youtube_dlc => yt_dlp}/extractor/vine.py | 0 {youtube_dlc => yt_dlp}/extractor/viqeo.py | 0 {youtube_dlc => yt_dlp}/extractor/viu.py | 0 {youtube_dlc => yt_dlp}/extractor/vk.py | 0 {youtube_dlc => yt_dlp}/extractor/vlive.py | 0 .../extractor/vodlocker.py | 0 {youtube_dlc => yt_dlp}/extractor/vodpl.py | 0 .../extractor/vodplatform.py | 0 .../extractor/voicerepublic.py | 0 {youtube_dlc => yt_dlp}/extractor/voot.py | 0 {youtube_dlc => yt_dlp}/extractor/voxmedia.py | 0 {youtube_dlc => yt_dlp}/extractor/vrak.py | 0 {youtube_dlc => yt_dlp}/extractor/vrt.py | 0 {youtube_dlc => yt_dlp}/extractor/vrv.py | 0 {youtube_dlc => yt_dlp}/extractor/vshare.py | 0 {youtube_dlc => yt_dlp}/extractor/vtm.py | 0 {youtube_dlc => yt_dlp}/extractor/vube.py | 0 {youtube_dlc => yt_dlp}/extractor/vuclip.py | 0 {youtube_dlc => yt_dlp}/extractor/vvvvid.py | 0 .../extractor/vyborymos.py | 0 {youtube_dlc => yt_dlp}/extractor/vzaar.py | 0 {youtube_dlc => yt_dlp}/extractor/wakanim.py | 0 {youtube_dlc => yt_dlp}/extractor/walla.py | 0 .../extractor/washingtonpost.py | 0 {youtube_dlc => yt_dlp}/extractor/wat.py | 0 {youtube_dlc => yt_dlp}/extractor/watchbox.py | 0 .../extractor/watchindianporn.py | 0 {youtube_dlc => yt_dlp}/extractor/wdr.py | 0 .../extractor/webcaster.py | 0 .../extractor/webofstories.py | 0 {youtube_dlc => yt_dlp}/extractor/weibo.py | 0 {youtube_dlc => yt_dlp}/extractor/weiqitv.py | 0 {youtube_dlc => yt_dlp}/extractor/wistia.py | 0 .../extractor/worldstarhiphop.py | 0 {youtube_dlc => yt_dlp}/extractor/wsj.py | 0 {youtube_dlc => yt_dlp}/extractor/wwe.py | 0 {youtube_dlc => yt_dlp}/extractor/xbef.py | 0 .../extractor/xboxclips.py | 0 .../extractor/xfileshare.py | 0 {youtube_dlc => yt_dlp}/extractor/xhamster.py | 0 {youtube_dlc => yt_dlp}/extractor/xiami.py | 0 {youtube_dlc => yt_dlp}/extractor/ximalaya.py | 0 {youtube_dlc => yt_dlp}/extractor/xminus.py | 0 {youtube_dlc => yt_dlp}/extractor/xnxx.py | 0 {youtube_dlc => yt_dlp}/extractor/xstream.py | 0 {youtube_dlc => yt_dlp}/extractor/xtube.py | 0 {youtube_dlc => yt_dlp}/extractor/xuite.py | 0 {youtube_dlc => yt_dlp}/extractor/xvideos.py | 0 .../extractor/xxxymovies.py | 0 {youtube_dlc => yt_dlp}/extractor/yahoo.py | 0 .../extractor/yandexdisk.py | 0 .../extractor/yandexmusic.py | 4 +- .../extractor/yandexvideo.py | 0 {youtube_dlc => yt_dlp}/extractor/yapfiles.py | 0 {youtube_dlc => yt_dlp}/extractor/yesjapan.py | 0 .../extractor/yinyuetai.py | 0 {youtube_dlc => yt_dlp}/extractor/ynet.py | 0 {youtube_dlc => yt_dlp}/extractor/youjizz.py | 0 {youtube_dlc => yt_dlp}/extractor/youku.py | 0 {youtube_dlc => yt_dlp}/extractor/younow.py | 0 {youtube_dlc => yt_dlp}/extractor/youporn.py | 0 {youtube_dlc => yt_dlp}/extractor/yourporn.py | 0 .../extractor/yourupload.py | 0 {youtube_dlc => yt_dlp}/extractor/youtube.py | 0 {youtube_dlc => yt_dlp}/extractor/zapiks.py | 0 {youtube_dlc => yt_dlp}/extractor/zaq1.py | 0 {youtube_dlc => yt_dlp}/extractor/zattoo.py | 0 {youtube_dlc => yt_dlp}/extractor/zdf.py | 0 {youtube_dlc => yt_dlp}/extractor/zee5.py | 0 {youtube_dlc => yt_dlp}/extractor/zhihu.py | 0 {youtube_dlc => yt_dlp}/extractor/zingmp3.py | 0 {youtube_dlc => yt_dlp}/extractor/zoom.py | 0 {youtube_dlc => yt_dlp}/extractor/zype.py | 0 {youtube_dlc => yt_dlp}/jsinterp.py | 0 {youtube_dlc => yt_dlp}/options.py | 17 ++- .../postprocessor/__init__.py | 0 .../postprocessor/common.py | 0 .../postprocessor/embedthumbnail.py | 0 .../postprocessor/execafterdownload.py | 0 .../postprocessor/ffmpeg.py | 4 +- .../postprocessor/metadatafromfield.py | 0 .../postprocessor/movefilesafterdownload.py | 0 .../postprocessor/sponskrub.py | 0 .../postprocessor/xattrpp.py | 0 {youtube_dlc => yt_dlp}/socks.py | 0 {youtube_dlc => yt_dlp}/swfinterp.py | 0 {youtube_dlc => yt_dlp}/update.py | 26 ++-- {youtube_dlc => yt_dlp}/utils.py | 22 +-- {youtube_dlc => yt_dlp}/version.py | 0 ytdlp_plugins/extractor/sample.py | 2 +- 927 files changed, 501 insertions(+), 506 deletions(-) create mode 100644 docs/index.rst delete mode 100644 youtube-dlc.cmd delete mode 100644 youtube-dlc.sh create mode 100644 yt-dlp.cmd create mode 100644 yt-dlp.sh delete mode 100644 yt-dlp.sublime-project rename {youtube_dlc => yt_dlp}/YoutubeDL.py (99%) rename {youtube_dlc => yt_dlp}/__init__.py (99%) rename {youtube_dlc => yt_dlp}/__main__.py (73%) rename {youtube_dlc => yt_dlp}/aes.py (100%) rename {youtube_dlc => yt_dlp}/cache.py (98%) rename {youtube_dlc => yt_dlp}/compat.py (99%) rename {youtube_dlc => yt_dlp}/downloader/__init__.py (100%) rename {youtube_dlc => yt_dlp}/downloader/common.py (99%) rename {youtube_dlc => yt_dlp}/downloader/dash.py (100%) rename {youtube_dlc => yt_dlp}/downloader/external.py (100%) rename {youtube_dlc => yt_dlp}/downloader/f4m.py (100%) rename {youtube_dlc => yt_dlp}/downloader/fragment.py (98%) rename {youtube_dlc => yt_dlp}/downloader/hls.py (100%) rename {youtube_dlc => yt_dlp}/downloader/http.py (100%) rename {youtube_dlc => yt_dlp}/downloader/ism.py (100%) rename {youtube_dlc => yt_dlp}/downloader/niconico.py (100%) rename {youtube_dlc => yt_dlp}/downloader/rtmp.py (100%) rename {youtube_dlc => yt_dlp}/downloader/rtsp.py (100%) rename {youtube_dlc => yt_dlp}/downloader/youtube_live_chat.py (100%) rename {youtube_dlc => yt_dlp}/extractor/__init__.py (100%) rename {youtube_dlc => yt_dlp}/extractor/abc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/abcnews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/abcotvs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/academicearth.py (100%) rename {youtube_dlc => yt_dlp}/extractor/acast.py (100%) rename {youtube_dlc => yt_dlp}/extractor/adn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/adobeconnect.py (100%) rename {youtube_dlc => yt_dlp}/extractor/adobepass.py (100%) rename {youtube_dlc => yt_dlp}/extractor/adobetv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/adultswim.py (100%) rename {youtube_dlc => yt_dlp}/extractor/aenetworks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/afreecatv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/airmozilla.py (100%) rename {youtube_dlc => yt_dlp}/extractor/aliexpress.py (100%) rename {youtube_dlc => yt_dlp}/extractor/aljazeera.py (100%) rename {youtube_dlc => yt_dlp}/extractor/allocine.py (100%) rename {youtube_dlc => yt_dlp}/extractor/alphaporno.py (100%) rename {youtube_dlc => yt_dlp}/extractor/alura.py (100%) rename {youtube_dlc => yt_dlp}/extractor/amara.py (100%) rename {youtube_dlc => yt_dlp}/extractor/amcnetworks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/americastestkitchen.py (100%) rename {youtube_dlc => yt_dlp}/extractor/amp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/animelab.py (100%) rename {youtube_dlc => yt_dlp}/extractor/animeondemand.py (100%) rename {youtube_dlc => yt_dlp}/extractor/anvato.py (99%) rename {youtube_dlc => yt_dlp}/extractor/anvato_token_generator/__init__.py (100%) rename {youtube_dlc => yt_dlp}/extractor/anvato_token_generator/common.py (100%) rename {youtube_dlc => yt_dlp}/extractor/anvato_token_generator/nfl.py (100%) rename {youtube_dlc => yt_dlp}/extractor/aol.py (100%) rename {youtube_dlc => yt_dlp}/extractor/apa.py (100%) rename {youtube_dlc => yt_dlp}/extractor/aparat.py (100%) rename {youtube_dlc => yt_dlp}/extractor/appleconnect.py (100%) rename {youtube_dlc => yt_dlp}/extractor/applepodcasts.py (100%) rename {youtube_dlc => yt_dlp}/extractor/appletrailers.py (99%) rename {youtube_dlc => yt_dlp}/extractor/archiveorg.py (100%) rename {youtube_dlc => yt_dlp}/extractor/arcpublishing.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ard.py (100%) rename {youtube_dlc => yt_dlp}/extractor/arkena.py (100%) rename {youtube_dlc => yt_dlp}/extractor/arte.py (100%) rename {youtube_dlc => yt_dlp}/extractor/asiancrush.py (100%) rename {youtube_dlc => yt_dlp}/extractor/atresplayer.py (100%) rename {youtube_dlc => yt_dlp}/extractor/atttechchannel.py (100%) rename {youtube_dlc => yt_dlp}/extractor/atvat.py (100%) rename {youtube_dlc => yt_dlp}/extractor/audimedia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/audioboom.py (100%) rename {youtube_dlc => yt_dlp}/extractor/audiomack.py (100%) rename {youtube_dlc => yt_dlp}/extractor/audius.py (100%) rename {youtube_dlc => yt_dlp}/extractor/awaan.py (100%) rename {youtube_dlc => yt_dlp}/extractor/aws.py (100%) rename {youtube_dlc => yt_dlp}/extractor/azmedien.py (100%) rename {youtube_dlc => yt_dlp}/extractor/baidu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bandcamp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bbc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/beatport.py (100%) rename {youtube_dlc => yt_dlp}/extractor/beeg.py (100%) rename {youtube_dlc => yt_dlp}/extractor/behindkink.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bellmedia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bfi.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bfmtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bibeltv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bigflix.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bild.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bilibili.py (99%) rename {youtube_dlc => yt_dlp}/extractor/biobiochiletv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/biqle.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bitchute.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bitwave.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bleacherreport.py (100%) rename {youtube_dlc => yt_dlp}/extractor/blinkx.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bloomberg.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bokecc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bongacams.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bostonglobe.py (100%) rename {youtube_dlc => yt_dlp}/extractor/box.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bpb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/br.py (100%) rename {youtube_dlc => yt_dlp}/extractor/bravotv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/breakcom.py (100%) rename {youtube_dlc => yt_dlp}/extractor/brightcove.py (100%) rename {youtube_dlc => yt_dlp}/extractor/businessinsider.py (100%) rename {youtube_dlc => yt_dlp}/extractor/buzzfeed.py (100%) rename {youtube_dlc => yt_dlp}/extractor/byutv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/c56.py (100%) rename {youtube_dlc => yt_dlp}/extractor/camdemy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cammodels.py (100%) rename {youtube_dlc => yt_dlp}/extractor/camtube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/camwithher.py (100%) rename {youtube_dlc => yt_dlp}/extractor/canalc2.py (100%) rename {youtube_dlc => yt_dlp}/extractor/canalplus.py (100%) rename {youtube_dlc => yt_dlp}/extractor/canvas.py (100%) rename {youtube_dlc => yt_dlp}/extractor/carambatv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cartoonnetwork.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cbc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cbs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cbsinteractive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cbslocal.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cbsnews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cbssports.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ccc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ccma.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cctv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cda.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ceskatelevize.py (100%) rename {youtube_dlc => yt_dlp}/extractor/channel9.py (100%) rename {youtube_dlc => yt_dlp}/extractor/charlierose.py (100%) rename {youtube_dlc => yt_dlp}/extractor/chaturbate.py (100%) rename {youtube_dlc => yt_dlp}/extractor/chilloutzone.py (100%) rename {youtube_dlc => yt_dlp}/extractor/chirbit.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cinchcast.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cinemax.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ciscolive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cjsw.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cliphunter.py (100%) rename {youtube_dlc => yt_dlp}/extractor/clippit.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cliprs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/clipsyndicate.py (100%) rename {youtube_dlc => yt_dlp}/extractor/closertotruth.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cloudflarestream.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cloudy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/clubic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/clyp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cmt.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cnbc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cnn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/comedycentral.py (100%) rename {youtube_dlc => yt_dlp}/extractor/common.py (99%) rename {youtube_dlc => yt_dlp}/extractor/commonmistakes.py (92%) rename {youtube_dlc => yt_dlp}/extractor/commonprotocols.py (100%) rename {youtube_dlc => yt_dlp}/extractor/condenast.py (100%) rename {youtube_dlc => yt_dlp}/extractor/contv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/corus.py (100%) rename {youtube_dlc => yt_dlp}/extractor/coub.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cracked.py (100%) rename {youtube_dlc => yt_dlp}/extractor/crackle.py (100%) rename {youtube_dlc => yt_dlp}/extractor/crooksandliars.py (100%) rename {youtube_dlc => yt_dlp}/extractor/crunchyroll.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cspan.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ctsnews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ctv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ctvnews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cultureunplugged.py (100%) rename {youtube_dlc => yt_dlp}/extractor/curiositystream.py (100%) rename {youtube_dlc => yt_dlp}/extractor/cwtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dailymail.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dailymotion.py (100%) rename {youtube_dlc => yt_dlp}/extractor/daum.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dbtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dctp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/deezer.py (100%) rename {youtube_dlc => yt_dlp}/extractor/defense.py (100%) rename {youtube_dlc => yt_dlp}/extractor/democracynow.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dfb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dhm.py (100%) rename {youtube_dlc => yt_dlp}/extractor/digg.py (100%) rename {youtube_dlc => yt_dlp}/extractor/digiteka.py (100%) rename {youtube_dlc => yt_dlp}/extractor/discovery.py (100%) rename {youtube_dlc => yt_dlp}/extractor/discoverygo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/discoverynetworks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/discoveryvr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/disney.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dispeak.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dlive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/doodstream.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dotsub.py (100%) rename {youtube_dlc => yt_dlp}/extractor/douyutv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/drbonanza.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dreisat.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dropbox.py (90%) rename {youtube_dlc => yt_dlp}/extractor/drtuber.py (100%) rename {youtube_dlc => yt_dlp}/extractor/drtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dtube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/duboku.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dumpert.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dvtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/dw.py (100%) rename {youtube_dlc => yt_dlp}/extractor/eagleplatform.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ebaumsworld.py (100%) rename {youtube_dlc => yt_dlp}/extractor/echomsk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/egghead.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ehow.py (100%) rename {youtube_dlc => yt_dlp}/extractor/eighttracks.py (85%) rename {youtube_dlc => yt_dlp}/extractor/einthusan.py (100%) rename {youtube_dlc => yt_dlp}/extractor/eitb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ellentube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/elonet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/elpais.py (100%) rename {youtube_dlc => yt_dlp}/extractor/embedly.py (100%) rename {youtube_dlc => yt_dlp}/extractor/engadget.py (100%) rename {youtube_dlc => yt_dlp}/extractor/eporner.py (100%) rename {youtube_dlc => yt_dlp}/extractor/eroprofile.py (100%) rename {youtube_dlc => yt_dlp}/extractor/escapist.py (100%) rename {youtube_dlc => yt_dlp}/extractor/espn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/esri.py (100%) rename {youtube_dlc => yt_dlp}/extractor/europa.py (100%) rename {youtube_dlc => yt_dlp}/extractor/everyonesmixtape.py (100%) rename {youtube_dlc => yt_dlp}/extractor/expotv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/expressen.py (100%) rename {youtube_dlc => yt_dlp}/extractor/extractors.py (100%) rename {youtube_dlc => yt_dlp}/extractor/extremetube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/eyedotv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/facebook.py (100%) rename {youtube_dlc => yt_dlp}/extractor/faz.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fc2.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fczenit.py (100%) rename {youtube_dlc => yt_dlp}/extractor/filmon.py (100%) rename {youtube_dlc => yt_dlp}/extractor/filmweb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/firsttv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fivemin.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fivetv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/flickr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/folketinget.py (100%) rename {youtube_dlc => yt_dlp}/extractor/footyroom.py (100%) rename {youtube_dlc => yt_dlp}/extractor/formula1.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fourtube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fox.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fox9.py (100%) rename {youtube_dlc => yt_dlp}/extractor/foxgay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/foxnews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/foxsports.py (100%) rename {youtube_dlc => yt_dlp}/extractor/franceculture.py (100%) rename {youtube_dlc => yt_dlp}/extractor/franceinter.py (100%) rename {youtube_dlc => yt_dlp}/extractor/francetv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/freesound.py (100%) rename {youtube_dlc => yt_dlp}/extractor/freespeech.py (100%) rename {youtube_dlc => yt_dlp}/extractor/freshlive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/frontendmasters.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fujitv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/funimation.py (100%) rename {youtube_dlc => yt_dlp}/extractor/funk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fusion.py (100%) rename {youtube_dlc => yt_dlp}/extractor/fxnetworks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gaia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gameinformer.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gamespot.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gamestar.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gaskrank.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gazeta.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gdcvault.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gedi.py (100%) rename {youtube_dlc => yt_dlp}/extractor/generic.py (99%) rename {youtube_dlc => yt_dlp}/extractor/gfycat.py (100%) rename {youtube_dlc => yt_dlp}/extractor/giantbomb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/giga.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gigya.py (100%) rename {youtube_dlc => yt_dlp}/extractor/glide.py (100%) rename {youtube_dlc => yt_dlp}/extractor/globo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/go.py (100%) rename {youtube_dlc => yt_dlp}/extractor/godtube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/golem.py (100%) rename {youtube_dlc => yt_dlp}/extractor/googledrive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/googlepodcasts.py (100%) rename {youtube_dlc => yt_dlp}/extractor/googlesearch.py (100%) rename {youtube_dlc => yt_dlp}/extractor/goshgay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/gputechconf.py (100%) rename {youtube_dlc => yt_dlp}/extractor/groupon.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hbo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hearthisat.py (100%) rename {youtube_dlc => yt_dlp}/extractor/heise.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hellporno.py (100%) rename {youtube_dlc => yt_dlp}/extractor/helsinki.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hentaistigma.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hgtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hidive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/historicfilms.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hitbox.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hitrecord.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hketv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hornbunny.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hotnewhiphop.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hotstar.py (100%) rename {youtube_dlc => yt_dlp}/extractor/howcast.py (100%) rename {youtube_dlc => yt_dlp}/extractor/howstuffworks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hrfensehen.py (98%) rename {youtube_dlc => yt_dlp}/extractor/hrti.py (100%) rename {youtube_dlc => yt_dlp}/extractor/huajiao.py (100%) rename {youtube_dlc => yt_dlp}/extractor/huffpost.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hungama.py (100%) rename {youtube_dlc => yt_dlp}/extractor/hypem.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ign.py (100%) rename {youtube_dlc => yt_dlp}/extractor/iheart.py (100%) rename {youtube_dlc => yt_dlp}/extractor/imdb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/imggaming.py (100%) rename {youtube_dlc => yt_dlp}/extractor/imgur.py (97%) rename {youtube_dlc => yt_dlp}/extractor/ina.py (100%) rename {youtube_dlc => yt_dlp}/extractor/inc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/indavideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/infoq.py (100%) rename {youtube_dlc => yt_dlp}/extractor/instagram.py (100%) rename {youtube_dlc => yt_dlp}/extractor/internazionale.py (100%) rename {youtube_dlc => yt_dlp}/extractor/internetvideoarchive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/iprima.py (100%) rename {youtube_dlc => yt_dlp}/extractor/iqiyi.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ir90tv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/itv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ivi.py (99%) rename {youtube_dlc => yt_dlp}/extractor/ivideon.py (100%) rename {youtube_dlc => yt_dlp}/extractor/iwara.py (100%) rename {youtube_dlc => yt_dlp}/extractor/izlesene.py (100%) rename {youtube_dlc => yt_dlp}/extractor/jamendo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/jeuxvideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/joj.py (100%) rename {youtube_dlc => yt_dlp}/extractor/jove.py (100%) rename {youtube_dlc => yt_dlp}/extractor/jwplatform.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kakao.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kaltura.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kanalplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kankan.py (100%) rename {youtube_dlc => yt_dlp}/extractor/karaoketv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/karrierevideos.py (100%) rename {youtube_dlc => yt_dlp}/extractor/keezmovies.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ketnet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/khanacademy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kickstarter.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kinja.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kinopoisk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/konserthusetplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/krasview.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ku6.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kusi.py (100%) rename {youtube_dlc => yt_dlp}/extractor/kuwo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/la7.py (100%) rename {youtube_dlc => yt_dlp}/extractor/laola1tv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lbry.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lci.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lcp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lecture2go.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lecturio.py (100%) rename {youtube_dlc => yt_dlp}/extractor/leeco.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lego.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lemonde.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lenta.py (100%) rename {youtube_dlc => yt_dlp}/extractor/libraryofcongress.py (100%) rename {youtube_dlc => yt_dlp}/extractor/libsyn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lifenews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/limelight.py (100%) rename {youtube_dlc => yt_dlp}/extractor/line.py (100%) rename {youtube_dlc => yt_dlp}/extractor/linkedin.py (100%) rename {youtube_dlc => yt_dlp}/extractor/linuxacademy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/litv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/livejournal.py (100%) rename {youtube_dlc => yt_dlp}/extractor/liveleak.py (100%) rename {youtube_dlc => yt_dlp}/extractor/livestream.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lnkgo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/localnews8.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lovehomeporn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lrt.py (100%) rename {youtube_dlc => yt_dlp}/extractor/lynda.py (100%) rename {youtube_dlc => yt_dlp}/extractor/m6.py (100%) rename {youtube_dlc => yt_dlp}/extractor/magentamusik360.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mailru.py (100%) rename {youtube_dlc => yt_dlp}/extractor/malltv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mangomolo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/manyvids.py (100%) rename {youtube_dlc => yt_dlp}/extractor/markiza.py (100%) rename {youtube_dlc => yt_dlp}/extractor/massengeschmacktv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/matchtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mdr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/medaltv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/medialaan.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mediaset.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mediasite.py (100%) rename {youtube_dlc => yt_dlp}/extractor/medici.py (100%) rename {youtube_dlc => yt_dlp}/extractor/megaphone.py (100%) rename {youtube_dlc => yt_dlp}/extractor/meipai.py (100%) rename {youtube_dlc => yt_dlp}/extractor/melonvod.py (100%) rename {youtube_dlc => yt_dlp}/extractor/meta.py (100%) rename {youtube_dlc => yt_dlp}/extractor/metacafe.py (100%) rename {youtube_dlc => yt_dlp}/extractor/metacritic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mgoon.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mgtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/miaopai.py (100%) rename {youtube_dlc => yt_dlp}/extractor/microsoftvirtualacademy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mildom.py (100%) rename {youtube_dlc => yt_dlp}/extractor/minds.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ministrygrid.py (100%) rename {youtube_dlc => yt_dlp}/extractor/minoto.py (100%) rename {youtube_dlc => yt_dlp}/extractor/miomio.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mit.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mitele.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mixcloud.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mlb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mnet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/moevideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mofosex.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mojvideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/morningstar.py (100%) rename {youtube_dlc => yt_dlp}/extractor/motherless.py (100%) rename {youtube_dlc => yt_dlp}/extractor/motorsport.py (100%) rename {youtube_dlc => yt_dlp}/extractor/movieclips.py (100%) rename {youtube_dlc => yt_dlp}/extractor/moviezine.py (100%) rename {youtube_dlc => yt_dlp}/extractor/movingimage.py (100%) rename {youtube_dlc => yt_dlp}/extractor/msn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/muenchentv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mwave.py (100%) rename {youtube_dlc => yt_dlp}/extractor/mychannels.py (100%) rename {youtube_dlc => yt_dlp}/extractor/myspace.py (100%) rename {youtube_dlc => yt_dlp}/extractor/myspass.py (100%) rename {youtube_dlc => yt_dlp}/extractor/myvi.py (100%) rename {youtube_dlc => yt_dlp}/extractor/myvideoge.py (100%) rename {youtube_dlc => yt_dlp}/extractor/myvidster.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nationalgeographic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/naver.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nba.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nbc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ndr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ndtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nerdcubed.py (100%) rename {youtube_dlc => yt_dlp}/extractor/neteasemusic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/netzkino.py (100%) rename {youtube_dlc => yt_dlp}/extractor/newgrounds.py (100%) rename {youtube_dlc => yt_dlp}/extractor/newstube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nextmedia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nexx.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nfl.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nhk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nhl.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nick.py (100%) rename {youtube_dlc => yt_dlp}/extractor/niconico.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ninecninemedia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ninegag.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ninenow.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nintendo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nitter.py (100%) rename {youtube_dlc => yt_dlp}/extractor/njpwworld.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nobelprize.py (100%) rename {youtube_dlc => yt_dlp}/extractor/noco.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nonktube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/noovo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/normalboots.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nosvideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nova.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nowness.py (98%) rename {youtube_dlc => yt_dlp}/extractor/noz.py (100%) rename {youtube_dlc => yt_dlp}/extractor/npo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/npr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nrk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nrl.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ntvcojp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ntvde.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ntvru.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nuevo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nuvid.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nytimes.py (100%) rename {youtube_dlc => yt_dlp}/extractor/nzz.py (100%) rename {youtube_dlc => yt_dlp}/extractor/odatv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/odnoklassniki.py (100%) rename {youtube_dlc => yt_dlp}/extractor/oktoberfesttv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/once.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ondemandkorea.py (100%) rename {youtube_dlc => yt_dlp}/extractor/onet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/onionstudios.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ooyala.py (100%) rename {youtube_dlc => yt_dlp}/extractor/openload.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ora.py (100%) rename {youtube_dlc => yt_dlp}/extractor/orf.py (100%) rename {youtube_dlc => yt_dlp}/extractor/outsidetv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/packtpub.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pandoratv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/parliamentliveuk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/patreon.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pbs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pearvideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/peertube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/people.py (100%) rename {youtube_dlc => yt_dlp}/extractor/performgroup.py (100%) rename {youtube_dlc => yt_dlp}/extractor/periscope.py (100%) rename {youtube_dlc => yt_dlp}/extractor/philharmoniedeparis.py (100%) rename {youtube_dlc => yt_dlp}/extractor/phoenix.py (100%) rename {youtube_dlc => yt_dlp}/extractor/photobucket.py (100%) rename {youtube_dlc => yt_dlp}/extractor/picarto.py (100%) rename {youtube_dlc => yt_dlp}/extractor/piksel.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pinkbike.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pinterest.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pladform.py (100%) rename {youtube_dlc => yt_dlp}/extractor/platzi.py (100%) rename {youtube_dlc => yt_dlp}/extractor/playfm.py (100%) rename {youtube_dlc => yt_dlp}/extractor/playplustv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/plays.py (100%) rename {youtube_dlc => yt_dlp}/extractor/playtvak.py (100%) rename {youtube_dlc => yt_dlp}/extractor/playvid.py (100%) rename {youtube_dlc => yt_dlp}/extractor/playwire.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pluralsight.py (100%) rename {youtube_dlc => yt_dlp}/extractor/podomatic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pokemon.py (100%) rename {youtube_dlc => yt_dlp}/extractor/polskieradio.py (100%) rename {youtube_dlc => yt_dlp}/extractor/popcorntimes.py (100%) rename {youtube_dlc => yt_dlp}/extractor/popcorntv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/porn91.py (100%) rename {youtube_dlc => yt_dlp}/extractor/porncom.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pornhd.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pornhub.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pornotube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pornovoisines.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pornoxo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/presstv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/prosiebensat1.py (100%) rename {youtube_dlc => yt_dlp}/extractor/puhutv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/puls4.py (100%) rename {youtube_dlc => yt_dlp}/extractor/pyvideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/qqmusic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/r7.py (100%) rename {youtube_dlc => yt_dlp}/extractor/radiobremen.py (100%) rename {youtube_dlc => yt_dlp}/extractor/radiocanada.py (100%) rename {youtube_dlc => yt_dlp}/extractor/radiode.py (100%) rename {youtube_dlc => yt_dlp}/extractor/radiofrance.py (100%) rename {youtube_dlc => yt_dlp}/extractor/radiojavan.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rai.py (100%) rename {youtube_dlc => yt_dlp}/extractor/raywenderlich.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rbmaradio.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rcs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rds.py (100%) rename {youtube_dlc => yt_dlp}/extractor/redbulltv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/reddit.py (100%) rename {youtube_dlc => yt_dlp}/extractor/redtube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/regiotv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rentv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/restudy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/reuters.py (100%) rename {youtube_dlc => yt_dlp}/extractor/reverbnation.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rice.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rmcdecouverte.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ro220.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rockstargames.py (100%) rename {youtube_dlc => yt_dlp}/extractor/roosterteeth.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rottentomatoes.py (100%) rename {youtube_dlc => yt_dlp}/extractor/roxwel.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rozhlas.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rtbf.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rte.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rtl2.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rtlnl.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rtp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rts.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rtve.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rtvnh.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rtvs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ruhd.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rumble.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rutube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/rutv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ruutu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ruv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/safari.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sapo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/savefrom.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sbs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/screencast.py (100%) rename {youtube_dlc => yt_dlp}/extractor/screencastomatic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/scrippsnetworks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/scte.py (100%) rename {youtube_dlc => yt_dlp}/extractor/seeker.py (100%) rename {youtube_dlc => yt_dlp}/extractor/senateisvp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sendtonews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/servus.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sevenplus.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sexu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/seznamzpravy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/shahid.py (100%) rename {youtube_dlc => yt_dlp}/extractor/shared.py (100%) rename {youtube_dlc => yt_dlp}/extractor/showroomlive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/simplecast.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sina.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sixplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sky.py (100%) rename {youtube_dlc => yt_dlp}/extractor/skyit.py (100%) rename {youtube_dlc => yt_dlp}/extractor/skylinewebcams.py (100%) rename {youtube_dlc => yt_dlp}/extractor/skynewsarabia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/slideshare.py (100%) rename {youtube_dlc => yt_dlp}/extractor/slideslive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/slutload.py (100%) rename {youtube_dlc => yt_dlp}/extractor/snotr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sohu.py (99%) rename {youtube_dlc => yt_dlp}/extractor/sonyliv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/soundcloud.py (99%) rename {youtube_dlc => yt_dlp}/extractor/soundgasm.py (100%) rename {youtube_dlc => yt_dlp}/extractor/southpark.py (100%) rename {youtube_dlc => yt_dlp}/extractor/spankbang.py (100%) rename {youtube_dlc => yt_dlp}/extractor/spankwire.py (100%) rename {youtube_dlc => yt_dlp}/extractor/spiegel.py (100%) rename {youtube_dlc => yt_dlp}/extractor/spiegeltv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/spike.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sport5.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sportbox.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sportdeutschland.py (100%) rename {youtube_dlc => yt_dlp}/extractor/spotify.py (100%) rename {youtube_dlc => yt_dlp}/extractor/spreaker.py (100%) rename {youtube_dlc => yt_dlp}/extractor/springboardplatform.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sprout.py (100%) rename {youtube_dlc => yt_dlp}/extractor/srgssr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/srmediathek.py (100%) rename {youtube_dlc => yt_dlp}/extractor/stanfordoc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/steam.py (100%) rename {youtube_dlc => yt_dlp}/extractor/stitcher.py (100%) rename {youtube_dlc => yt_dlp}/extractor/storyfire.py (100%) rename {youtube_dlc => yt_dlp}/extractor/streamable.py (100%) rename {youtube_dlc => yt_dlp}/extractor/streamcloud.py (93%) rename {youtube_dlc => yt_dlp}/extractor/streamcz.py (100%) rename {youtube_dlc => yt_dlp}/extractor/streetvoice.py (100%) rename {youtube_dlc => yt_dlp}/extractor/stretchinternet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/stv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sunporno.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sverigesradio.py (100%) rename {youtube_dlc => yt_dlp}/extractor/svt.py (100%) rename {youtube_dlc => yt_dlp}/extractor/swrmediathek.py (100%) rename {youtube_dlc => yt_dlp}/extractor/syfy.py (100%) rename {youtube_dlc => yt_dlp}/extractor/sztvhu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tagesschau.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tass.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tastytrade.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tbs.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tdslifeway.py (100%) rename {youtube_dlc => yt_dlp}/extractor/teachable.py (100%) rename {youtube_dlc => yt_dlp}/extractor/teachertube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/teachingchannel.py (100%) rename {youtube_dlc => yt_dlp}/extractor/teamcoco.py (100%) rename {youtube_dlc => yt_dlp}/extractor/teamtreehouse.py (100%) rename {youtube_dlc => yt_dlp}/extractor/techtalks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ted.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tele13.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tele5.py (100%) rename {youtube_dlc => yt_dlp}/extractor/telebruxelles.py (100%) rename {youtube_dlc => yt_dlp}/extractor/telecinco.py (100%) rename {youtube_dlc => yt_dlp}/extractor/telegraaf.py (100%) rename {youtube_dlc => yt_dlp}/extractor/telemb.py (100%) rename {youtube_dlc => yt_dlp}/extractor/telequebec.py (100%) rename {youtube_dlc => yt_dlp}/extractor/teletask.py (100%) rename {youtube_dlc => yt_dlp}/extractor/telewebion.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tennistv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tenplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/testurl.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tf1.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tfo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/theintercept.py (100%) rename {youtube_dlc => yt_dlp}/extractor/theplatform.py (100%) rename {youtube_dlc => yt_dlp}/extractor/thescene.py (100%) rename {youtube_dlc => yt_dlp}/extractor/thestar.py (100%) rename {youtube_dlc => yt_dlp}/extractor/thesun.py (100%) rename {youtube_dlc => yt_dlp}/extractor/theweatherchannel.py (100%) rename {youtube_dlc => yt_dlp}/extractor/thisamericanlife.py (100%) rename {youtube_dlc => yt_dlp}/extractor/thisav.py (100%) rename {youtube_dlc => yt_dlp}/extractor/thisoldhouse.py (100%) rename {youtube_dlc => yt_dlp}/extractor/thisvid.py (100%) rename {youtube_dlc => yt_dlp}/extractor/threeqsdn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tiktok.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tinypic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tmz.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tnaflix.py (100%) rename {youtube_dlc => yt_dlp}/extractor/toggle.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tonline.py (100%) rename {youtube_dlc => yt_dlp}/extractor/toongoggles.py (100%) rename {youtube_dlc => yt_dlp}/extractor/toutv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/toypics.py (100%) rename {youtube_dlc => yt_dlp}/extractor/traileraddict.py (100%) rename {youtube_dlc => yt_dlp}/extractor/trilulilu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/trovo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/trovolive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/trunews.py (100%) rename {youtube_dlc => yt_dlp}/extractor/trutv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tube8.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tubitv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tudou.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tumblr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tunein.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tunepk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/turbo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/turner.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tv2.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tv2dk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tv2hu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tv4.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tv5mondeplus.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tv5unis.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tva.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvanouvelles.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvc.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tver.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvigle.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvland.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvn24.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvnet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvnoe.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvnow.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvp.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tvplayer.py (100%) rename {youtube_dlc => yt_dlp}/extractor/tweakers.py (100%) rename {youtube_dlc => yt_dlp}/extractor/twentyfourvideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/twentymin.py (100%) rename {youtube_dlc => yt_dlp}/extractor/twentythreevideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/twitcasting.py (100%) rename {youtube_dlc => yt_dlp}/extractor/twitch.py (100%) rename {youtube_dlc => yt_dlp}/extractor/twitter.py (100%) rename {youtube_dlc => yt_dlp}/extractor/udemy.py (99%) rename {youtube_dlc => yt_dlp}/extractor/udn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ufctv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/uktvplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/umg.py (100%) rename {youtube_dlc => yt_dlp}/extractor/unistra.py (100%) rename {youtube_dlc => yt_dlp}/extractor/unity.py (100%) rename {youtube_dlc => yt_dlp}/extractor/uol.py (100%) rename {youtube_dlc => yt_dlp}/extractor/uplynk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/urort.py (100%) rename {youtube_dlc => yt_dlp}/extractor/urplay.py (100%) rename {youtube_dlc => yt_dlp}/extractor/usanetwork.py (100%) rename {youtube_dlc => yt_dlp}/extractor/usatoday.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ustream.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ustudio.py (100%) rename {youtube_dlc => yt_dlp}/extractor/varzesh3.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vbox7.py (100%) rename {youtube_dlc => yt_dlp}/extractor/veehd.py (100%) rename {youtube_dlc => yt_dlp}/extractor/veoh.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vesti.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vevo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vgtv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vh1.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vice.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vidbit.py (100%) rename {youtube_dlc => yt_dlp}/extractor/viddler.py (100%) rename {youtube_dlc => yt_dlp}/extractor/videa.py (100%) rename {youtube_dlc => yt_dlp}/extractor/videodetective.py (100%) rename {youtube_dlc => yt_dlp}/extractor/videofyme.py (100%) rename {youtube_dlc => yt_dlp}/extractor/videomore.py (100%) rename {youtube_dlc => yt_dlp}/extractor/videopress.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vidio.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vidlii.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vidme.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vidzi.py (96%) rename {youtube_dlc => yt_dlp}/extractor/vier.py (100%) rename {youtube_dlc => yt_dlp}/extractor/viewlift.py (100%) rename {youtube_dlc => yt_dlp}/extractor/viidea.py (100%) rename {youtube_dlc => yt_dlp}/extractor/viki.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vimeo.py (99%) rename {youtube_dlc => yt_dlp}/extractor/vimple.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vine.py (100%) rename {youtube_dlc => yt_dlp}/extractor/viqeo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/viu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vlive.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vodlocker.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vodpl.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vodplatform.py (100%) rename {youtube_dlc => yt_dlp}/extractor/voicerepublic.py (100%) rename {youtube_dlc => yt_dlp}/extractor/voot.py (100%) rename {youtube_dlc => yt_dlp}/extractor/voxmedia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vrak.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vrt.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vrv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vshare.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vtm.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vuclip.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vvvvid.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vyborymos.py (100%) rename {youtube_dlc => yt_dlp}/extractor/vzaar.py (100%) rename {youtube_dlc => yt_dlp}/extractor/wakanim.py (100%) rename {youtube_dlc => yt_dlp}/extractor/walla.py (100%) rename {youtube_dlc => yt_dlp}/extractor/washingtonpost.py (100%) rename {youtube_dlc => yt_dlp}/extractor/wat.py (100%) rename {youtube_dlc => yt_dlp}/extractor/watchbox.py (100%) rename {youtube_dlc => yt_dlp}/extractor/watchindianporn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/wdr.py (100%) rename {youtube_dlc => yt_dlp}/extractor/webcaster.py (100%) rename {youtube_dlc => yt_dlp}/extractor/webofstories.py (100%) rename {youtube_dlc => yt_dlp}/extractor/weibo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/weiqitv.py (100%) rename {youtube_dlc => yt_dlp}/extractor/wistia.py (100%) rename {youtube_dlc => yt_dlp}/extractor/worldstarhiphop.py (100%) rename {youtube_dlc => yt_dlp}/extractor/wsj.py (100%) rename {youtube_dlc => yt_dlp}/extractor/wwe.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xbef.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xboxclips.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xfileshare.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xhamster.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xiami.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ximalaya.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xminus.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xnxx.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xstream.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xtube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xuite.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xvideos.py (100%) rename {youtube_dlc => yt_dlp}/extractor/xxxymovies.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yahoo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yandexdisk.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yandexmusic.py (99%) rename {youtube_dlc => yt_dlp}/extractor/yandexvideo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yapfiles.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yesjapan.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yinyuetai.py (100%) rename {youtube_dlc => yt_dlp}/extractor/ynet.py (100%) rename {youtube_dlc => yt_dlp}/extractor/youjizz.py (100%) rename {youtube_dlc => yt_dlp}/extractor/youku.py (100%) rename {youtube_dlc => yt_dlp}/extractor/younow.py (100%) rename {youtube_dlc => yt_dlp}/extractor/youporn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yourporn.py (100%) rename {youtube_dlc => yt_dlp}/extractor/yourupload.py (100%) rename {youtube_dlc => yt_dlp}/extractor/youtube.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zapiks.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zaq1.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zattoo.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zdf.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zee5.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zhihu.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zingmp3.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zoom.py (100%) rename {youtube_dlc => yt_dlp}/extractor/zype.py (100%) rename {youtube_dlc => yt_dlp}/jsinterp.py (100%) rename {youtube_dlc => yt_dlp}/options.py (98%) rename {youtube_dlc => yt_dlp}/postprocessor/__init__.py (100%) rename {youtube_dlc => yt_dlp}/postprocessor/common.py (100%) rename {youtube_dlc => yt_dlp}/postprocessor/embedthumbnail.py (100%) rename {youtube_dlc => yt_dlp}/postprocessor/execafterdownload.py (100%) rename {youtube_dlc => yt_dlp}/postprocessor/ffmpeg.py (99%) rename {youtube_dlc => yt_dlp}/postprocessor/metadatafromfield.py (100%) rename {youtube_dlc => yt_dlp}/postprocessor/movefilesafterdownload.py (100%) rename {youtube_dlc => yt_dlp}/postprocessor/sponskrub.py (100%) rename {youtube_dlc => yt_dlp}/postprocessor/xattrpp.py (100%) rename {youtube_dlc => yt_dlp}/socks.py (100%) rename {youtube_dlc => yt_dlp}/swfinterp.py (100%) rename {youtube_dlc => yt_dlp}/update.py (88%) rename {youtube_dlc => yt_dlp}/utils.py (99%) rename {youtube_dlc => yt_dlp}/version.py (100%) diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md index 3dbc8b43e8..4966cbe649 100644 --- a/.github/ISSUE_TEMPLATE/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE/1_broken_site.md @@ -20,11 +20,11 @@ assignees: '' ## Checklist @@ -38,8 +38,8 @@ Carefully read and work through this check list in order to prevent the most com ## Verbose log diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md index 651d275148..19bdafce64 100644 --- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -20,9 +20,9 @@ assignees: '' ## Checklist diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md index 3c8858def7..e7d7c919ef 100644 --- a/.github/ISSUE_TEMPLATE/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE/4_bug_report.md @@ -20,12 +20,12 @@ assignees: '' ## Checklist @@ -40,8 +40,8 @@ Carefully read and work through this check list in order to prevent the most com ## Verbose log diff --git a/.github/ISSUE_TEMPLATE/6_question.md b/.github/ISSUE_TEMPLATE/6_question.md index da82dcd2c7..dd2857c092 100644 --- a/.github/ISSUE_TEMPLATE/6_question.md +++ b/.github/ISSUE_TEMPLATE/6_question.md @@ -20,9 +20,9 @@ assignees: '' ## Checklist @@ -34,7 +34,7 @@ Carefully read and work through this check list in order to prevent the most com ## Question WRITE QUESTION HERE diff --git a/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md b/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md index 563011ec11..9d346d1622 100644 --- a/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md +++ b/.github/ISSUE_TEMPLATE_tmpl/1_broken_site.md @@ -20,11 +20,11 @@ assignees: '' ## Checklist @@ -38,8 +38,8 @@ Carefully read and work through this check list in order to prevent the most com ## Verbose log diff --git a/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md b/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md index 8e8c61321f..d74b6e279f 100644 --- a/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md +++ b/.github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md @@ -20,9 +20,9 @@ assignees: '' ## Checklist diff --git a/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md b/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md index e029bc064b..043489941d 100644 --- a/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md +++ b/.github/ISSUE_TEMPLATE_tmpl/4_bug_report.md @@ -20,12 +20,12 @@ assignees: '' ## Checklist @@ -40,8 +40,8 @@ Carefully read and work through this check list in order to prevent the most com ## Verbose log diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index eb30253eed..f711701cb6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,7 +8,7 @@ ### Before submitting a *pull request* make sure you have: - [ ] At least skimmed through [adding new extractor tutorial](https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site) and [youtube-dl coding conventions](https://github.com/ytdl-org/youtube-dl#youtube-dl-coding-conventions) sections -- [ ] [Searched](https://github.com/pukkandan/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests +- [ ] [Searched](https://github.com/yt-dlp/yt-dlp/search?q=is%3Apr&type=Issues) the bugtracker for similar pull requests - [ ] Checked the code with [flake8](https://pypi.python.org/pypi/flake8) ### In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under [Unlicense](http://unlicense.org/). Check one of the following options: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58a72c9e51..48dfbafd32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest outputs: - ytdlc_version: ${{ steps.bump_version.outputs.ytdlc_version }} + ytdlp_version: ${{ steps.bump_version.outputs.ytdlp_version }} upload_url: ${{ steps.create_release.outputs.upload_url }} sha2_unix: ${{ steps.sha2_file.outputs.sha2_unix }} @@ -27,7 +27,7 @@ jobs: id: bump_version run: python devscripts/update-version.py - name: Print version - run: echo "${{ steps.bump_version.outputs.ytdlc_version }}" + run: echo "${{ steps.bump_version.outputs.ytdlp_version }}" - name: Run Make run: make - name: Create Release @@ -36,26 +36,26 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.bump_version.outputs.ytdlc_version }} - release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlc_version }} + tag_name: ${{ steps.bump_version.outputs.ytdlp_version }} + release_name: yt-dlp ${{ steps.bump_version.outputs.ytdlp_version }} body: | Changelog: PLACEHOLDER draft: false prerelease: false - - name: Upload youtube-dlc Unix binary + - name: Upload yt-dlp Unix binary id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./youtube-dlc - asset_name: youtube-dlc + asset_path: ./yt-dlp + asset_name: yt-dlp asset_content_type: application/octet-stream - - name: Get SHA2-256SUMS for youtube-dlc + - name: Get SHA2-256SUMS for yt-dlp id: sha2_file - run: echo "::set-output name=sha2_unix::$(sha256sum youtube-dlc | awk '{print $1}')" + run: echo "::set-output name=sha2_unix::$(sha256sum yt-dlp | awk '{print $1}')" - name: Install dependencies for pypi env: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} @@ -96,22 +96,22 @@ jobs: id: bump_version run: python devscripts/update-version.py - name: Print version - run: echo "${{ steps.bump_version.outputs.ytdlc_version }}" + run: echo "${{ steps.bump_version.outputs.ytdlp_version }}" - name: Run PyInstaller Script run: python pyinst.py 64 - - name: Upload youtube-dlc.exe Windows binary + - name: Upload yt-dlp.exe Windows binary id: upload-release-windows uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.build_unix.outputs.upload_url }} - asset_path: ./dist/youtube-dlc.exe - asset_name: youtube-dlc.exe + asset_path: ./dist/yt-dlp.exe + asset_name: yt-dlp.exe asset_content_type: application/vnd.microsoft.portable-executable - - name: Get SHA2-256SUMS for youtube-dlc.exe + - name: Get SHA2-256SUMS for yt-dlp.exe id: sha2_file_win - run: echo "::set-output name=sha2_windows::$((Get-FileHash dist\youtube-dlc.exe -Algorithm SHA256).Hash.ToLower())" + run: echo "::set-output name=sha2_windows::$((Get-FileHash dist\yt-dlp.exe -Algorithm SHA256).Hash.ToLower())" build_windows32: @@ -137,33 +137,33 @@ jobs: id: bump_version run: python devscripts/update-version.py - name: Print version - run: echo "${{ steps.bump_version.outputs.ytdlc_version }}" + run: echo "${{ steps.bump_version.outputs.ytdlp_version }}" - name: Run PyInstaller Script for 32 Bit run: python pyinst.py 32 - - name: Upload Executable youtube-dlc_x86.exe + - name: Upload Executable yt-dlp_x86.exe id: upload-release-windows32 uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.build_unix.outputs.upload_url }} - asset_path: ./dist/youtube-dlc_x86.exe - asset_name: youtube-dlc_x86.exe + asset_path: ./dist/yt-dlp_x86.exe + asset_name: yt-dlp_x86.exe asset_content_type: application/vnd.microsoft.portable-executable - - name: Get SHA2-256SUMS for youtube-dlc_x86.exe + - name: Get SHA2-256SUMS for yt-dlp_x86.exe id: sha2_file_win32 - run: echo "::set-output name=sha2_windows32::$((Get-FileHash dist\youtube-dlc_x86.exe -Algorithm SHA256).Hash.ToLower())" + run: echo "::set-output name=sha2_windows32::$((Get-FileHash dist\yt-dlp_x86.exe -Algorithm SHA256).Hash.ToLower())" - name: Make SHA2-256SUMS file env: SHA2_WINDOWS: ${{ needs.build_windows.outputs.sha2_windows }} SHA2_WINDOWS32: ${{ steps.sha2_file_win32.outputs.sha2_windows32 }} SHA2_UNIX: ${{ needs.build_unix.outputs.sha2_unix }} - YTDLC_VERSION: ${{ needs.build_unix.outputs.ytdlc_version }} + YTDLP_VERSION: ${{ needs.build_unix.outputs.ytdlp_version }} run: | - echo "version:${env:YTDLC_VERSION}" >> SHA2-256SUMS - echo "youtube-dlc.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS - echo "youtube-dlc_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS - echo "youtube-dlc:${env:SHA2_UNIX}" >> SHA2-256SUMS + echo "version:${env:YTDLP_VERSION}" >> SHA2-256SUMS + echo "yt-dlp.exe:${env:SHA2_WINDOWS}" >> SHA2-256SUMS + echo "yt-dlp_x86.exe:${env:SHA2_WINDOWS32}" >> SHA2-256SUMS + echo "yt-dlp:${env:SHA2_UNIX}" >> SHA2-256SUMS - name: Upload 256SUMS file id: upload-sums diff --git a/.gitignore b/.gitignore index 3d53934327..de401472f9 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ README.txt # Binary youtube-dl youtube-dlc -youtube-dlc.zip +yt-dlp.zip *.exe # Downloaded @@ -82,9 +82,7 @@ cookies.txt .idea *.iml .vscode -*.sublime-workspace -*.sublime-project -!yt-dlp.sublime-project +*.sublime-* # Lazy extractors */extractor/lazy_extractors.py @@ -92,4 +90,4 @@ cookies.txt # Plugins ytdlp_plugins/extractor/* !ytdlp_plugins/extractor/__init__.py -!ytdlp_plugins/extractor/sample.py \ No newline at end of file +!ytdlp_plugins/extractor/sample.py diff --git a/Changelog.md b/Changelog.md index 9114f4cd22..51da29c60c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -141,12 +141,12 @@ ### 2021.01.24 * **Merge youtube-dl:** Upto [2021.01.24](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16) -* Plugin support ([documentation](https://github.com/pukkandan/yt-dlp#plugins)) +* Plugin support ([documentation](https://github.com/yt-dlp/yt-dlp#plugins)) * **Multiple paths**: New option `-P`/`--paths` to give different paths for different types of files - * The syntax is `-P "type:path" -P "type:path"` ([documentation](https://github.com/pukkandan/yt-dlp#:~:text=-P,%20--paths%20TYPE:PATH)) + * The syntax is `-P "type:path" -P "type:path"` ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=-P,%20--paths%20TYPE:PATH)) * Valid types are: home, temp, description, annotation, subtitle, infojson, thumbnail - * Additionally, configuration file is taken from home directory or current directory ([documentation](https://github.com/pukkandan/yt-dlp#:~:text=Home%20Configuration)) -* Allow passing different arguments to different external downloaders ([documentation](https://github.com/pukkandan/yt-dlp#:~:text=--downloader-args%20NAME:ARGS)) + * Additionally, configuration file is taken from home directory or current directory ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=Home%20Configuration)) +* Allow passing different arguments to different external downloaders ([documentation](https://github.com/yt-dlp/yt-dlp#:~:text=--downloader-args%20NAME:ARGS)) * [mildom] Add extractor by [nao20010128nao](https://github.com/nao20010128nao) * Warn when using old style `--external-downloader-args` and `--post-processor-args` * Fix `--no-overwrite` when using `--write-link` @@ -172,7 +172,7 @@ * **Merge youtube-dl:** Upto [2021.01.16](https://github.com/ytdl-org/youtube-dl/releases/tag/2021.01.16) * **Configuration files:** * Portable configuration file: `./yt-dlp.conf` - * Allow the configuration files to be named `yt-dlp` instead of `youtube-dlc`. See [this](https://github.com/pukkandan/yt-dlp#configuration) for details + * Allow the configuration files to be named `yt-dlp` instead of `youtube-dlc`. See [this](https://github.com/yt-dlp/yt-dlp#configuration) for details * Add PyPI release @@ -181,7 +181,7 @@ * [roosterteeth.com] Fix for bonus episodes by [Zocker1999NET](https://github.com/Zocker1999NET) * [tiktok] Fix for when share_info is empty * [EmbedThumbnail] Fix bug due to incorrect function name -* [documentation] Changed sponskrub links to point to [pukkandan/sponskrub](https://github.com/pukkandan/SponSkrub) since I am now providing both linux and windows releases +* [documentation] Changed sponskrub links to point to [yt-dlp/SponSkrub](https://github.com/yt-dlp/SponSkrub) since I am now providing both linux and windows releases * [documentation] Change all links to correctly point to new fork URL * [documentation] Fixes typos diff --git a/MANIFEST.in b/MANIFEST.in index d2cce9a1cc..480b5c7006 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,8 +2,8 @@ include README.md include LICENSE include AUTHORS include ChangeLog -include youtube-dlc.bash-completion -include youtube-dlc.fish -include youtube-dlc.1 +include yt-dlp.bash-completion +include yt-dlp.fish +include yt-dlp.1 recursive-include docs Makefile conf.py *.rst recursive-include test * diff --git a/Makefile b/Makefile index f5390c46db..b27f6e6958 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -all: youtube-dlc doc man +all: yt-dlp doc man doc: README.md CONTRIBUTING.md issuetemplates supportedsites -man: README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish +man: README.txt yt-dlp.1 yt-dlp.bash-completion yt-dlp.zsh yt-dlp.fish clean: - rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.spec *.frag *.frag.urls *.frag.aria2 CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe + rm -rf yt-dlp.1.temp.md yt-dlp.1 yt-dlp.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ yt-dlp.tar.gz yt-dlp.zsh yt-dlp.fish yt_dlp/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png *.spec *.frag *.frag.urls *.frag.aria2 CONTRIBUTING.md.tmp yt-dlp yt-dlp.exe find . -name "*.pyc" -delete find . -name "*.class" -delete @@ -21,23 +21,23 @@ SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then ech # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2 MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi) -install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish +install: yt-dlp yt-dlp.1 yt-dlp.bash-completion yt-dlp.zsh yt-dlp.fish install -d $(DESTDIR)$(BINDIR) - install -m 755 youtube-dlc $(DESTDIR)$(BINDIR) + install -m 755 yt-dlp $(DESTDIR)$(BINDIR) install -d $(DESTDIR)$(MANDIR)/man1 - install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1 + install -m 644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1 install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d - install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc + install -m 644 yt-dlp.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/yt-dlp install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions - install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc + install -m 644 yt-dlp.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions - install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish + install -m 644 yt-dlp.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/yt-dlp.fish codetest: flake8 . test: - #nosetests --with-coverage --cover-package=youtube_dlc --cover-html --verbose --processes 4 test + #nosetests --with-coverage --cover-package=yt_dlp --cover-html --verbose --processes 4 test nosetests --verbose test $(MAKE) codetest @@ -57,34 +57,34 @@ offlinetest: codetest --exclude test_youtube_signature.py \ --exclude test_post_hooks.py -tar: youtube-dlc.tar.gz +tar: yt-dlp.tar.gz .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites -pypi-files: youtube-dlc.bash-completion README.txt youtube-dlc.1 youtube-dlc.fish +pypi-files: yt-dlp.bash-completion README.txt yt-dlp.1 yt-dlp.fish -youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py +yt-dlp: yt_dlp/*.py yt_dlp/*/*.py mkdir -p zip - for d in youtube_dlc youtube_dlc/downloader youtube_dlc/extractor youtube_dlc/postprocessor ; do \ + for d in yt_dlp yt_dlp/downloader yt_dlp/extractor yt_dlp/postprocessor ; do \ mkdir -p zip/$$d ;\ cp -pPR $$d/*.py zip/$$d/ ;\ done - touch -t 200001010101 zip/youtube_dlc/*.py zip/youtube_dlc/*/*.py - mv zip/youtube_dlc/__main__.py zip/ - cd zip ; zip -q ../youtube-dlc youtube_dlc/*.py youtube_dlc/*/*.py __main__.py + touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py + mv zip/yt_dlp/__main__.py zip/ + cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py rm -rf zip - echo '#!$(PYTHON)' > youtube-dlc - cat youtube-dlc.zip >> youtube-dlc - rm youtube-dlc.zip - chmod a+x youtube-dlc + echo '#!$(PYTHON)' > yt-dlp + cat yt-dlp.zip >> yt-dlp + rm yt-dlp.zip + chmod a+x yt-dlp -README.md: youtube_dlc/*.py youtube_dlc/*/*.py - COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.py +README.md: yt_dlp/*.py yt_dlp/*/*.py + COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --help | $(PYTHON) devscripts/make_readme.py CONTRIBUTING.md: README.md $(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md -issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dlc/version.py +issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md yt_dlp/version.py $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md @@ -97,34 +97,34 @@ supportedsites: README.txt: README.md pandoc -f $(MARKDOWN) -t plain README.md -o README.txt -youtube-dlc.1: README.md - $(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md - pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1 - rm -f youtube-dlc.1.temp.md +yt-dlp.1: README.md + $(PYTHON) devscripts/prepare_manpage.py yt-dlp.1.temp.md + pandoc -s -f $(MARKDOWN) -t man yt-dlp.1.temp.md -o yt-dlp.1 + rm -f yt-dlp.1.temp.md -youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in +yt-dlp.bash-completion: yt_dlp/*.py yt_dlp/*/*.py devscripts/bash-completion.in $(PYTHON) devscripts/bash-completion.py -bash-completion: youtube-dlc.bash-completion +bash-completion: yt-dlp.bash-completion -youtube-dlc.zsh: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/zsh-completion.in +yt-dlp.zsh: yt_dlp/*.py yt_dlp/*/*.py devscripts/zsh-completion.in $(PYTHON) devscripts/zsh-completion.py -zsh-completion: youtube-dlc.zsh +zsh-completion: yt-dlp.zsh -youtube-dlc.fish: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/fish-completion.in +yt-dlp.fish: yt_dlp/*.py yt_dlp/*/*.py devscripts/fish-completion.in $(PYTHON) devscripts/fish-completion.py -fish-completion: youtube-dlc.fish +fish-completion: yt-dlp.fish -lazy-extractors: youtube_dlc/extractor/lazy_extractors.py +lazy-extractors: yt_dlp/extractor/lazy_extractors.py -_EXTRACTOR_FILES = $(shell find youtube_dlc/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py') -youtube_dlc/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES) +_EXTRACTOR_FILES = $(shell find yt_dlp/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py') +yt_dlp/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES) $(PYTHON) devscripts/make_lazy_extractors.py $@ -youtube-dlc.tar.gz: youtube-dlc README.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish ChangeLog AUTHORS - @tar -czf youtube-dlc.tar.gz --transform "s|^|youtube-dlc/|" --owner 0 --group 0 \ +yt-dlp.tar.gz: yt-dlp README.md README.txt yt-dlp.1 yt-dlp.bash-completion yt-dlp.zsh yt-dlp.fish ChangeLog AUTHORS + @tar -czf yt-dlp.tar.gz --transform "s|^|yt-dlp/|" --owner 0 --group 0 \ --exclude '*.DS_Store' \ --exclude '*.kate-swp' \ --exclude '*.pyc' \ @@ -134,8 +134,8 @@ youtube-dlc.tar.gz: youtube-dlc README.md README.txt youtube-dlc.1 youtube-dlc.b --exclude '.git' \ --exclude 'docs/_build' \ -- \ - bin devscripts test youtube_dlc docs \ + bin devscripts test yt_dlp docs \ ChangeLog AUTHORS LICENSE README.md README.txt \ - Makefile MANIFEST.in youtube-dlc.1 youtube-dlc.bash-completion \ - youtube-dlc.zsh youtube-dlc.fish setup.py setup.cfg \ - youtube-dlc + Makefile MANIFEST.in yt-dlp.1 yt-dlp.bash-completion \ + yt-dlp.zsh yt-dlp.fish setup.py setup.cfg \ + yt-dlp diff --git a/README.md b/README.md index 2141e922de..ef1a7bba24 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # YT-DLP -[![Release version](https://img.shields.io/github/v/release/pukkandan/yt-dlp?color=brightgreen&label=Release)](https://github.com/pukkandan/yt-dlp/releases/latest) +[![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Release)](https://github.com/yt-dlp/yt-dlp/releases/latest) [![License: Unlicense](https://img.shields.io/badge/License-Unlicense-blue.svg)](LICENSE) -[![CI Status](https://github.com/pukkandan/yt-dlp/workflows/Core%20Tests/badge.svg?branch=master)](https://github.com/pukkandan/yt-dlp/actions) +[![CI Status](https://github.com/yt-dlp/yt-dlp/workflows/Core%20Tests/badge.svg?branch=master)](https://github.com/yt-dlp/yt-dlp/actions) [![Discord](https://img.shields.io/discord/807245652072857610?color=blue&label=discord&logo=discord)](https://discord.gg/S75JaBna) -[![Commits](https://img.shields.io/github/commit-activity/m/pukkandan/yt-dlp?label=commits)](https://github.com/pukkandan/yt-dlp/commits) -[![Last Commit](https://img.shields.io/github/last-commit/pukkandan/yt-dlp/master)](https://github.com/pukkandan/yt-dlp/commits) -[![Downloads](https://img.shields.io/github/downloads/pukkandan/yt-dlp/total)](https://github.com/pukkandan/yt-dlp/releases/latest) +[![Commits](https://img.shields.io/github/commit-activity/m/yt-dlp/yt-dlp?label=commits)](https://github.com/yt-dlp/yt-dlp/commits) +[![Last Commit](https://img.shields.io/github/last-commit/yt-dlp/yt-dlp/master)](https://github.com/yt-dlp/yt-dlp/commits) +[![Downloads](https://img.shields.io/github/downloads/yt-dlp/yt-dlp/total)](https://github.com/yt-dlp/yt-dlp/releases/latest) [![PyPi Downloads](https://img.shields.io/pypi/dm/yt-dlp?label=PyPi)](https://pypi.org/project/yt-dlp) A command-line program to download videos from youtube.com and many other [video platforms](docs/supportedsites.md) @@ -52,13 +52,13 @@ This is a fork of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) which i # NEW FEATURES The major new features from the latest release of [blackjack4494/yt-dlc](https://github.com/blackjack4494/yt-dlc) are: -* **[SponSkrub Integration](#sponskrub-sponsorblock-options)**: You can use [SponSkrub](https://github.com/pukkandan/SponSkrub) to mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API +* **[SponSkrub Integration](#sponskrub-sponsorblock-options)**: You can use [SponSkrub](https://github.com/yt-dlp/SponSkrub) to mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API * **[Format Sorting](#sorting-formats)**: The default format sorting options have been changed so that higher resolution and better codecs will be now preferred instead of simply using larger bitrate. Furthermore, you can now specify the sort order using `-S`. This allows for much easier format selection that what is possible by simply using `--format` ([examples](#format-selection-examples)) * **Merged with youtube-dl v2021.02.10**: You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) -* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--get-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, Playlist infojson etc. Note that the NicoNico improvements are not available. See [#31](https://github.com/pukkandan/yt-dlp/pull/31) for details. +* **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--get-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, Playlist infojson etc. Note that the NicoNico improvements are not available. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details. * **Youtube improvements**: * All Youtube Feeds (`:ytfav`, `:ytwatchlater`, `:ytsubs`, `:ythistory`, `:ytrec`) works correctly and supports downloading multiple pages of content @@ -73,7 +73,7 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/ * **Plugin support**: Extractors can be loaded from an external file. See [plugins](#plugins) for details -* **Multiple paths and output templates**: You can give different [output templates](#output-template) and download paths for different types of files. You can also set a temporary path where intermediary files are downloaded to. See [`--paths`](https://github.com/pukkandan/yt-dlp/#:~:text=-P,%20--paths%20TYPE:PATH) for details +* **Multiple paths and output templates**: You can give different [output templates](#output-template) and download paths for different types of files. You can also set a temporary path where intermediary files are downloaded to. See [`--paths`](https://github.com/yt-dlp/yt-dlp/#:~:text=-P,%20--paths%20TYPE:PATH) for details @@ -83,10 +83,10 @@ The major new features from the latest release of [blackjack4494/yt-dlc](https:/ * **Improvements**: Multiple `--postprocessor-args` and `--external-downloader-args`, Date/time formatting in `-o`, faster archive checking, more [format selection options](#format-selection) etc -* **Self-updater**: The releases can be updated using `youtube-dlc -U` +* **Self-updater**: The releases can be updated using `yt-dlp -U` -See [changelog](Changelog.md) or [commits](https://github.com/pukkandan/yt-dlp/commits) for the full list of changes +See [changelog](Changelog.md) or [commits](https://github.com/yt-dlp/yt-dlp/commits) for the full list of changes **PS**: Some of these changes are already in youtube-dlc, but are still unreleased. See [this](Changelog.md#unreleased-changes-in-blackjack4494yt-dlc) for details @@ -97,13 +97,13 @@ If you are coming from [youtube-dl](https://github.com/ytdl-org/youtube-dl), the # INSTALLATION You can install yt-dlp using one of the following methods: -* Download the binary from the [latest release](https://github.com/pukkandan/yt-dlp/releases/latest) (recommended method) +* Download the binary from the [latest release](https://github.com/yt-dlp/yt-dlp/releases/latest) (recommended method) * Use [PyPI package](https://pypi.org/project/yt-dlp): `python -m pip install --upgrade yt-dlp` -* Use pip+git: `python -m pip install --upgrade git+https://github.com/pukkandan/yt-dlp.git@release` -* Install master branch: `python -m pip install --upgrade git+https://github.com/pukkandan/yt-dlp` +* Use pip+git: `python -m pip install --upgrade git+https://github.com/yt-dlp/yt-dlp.git@release` +* Install master branch: `python -m pip install --upgrade git+https://github.com/yt-dlp/yt-dlp` ### UPDATE -Starting from version `2021.02.09`, you can use `youtube-dlc -U` to update if you are using the provided release. +Starting from version `2021.02.09`, you can use `yt-dlp -U` to update if you are using the provided release. If you are using `pip`, simply re-run the same command that was used to install the program. ### COMPILE @@ -117,7 +117,7 @@ Once you have all the necessary dependancies installed, just run `py pyinst.py`. You can also build the executable without any version info or metadata by using: - pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc + pyinstaller.exe yt_dlp\__main__.py --onefile --name yt-dlp **For Unix**: You will need the required build tools @@ -129,9 +129,9 @@ Then simply type this **Note**: In either platform, `devscripts\update-version.py` can be used to automatically update the version number # DESCRIPTION -**youtube-dlc** is a command-line program to download videos from youtube.com many other [video platforms](docs/supportedsites.md). It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is not platform specific. It should work on your Unix box, on Windows or on macOS. It is released to the public domain, which means you can modify it, redistribute it or use it however you like. +**yt-dlp** is a command-line program to download videos from youtube.com many other [video platforms](docs/supportedsites.md). It requires the Python interpreter, version 2.6, 2.7, or 3.2+, and it is not platform specific. It should work on your Unix box, on Windows or on macOS. It is released to the public domain, which means you can modify it, redistribute it or use it however you like. - youtube-dlc [OPTIONS] [--] URL [URL...] + yt-dlp [OPTIONS] [--] URL [URL...] # OPTIONS @@ -561,7 +561,7 @@ Then simply type this ## Authentication Options: -u, --username USERNAME Login with this account ID -p, --password PASSWORD Account password. If this option is left - out, youtube-dlc will ask interactively + out, yt-dlp will ask interactively -2, --twofactor TWOFACTOR Two-factor authentication code -n, --netrc Use .netrc authentication data --video-password PASSWORD Video password (vimeo, youku) @@ -572,7 +572,7 @@ Then simply type this a list of available MSOs --ap-username USERNAME Multiple-system operator account login --ap-password PASSWORD Multiple-system operator account password. - If this option is left out, youtube-dlc + If this option is left out, yt-dlp will ask interactively --ap-list-mso List all supported multiple-system operators @@ -667,7 +667,7 @@ Then simply type this (currently supported: srt|ass|vtt|lrc) ## SponSkrub (SponsorBlock) Options: -[SponSkrub](https://github.com/pukkandan/SponSkrub) is a utility to +[SponSkrub](https://github.com/yt-dlp/SponSkrub) is a utility to mark/remove sponsor segments from downloaded YouTube videos using [SponsorBlock API](https://sponsor.ajay.app) @@ -712,11 +712,11 @@ Then simply type this # CONFIGURATION -You can configure youtube-dlc by placing any supported command line option to a configuration file. The configuration is loaded from the following locations: +You can configure yt-dlp by placing any supported command line option to a configuration file. The configuration is loaded from the following locations: 1. **Main Configuration**: The file given by `--config-location` -1. **Portable Configuration**: `yt-dlp.conf` or `youtube-dlc.conf` in the same directory as the bundled binary. If you are running from source-code (`/youtube_dlc/__main__.py`), the root directory is used instead. -1. **Home Configuration**: `yt-dlp.conf` or `youtube-dlc.conf` in the home path given by `-P "home:"`, or in the current directory if no such path is given +1. **Portable Configuration**: `yt-dlp.conf` in the same directory as the bundled binary. If you are running from source-code (`/yt_dlp/__main__.py`), the root directory is used instead. +1. **Home Configuration**: `yt-dlp.conf` in the home path given by `-P "home:"`, or in the current directory if no such path is given 1. **User Configuration**: * `%XDG_CONFIG_HOME%/yt-dlp/config` (recommended on Linux/macOS) * `%XDG_CONFIG_HOME%/yt-dlp.conf` @@ -725,10 +725,10 @@ You can configure youtube-dlc by placing any supported command line option to a * `~/yt-dlp.conf` * `~/yt-dlp.conf.txt` - If none of these files are found, the search is performed again by replacing `yt-dlp` with `youtube-dlc`. Note that `~` points to `C:\Users\` on windows. Also, `%XDG_CONFIG_HOME%` defaults to `~/.config` if undefined -1. **System Configuration**: `/etc/yt-dlp.conf` or `/etc/youtube-dlc.conf` + Note that `~` points to `C:\Users\` on windows. Also, `%XDG_CONFIG_HOME%` defaults to `~/.config` if undefined +1. **System Configuration**: `/etc/yt-dlp.conf` or `/etc/yt-dlp.conf` -For example, with the following configuration file youtube-dlc will always extract the audio, not copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory: +For example, with the following configuration file yt-dlp will always extract the audio, not copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory: ``` # Lines starting with # are comments @@ -747,11 +747,11 @@ For example, with the following configuration file youtube-dlc will always extra Note that options in configuration file are just the same options aka switches used in regular command line calls; thus there **must be no whitespace** after `-` or `--`, e.g. `-o` or `--proxy` but not `- o` or `-- proxy`. -You can use `--ignore-config` if you want to disable all configuration files for a particular youtube-dlc run. If `--ignore-config` is found inside any configuration file, no further configuration will be loaded. For example, having the option in the portable configuration file prevents loading of user and system configurations. Additionally, (for backward compatibility) if `--ignore-config` is found inside the system configuration file, the user configuration is not loaded. +You can use `--ignore-config` if you want to disable all configuration files for a particular yt-dlp run. If `--ignore-config` is found inside any configuration file, no further configuration will be loaded. For example, having the option in the portable configuration file prevents loading of user and system configurations. Additionally, (for backward compatibility) if `--ignore-config` is found inside the system configuration file, the user configuration is not loaded. ### Authentication with `.netrc` file -You may also want to configure automatic credentials storage for extractors that support authentication (by providing login and password with `--username` and `--password`) in order not to pass credentials as command line arguments on every youtube-dlc execution and prevent tracking plain text passwords in the shell command history. You can achieve this using a [`.netrc` file](https://stackoverflow.com/tags/.netrc/info) on a per extractor basis. For that you will need to create a `.netrc` file in your `$HOME` and restrict permissions to read/write by only you: +You may also want to configure automatic credentials storage for extractors that support authentication (by providing login and password with `--username` and `--password`) in order not to pass credentials as command line arguments on every yt-dlp execution and prevent tracking plain text passwords in the shell command history. You can achieve this using a [`.netrc` file](https://stackoverflow.com/tags/.netrc/info) on a per extractor basis. For that you will need to create a `.netrc` file in your `$HOME` and restrict permissions to read/write by only you: ``` touch $HOME/.netrc chmod a-rwx,u+rw $HOME/.netrc @@ -765,7 +765,7 @@ For example: machine youtube login myaccount@gmail.com password my_youtube_password machine twitch login my_twitch_account_name password my_twitch_password ``` -To activate authentication with the `.netrc` file you should pass `--netrc` to youtube-dlc or place it in the [configuration file](#configuration). +To activate authentication with the `.netrc` file you should pass `--netrc` to yt-dlp or place it in the [configuration file](#configuration). On Windows you may also need to setup the `%HOME%` environment variable manually. For example: ``` @@ -778,7 +778,7 @@ The `-o` option is used to indicate a template for the output file names while ` **tl;dr:** [navigate me to examples](#output-template-examples). -The basic usage of `-o` is not to set any template arguments when downloading a single file, like in `youtube-dlc -o funny_video.flv "https://some/video"`. However, it may contain special sequences that will be replaced when downloading each video. The special sequences may be formatted according to [python string formatting operations](https://docs.python.org/2/library/stdtypes.html#string-formatting). For example, `%(NAME)s` or `%(NAME)05d`. To clarify, that is a percent symbol followed by a name in parentheses, followed by formatting operations. Date/time fields can also be formatted according to [strftime formatting](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) by specifying it inside the parantheses seperated from the field name using a `>`. For example, `%(duration>%H-%M-%S)s`. +The basic usage of `-o` is not to set any template arguments when downloading a single file, like in `yt-dlp -o funny_video.flv "https://some/video"`. However, it may contain special sequences that will be replaced when downloading each video. The special sequences may be formatted according to [python string formatting operations](https://docs.python.org/2/library/stdtypes.html#string-formatting). For example, `%(NAME)s` or `%(NAME)05d`. To clarify, that is a percent symbol followed by a name in parentheses, followed by formatting operations. Date/time fields can also be formatted according to [strftime formatting](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) by specifying it inside the parantheses seperated from the field name using a `>`. For example, `%(duration>%H-%M-%S)s`. Additionally, you can set different output templates for the various metadata files seperately from the general output template by specifying the type of file followed by the template seperated by a colon ":". The different filetypes supported are `subtitle|thumbnail|description|annotation|infojson|pl_description|pl_infojson`. For example, `-o '%(title)s.%(ext)s' -o 'thumbnail:%(title)s\%(title)s.%(ext)s'` will put the thumbnails in a folder with the same name as the video. @@ -873,7 +873,7 @@ Available for the media that is a track or a part of a music album: Each aforementioned sequence when referenced in an output template will be replaced by the actual value corresponding to the sequence name. Note that some of the sequences are not guaranteed to be present since they depend on the metadata obtained by a particular extractor. Such sequences will be replaced with placeholder value provided with `--output-na-placeholder` (`NA` by default). -For example for `-o %(title)s-%(id)s.%(ext)s` and an mp4 video with title `youtube-dlc test video` and id `BaW_jenozKcj`, this will result in a `youtube-dlc test video-BaW_jenozKcj.mp4` file created in the current directory. +For example for `-o %(title)s-%(id)s.%(ext)s` and an mp4 video with title `yt-dlp test video` and id `BaW_jenozKcj`, this will result in a `yt-dlp test video-BaW_jenozKcj.mp4` file created in the current directory. For numeric sequences you can use numeric related formatting, for example, `%(view_count)05d` will result in a string with view count padded with zeros up to 5 characters, like in `00042`. @@ -894,35 +894,35 @@ If you are using an output template inside a Windows batch file then you must es Note that on Windows you need to use double quotes instead of single. ```bash -$ youtube-dlc --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc -youtube-dlc test video ''_ä↭𝕐.mp4 # All kinds of weird characters +$ yt-dlp --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc +youtube-dl test video ''_ä↭𝕐.mp4 # All kinds of weird characters -$ youtube-dlc --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc --restrict-filenames -youtube-dlc_test_video_.mp4 # A simple file name +$ yt-dlp --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc --restrict-filenames +youtube-dl_test_video_.mp4 # A simple file name # Download YouTube playlist videos in separate directory indexed by video order in a playlist -$ youtube-dlc -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re +$ yt-dlp -o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re # Download YouTube playlist videos in seperate directories according to their uploaded year -$ youtube-dlc -o '%(upload_date>%Y)s/%(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re +$ yt-dlp -o '%(upload_date>%Y)s/%(title)s.%(ext)s' https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re # Download all playlists of YouTube channel/user keeping each playlist in separate directory: -$ youtube-dlc -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/user/TheLinuxFoundation/playlists +$ yt-dlp -o '%(uploader)s/%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s' https://www.youtube.com/user/TheLinuxFoundation/playlists # Download Udemy course keeping each chapter in separate directory under MyVideos directory in your home -$ youtube-dlc -u user -p password -P '~/MyVideos' -o '%(playlist)s/%(chapter_number)s - %(chapter)s/%(title)s.%(ext)s' https://www.udemy.com/java-tutorial/ +$ yt-dlp -u user -p password -P '~/MyVideos' -o '%(playlist)s/%(chapter_number)s - %(chapter)s/%(title)s.%(ext)s' https://www.udemy.com/java-tutorial/ # Download entire series season keeping each series and each season in separate directory under C:/MyVideos -$ youtube-dlc -P "C:/MyVideos" -o "%(series)s/%(season_number)s - %(season)s/%(episode_number)s - %(episode)s.%(ext)s" https://videomore.ru/kino_v_detalayah/5_sezon/367617 +$ yt-dlp -P "C:/MyVideos" -o "%(series)s/%(season_number)s - %(season)s/%(episode_number)s - %(episode)s.%(ext)s" https://videomore.ru/kino_v_detalayah/5_sezon/367617 # Stream the video being downloaded to stdout -$ youtube-dlc -o - BaW_jenozKc +$ yt-dlp -o - BaW_jenozKc ``` # FORMAT SELECTION -By default, youtube-dlc tries to download the best available quality if you **don't** pass any options. -This is generally equivalent to using `-f bestvideo*+bestaudio/best`. However, if multiple audiostreams is enabled (`--audio-multistreams`), the default format changes to `-f bestvideo+bestaudio/best`. Similarly, if ffmpeg is unavailable, or if you use youtube-dlc to stream to `stdout` (`-o -`), the default becomes `-f best/bestvideo+bestaudio`. +By default, yt-dlp tries to download the best available quality if you **don't** pass any options. +This is generally equivalent to using `-f bestvideo*+bestaudio/best`. However, if multiple audiostreams is enabled (`--audio-multistreams`), the default format changes to `-f bestvideo+bestaudio/best`. Similarly, if ffmpeg is unavailable, or if you use yt-dlp to stream to `stdout` (`-o -`), the default becomes `-f best/bestvideo+bestaudio`. The general syntax for format selection is `--f FORMAT` (or `--format FORMAT`) where `FORMAT` is a *selector expression*, i.e. an expression that describes format or formats you would like to download. @@ -1034,19 +1034,19 @@ Note that on Windows you may need to use double quotes instead of single. ```bash # Download and merge the best best video-only format and the best audio-only format, # or download the best combined format if video-only format is not available -$ youtube-dlc -f 'bv+ba/b' +$ yt-dlp -f 'bv+ba/b' # Download best format that contains video, # and if it doesn't already have an audio stream, merge it with best audio-only format -$ youtube-dlc -f 'bv*+ba/b' +$ yt-dlp -f 'bv*+ba/b' # Same as above -$ youtube-dlc +$ yt-dlp # Download the best video-only format and the best audio-only format without merging them # For this case, an output template should be used since # by default, bestvideo and bestaudio will have the same file name. -$ youtube-dlc -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s' +$ yt-dlp -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s' @@ -1054,74 +1054,74 @@ $ youtube-dlc -f 'bv,ba' -o '%(title)s.f%(format_id)s.%(ext)s' # and how to use -S to achieve a similar but better result # Download the worst video available (old method) -$ youtube-dlc -f 'wv*+wa/w' +$ yt-dlp -f 'wv*+wa/w' # Download the best video available but with the smallest resolution -$ youtube-dlc -S '+res' +$ yt-dlp -S '+res' # Download the smallest video available -$ youtube-dlc -S '+size,+br' +$ yt-dlp -S '+size,+br' # Download the best mp4 video available, or the best video if no mp4 available -$ youtube-dlc -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b' +$ yt-dlp -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b' # Download the best video with the best extension # (For video, mp4 > webm > flv. For audio, m4a > aac > mp3 ...) -$ youtube-dlc -S 'ext' +$ yt-dlp -S 'ext' # Download the best video available but no better than 480p, # or the worst video if there is no video under 480p -$ youtube-dlc -f 'bv*[height<=480]+ba/b[height<=480] / wv*+ba/w' +$ yt-dlp -f 'bv*[height<=480]+ba/b[height<=480] / wv*+ba/w' # Download the best video available with the largest height but no better than 480p, # or the best video with the smallest resolution if there is no video under 480p -$ youtube-dlc -S 'height:480' +$ yt-dlp -S 'height:480' # Download the best video available with the largest resolution but no better than 480p, # or the best video with the smallest resolution if there is no video under 480p # Resolution is determined by using the smallest dimension. # So this works correctly for vertical videos as well -$ youtube-dlc -S 'res:480' +$ yt-dlp -S 'res:480' # Download the best video (that also has audio) but no bigger than 50 MB, # or the worst video (that also has audio) if there is no video under 50 MB -$ youtube-dlc -f 'b[filesize<50M] / w' +$ yt-dlp -f 'b[filesize<50M] / w' # Download largest video (that also has audio) but no bigger than 50 MB, # or the smallest video (that also has audio) if there is no video under 50 MB -$ youtube-dlc -f 'b' -S 'filesize:50M' +$ yt-dlp -f 'b' -S 'filesize:50M' # Download best video (that also has audio) that is closest in size to 50 MB -$ youtube-dlc -f 'b' -S 'filesize~50M' +$ yt-dlp -f 'b' -S 'filesize~50M' # Download best video available via direct link over HTTP/HTTPS protocol, # or the best video available via any protocol if there is no such video -$ youtube-dlc -f '(bv*+ba/b)[protocol^=http][protocol!*=dash] / (bv*+ba/b)' +$ yt-dlp -f '(bv*+ba/b)[protocol^=http][protocol!*=dash] / (bv*+ba/b)' # Download best video available via the best protocol # (https/ftps > http/ftp > m3u8_native > m3u8 > http_dash_segments ...) -$ youtube-dlc -S 'proto' +$ yt-dlp -S 'proto' # Download the best video with h264 codec, or the best video if there is no such video -$ youtube-dlc -f '(bv*+ba/b)[vcodec^=avc1] / (bv*+ba/b)' +$ yt-dlp -f '(bv*+ba/b)[vcodec^=avc1] / (bv*+ba/b)' # Download the best video with best codec no better than h264, # or the best video with worst codec if there is no such video -$ youtube-dlc -S 'codec:h264' +$ yt-dlp -S 'codec:h264' # Download the best video with worst codec no worse than h264, # or the best video with best codec if there is no such video -$ youtube-dlc -S '+codec:h264' +$ yt-dlp -S '+codec:h264' @@ -1129,26 +1129,26 @@ $ youtube-dlc -S '+codec:h264' # Download the best video no better than 720p prefering framerate greater than 30, # or the worst video (still prefering framerate greater than 30) if there is no such video -$ youtube-dlc -f '((bv*[fps>30]/bv*)[height<=720]/(wv*[fps>30]/wv*)) + ba / (b[fps>30]/b)[height<=720]/(w[fps>30]/w)' +$ yt-dlp -f '((bv*[fps>30]/bv*)[height<=720]/(wv*[fps>30]/wv*)) + ba / (b[fps>30]/b)[height<=720]/(w[fps>30]/w)' # Download the video with the largest resolution no better than 720p, # or the video with the smallest resolution available if there is no such video, # prefering larger framerate for formats with the same resolution -$ youtube-dlc -S 'res:720,fps' +$ yt-dlp -S 'res:720,fps' # Download the video with smallest resolution no worse than 480p, # or the video with the largest resolution available if there is no such video, # prefering better codec and then larger total bitrate for the same resolution -$ youtube-dlc -S '+res:480,codec,br' +$ yt-dlp -S '+res:480,codec,br' ``` # PLUGINS Plugins are loaded from `/ytdlp_plugins//__init__.py`. Currently only `extractor` plugins are supported. Support for `downloader` and `postprocessor` plugins may be added in the future. See [ytdlp_plugins](ytdlp_plugins) for example. -**Note**: `` is the directory of the binary (`/youtube-dlc`), or the root directory of the module if you are running directly from source-code (`/youtube_dlc/__main__.py`) +**Note**: `` is the directory of the binary (`/yt-dlp`), or the root directory of the module if you are running directly from source-code (`/yt_dlp/__main__.py`) # MORE For FAQ, Developer Instructions etc., see the [original README](https://github.com/ytdl-org/youtube-dl#faq) diff --git a/devscripts/bash-completion.in b/devscripts/bash-completion.in index 1bf41f2ccf..21f52798ed 100644 --- a/devscripts/bash-completion.in +++ b/devscripts/bash-completion.in @@ -1,4 +1,4 @@ -__youtube_dlc() +__yt_dlp() { local cur prev opts fileopts diropts keywords COMPREPLY=() @@ -26,4 +26,4 @@ __youtube_dlc() fi } -complete -F __youtube_dlc youtube-dlc +complete -F __yt_dlp yt-dlp diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py index d68c9b1cce..66c3d14f7f 100755 --- a/devscripts/bash-completion.py +++ b/devscripts/bash-completion.py @@ -6,9 +6,9 @@ from os.path import dirname as dirn import sys sys.path.insert(0, dirn(dirn((os.path.abspath(__file__))))) -import youtube_dlc +import yt_dlp -BASH_COMPLETION_FILE = "youtube-dlc.bash-completion" +BASH_COMPLETION_FILE = "yt-dlp.bash-completion" BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in" @@ -26,5 +26,5 @@ def build_completion(opt_parser): f.write(filled_template) -parser = youtube_dlc.parseOpts()[0] +parser = yt_dlp.parseOpts()[0] build_completion(parser) diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py index 62dbd2cb17..9b5305a67d 100644 --- a/devscripts/buildserver.py +++ b/devscripts/buildserver.py @@ -12,7 +12,7 @@ import traceback import os.path sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__))))) -from youtube_dlc.compat import ( +from yt_dlp.compat import ( compat_input, compat_http_server, compat_str, @@ -325,7 +325,7 @@ class YoutubeDLBuilder(object): authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile', 'ytdl-org'] def __init__(self, **kwargs): - if self.repoName != 'youtube-dlc': + if self.repoName != 'yt-dlp': raise BuildError('Invalid repository "%s"' % self.repoName) if self.user not in self.authorizedUsers: raise HTTPError('Unauthorized user "%s"' % self.user, 401) diff --git a/devscripts/check-porn.py b/devscripts/check-porn.py index 68a33d823f..5e00724683 100644 --- a/devscripts/check-porn.py +++ b/devscripts/check-porn.py @@ -15,8 +15,8 @@ import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import gettestcases -from youtube_dlc.utils import compat_urllib_parse_urlparse -from youtube_dlc.utils import compat_urllib_request +from yt_dlp.utils import compat_urllib_parse_urlparse +from yt_dlp.utils import compat_urllib_request if len(sys.argv) > 1: METHOD = 'LIST' diff --git a/devscripts/create-github-release.py b/devscripts/create-github-release.py index 3e11be6fa1..e5740f40e8 100644 --- a/devscripts/create-github-release.py +++ b/devscripts/create-github-release.py @@ -14,13 +14,13 @@ import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.compat import ( +from yt_dlp.compat import ( compat_basestring, compat_getpass, compat_print, compat_urllib_request, ) -from youtube_dlc.utils import ( +from yt_dlp.utils import ( make_HTTPS_handler, sanitized_Request, ) @@ -100,7 +100,7 @@ def main(): releaser = GitHubReleaser() new_release = releaser.create_release( - version, name='youtube-dlc %s' % version, body=body) + version, name='yt-dlp %s' % version, body=body) release_id = new_release['id'] for asset in os.listdir(build_path): diff --git a/devscripts/fish-completion.in b/devscripts/fish-completion.in index 4f08b6d4a4..32938fbb4b 100644 --- a/devscripts/fish-completion.in +++ b/devscripts/fish-completion.in @@ -2,4 +2,4 @@ {{commands}} -complete --command youtube-dlc --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory" +complete --command yt-dlp --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory" diff --git a/devscripts/fish-completion.py b/devscripts/fish-completion.py index be65f43406..1c91f722b8 100755 --- a/devscripts/fish-completion.py +++ b/devscripts/fish-completion.py @@ -7,10 +7,10 @@ from os.path import dirname as dirn import sys sys.path.insert(0, dirn(dirn((os.path.abspath(__file__))))) -import youtube_dlc -from youtube_dlc.utils import shell_quote +import yt_dlp +from yt_dlp.utils import shell_quote -FISH_COMPLETION_FILE = 'youtube-dlc.fish' +FISH_COMPLETION_FILE = 'yt-dlp.fish' FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in' EXTRA_ARGS = { @@ -31,7 +31,7 @@ def build_completion(opt_parser): for group in opt_parser.option_groups: for option in group.option_list: long_option = option.get_opt_string().strip('-') - complete_cmd = ['complete', '--command', 'youtube-dlc', '--long-option', long_option] + complete_cmd = ['complete', '--command', 'yt-dlp', '--long-option', long_option] if option._short_opts: complete_cmd += ['--short-option', option._short_opts[0].strip('-')] if option.help != optparse.SUPPRESS_HELP: @@ -46,5 +46,5 @@ def build_completion(opt_parser): f.write(filled_template) -parser = youtube_dlc.parseOpts()[0] +parser = yt_dlp.parseOpts()[0] build_completion(parser) diff --git a/devscripts/generate_aes_testdata.py b/devscripts/generate_aes_testdata.py index c89bb547e7..f9bb2ad3b0 100644 --- a/devscripts/generate_aes_testdata.py +++ b/devscripts/generate_aes_testdata.py @@ -7,8 +7,8 @@ import os import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.utils import intlist_to_bytes -from youtube_dlc.aes import aes_encrypt, key_expansion +from yt_dlp.utils import intlist_to_bytes +from yt_dlp.aes import aes_encrypt, key_expansion secret_msg = b'Secret message goes here' diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py index 04588a5eec..9ea01374d6 100755 --- a/devscripts/gh-pages/add-version.py +++ b/devscripts/gh-pages/add-version.py @@ -22,9 +22,9 @@ if 'signature' in versions_info: new_version = {} filenames = { - 'bin': 'youtube-dlc', - 'exe': 'youtube-dlc.exe', - 'tar': 'youtube-dlc-%s.tar.gz' % version} + 'bin': 'yt-dlp', + 'exe': 'yt-dlp.exe', + 'tar': 'yt-dlp-%s.tar.gz' % version} build_dir = os.path.join('..', '..', 'build', version) for key, filename in filenames.items(): url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename) diff --git a/devscripts/gh-pages/update-feed.py b/devscripts/gh-pages/update-feed.py index b07f1e830c..c9f2fdb07c 100755 --- a/devscripts/gh-pages/update-feed.py +++ b/devscripts/gh-pages/update-feed.py @@ -11,24 +11,24 @@ atom_template = textwrap.dedent("""\ - youtube-dlc releases - https://yt-dl.org/feed/youtube-dlc-updates-feed + yt-dlp releases + https://yt-dl.org/feed/yt-dlp-updates-feed @TIMESTAMP@ @ENTRIES@ """) entry_template = textwrap.dedent(""" - https://yt-dl.org/feed/youtube-dlc-updates-feed/youtube-dlc-@VERSION@ + https://yt-dl.org/feed/yt-dlp-updates-feed/yt-dlp-@VERSION@ New version @VERSION@ - + - The youtube-dlc maintainers + The yt-dlp maintainers @TIMESTAMP@ diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py index 38acb5d9a2..b53685fccd 100755 --- a/devscripts/gh-pages/update-sites.py +++ b/devscripts/gh-pages/update-sites.py @@ -5,10 +5,10 @@ import sys import os import textwrap -# We must be able to import youtube_dlc +# We must be able to import yt_dlp sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) -import youtube_dlc +import yt_dlp def main(): @@ -16,7 +16,7 @@ def main(): template = tmplf.read() ie_htmls = [] - for ie in youtube_dlc.list_extractors(age_limit=None): + for ie in yt_dlp.list_extractors(age_limit=None): ie_html = '{}'.format(ie.IE_NAME) ie_desc = getattr(ie, 'IE_DESC', None) if ie_desc is False: diff --git a/devscripts/make_contributing.py b/devscripts/make_contributing.py index 80426fb0ac..b0cacbc4bf 100755 --- a/devscripts/make_contributing.py +++ b/devscripts/make_contributing.py @@ -21,7 +21,7 @@ def main(): bug_text = re.search( """ # r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1) # dev_text = re.search( -# r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING youtube-dlc', +# r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING yt-dlp', """ readme).group(1) out = bug_text + dev_text diff --git a/devscripts/make_issue_template.py b/devscripts/make_issue_template.py index 37cb0d4ee1..13f337c822 100644 --- a/devscripts/make_issue_template.py +++ b/devscripts/make_issue_template.py @@ -16,9 +16,9 @@ def main(): with io.open(infile, encoding='utf-8') as inf: issue_template_tmpl = inf.read() - # Get the version from youtube_dlc/version.py without importing the package - exec(compile(open('youtube_dlc/version.py').read(), - 'youtube_dlc/version.py', 'exec')) + # Get the version from yt_dlp/version.py without importing the package + exec(compile(open('yt_dlp/version.py').read(), + 'yt_dlp/version.py', 'exec')) out = issue_template_tmpl % {'version': locals()['__version__']} diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py index c27ef97814..0ddaa3f830 100644 --- a/devscripts/make_lazy_extractors.py +++ b/devscripts/make_lazy_extractors.py @@ -14,8 +14,8 @@ lazy_extractors_filename = sys.argv[1] if os.path.exists(lazy_extractors_filename): os.remove(lazy_extractors_filename) -from youtube_dlc.extractor import _ALL_CLASSES -from youtube_dlc.extractor.common import InfoExtractor, SearchInfoExtractor +from yt_dlp.extractor import _ALL_CLASSES +from yt_dlp.extractor.common import InfoExtractor, SearchInfoExtractor with open('devscripts/lazy_load_template.py', 'rt') as f: module_template = f.read() diff --git a/devscripts/make_supportedsites.py b/devscripts/make_supportedsites.py index 0ae6f8aa30..12655bf89b 100644 --- a/devscripts/make_supportedsites.py +++ b/devscripts/make_supportedsites.py @@ -7,10 +7,10 @@ import os import sys -# Import youtube_dlc +# Import yt_dlp ROOT_DIR = os.path.join(os.path.dirname(__file__), '..') sys.path.insert(0, ROOT_DIR) -import youtube_dlc +import yt_dlp def main(): @@ -33,7 +33,7 @@ def main(): ie_md += ' (Currently broken)' yield ie_md - ies = sorted(youtube_dlc.gen_extractors(), key=lambda i: i.IE_NAME.lower()) + ies = sorted(yt_dlp.gen_extractors(), key=lambda i: i.IE_NAME.lower()) out = '# Supported sites\n' + ''.join( ' - ' + md + '\n' for md in gen_ies_md(ies)) diff --git a/devscripts/prepare_manpage.py b/devscripts/prepare_manpage.py index 843ade482e..4578a33ceb 100644 --- a/devscripts/prepare_manpage.py +++ b/devscripts/prepare_manpage.py @@ -8,7 +8,7 @@ import re ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) README_FILE = os.path.join(ROOT_DIR, 'README.md') -PREFIX = r'''%youtube-dlc(1) +PREFIX = r'''%yt-dlp(1) # NAME @@ -16,7 +16,7 @@ youtube\-dl \- download videos from youtube.com or other video platforms # SYNOPSIS -**youtube-dlc** \[OPTIONS\] URL [URL...] +**yt-dlp** \[OPTIONS\] URL [URL...] ''' @@ -33,7 +33,7 @@ def main(): readme = f.read() readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme) - readme = re.sub(r'\s+youtube-dlc \[OPTIONS\] URL \[URL\.\.\.\]', '', readme) + readme = re.sub(r'\s+yt-dlp \[OPTIONS\] URL \[URL\.\.\.\]', '', readme) readme = PREFIX + readme readme = filter_options(readme) diff --git a/devscripts/release.sh b/devscripts/release.sh index 2da2ac4718..86294d56b3 100755 --- a/devscripts/release.sh +++ b/devscripts/release.sh @@ -54,8 +54,8 @@ fi if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi if [ ! -z "`git status --porcelain | grep -v CHANGELOG`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi -useless_files=$(find youtube_dlc -type f -not -name '*.py') -if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dlc: $useless_files"; exit 1; fi +useless_files=$(find yt_dlp -type f -not -name '*.py') +if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in yt_dlp: $useless_files"; exit 1; fi if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi @@ -69,18 +69,18 @@ make clean if $skip_tests ; then echo 'SKIPPING TESTS' else - nosetests --verbose --with-coverage --cover-package=youtube_dlc --cover-html test --stop || exit 1 + nosetests --verbose --with-coverage --cover-package=yt_dlp --cover-html test --stop || exit 1 fi /bin/echo -e "\n### Changing version in version.py..." -sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dlc/version.py +sed -i "s/__version__ = '.*'/__version__ = '$version'/" yt_dlp/version.py /bin/echo -e "\n### Changing version in ChangeLog..." sed -i "s//$version/" ChangeLog -/bin/echo -e "\n### Committing documentation, templates and youtube_dlc/version.py..." +/bin/echo -e "\n### Committing documentation, templates and yt_dlp/version.py..." make README.md CONTRIBUTING.md issuetemplates supportedsites -git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md youtube_dlc/version.py ChangeLog +git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md yt_dlp/version.py ChangeLog git commit $gpg_sign_commits -m "release $version" /bin/echo -e "\n### Now tagging, signing and pushing..." @@ -95,13 +95,13 @@ git push origin "$version" /bin/echo -e "\n### OK, now it is time to build the binaries..." REV=$(git rev-parse HEAD) -make youtube-dlc youtube-dlc.tar.gz +make yt-dlp yt-dlp.tar.gz read -p "VM running? (y/n) " -n 1 -wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dlc.exe?rev=$REV" -O youtube-dlc.exe +wget "http://$buildserver/build/ytdl-org/youtube-dl/yt-dlp.exe?rev=$REV" -O yt-dlp.exe mkdir -p "build/$version" -mv youtube-dlc youtube-dlc.exe "build/$version" -mv youtube-dlc.tar.gz "build/$version/youtube-dlc-$version.tar.gz" -RELEASE_FILES="youtube-dlc youtube-dlc.exe youtube-dlc-$version.tar.gz" +mv yt-dlp yt-dlp.exe "build/$version" +mv yt-dlp.tar.gz "build/$version/yt-dlp-$version.tar.gz" +RELEASE_FILES="yt-dlp yt-dlp.exe yt-dlp-$version.tar.gz" (cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS) (cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS) (cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS) diff --git a/devscripts/show-downloads-statistics.py b/devscripts/show-downloads-statistics.py index b8c4269c48..e76f1e4c8a 100644 --- a/devscripts/show-downloads-statistics.py +++ b/devscripts/show-downloads-statistics.py @@ -11,11 +11,11 @@ import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.compat import ( +from yt_dlp.compat import ( compat_print, compat_urllib_request, ) -from youtube_dlc.utils import format_bytes +from yt_dlp.utils import format_bytes def format_size(bytes): @@ -38,9 +38,9 @@ for page in itertools.count(1): asset_name = asset['name'] total_bytes += asset['download_count'] * asset['size'] if all(not re.match(p, asset_name) for p in ( - r'^youtube-dlc$', - r'^youtube-dlc-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$', - r'^youtube-dlc\.exe$')): + r'^yt-dlp$', + r'^yt-dlp-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$', + r'^yt-dlp\.exe$')): continue compat_print( ' %s size: %s downloads: %d' diff --git a/devscripts/update-version.py b/devscripts/update-version.py index 54d2158a6c..c6e7b53098 100644 --- a/devscripts/update-version.py +++ b/devscripts/update-version.py @@ -5,7 +5,7 @@ from datetime import datetime # response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION') # old_version = response.read().decode('utf-8') -exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec')) +exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec')) old_version = locals()['__version__'] old_version_list = old_version.split(".", 4) @@ -19,13 +19,13 @@ rev = str(int(old_rev or 0) + 1) if old_ver == ver else '' VERSION = '.'.join((ver, rev)) if rev else ver # VERSION_LIST = [(int(v) for v in ver.split(".") + [rev or 0])] -print('::set-output name=ytdlc_version::' + VERSION) +print('::set-output name=ytdlp_version::' + VERSION) -file_version_py = open('youtube_dlc/version.py', 'rt') +file_version_py = open('yt_dlp/version.py', 'rt') data = file_version_py.read() data = data.replace(old_version, VERSION) file_version_py.close() -file_version_py = open('youtube_dlc/version.py', 'wt') +file_version_py = open('yt_dlp/version.py', 'wt') file_version_py.write(data) file_version_py.close() diff --git a/devscripts/zsh-completion.in b/devscripts/zsh-completion.in index 2317f41df0..9117d339e0 100644 --- a/devscripts/zsh-completion.in +++ b/devscripts/zsh-completion.in @@ -1,6 +1,6 @@ -#compdef youtube-dlc +#compdef yt-dlp -__youtube_dlc() { +__yt_dlp() { local curcontext="$curcontext" fileopts diropts cur prev typeset -A opt_args fileopts="{{fileopts}}" @@ -27,4 +27,4 @@ __youtube_dlc() { esac } -__youtube_dlc \ No newline at end of file +__yt_dlp \ No newline at end of file diff --git a/devscripts/zsh-completion.py b/devscripts/zsh-completion.py index 8b957144f9..92eac58736 100755 --- a/devscripts/zsh-completion.py +++ b/devscripts/zsh-completion.py @@ -6,9 +6,9 @@ from os.path import dirname as dirn import sys sys.path.insert(0, dirn(dirn((os.path.abspath(__file__))))) -import youtube_dlc +import yt_dlp -ZSH_COMPLETION_FILE = "youtube-dlc.zsh" +ZSH_COMPLETION_FILE = "yt-dlp.zsh" ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in" @@ -45,5 +45,5 @@ def build_completion(opt_parser): f.write(template) -parser = youtube_dlc.parseOpts()[0] +parser = yt_dlp.parseOpts()[0] build_completion(parser) diff --git a/docs/Makefile b/docs/Makefile index a7159ff459..1a8e3cb1cb 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -85,17 +85,17 @@ qthelp: @echo @echo "Build finished; now you can run "qcollectiongenerator" with the" \ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dlc.qhcp" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/yt-dlp.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dlc.qhc" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/yt-dlp.qhc" devhelp: $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp @echo @echo "Build finished." @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/youtube-dlc" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dlc" + @echo "# mkdir -p $$HOME/.local/share/devhelp/yt-dlp" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/yt-dlp" @echo "# devhelp" epub: diff --git a/docs/conf.py b/docs/conf.py index 3ce98be4df..58c0359e73 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,16 +1,6 @@ # coding: utf-8 # -# youtube-dlc documentation build configuration file, created by -# sphinx-quickstart on Fri Mar 14 21:05:43 2014. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. +# yt-dlp documentation build configuration file import sys import os @@ -47,7 +37,7 @@ copyright = u'UNLICENSE' # built documents. # # The short X.Y version. -from youtube_dlc.version import __version__ +from yt_dlp.version import __version__ version = __version__ # The full version, including alpha/beta/rc tags. release = version diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000000..9be67038aa --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,23 @@ +Welcome to yt-dlp's documentation! +====================================== + +*yt-dlp* is a command-line program to download videos from YouTube.com and more sites. +It can also be used in Python code. + +Developer guide +--------------- + +This section contains information for using *yt-dlp* from Python programs. + +.. toctree:: + :maxdepth: 2 + + module_guide + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + diff --git a/docs/module_guide.rst b/docs/module_guide.rst index 6413659cfd..d6a96a9cfc 100644 --- a/docs/module_guide.rst +++ b/docs/module_guide.rst @@ -1,11 +1,11 @@ -Using the ``youtube_dlc`` module +Using the ``yt_dlp`` module =============================== -When using the ``youtube_dlc`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors: +When using the ``yt_dlp`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors: .. code-block:: python - >>> from youtube_dlc import YoutubeDL + >>> from yt_dlp import YoutubeDL >>> ydl = YoutubeDL() >>> ydl.add_default_info_extractors() @@ -22,7 +22,7 @@ You use the :meth:`YoutubeDL.extract_info` method for getting the video informat [youtube] BaW_jenozKc: Downloading video info webpage [youtube] BaW_jenozKc: Extracting video information >>> info['title'] - 'youtube-dlc test video "\'/\\ä↭𝕐' + 'youtube-dl test video "\'/\\ä↭𝕐' >>> info['height'], info['width'] (720, 1280) @@ -64,4 +64,3 @@ You can access the videos in the playlist with the ``entries`` field: Video #7: Coding a better government Video #8: The era of open innovation Video #9: The currency of the new economy is trust - diff --git a/pyinst.py b/pyinst.py index e7b6dba254..005a5d9e2e 100644 --- a/pyinst.py +++ b/pyinst.py @@ -23,7 +23,7 @@ FILE_DESCRIPTION = 'Media Downloader%s' % (' (32 Bit)' if _x86 else '') # print('Changing working directory to %s' % root_dir) # os.chdir(root_dir) -exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec')) +exec(compile(open('yt_dlp/version.py').read(), 'yt_dlp/version.py', 'exec')) VERSION = locals()['__version__'] VERSION_LIST = VERSION.split('.') @@ -47,17 +47,17 @@ VERSION_FILE = VSVersionInfo( StringFileInfo([ StringTable( '040904B0', [ - StringStruct('Comments', 'Youtube-dlc%s Command Line Interface.' % _x86), - StringStruct('CompanyName', 'https://github.com/pukkandan/yt-dlp'), + StringStruct('Comments', 'yt-dlp%s Command Line Interface.' % _x86), + StringStruct('CompanyName', 'https://github.com/yt-dlp'), StringStruct('FileDescription', FILE_DESCRIPTION), StringStruct('FileVersion', VERSION), - StringStruct('InternalName', 'youtube-dlc%s' % _x86), + StringStruct('InternalName', 'yt-dlp%s' % _x86), StringStruct( 'LegalCopyright', - 'pukkandan@gmail.com | UNLICENSE', + 'pukkandan.ytdlp@gmail.com | UNLICENSE', ), - StringStruct('OriginalFilename', 'youtube-dlc%s.exe' % _x86), - StringStruct('ProductName', 'Youtube-dlc%s' % _x86), + StringStruct('OriginalFilename', 'yt-dlp%s.exe' % _x86), + StringStruct('ProductName', 'yt-dlp%s' % _x86), StringStruct('ProductVersion', '%s%s' % (VERSION, _x86)), ])]), VarFileInfo([VarStruct('Translation', [0, 1200])]) @@ -65,7 +65,7 @@ VERSION_FILE = VSVersionInfo( ) PyInstaller.__main__.run([ - '--name=youtube-dlc%s' % _x86, + '--name=yt-dlp%s' % _x86, '--onefile', '--icon=devscripts/cloud.ico', '--exclude-module=youtube_dl', @@ -74,6 +74,6 @@ PyInstaller.__main__.run([ '--hidden-import=mutagen', '--hidden-import=Crypto', '--upx-exclude=vcruntime140.dll', - 'youtube_dlc/__main__.py', + 'yt_dlp/__main__.py', ]) -SetVersion('dist/youtube-dlc%s.exe' % _x86, VERSION_FILE) +SetVersion('dist/yt-dlp%s.exe' % _x86, VERSION_FILE) diff --git a/setup.cfg b/setup.cfg index e1f03714e8..59372d93a5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,5 +2,5 @@ universal = True [flake8] -exclude = youtube_dlc/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv,devscripts/create-github-release.py,devscripts/release.sh,devscripts/show-downloads-statistics.py +exclude = yt_dlp/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv,devscripts/create-github-release.py,devscripts/release.sh,devscripts/show-downloads-statistics.py ignore = E402,E501,E731,E741,W503 \ No newline at end of file diff --git a/setup.py b/setup.py index 09e2c84c9a..c49b8edaf7 100644 --- a/setup.py +++ b/setup.py @@ -8,15 +8,15 @@ import sys from distutils.spawn import spawn -# Get the version from youtube_dlc/version.py without importing the package -exec(compile(open('youtube_dlc/version.py').read(), - 'youtube_dlc/version.py', 'exec')) +# Get the version from yt_dlp/version.py without importing the package +exec(compile(open('yt_dlp/version.py').read(), + 'yt_dlp/version.py', 'exec')) DESCRIPTION = 'Command-line program to download videos from YouTube.com and many other other video platforms.' LONG_DESCRIPTION = '\n\n'.join(( - 'Official repository: ', + 'Official repository: ', '**PS**: Many links in this document will not work since this is a copy of the README.md from Github', open("README.md", "r", encoding="utf-8").read())) @@ -27,10 +27,10 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe': print("inv") else: files_spec = [ - ('etc/bash_completion.d', ['youtube-dlc.bash-completion']), - ('etc/fish/completions', ['youtube-dlc.fish']), - ('share/doc/youtube_dlc', ['README.txt']), - ('share/man/man1', ['youtube-dlc.1']) + ('etc/bash_completion.d', ['yt-dlp.bash-completion']), + ('etc/fish/completions', ['yt-dlp.fish']), + ('share/doc/yt_dlp', ['README.txt']), + ('share/man/man1', ['yt-dlp.1']) ] root = os.path.dirname(os.path.abspath(__file__)) data_files = [] @@ -46,7 +46,7 @@ else: params = { 'data_files': data_files, } - params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dlc:main']} + params['entry_points'] = {'console_scripts': ['yt-dlp = yt_dlp:main']} class build_lazy_extractors(Command): @@ -61,7 +61,7 @@ class build_lazy_extractors(Command): def run(self): spawn( - [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dlc/extractor/lazy_extractors.py'], + [sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'], dry_run=self.dry_run, ) @@ -72,17 +72,17 @@ setup( name="yt-dlp", version=__version__, maintainer="pukkandan", - maintainer_email="pukkandan@gmail.com", + maintainer_email="pukkandan.ytdlp@gmail.com", description=DESCRIPTION, long_description=LONG_DESCRIPTION, long_description_content_type="text/markdown", - url="https://github.com/pukkandan/yt-dlp", + url="https://github.com/yt-dlp/yt-dlp", packages=packages, install_requires=REQUIREMENTS, project_urls={ - 'Documentation': 'https://github.com/pukkandan/yt-dlp#yt-dlp', - 'Source': 'https://github.com/pukkandan/yt-dlp', - 'Tracker': 'https://github.com/pukkandan/yt-dlp/issues', + 'Documentation': 'https://github.com/yt-dlp/yt-dlp#yt-dlp', + 'Source': 'https://github.com/yt-dlp/yt-dlp', + 'Tracker': 'https://github.com/yt-dlp/yt-dlp/issues', #'Funding': 'https://donate.pypi.org', }, classifiers=[ diff --git a/test/helper.py b/test/helper.py index f45818b0f1..963c405087 100644 --- a/test/helper.py +++ b/test/helper.py @@ -10,13 +10,13 @@ import types import ssl import sys -import youtube_dlc.extractor -from youtube_dlc import YoutubeDL -from youtube_dlc.compat import ( +import yt_dlp.extractor +from yt_dlp import YoutubeDL +from yt_dlp.compat import ( compat_os_name, compat_str, ) -from youtube_dlc.utils import ( +from yt_dlp.utils import ( preferredencoding, write_string, ) @@ -90,7 +90,7 @@ class FakeYDL(YoutubeDL): def gettestcases(include_onlymatching=False): - for ie in youtube_dlc.extractor.gen_extractors(): + for ie in yt_dlp.extractor.gen_extractors(): for tc in ie.get_testcases(include_onlymatching): yield tc diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py index d742284bc5..a086166948 100644 --- a/test/test_InfoExtractor.py +++ b/test/test_InfoExtractor.py @@ -10,10 +10,10 @@ import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL, expect_dict, expect_value, http_server_port -from youtube_dlc.compat import compat_etree_fromstring, compat_http_server -from youtube_dlc.extractor.common import InfoExtractor -from youtube_dlc.extractor import YoutubeIE, get_info_extractor -from youtube_dlc.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError +from yt_dlp.compat import compat_etree_fromstring, compat_http_server +from yt_dlp.extractor.common import InfoExtractor +from yt_dlp.extractor import YoutubeIE, get_info_extractor +from yt_dlp.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError import threading diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py index 43a5dcd749..6ae36638be 100644 --- a/test/test_YoutubeDL.py +++ b/test/test_YoutubeDL.py @@ -12,12 +12,12 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import copy from test.helper import FakeYDL, assertRegexpMatches -from youtube_dlc import YoutubeDL -from youtube_dlc.compat import compat_str, compat_urllib_error -from youtube_dlc.extractor import YoutubeIE -from youtube_dlc.extractor.common import InfoExtractor -from youtube_dlc.postprocessor.common import PostProcessor -from youtube_dlc.utils import ExtractorError, match_filter_func +from yt_dlp import YoutubeDL +from yt_dlp.compat import compat_str, compat_urllib_error +from yt_dlp.extractor import YoutubeIE +from yt_dlp.extractor.common import InfoExtractor +from yt_dlp.postprocessor.common import PostProcessor +from yt_dlp.utils import ExtractorError, match_filter_func TEST_URL = 'http://localhost/sample.mp4' diff --git a/test/test_YoutubeDLCookieJar.py b/test/test_YoutubeDLCookieJar.py index 615d8a9d88..0fadf812b0 100644 --- a/test/test_YoutubeDLCookieJar.py +++ b/test/test_YoutubeDLCookieJar.py @@ -10,7 +10,7 @@ import tempfile import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.utils import YoutubeDLCookieJar +from yt_dlp.utils import YoutubeDLCookieJar class TestYoutubeDLCookieJar(unittest.TestCase): diff --git a/test/test_aes.py b/test/test_aes.py index ef1e1b189c..efbdd2e1a9 100644 --- a/test/test_aes.py +++ b/test/test_aes.py @@ -8,8 +8,8 @@ import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text -from youtube_dlc.utils import bytes_to_intlist, intlist_to_bytes +from yt_dlp.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text +from yt_dlp.utils import bytes_to_intlist, intlist_to_bytes import base64 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py' diff --git a/test/test_age_restriction.py b/test/test_age_restriction.py index b73bdd7674..2eccd47187 100644 --- a/test/test_age_restriction.py +++ b/test/test_age_restriction.py @@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import try_rm -from youtube_dlc import YoutubeDL +from yt_dlp import YoutubeDL def _download_restricted(url, filename, age): diff --git a/test/test_all_urls.py b/test/test_all_urls.py index c16b427a30..e6cb33cd2f 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import gettestcases -from youtube_dlc.extractor import ( +from yt_dlp.extractor import ( FacebookIE, gen_extractors, YoutubeIE, diff --git a/test/test_cache.py b/test/test_cache.py index 1167519d11..d6de221946 100644 --- a/test/test_cache.py +++ b/test/test_cache.py @@ -13,7 +13,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL -from youtube_dlc.cache import Cache +from yt_dlp.cache import Cache def _is_empty(d): diff --git a/test/test_compat.py b/test/test_compat.py index 20a7099d66..d903a5bfea 100644 --- a/test/test_compat.py +++ b/test/test_compat.py @@ -10,7 +10,7 @@ import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.compat import ( +from yt_dlp.compat import ( compat_getenv, compat_setenv, compat_etree_Element, @@ -30,11 +30,11 @@ from youtube_dlc.compat import ( class TestCompat(unittest.TestCase): def test_compat_getenv(self): test_str = 'тест' - compat_setenv('youtube_dlc_COMPAT_GETENV', test_str) - self.assertEqual(compat_getenv('youtube_dlc_COMPAT_GETENV'), test_str) + compat_setenv('yt_dlp_COMPAT_GETENV', test_str) + self.assertEqual(compat_getenv('yt_dlp_COMPAT_GETENV'), test_str) def test_compat_setenv(self): - test_var = 'youtube_dlc_COMPAT_SETENV' + test_var = 'yt_dlp_COMPAT_SETENV' test_str = 'тест' compat_setenv(test_var, test_str) compat_getenv(test_var) @@ -48,11 +48,11 @@ class TestCompat(unittest.TestCase): compat_setenv('HOME', old_home or '') def test_all_present(self): - import youtube_dlc.compat - all_names = youtube_dlc.compat.__all__ + import yt_dlp.compat + all_names = yt_dlp.compat.__all__ present_names = set(filter( lambda c: '_' in c and not c.startswith('_'), - dir(youtube_dlc.compat))) - set(['unicode_literals']) + dir(yt_dlp.compat))) - set(['unicode_literals']) self.assertEqual(all_names, sorted(present_names)) def test_compat_urllib_parse_quote(self): diff --git a/test/test_download.py b/test/test_download.py index bcd3b40417..5559b4d6fe 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -24,24 +24,24 @@ import io import json import socket -import youtube_dlc.YoutubeDL -from youtube_dlc.compat import ( +import yt_dlp.YoutubeDL +from yt_dlp.compat import ( compat_http_client, compat_urllib_error, compat_HTTPError, ) -from youtube_dlc.utils import ( +from yt_dlp.utils import ( DownloadError, ExtractorError, format_bytes, UnavailableVideoError, ) -from youtube_dlc.extractor import get_info_extractor +from yt_dlp.extractor import get_info_extractor RETRIES = 3 -class YoutubeDL(youtube_dlc.YoutubeDL): +class YoutubeDL(yt_dlp.YoutubeDL): def __init__(self, *args, **kwargs): self.to_stderr = self.to_screen self.processed_info_dicts = [] @@ -92,7 +92,7 @@ class TestDownload(unittest.TestCase): def generator(test_case, tname): def test_template(self): - ie = youtube_dlc.extractor.get_info_extractor(test_case['name'])() + ie = yt_dlp.extractor.get_info_extractor(test_case['name'])() other_ies = [get_info_extractor(ie_key)() for ie_key in test_case.get('add_ie', [])] is_playlist = any(k.startswith('playlist') for k in test_case) test_cases = test_case.get( diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py index c8e28bd3a3..2ef96b922c 100644 --- a/test/test_downloader_http.py +++ b/test/test_downloader_http.py @@ -10,10 +10,10 @@ import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import http_server_port, try_rm -from youtube_dlc import YoutubeDL -from youtube_dlc.compat import compat_http_server -from youtube_dlc.downloader.http import HttpFD -from youtube_dlc.utils import encodeFilename +from yt_dlp import YoutubeDL +from yt_dlp.compat import compat_http_server +from yt_dlp.downloader.http import HttpFD +from yt_dlp.utils import encodeFilename import threading TEST_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/test/test_execution.py b/test/test_execution.py index b18e63d73f..2aea4df1bd 100644 --- a/test/test_execution.py +++ b/test/test_execution.py @@ -10,7 +10,7 @@ import os import subprocess sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.utils import encodeArgument +from yt_dlp.utils import encodeArgument rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -23,18 +23,18 @@ except AttributeError: class TestExecution(unittest.TestCase): def test_import(self): - subprocess.check_call([sys.executable, '-c', 'import youtube_dlc'], cwd=rootDir) + subprocess.check_call([sys.executable, '-c', 'import yt_dlp'], cwd=rootDir) def test_module_exec(self): if sys.version_info >= (2, 7): # Python 2.6 doesn't support package execution - subprocess.check_call([sys.executable, '-m', 'youtube_dlc', '--version'], cwd=rootDir, stdout=_DEV_NULL) + subprocess.check_call([sys.executable, '-m', 'yt_dlp', '--version'], cwd=rootDir, stdout=_DEV_NULL) def test_main_exec(self): - subprocess.check_call([sys.executable, 'youtube_dlc/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL) + subprocess.check_call([sys.executable, 'yt_dlp/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL) def test_cmdline_umlauts(self): p = subprocess.Popen( - [sys.executable, 'youtube_dlc/__main__.py', encodeArgument('ä'), '--version'], + [sys.executable, 'yt_dlp/__main__.py', encodeArgument('ä'), '--version'], cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE) _, stderr = p.communicate() self.assertFalse(stderr) diff --git a/test/test_http.py b/test/test_http.py index 55c3c6183d..c9e7ee225c 100644 --- a/test/test_http.py +++ b/test/test_http.py @@ -9,8 +9,8 @@ import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import http_server_port -from youtube_dlc import YoutubeDL -from youtube_dlc.compat import compat_http_server, compat_urllib_request +from yt_dlp import YoutubeDL +from yt_dlp.compat import compat_http_server, compat_urllib_request import ssl import threading diff --git a/test/test_iqiyi_sdk_interpreter.py b/test/test_iqiyi_sdk_interpreter.py index 303609baa4..b39bf42701 100644 --- a/test/test_iqiyi_sdk_interpreter.py +++ b/test/test_iqiyi_sdk_interpreter.py @@ -9,7 +9,7 @@ import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL -from youtube_dlc.extractor import IqiyiIE +from yt_dlp.extractor import IqiyiIE class IqiyiIEWithCredentials(IqiyiIE): diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py index 97fc8d5aa8..def823884d 100644 --- a/test/test_jsinterp.py +++ b/test/test_jsinterp.py @@ -8,7 +8,7 @@ import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.jsinterp import JSInterpreter +from yt_dlp.jsinterp import JSInterpreter class TestJSInterpreter(unittest.TestCase): diff --git a/test/test_netrc.py b/test/test_netrc.py index 566ba37a64..36b9435917 100644 --- a/test/test_netrc.py +++ b/test/test_netrc.py @@ -7,7 +7,7 @@ import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.extractor import ( +from yt_dlp.extractor import ( gen_extractors, ) diff --git a/test/test_options.py b/test/test_options.py index dce2533736..42d9183a96 100644 --- a/test/test_options.py +++ b/test/test_options.py @@ -8,7 +8,7 @@ import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.options import _hide_login_info +from yt_dlp.options import _hide_login_info class TestOptions(unittest.TestCase): diff --git a/test/test_overwrites.py b/test/test_overwrites.py index d5c866c833..41b4e6dead 100644 --- a/test/test_overwrites.py +++ b/test/test_overwrites.py @@ -23,7 +23,7 @@ class TestOverwrites(unittest.TestCase): def test_default_overwrites(self): outp = subprocess.Popen( [ - sys.executable, 'youtube_dlc/__main__.py', + sys.executable, 'yt_dlp/__main__.py', '-o', 'test.webm', 'https://www.youtube.com/watch?v=jNQXAC9IVRw' ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -35,7 +35,7 @@ class TestOverwrites(unittest.TestCase): def test_yes_overwrites(self): outp = subprocess.Popen( [ - sys.executable, 'youtube_dlc/__main__.py', '--yes-overwrites', + sys.executable, 'yt_dlp/__main__.py', '--yes-overwrites', '-o', 'test.webm', 'https://www.youtube.com/watch?v=jNQXAC9IVRw' ], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/test/test_post_hooks.py b/test/test_post_hooks.py index 63500924e9..51031871c6 100644 --- a/test/test_post_hooks.py +++ b/test/test_post_hooks.py @@ -8,11 +8,11 @@ import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import get_params, try_rm -import youtube_dlc.YoutubeDL -from youtube_dlc.utils import DownloadError +import yt_dlp.YoutubeDL +from yt_dlp.utils import DownloadError -class YoutubeDL(youtube_dlc.YoutubeDL): +class YoutubeDL(yt_dlp.YoutubeDL): def __init__(self, *args, **kwargs): super(YoutubeDL, self).__init__(*args, **kwargs) self.to_stderr = self.to_screen diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py index fabe7e6fb9..2e9a1bf943 100644 --- a/test/test_postprocessors.py +++ b/test/test_postprocessors.py @@ -8,7 +8,7 @@ import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dlc.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP +from yt_dlp.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP class TestMetadataFromField(unittest.TestCase): diff --git a/test/test_socks.py b/test/test_socks.py index be52e2343e..8b42869821 100644 --- a/test/test_socks.py +++ b/test/test_socks.py @@ -15,7 +15,7 @@ from test.helper import ( FakeYDL, get_params, ) -from youtube_dlc.compat import ( +from yt_dlp.compat import ( compat_str, compat_urllib_request, ) diff --git a/test/test_subtitles.py b/test/test_subtitles.py index 0014d57b69..61547cdb10 100644 --- a/test/test_subtitles.py +++ b/test/test_subtitles.py @@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL, md5 -from youtube_dlc.extractor import ( +from yt_dlp.extractor import ( YoutubeIE, DailymotionIE, TEDIE, diff --git a/test/test_swfinterp.py b/test/test_swfinterp.py index 1a8b353e8d..29a390e425 100644 --- a/test/test_swfinterp.py +++ b/test/test_swfinterp.py @@ -14,7 +14,7 @@ import json import re import subprocess -from youtube_dlc.swfinterp import SWFInterpreter +from yt_dlp.swfinterp import SWFInterpreter TEST_DIR = os.path.join( diff --git a/test/test_update.py.disabled b/test/test_update.py.disabled index 1b144c43c4..617aee2f8b 100644 --- a/test/test_update.py.disabled +++ b/test/test_update.py.disabled @@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import json -from youtube_dlc.update import rsa_verify +from yt_dlp.update import rsa_verify class TestUpdate(unittest.TestCase): diff --git a/test/test_utils.py b/test/test_utils.py index a0f78ebe14..795d2b46a2 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -15,7 +15,7 @@ import io import json import xml.etree.ElementTree -from youtube_dlc.utils import ( +from yt_dlp.utils import ( age_restricted, args_to_str, encode_base_n, @@ -107,7 +107,7 @@ from youtube_dlc.utils import ( parse_codecs, iri_to_uri, ) -from youtube_dlc.compat import ( +from yt_dlp.compat import ( compat_chr, compat_etree_fromstring, compat_getenv, @@ -242,12 +242,12 @@ class TestUtil(unittest.TestCase): def env(var): return '%{0}%'.format(var) if sys.platform == 'win32' else '${0}'.format(var) - compat_setenv('youtube_dlc_EXPATH_PATH', 'expanded') - self.assertEqual(expand_path(env('youtube_dlc_EXPATH_PATH')), 'expanded') + compat_setenv('yt_dlp_EXPATH_PATH', 'expanded') + self.assertEqual(expand_path(env('yt_dlp_EXPATH_PATH')), 'expanded') self.assertEqual(expand_path(env('HOME')), compat_getenv('HOME')) self.assertEqual(expand_path('~'), compat_getenv('HOME')) self.assertEqual( - expand_path('~/%s' % env('youtube_dlc_EXPATH_PATH')), + expand_path('~/%s' % env('yt_dlp_EXPATH_PATH')), '%s/expanded' % compat_getenv('HOME')) def test_prepend_extension(self): @@ -1425,8 +1425,8 @@ Line 1 self.assertEqual(caesar('ebg', 'acegik', -2), 'abc') def test_rot47(self): - self.assertEqual(rot47('youtube-dlc'), r'J@FEF36\5=4') - self.assertEqual(rot47('YOUTUBE-DLC'), r'*~&%&qt\s{r') + self.assertEqual(rot47('yt-dlp'), r'JE\5=A') + self.assertEqual(rot47('YT-DLP'), r'*%\s{!') def test_urshift(self): self.assertEqual(urshift(3, 1), 1) diff --git a/test/test_verbose_output.py b/test/test_verbose_output.py index 462f25e03f..9b1ccde880 100644 --- a/test/test_verbose_output.py +++ b/test/test_verbose_output.py @@ -17,7 +17,7 @@ class TestVerboseOutput(unittest.TestCase): def test_private_info_arg(self): outp = subprocess.Popen( [ - sys.executable, 'youtube_dlc/__main__.py', '-v', + sys.executable, 'yt_dlp/__main__.py', '-v', '--username', 'johnsmith@gmail.com', '--password', 'secret', ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -30,7 +30,7 @@ class TestVerboseOutput(unittest.TestCase): def test_private_info_shortarg(self): outp = subprocess.Popen( [ - sys.executable, 'youtube_dlc/__main__.py', '-v', + sys.executable, 'yt_dlp/__main__.py', '-v', '-u', 'johnsmith@gmail.com', '-p', 'secret', ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -43,7 +43,7 @@ class TestVerboseOutput(unittest.TestCase): def test_private_info_eq(self): outp = subprocess.Popen( [ - sys.executable, 'youtube_dlc/__main__.py', '-v', + sys.executable, 'yt_dlp/__main__.py', '-v', '--username=johnsmith@gmail.com', '--password=secret', ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -56,7 +56,7 @@ class TestVerboseOutput(unittest.TestCase): def test_private_info_shortarg_eq(self): outp = subprocess.Popen( [ - sys.executable, 'youtube_dlc/__main__.py', '-v', + sys.executable, 'yt_dlp/__main__.py', '-v', '-u=johnsmith@gmail.com', '-p=secret', ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py index d98c96c15f..3a01223748 100644 --- a/test/test_write_annotations.py +++ b/test/test_write_annotations.py @@ -15,11 +15,11 @@ import io import xml.etree.ElementTree -import youtube_dlc.YoutubeDL -import youtube_dlc.extractor +import yt_dlp.YoutubeDL +import yt_dlp.extractor -class YoutubeDL(youtube_dlc.YoutubeDL): +class YoutubeDL(yt_dlp.YoutubeDL): def __init__(self, *args, **kwargs): super(YoutubeDL, self).__init__(*args, **kwargs) self.to_stderr = self.to_screen @@ -45,7 +45,7 @@ class TestAnnotations(unittest.TestCase): def test_info_json(self): expected = list(EXPECTED_ANNOTATIONS) # Two annotations could have the same text. - ie = youtube_dlc.extractor.YoutubeIE() + ie = yt_dlp.extractor.YoutubeIE() ydl = YoutubeDL(params) ydl.add_info_extractor(ie) ydl.download([TEST_ID]) diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index d9b8fa5500..b38a47fc51 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -10,7 +10,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from test.helper import FakeYDL -from youtube_dlc.extractor import ( +from yt_dlp.extractor import ( YoutubePlaylistIE, YoutubeTabIE, YoutubeIE, diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py index 2685185918..80cb4b93aa 100644 --- a/test/test_youtube_signature.py +++ b/test/test_youtube_signature.py @@ -13,8 +13,8 @@ import re import string from test.helper import FakeYDL -from youtube_dlc.extractor import YoutubeIE -from youtube_dlc.compat import compat_str, compat_urlretrieve +from yt_dlp.extractor import YoutubeIE +from yt_dlp.compat import compat_str, compat_urlretrieve _TESTS = [ ( diff --git a/tox.ini b/tox.ini index 842091d65c..4e7143fc61 100644 --- a/tox.ini +++ b/tox.ini @@ -10,5 +10,5 @@ defaultargs = test --exclude test_download.py --exclude test_age_restriction.py --exclude test_subtitles.py --exclude test_write_annotations.py --exclude test_youtube_lists.py --exclude test_iqiyi_sdk_interpreter.py --exclude test_socks.py -commands = nosetests --verbose {posargs:{[testenv]defaultargs}} # --with-coverage --cover-package=youtube_dlc --cover-html +commands = nosetests --verbose {posargs:{[testenv]defaultargs}} # --with-coverage --cover-package=yt_dlp --cover-html # test.test_download:TestDownload.test_NowVideo diff --git a/youtube-dlc.cmd b/youtube-dlc.cmd deleted file mode 100644 index 4bda71f173..0000000000 --- a/youtube-dlc.cmd +++ /dev/null @@ -1 +0,0 @@ -@py "%~dp0youtube_dlc\__main__.py" %* \ No newline at end of file diff --git a/youtube-dlc.sh b/youtube-dlc.sh deleted file mode 100644 index 4b86f3b1df..0000000000 --- a/youtube-dlc.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -python3 -m youtube_dlc "$@" \ No newline at end of file diff --git a/yt-dlp.cmd b/yt-dlp.cmd new file mode 100644 index 0000000000..2b651a41e4 --- /dev/null +++ b/yt-dlp.cmd @@ -0,0 +1 @@ +@py "%~dp0yt_dlp\__main__.py" %* \ No newline at end of file diff --git a/yt-dlp.sh b/yt-dlp.sh new file mode 100644 index 0000000000..97b86e0f0a --- /dev/null +++ b/yt-dlp.sh @@ -0,0 +1,2 @@ +#!/bin/bash +python3 "$(dirname $(realpath $0))/yt_dlp/__main__.py" "$@" diff --git a/yt-dlp.sublime-project b/yt-dlp.sublime-project deleted file mode 100644 index 0ffdc674b2..0000000000 --- a/yt-dlp.sublime-project +++ /dev/null @@ -1,18 +0,0 @@ -{ - "folders": - [ - { - "path": "./youtube_dlc", - "folder_exclude_patterns": ["__pycache__"], - }, - { - "path": "./youtube_dl", - "folder_exclude_patterns": ["__pycache__"], - }, - { - "path": ".", - "name": "root-folder", - "folder_exclude_patterns": ["youtube_dl", "youtube_dlc", ".git", "build", "dist", "zip"], - }, - ] -} diff --git a/youtube_dlc/YoutubeDL.py b/yt_dlp/YoutubeDL.py similarity index 99% rename from youtube_dlc/YoutubeDL.py rename to yt_dlp/YoutubeDL.py index 8ff6a64f04..a54755e158 100644 --- a/youtube_dlc/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -199,7 +199,7 @@ class YoutubeDL(object): trim_file_name: Limit length of filename (extension excluded) windowsfilenames: Force the filenames to be windows compatible ignoreerrors: Do not stop on download errors - (Default True when running youtube-dlc, + (Default True when running yt-dlp, but False when directly accessing YoutubeDL class) force_generic_extractor: Force downloader to use the generic extractor overwrites: Overwrite all video and metadata files if True, @@ -279,7 +279,7 @@ class YoutubeDL(object): playlist items. postprocessors: A list of dictionaries, each with an entry * key: The name of the postprocessor. See - youtube_dlc/postprocessor/__init__.py for a list. + yt_dlp/postprocessor/__init__.py for a list. * _after_move: Optional. If True, run this post_processor after 'MoveFilesAfterDownload' as well as any further keyword arguments for the @@ -323,7 +323,7 @@ class YoutubeDL(object): about it, warn otherwise (default) source_address: Client-side IP address to bind to. call_home: Boolean, true iff we are allowed to contact the - youtube-dlc servers for debugging. + yt-dlp servers for debugging. (BROKEN) sleep_interval: Number of seconds to sleep before each download when used alone or a lower bound of a range for randomized sleep before each download (minimum possible number @@ -360,7 +360,7 @@ class YoutubeDL(object): use downloader suggested by extractor if None. The following parameters are not used by YoutubeDL itself, they are used by - the downloader (see youtube_dlc/downloader/common.py): + the downloader (see yt_dlp/downloader/common.py): nopart, updatetime, buffersize, ratelimit, min_filesize, max_filesize, test, noresizebuffer, retries, continuedl, noprogress, consoletitle, xattr_set_filesize, external_downloader_args, hls_use_mpegts, @@ -549,7 +549,7 @@ class YoutubeDL(object): if re.match(r'^-[0-9A-Za-z_-]{10}$', a)] if idxs: correct_argv = ( - ['youtube-dlc'] + ['yt-dlp'] + [a for i, a in enumerate(argv) if i not in idxs] + ['--'] + [argv[i] for i in idxs] ) @@ -2893,7 +2893,7 @@ class YoutubeDL(object): file_handler = compat_urllib_request.FileHandler() def file_open(*args, **kwargs): - raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dlc for security reasons') + raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in yt-dlp for security reasons') file_handler.file_open = file_open opener = compat_urllib_request.build_opener( diff --git a/youtube_dlc/__init__.py b/yt_dlp/__init__.py similarity index 99% rename from youtube_dlc/__init__.py rename to yt_dlp/__init__.py index 60400632d5..91539daaf8 100644 --- a/youtube_dlc/__init__.py +++ b/yt_dlp/__init__.py @@ -57,7 +57,7 @@ def _real_main(argv=None): workaround_optparse_bug9161() - setproctitle('youtube-dlc') + setproctitle('yt-dlp') parser, opts, args = parseOpts(argv) @@ -573,7 +573,7 @@ def _real_main(argv=None): ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv) parser.error( 'You must provide at least one URL.\n' - 'Type youtube-dlc --help to see a list of all options.') + 'Type yt-dlp --help to see a list of all options.') try: if opts.load_info_filename is not None: diff --git a/youtube_dlc/__main__.py b/yt_dlp/__main__.py similarity index 73% rename from youtube_dlc/__main__.py rename to yt_dlp/__main__.py index 0e76016868..f7329d67ea 100644 --- a/youtube_dlc/__main__.py +++ b/yt_dlp/__main__.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals # Execute with -# $ python youtube_dlc/__main__.py (2.6+) -# $ python -m youtube_dlc (2.7+) +# $ python yt_dlp/__main__.py (2.6+) +# $ python -m yt_dlp (2.7+) import sys @@ -13,7 +13,7 @@ if __package__ is None and not hasattr(sys, 'frozen'): path = os.path.realpath(os.path.abspath(__file__)) sys.path.insert(0, os.path.dirname(os.path.dirname(path))) -import youtube_dlc +import yt_dlp if __name__ == '__main__': - youtube_dlc.main() + yt_dlp.main() diff --git a/youtube_dlc/aes.py b/yt_dlp/aes.py similarity index 100% rename from youtube_dlc/aes.py rename to yt_dlp/aes.py diff --git a/youtube_dlc/cache.py b/yt_dlp/cache.py similarity index 98% rename from youtube_dlc/cache.py rename to yt_dlp/cache.py index ada6aa1f28..dde9cca646 100644 --- a/youtube_dlc/cache.py +++ b/yt_dlp/cache.py @@ -23,7 +23,7 @@ class Cache(object): res = self._ydl.params.get('cachedir') if res is None: cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache') - res = os.path.join(cache_root, 'youtube-dlc') + res = os.path.join(cache_root, 'yt-dlp') return expand_path(res) def _get_cache_fn(self, section, key, dtype): diff --git a/youtube_dlc/compat.py b/yt_dlp/compat.py similarity index 99% rename from youtube_dlc/compat.py rename to yt_dlp/compat.py index 4a75a336c8..9659d480e1 100644 --- a/youtube_dlc/compat.py +++ b/yt_dlp/compat.py @@ -2993,7 +2993,7 @@ else: if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0): # PyPy2 prior to version 5.4.0 expects byte strings as Windows function - # names, see the original PyPy issue [1] and the youtube-dlc one [2]. + # names, see the original PyPy issue [1] and the yt-dlp one [2]. # 1. https://bitbucket.org/pypy/pypy/issues/2360/windows-ctypescdll-typeerror-function-name # 2. https://github.com/ytdl-org/youtube-dl/pull/4392 def compat_ctypes_WINFUNCTYPE(*args, **kwargs): diff --git a/youtube_dlc/downloader/__init__.py b/yt_dlp/downloader/__init__.py similarity index 100% rename from youtube_dlc/downloader/__init__.py rename to yt_dlp/downloader/__init__.py diff --git a/youtube_dlc/downloader/common.py b/yt_dlp/downloader/common.py similarity index 99% rename from youtube_dlc/downloader/common.py rename to yt_dlp/downloader/common.py index f7e7955aae..7f72969157 100644 --- a/youtube_dlc/downloader/common.py +++ b/yt_dlp/downloader/common.py @@ -243,7 +243,7 @@ class FileDownloader(object): else: clear_line = ('\r\x1b[K' if sys.stderr.isatty() else '\r') self.to_screen(clear_line + fullmsg, skip_eol=not is_last_line) - self.to_console_title('youtube-dlc ' + msg) + self.to_console_title('yt-dlp ' + msg) def report_progress(self, s): if s['status'] == 'finished': diff --git a/youtube_dlc/downloader/dash.py b/yt_dlp/downloader/dash.py similarity index 100% rename from youtube_dlc/downloader/dash.py rename to yt_dlp/downloader/dash.py diff --git a/youtube_dlc/downloader/external.py b/yt_dlp/downloader/external.py similarity index 100% rename from youtube_dlc/downloader/external.py rename to yt_dlp/downloader/external.py diff --git a/youtube_dlc/downloader/f4m.py b/yt_dlp/downloader/f4m.py similarity index 100% rename from youtube_dlc/downloader/f4m.py rename to yt_dlp/downloader/f4m.py diff --git a/youtube_dlc/downloader/fragment.py b/yt_dlp/downloader/fragment.py similarity index 98% rename from youtube_dlc/downloader/fragment.py rename to yt_dlp/downloader/fragment.py index 5bc7f50f68..44beed0664 100644 --- a/youtube_dlc/downloader/fragment.py +++ b/yt_dlp/downloader/fragment.py @@ -32,9 +32,9 @@ class FragmentFD(FileDownloader): keep_fragments: Keep downloaded fragments on disk after downloading is finished - For each incomplete fragment download youtube-dlc keeps on disk a special + For each incomplete fragment download yt-dlp keeps on disk a special bookkeeping file with download state and metadata (in future such files will - be used for any incomplete download handled by youtube-dlc). This file is + be used for any incomplete download handled by yt-dlp). This file is used to properly handle resuming, check download file consistency and detect potential errors. The file has a .ytdl extension and represents a standard JSON file of the following format: diff --git a/youtube_dlc/downloader/hls.py b/yt_dlp/downloader/hls.py similarity index 100% rename from youtube_dlc/downloader/hls.py rename to yt_dlp/downloader/hls.py diff --git a/youtube_dlc/downloader/http.py b/yt_dlp/downloader/http.py similarity index 100% rename from youtube_dlc/downloader/http.py rename to yt_dlp/downloader/http.py diff --git a/youtube_dlc/downloader/ism.py b/yt_dlp/downloader/ism.py similarity index 100% rename from youtube_dlc/downloader/ism.py rename to yt_dlp/downloader/ism.py diff --git a/youtube_dlc/downloader/niconico.py b/yt_dlp/downloader/niconico.py similarity index 100% rename from youtube_dlc/downloader/niconico.py rename to yt_dlp/downloader/niconico.py diff --git a/youtube_dlc/downloader/rtmp.py b/yt_dlp/downloader/rtmp.py similarity index 100% rename from youtube_dlc/downloader/rtmp.py rename to yt_dlp/downloader/rtmp.py diff --git a/youtube_dlc/downloader/rtsp.py b/yt_dlp/downloader/rtsp.py similarity index 100% rename from youtube_dlc/downloader/rtsp.py rename to yt_dlp/downloader/rtsp.py diff --git a/youtube_dlc/downloader/youtube_live_chat.py b/yt_dlp/downloader/youtube_live_chat.py similarity index 100% rename from youtube_dlc/downloader/youtube_live_chat.py rename to yt_dlp/downloader/youtube_live_chat.py diff --git a/youtube_dlc/extractor/__init__.py b/yt_dlp/extractor/__init__.py similarity index 100% rename from youtube_dlc/extractor/__init__.py rename to yt_dlp/extractor/__init__.py diff --git a/youtube_dlc/extractor/abc.py b/yt_dlp/extractor/abc.py similarity index 100% rename from youtube_dlc/extractor/abc.py rename to yt_dlp/extractor/abc.py diff --git a/youtube_dlc/extractor/abcnews.py b/yt_dlp/extractor/abcnews.py similarity index 100% rename from youtube_dlc/extractor/abcnews.py rename to yt_dlp/extractor/abcnews.py diff --git a/youtube_dlc/extractor/abcotvs.py b/yt_dlp/extractor/abcotvs.py similarity index 100% rename from youtube_dlc/extractor/abcotvs.py rename to yt_dlp/extractor/abcotvs.py diff --git a/youtube_dlc/extractor/academicearth.py b/yt_dlp/extractor/academicearth.py similarity index 100% rename from youtube_dlc/extractor/academicearth.py rename to yt_dlp/extractor/academicearth.py diff --git a/youtube_dlc/extractor/acast.py b/yt_dlp/extractor/acast.py similarity index 100% rename from youtube_dlc/extractor/acast.py rename to yt_dlp/extractor/acast.py diff --git a/youtube_dlc/extractor/adn.py b/yt_dlp/extractor/adn.py similarity index 100% rename from youtube_dlc/extractor/adn.py rename to yt_dlp/extractor/adn.py diff --git a/youtube_dlc/extractor/adobeconnect.py b/yt_dlp/extractor/adobeconnect.py similarity index 100% rename from youtube_dlc/extractor/adobeconnect.py rename to yt_dlp/extractor/adobeconnect.py diff --git a/youtube_dlc/extractor/adobepass.py b/yt_dlp/extractor/adobepass.py similarity index 100% rename from youtube_dlc/extractor/adobepass.py rename to yt_dlp/extractor/adobepass.py diff --git a/youtube_dlc/extractor/adobetv.py b/yt_dlp/extractor/adobetv.py similarity index 100% rename from youtube_dlc/extractor/adobetv.py rename to yt_dlp/extractor/adobetv.py diff --git a/youtube_dlc/extractor/adultswim.py b/yt_dlp/extractor/adultswim.py similarity index 100% rename from youtube_dlc/extractor/adultswim.py rename to yt_dlp/extractor/adultswim.py diff --git a/youtube_dlc/extractor/aenetworks.py b/yt_dlp/extractor/aenetworks.py similarity index 100% rename from youtube_dlc/extractor/aenetworks.py rename to yt_dlp/extractor/aenetworks.py diff --git a/youtube_dlc/extractor/afreecatv.py b/yt_dlp/extractor/afreecatv.py similarity index 100% rename from youtube_dlc/extractor/afreecatv.py rename to yt_dlp/extractor/afreecatv.py diff --git a/youtube_dlc/extractor/airmozilla.py b/yt_dlp/extractor/airmozilla.py similarity index 100% rename from youtube_dlc/extractor/airmozilla.py rename to yt_dlp/extractor/airmozilla.py diff --git a/youtube_dlc/extractor/aliexpress.py b/yt_dlp/extractor/aliexpress.py similarity index 100% rename from youtube_dlc/extractor/aliexpress.py rename to yt_dlp/extractor/aliexpress.py diff --git a/youtube_dlc/extractor/aljazeera.py b/yt_dlp/extractor/aljazeera.py similarity index 100% rename from youtube_dlc/extractor/aljazeera.py rename to yt_dlp/extractor/aljazeera.py diff --git a/youtube_dlc/extractor/allocine.py b/yt_dlp/extractor/allocine.py similarity index 100% rename from youtube_dlc/extractor/allocine.py rename to yt_dlp/extractor/allocine.py diff --git a/youtube_dlc/extractor/alphaporno.py b/yt_dlp/extractor/alphaporno.py similarity index 100% rename from youtube_dlc/extractor/alphaporno.py rename to yt_dlp/extractor/alphaporno.py diff --git a/youtube_dlc/extractor/alura.py b/yt_dlp/extractor/alura.py similarity index 100% rename from youtube_dlc/extractor/alura.py rename to yt_dlp/extractor/alura.py diff --git a/youtube_dlc/extractor/amara.py b/yt_dlp/extractor/amara.py similarity index 100% rename from youtube_dlc/extractor/amara.py rename to yt_dlp/extractor/amara.py diff --git a/youtube_dlc/extractor/amcnetworks.py b/yt_dlp/extractor/amcnetworks.py similarity index 100% rename from youtube_dlc/extractor/amcnetworks.py rename to yt_dlp/extractor/amcnetworks.py diff --git a/youtube_dlc/extractor/americastestkitchen.py b/yt_dlp/extractor/americastestkitchen.py similarity index 100% rename from youtube_dlc/extractor/americastestkitchen.py rename to yt_dlp/extractor/americastestkitchen.py diff --git a/youtube_dlc/extractor/amp.py b/yt_dlp/extractor/amp.py similarity index 100% rename from youtube_dlc/extractor/amp.py rename to yt_dlp/extractor/amp.py diff --git a/youtube_dlc/extractor/animelab.py b/yt_dlp/extractor/animelab.py similarity index 100% rename from youtube_dlc/extractor/animelab.py rename to yt_dlp/extractor/animelab.py diff --git a/youtube_dlc/extractor/animeondemand.py b/yt_dlp/extractor/animeondemand.py similarity index 100% rename from youtube_dlc/extractor/animeondemand.py rename to yt_dlp/extractor/animeondemand.py diff --git a/youtube_dlc/extractor/anvato.py b/yt_dlp/extractor/anvato.py similarity index 99% rename from youtube_dlc/extractor/anvato.py rename to yt_dlp/extractor/anvato.py index ab69b69bd5..7386ae2e6b 100644 --- a/youtube_dlc/extractor/anvato.py +++ b/yt_dlp/extractor/anvato.py @@ -23,7 +23,7 @@ from ..utils import ( # This import causes a ModuleNotFoundError on some systems for unknown reason. # See issues: -# https://github.com/pukkandan/yt-dlp/issues/35 +# https://github.com/yt-dlp/yt-dlp/issues/35 # https://github.com/ytdl-org/youtube-dl/issues/27449 # https://github.com/animelover1984/youtube-dl/issues/17 try: diff --git a/youtube_dlc/extractor/anvato_token_generator/__init__.py b/yt_dlp/extractor/anvato_token_generator/__init__.py similarity index 100% rename from youtube_dlc/extractor/anvato_token_generator/__init__.py rename to yt_dlp/extractor/anvato_token_generator/__init__.py diff --git a/youtube_dlc/extractor/anvato_token_generator/common.py b/yt_dlp/extractor/anvato_token_generator/common.py similarity index 100% rename from youtube_dlc/extractor/anvato_token_generator/common.py rename to yt_dlp/extractor/anvato_token_generator/common.py diff --git a/youtube_dlc/extractor/anvato_token_generator/nfl.py b/yt_dlp/extractor/anvato_token_generator/nfl.py similarity index 100% rename from youtube_dlc/extractor/anvato_token_generator/nfl.py rename to yt_dlp/extractor/anvato_token_generator/nfl.py diff --git a/youtube_dlc/extractor/aol.py b/yt_dlp/extractor/aol.py similarity index 100% rename from youtube_dlc/extractor/aol.py rename to yt_dlp/extractor/aol.py diff --git a/youtube_dlc/extractor/apa.py b/yt_dlp/extractor/apa.py similarity index 100% rename from youtube_dlc/extractor/apa.py rename to yt_dlp/extractor/apa.py diff --git a/youtube_dlc/extractor/aparat.py b/yt_dlp/extractor/aparat.py similarity index 100% rename from youtube_dlc/extractor/aparat.py rename to yt_dlp/extractor/aparat.py diff --git a/youtube_dlc/extractor/appleconnect.py b/yt_dlp/extractor/appleconnect.py similarity index 100% rename from youtube_dlc/extractor/appleconnect.py rename to yt_dlp/extractor/appleconnect.py diff --git a/youtube_dlc/extractor/applepodcasts.py b/yt_dlp/extractor/applepodcasts.py similarity index 100% rename from youtube_dlc/extractor/applepodcasts.py rename to yt_dlp/extractor/applepodcasts.py diff --git a/youtube_dlc/extractor/appletrailers.py b/yt_dlp/extractor/appletrailers.py similarity index 99% rename from youtube_dlc/extractor/appletrailers.py rename to yt_dlp/extractor/appletrailers.py index b5ed2b88b3..d3d77a1d0b 100644 --- a/youtube_dlc/extractor/appletrailers.py +++ b/yt_dlp/extractor/appletrailers.py @@ -199,7 +199,7 @@ class AppleTrailersIE(InfoExtractor): 'upload_date': upload_date, 'uploader_id': uploader_id, 'http_headers': { - 'User-Agent': 'QuickTime compatible (youtube-dlc)', + 'User-Agent': 'QuickTime compatible (yt-dlp)', }, }) diff --git a/youtube_dlc/extractor/archiveorg.py b/yt_dlp/extractor/archiveorg.py similarity index 100% rename from youtube_dlc/extractor/archiveorg.py rename to yt_dlp/extractor/archiveorg.py diff --git a/youtube_dlc/extractor/arcpublishing.py b/yt_dlp/extractor/arcpublishing.py similarity index 100% rename from youtube_dlc/extractor/arcpublishing.py rename to yt_dlp/extractor/arcpublishing.py diff --git a/youtube_dlc/extractor/ard.py b/yt_dlp/extractor/ard.py similarity index 100% rename from youtube_dlc/extractor/ard.py rename to yt_dlp/extractor/ard.py diff --git a/youtube_dlc/extractor/arkena.py b/yt_dlp/extractor/arkena.py similarity index 100% rename from youtube_dlc/extractor/arkena.py rename to yt_dlp/extractor/arkena.py diff --git a/youtube_dlc/extractor/arte.py b/yt_dlp/extractor/arte.py similarity index 100% rename from youtube_dlc/extractor/arte.py rename to yt_dlp/extractor/arte.py diff --git a/youtube_dlc/extractor/asiancrush.py b/yt_dlp/extractor/asiancrush.py similarity index 100% rename from youtube_dlc/extractor/asiancrush.py rename to yt_dlp/extractor/asiancrush.py diff --git a/youtube_dlc/extractor/atresplayer.py b/yt_dlp/extractor/atresplayer.py similarity index 100% rename from youtube_dlc/extractor/atresplayer.py rename to yt_dlp/extractor/atresplayer.py diff --git a/youtube_dlc/extractor/atttechchannel.py b/yt_dlp/extractor/atttechchannel.py similarity index 100% rename from youtube_dlc/extractor/atttechchannel.py rename to yt_dlp/extractor/atttechchannel.py diff --git a/youtube_dlc/extractor/atvat.py b/yt_dlp/extractor/atvat.py similarity index 100% rename from youtube_dlc/extractor/atvat.py rename to yt_dlp/extractor/atvat.py diff --git a/youtube_dlc/extractor/audimedia.py b/yt_dlp/extractor/audimedia.py similarity index 100% rename from youtube_dlc/extractor/audimedia.py rename to yt_dlp/extractor/audimedia.py diff --git a/youtube_dlc/extractor/audioboom.py b/yt_dlp/extractor/audioboom.py similarity index 100% rename from youtube_dlc/extractor/audioboom.py rename to yt_dlp/extractor/audioboom.py diff --git a/youtube_dlc/extractor/audiomack.py b/yt_dlp/extractor/audiomack.py similarity index 100% rename from youtube_dlc/extractor/audiomack.py rename to yt_dlp/extractor/audiomack.py diff --git a/youtube_dlc/extractor/audius.py b/yt_dlp/extractor/audius.py similarity index 100% rename from youtube_dlc/extractor/audius.py rename to yt_dlp/extractor/audius.py diff --git a/youtube_dlc/extractor/awaan.py b/yt_dlp/extractor/awaan.py similarity index 100% rename from youtube_dlc/extractor/awaan.py rename to yt_dlp/extractor/awaan.py diff --git a/youtube_dlc/extractor/aws.py b/yt_dlp/extractor/aws.py similarity index 100% rename from youtube_dlc/extractor/aws.py rename to yt_dlp/extractor/aws.py diff --git a/youtube_dlc/extractor/azmedien.py b/yt_dlp/extractor/azmedien.py similarity index 100% rename from youtube_dlc/extractor/azmedien.py rename to yt_dlp/extractor/azmedien.py diff --git a/youtube_dlc/extractor/baidu.py b/yt_dlp/extractor/baidu.py similarity index 100% rename from youtube_dlc/extractor/baidu.py rename to yt_dlp/extractor/baidu.py diff --git a/youtube_dlc/extractor/bandcamp.py b/yt_dlp/extractor/bandcamp.py similarity index 100% rename from youtube_dlc/extractor/bandcamp.py rename to yt_dlp/extractor/bandcamp.py diff --git a/youtube_dlc/extractor/bbc.py b/yt_dlp/extractor/bbc.py similarity index 100% rename from youtube_dlc/extractor/bbc.py rename to yt_dlp/extractor/bbc.py diff --git a/youtube_dlc/extractor/beatport.py b/yt_dlp/extractor/beatport.py similarity index 100% rename from youtube_dlc/extractor/beatport.py rename to yt_dlp/extractor/beatport.py diff --git a/youtube_dlc/extractor/beeg.py b/yt_dlp/extractor/beeg.py similarity index 100% rename from youtube_dlc/extractor/beeg.py rename to yt_dlp/extractor/beeg.py diff --git a/youtube_dlc/extractor/behindkink.py b/yt_dlp/extractor/behindkink.py similarity index 100% rename from youtube_dlc/extractor/behindkink.py rename to yt_dlp/extractor/behindkink.py diff --git a/youtube_dlc/extractor/bellmedia.py b/yt_dlp/extractor/bellmedia.py similarity index 100% rename from youtube_dlc/extractor/bellmedia.py rename to yt_dlp/extractor/bellmedia.py diff --git a/youtube_dlc/extractor/bet.py b/yt_dlp/extractor/bet.py similarity index 100% rename from youtube_dlc/extractor/bet.py rename to yt_dlp/extractor/bet.py diff --git a/youtube_dlc/extractor/bfi.py b/yt_dlp/extractor/bfi.py similarity index 100% rename from youtube_dlc/extractor/bfi.py rename to yt_dlp/extractor/bfi.py diff --git a/youtube_dlc/extractor/bfmtv.py b/yt_dlp/extractor/bfmtv.py similarity index 100% rename from youtube_dlc/extractor/bfmtv.py rename to yt_dlp/extractor/bfmtv.py diff --git a/youtube_dlc/extractor/bibeltv.py b/yt_dlp/extractor/bibeltv.py similarity index 100% rename from youtube_dlc/extractor/bibeltv.py rename to yt_dlp/extractor/bibeltv.py diff --git a/youtube_dlc/extractor/bigflix.py b/yt_dlp/extractor/bigflix.py similarity index 100% rename from youtube_dlc/extractor/bigflix.py rename to yt_dlp/extractor/bigflix.py diff --git a/youtube_dlc/extractor/bild.py b/yt_dlp/extractor/bild.py similarity index 100% rename from youtube_dlc/extractor/bild.py rename to yt_dlp/extractor/bild.py diff --git a/youtube_dlc/extractor/bilibili.py b/yt_dlp/extractor/bilibili.py similarity index 99% rename from youtube_dlc/extractor/bilibili.py rename to yt_dlp/extractor/bilibili.py index b04077750f..be117a2bb4 100644 --- a/youtube_dlc/extractor/bilibili.py +++ b/yt_dlp/extractor/bilibili.py @@ -153,7 +153,7 @@ class BiliBiliIE(InfoExtractor): webpage, 'player parameters'))['cid'][0] else: if 'no_bangumi_tip' not in smuggled_data: - self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dlc with %s' % ( + self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run yt-dlp with %s' % ( video_id, anime_id, compat_urlparse.urljoin(url, '//bangumi.bilibili.com/anime/%s' % anime_id))) headers = { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', diff --git a/youtube_dlc/extractor/biobiochiletv.py b/yt_dlp/extractor/biobiochiletv.py similarity index 100% rename from youtube_dlc/extractor/biobiochiletv.py rename to yt_dlp/extractor/biobiochiletv.py diff --git a/youtube_dlc/extractor/biqle.py b/yt_dlp/extractor/biqle.py similarity index 100% rename from youtube_dlc/extractor/biqle.py rename to yt_dlp/extractor/biqle.py diff --git a/youtube_dlc/extractor/bitchute.py b/yt_dlp/extractor/bitchute.py similarity index 100% rename from youtube_dlc/extractor/bitchute.py rename to yt_dlp/extractor/bitchute.py diff --git a/youtube_dlc/extractor/bitwave.py b/yt_dlp/extractor/bitwave.py similarity index 100% rename from youtube_dlc/extractor/bitwave.py rename to yt_dlp/extractor/bitwave.py diff --git a/youtube_dlc/extractor/bleacherreport.py b/yt_dlp/extractor/bleacherreport.py similarity index 100% rename from youtube_dlc/extractor/bleacherreport.py rename to yt_dlp/extractor/bleacherreport.py diff --git a/youtube_dlc/extractor/blinkx.py b/yt_dlp/extractor/blinkx.py similarity index 100% rename from youtube_dlc/extractor/blinkx.py rename to yt_dlp/extractor/blinkx.py diff --git a/youtube_dlc/extractor/bloomberg.py b/yt_dlp/extractor/bloomberg.py similarity index 100% rename from youtube_dlc/extractor/bloomberg.py rename to yt_dlp/extractor/bloomberg.py diff --git a/youtube_dlc/extractor/bokecc.py b/yt_dlp/extractor/bokecc.py similarity index 100% rename from youtube_dlc/extractor/bokecc.py rename to yt_dlp/extractor/bokecc.py diff --git a/youtube_dlc/extractor/bongacams.py b/yt_dlp/extractor/bongacams.py similarity index 100% rename from youtube_dlc/extractor/bongacams.py rename to yt_dlp/extractor/bongacams.py diff --git a/youtube_dlc/extractor/bostonglobe.py b/yt_dlp/extractor/bostonglobe.py similarity index 100% rename from youtube_dlc/extractor/bostonglobe.py rename to yt_dlp/extractor/bostonglobe.py diff --git a/youtube_dlc/extractor/box.py b/yt_dlp/extractor/box.py similarity index 100% rename from youtube_dlc/extractor/box.py rename to yt_dlp/extractor/box.py diff --git a/youtube_dlc/extractor/bpb.py b/yt_dlp/extractor/bpb.py similarity index 100% rename from youtube_dlc/extractor/bpb.py rename to yt_dlp/extractor/bpb.py diff --git a/youtube_dlc/extractor/br.py b/yt_dlp/extractor/br.py similarity index 100% rename from youtube_dlc/extractor/br.py rename to yt_dlp/extractor/br.py diff --git a/youtube_dlc/extractor/bravotv.py b/yt_dlp/extractor/bravotv.py similarity index 100% rename from youtube_dlc/extractor/bravotv.py rename to yt_dlp/extractor/bravotv.py diff --git a/youtube_dlc/extractor/breakcom.py b/yt_dlp/extractor/breakcom.py similarity index 100% rename from youtube_dlc/extractor/breakcom.py rename to yt_dlp/extractor/breakcom.py diff --git a/youtube_dlc/extractor/brightcove.py b/yt_dlp/extractor/brightcove.py similarity index 100% rename from youtube_dlc/extractor/brightcove.py rename to yt_dlp/extractor/brightcove.py diff --git a/youtube_dlc/extractor/businessinsider.py b/yt_dlp/extractor/businessinsider.py similarity index 100% rename from youtube_dlc/extractor/businessinsider.py rename to yt_dlp/extractor/businessinsider.py diff --git a/youtube_dlc/extractor/buzzfeed.py b/yt_dlp/extractor/buzzfeed.py similarity index 100% rename from youtube_dlc/extractor/buzzfeed.py rename to yt_dlp/extractor/buzzfeed.py diff --git a/youtube_dlc/extractor/byutv.py b/yt_dlp/extractor/byutv.py similarity index 100% rename from youtube_dlc/extractor/byutv.py rename to yt_dlp/extractor/byutv.py diff --git a/youtube_dlc/extractor/c56.py b/yt_dlp/extractor/c56.py similarity index 100% rename from youtube_dlc/extractor/c56.py rename to yt_dlp/extractor/c56.py diff --git a/youtube_dlc/extractor/camdemy.py b/yt_dlp/extractor/camdemy.py similarity index 100% rename from youtube_dlc/extractor/camdemy.py rename to yt_dlp/extractor/camdemy.py diff --git a/youtube_dlc/extractor/cammodels.py b/yt_dlp/extractor/cammodels.py similarity index 100% rename from youtube_dlc/extractor/cammodels.py rename to yt_dlp/extractor/cammodels.py diff --git a/youtube_dlc/extractor/camtube.py b/yt_dlp/extractor/camtube.py similarity index 100% rename from youtube_dlc/extractor/camtube.py rename to yt_dlp/extractor/camtube.py diff --git a/youtube_dlc/extractor/camwithher.py b/yt_dlp/extractor/camwithher.py similarity index 100% rename from youtube_dlc/extractor/camwithher.py rename to yt_dlp/extractor/camwithher.py diff --git a/youtube_dlc/extractor/canalc2.py b/yt_dlp/extractor/canalc2.py similarity index 100% rename from youtube_dlc/extractor/canalc2.py rename to yt_dlp/extractor/canalc2.py diff --git a/youtube_dlc/extractor/canalplus.py b/yt_dlp/extractor/canalplus.py similarity index 100% rename from youtube_dlc/extractor/canalplus.py rename to yt_dlp/extractor/canalplus.py diff --git a/youtube_dlc/extractor/canvas.py b/yt_dlp/extractor/canvas.py similarity index 100% rename from youtube_dlc/extractor/canvas.py rename to yt_dlp/extractor/canvas.py diff --git a/youtube_dlc/extractor/carambatv.py b/yt_dlp/extractor/carambatv.py similarity index 100% rename from youtube_dlc/extractor/carambatv.py rename to yt_dlp/extractor/carambatv.py diff --git a/youtube_dlc/extractor/cartoonnetwork.py b/yt_dlp/extractor/cartoonnetwork.py similarity index 100% rename from youtube_dlc/extractor/cartoonnetwork.py rename to yt_dlp/extractor/cartoonnetwork.py diff --git a/youtube_dlc/extractor/cbc.py b/yt_dlp/extractor/cbc.py similarity index 100% rename from youtube_dlc/extractor/cbc.py rename to yt_dlp/extractor/cbc.py diff --git a/youtube_dlc/extractor/cbs.py b/yt_dlp/extractor/cbs.py similarity index 100% rename from youtube_dlc/extractor/cbs.py rename to yt_dlp/extractor/cbs.py diff --git a/youtube_dlc/extractor/cbsinteractive.py b/yt_dlp/extractor/cbsinteractive.py similarity index 100% rename from youtube_dlc/extractor/cbsinteractive.py rename to yt_dlp/extractor/cbsinteractive.py diff --git a/youtube_dlc/extractor/cbslocal.py b/yt_dlp/extractor/cbslocal.py similarity index 100% rename from youtube_dlc/extractor/cbslocal.py rename to yt_dlp/extractor/cbslocal.py diff --git a/youtube_dlc/extractor/cbsnews.py b/yt_dlp/extractor/cbsnews.py similarity index 100% rename from youtube_dlc/extractor/cbsnews.py rename to yt_dlp/extractor/cbsnews.py diff --git a/youtube_dlc/extractor/cbssports.py b/yt_dlp/extractor/cbssports.py similarity index 100% rename from youtube_dlc/extractor/cbssports.py rename to yt_dlp/extractor/cbssports.py diff --git a/youtube_dlc/extractor/ccc.py b/yt_dlp/extractor/ccc.py similarity index 100% rename from youtube_dlc/extractor/ccc.py rename to yt_dlp/extractor/ccc.py diff --git a/youtube_dlc/extractor/ccma.py b/yt_dlp/extractor/ccma.py similarity index 100% rename from youtube_dlc/extractor/ccma.py rename to yt_dlp/extractor/ccma.py diff --git a/youtube_dlc/extractor/cctv.py b/yt_dlp/extractor/cctv.py similarity index 100% rename from youtube_dlc/extractor/cctv.py rename to yt_dlp/extractor/cctv.py diff --git a/youtube_dlc/extractor/cda.py b/yt_dlp/extractor/cda.py similarity index 100% rename from youtube_dlc/extractor/cda.py rename to yt_dlp/extractor/cda.py diff --git a/youtube_dlc/extractor/ceskatelevize.py b/yt_dlp/extractor/ceskatelevize.py similarity index 100% rename from youtube_dlc/extractor/ceskatelevize.py rename to yt_dlp/extractor/ceskatelevize.py diff --git a/youtube_dlc/extractor/channel9.py b/yt_dlp/extractor/channel9.py similarity index 100% rename from youtube_dlc/extractor/channel9.py rename to yt_dlp/extractor/channel9.py diff --git a/youtube_dlc/extractor/charlierose.py b/yt_dlp/extractor/charlierose.py similarity index 100% rename from youtube_dlc/extractor/charlierose.py rename to yt_dlp/extractor/charlierose.py diff --git a/youtube_dlc/extractor/chaturbate.py b/yt_dlp/extractor/chaturbate.py similarity index 100% rename from youtube_dlc/extractor/chaturbate.py rename to yt_dlp/extractor/chaturbate.py diff --git a/youtube_dlc/extractor/chilloutzone.py b/yt_dlp/extractor/chilloutzone.py similarity index 100% rename from youtube_dlc/extractor/chilloutzone.py rename to yt_dlp/extractor/chilloutzone.py diff --git a/youtube_dlc/extractor/chirbit.py b/yt_dlp/extractor/chirbit.py similarity index 100% rename from youtube_dlc/extractor/chirbit.py rename to yt_dlp/extractor/chirbit.py diff --git a/youtube_dlc/extractor/cinchcast.py b/yt_dlp/extractor/cinchcast.py similarity index 100% rename from youtube_dlc/extractor/cinchcast.py rename to yt_dlp/extractor/cinchcast.py diff --git a/youtube_dlc/extractor/cinemax.py b/yt_dlp/extractor/cinemax.py similarity index 100% rename from youtube_dlc/extractor/cinemax.py rename to yt_dlp/extractor/cinemax.py diff --git a/youtube_dlc/extractor/ciscolive.py b/yt_dlp/extractor/ciscolive.py similarity index 100% rename from youtube_dlc/extractor/ciscolive.py rename to yt_dlp/extractor/ciscolive.py diff --git a/youtube_dlc/extractor/cjsw.py b/yt_dlp/extractor/cjsw.py similarity index 100% rename from youtube_dlc/extractor/cjsw.py rename to yt_dlp/extractor/cjsw.py diff --git a/youtube_dlc/extractor/cliphunter.py b/yt_dlp/extractor/cliphunter.py similarity index 100% rename from youtube_dlc/extractor/cliphunter.py rename to yt_dlp/extractor/cliphunter.py diff --git a/youtube_dlc/extractor/clippit.py b/yt_dlp/extractor/clippit.py similarity index 100% rename from youtube_dlc/extractor/clippit.py rename to yt_dlp/extractor/clippit.py diff --git a/youtube_dlc/extractor/cliprs.py b/yt_dlp/extractor/cliprs.py similarity index 100% rename from youtube_dlc/extractor/cliprs.py rename to yt_dlp/extractor/cliprs.py diff --git a/youtube_dlc/extractor/clipsyndicate.py b/yt_dlp/extractor/clipsyndicate.py similarity index 100% rename from youtube_dlc/extractor/clipsyndicate.py rename to yt_dlp/extractor/clipsyndicate.py diff --git a/youtube_dlc/extractor/closertotruth.py b/yt_dlp/extractor/closertotruth.py similarity index 100% rename from youtube_dlc/extractor/closertotruth.py rename to yt_dlp/extractor/closertotruth.py diff --git a/youtube_dlc/extractor/cloudflarestream.py b/yt_dlp/extractor/cloudflarestream.py similarity index 100% rename from youtube_dlc/extractor/cloudflarestream.py rename to yt_dlp/extractor/cloudflarestream.py diff --git a/youtube_dlc/extractor/cloudy.py b/yt_dlp/extractor/cloudy.py similarity index 100% rename from youtube_dlc/extractor/cloudy.py rename to yt_dlp/extractor/cloudy.py diff --git a/youtube_dlc/extractor/clubic.py b/yt_dlp/extractor/clubic.py similarity index 100% rename from youtube_dlc/extractor/clubic.py rename to yt_dlp/extractor/clubic.py diff --git a/youtube_dlc/extractor/clyp.py b/yt_dlp/extractor/clyp.py similarity index 100% rename from youtube_dlc/extractor/clyp.py rename to yt_dlp/extractor/clyp.py diff --git a/youtube_dlc/extractor/cmt.py b/yt_dlp/extractor/cmt.py similarity index 100% rename from youtube_dlc/extractor/cmt.py rename to yt_dlp/extractor/cmt.py diff --git a/youtube_dlc/extractor/cnbc.py b/yt_dlp/extractor/cnbc.py similarity index 100% rename from youtube_dlc/extractor/cnbc.py rename to yt_dlp/extractor/cnbc.py diff --git a/youtube_dlc/extractor/cnn.py b/yt_dlp/extractor/cnn.py similarity index 100% rename from youtube_dlc/extractor/cnn.py rename to yt_dlp/extractor/cnn.py diff --git a/youtube_dlc/extractor/comedycentral.py b/yt_dlp/extractor/comedycentral.py similarity index 100% rename from youtube_dlc/extractor/comedycentral.py rename to yt_dlp/extractor/comedycentral.py diff --git a/youtube_dlc/extractor/common.py b/yt_dlp/extractor/common.py similarity index 99% rename from youtube_dlc/extractor/common.py rename to yt_dlp/extractor/common.py index edfa99975d..b03582f54d 100644 --- a/youtube_dlc/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -272,7 +272,7 @@ class InfoExtractor(object): Set to "root" to indicate that this is a comment to the original video. age_limit: Age restriction for the video, as an integer (years) - webpage_url: The URL to the video webpage, if given to youtube-dlc it + webpage_url: The URL to the video webpage, if given to yt-dlp it should allow to get the same result again. (It will be set by YoutubeDL if it's missing) categories: A list of categories that the video falls in, for example @@ -1723,7 +1723,7 @@ class InfoExtractor(object): if not isinstance(manifest, compat_etree_Element) and not fatal: return [] - # currently youtube-dlc cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy + # currently yt-dlp cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0') if akamai_pv is not None and ';' in akamai_pv.text: playerVerificationChallenge = akamai_pv.text.split(';')[0] diff --git a/youtube_dlc/extractor/commonmistakes.py b/yt_dlp/extractor/commonmistakes.py similarity index 92% rename from youtube_dlc/extractor/commonmistakes.py rename to yt_dlp/extractor/commonmistakes.py index 933b89eb3e..593ff18350 100644 --- a/youtube_dlc/extractor/commonmistakes.py +++ b/yt_dlp/extractor/commonmistakes.py @@ -22,12 +22,12 @@ class CommonMistakesIE(InfoExtractor): def _real_extract(self, url): msg = ( - 'You\'ve asked youtube-dlc to download the URL "%s". ' + 'You\'ve asked yt-dlp to download the URL "%s". ' 'That doesn\'t make any sense. ' 'Simply remove the parameter in your command or configuration.' ) % url if not self._downloader.params.get('verbose'): - msg += ' Add -v to the command line to see what arguments and configuration youtube-dlc got.' + msg += ' Add -v to the command line to see what arguments and configuration yt-dlp got.' raise ExtractorError(msg, expected=True) diff --git a/youtube_dlc/extractor/commonprotocols.py b/yt_dlp/extractor/commonprotocols.py similarity index 100% rename from youtube_dlc/extractor/commonprotocols.py rename to yt_dlp/extractor/commonprotocols.py diff --git a/youtube_dlc/extractor/condenast.py b/yt_dlp/extractor/condenast.py similarity index 100% rename from youtube_dlc/extractor/condenast.py rename to yt_dlp/extractor/condenast.py diff --git a/youtube_dlc/extractor/contv.py b/yt_dlp/extractor/contv.py similarity index 100% rename from youtube_dlc/extractor/contv.py rename to yt_dlp/extractor/contv.py diff --git a/youtube_dlc/extractor/corus.py b/yt_dlp/extractor/corus.py similarity index 100% rename from youtube_dlc/extractor/corus.py rename to yt_dlp/extractor/corus.py diff --git a/youtube_dlc/extractor/coub.py b/yt_dlp/extractor/coub.py similarity index 100% rename from youtube_dlc/extractor/coub.py rename to yt_dlp/extractor/coub.py diff --git a/youtube_dlc/extractor/cracked.py b/yt_dlp/extractor/cracked.py similarity index 100% rename from youtube_dlc/extractor/cracked.py rename to yt_dlp/extractor/cracked.py diff --git a/youtube_dlc/extractor/crackle.py b/yt_dlp/extractor/crackle.py similarity index 100% rename from youtube_dlc/extractor/crackle.py rename to yt_dlp/extractor/crackle.py diff --git a/youtube_dlc/extractor/crooksandliars.py b/yt_dlp/extractor/crooksandliars.py similarity index 100% rename from youtube_dlc/extractor/crooksandliars.py rename to yt_dlp/extractor/crooksandliars.py diff --git a/youtube_dlc/extractor/crunchyroll.py b/yt_dlp/extractor/crunchyroll.py similarity index 100% rename from youtube_dlc/extractor/crunchyroll.py rename to yt_dlp/extractor/crunchyroll.py diff --git a/youtube_dlc/extractor/cspan.py b/yt_dlp/extractor/cspan.py similarity index 100% rename from youtube_dlc/extractor/cspan.py rename to yt_dlp/extractor/cspan.py diff --git a/youtube_dlc/extractor/ctsnews.py b/yt_dlp/extractor/ctsnews.py similarity index 100% rename from youtube_dlc/extractor/ctsnews.py rename to yt_dlp/extractor/ctsnews.py diff --git a/youtube_dlc/extractor/ctv.py b/yt_dlp/extractor/ctv.py similarity index 100% rename from youtube_dlc/extractor/ctv.py rename to yt_dlp/extractor/ctv.py diff --git a/youtube_dlc/extractor/ctvnews.py b/yt_dlp/extractor/ctvnews.py similarity index 100% rename from youtube_dlc/extractor/ctvnews.py rename to yt_dlp/extractor/ctvnews.py diff --git a/youtube_dlc/extractor/cultureunplugged.py b/yt_dlp/extractor/cultureunplugged.py similarity index 100% rename from youtube_dlc/extractor/cultureunplugged.py rename to yt_dlp/extractor/cultureunplugged.py diff --git a/youtube_dlc/extractor/curiositystream.py b/yt_dlp/extractor/curiositystream.py similarity index 100% rename from youtube_dlc/extractor/curiositystream.py rename to yt_dlp/extractor/curiositystream.py diff --git a/youtube_dlc/extractor/cwtv.py b/yt_dlp/extractor/cwtv.py similarity index 100% rename from youtube_dlc/extractor/cwtv.py rename to yt_dlp/extractor/cwtv.py diff --git a/youtube_dlc/extractor/dailymail.py b/yt_dlp/extractor/dailymail.py similarity index 100% rename from youtube_dlc/extractor/dailymail.py rename to yt_dlp/extractor/dailymail.py diff --git a/youtube_dlc/extractor/dailymotion.py b/yt_dlp/extractor/dailymotion.py similarity index 100% rename from youtube_dlc/extractor/dailymotion.py rename to yt_dlp/extractor/dailymotion.py diff --git a/youtube_dlc/extractor/daum.py b/yt_dlp/extractor/daum.py similarity index 100% rename from youtube_dlc/extractor/daum.py rename to yt_dlp/extractor/daum.py diff --git a/youtube_dlc/extractor/dbtv.py b/yt_dlp/extractor/dbtv.py similarity index 100% rename from youtube_dlc/extractor/dbtv.py rename to yt_dlp/extractor/dbtv.py diff --git a/youtube_dlc/extractor/dctp.py b/yt_dlp/extractor/dctp.py similarity index 100% rename from youtube_dlc/extractor/dctp.py rename to yt_dlp/extractor/dctp.py diff --git a/youtube_dlc/extractor/deezer.py b/yt_dlp/extractor/deezer.py similarity index 100% rename from youtube_dlc/extractor/deezer.py rename to yt_dlp/extractor/deezer.py diff --git a/youtube_dlc/extractor/defense.py b/yt_dlp/extractor/defense.py similarity index 100% rename from youtube_dlc/extractor/defense.py rename to yt_dlp/extractor/defense.py diff --git a/youtube_dlc/extractor/democracynow.py b/yt_dlp/extractor/democracynow.py similarity index 100% rename from youtube_dlc/extractor/democracynow.py rename to yt_dlp/extractor/democracynow.py diff --git a/youtube_dlc/extractor/dfb.py b/yt_dlp/extractor/dfb.py similarity index 100% rename from youtube_dlc/extractor/dfb.py rename to yt_dlp/extractor/dfb.py diff --git a/youtube_dlc/extractor/dhm.py b/yt_dlp/extractor/dhm.py similarity index 100% rename from youtube_dlc/extractor/dhm.py rename to yt_dlp/extractor/dhm.py diff --git a/youtube_dlc/extractor/digg.py b/yt_dlp/extractor/digg.py similarity index 100% rename from youtube_dlc/extractor/digg.py rename to yt_dlp/extractor/digg.py diff --git a/youtube_dlc/extractor/digiteka.py b/yt_dlp/extractor/digiteka.py similarity index 100% rename from youtube_dlc/extractor/digiteka.py rename to yt_dlp/extractor/digiteka.py diff --git a/youtube_dlc/extractor/discovery.py b/yt_dlp/extractor/discovery.py similarity index 100% rename from youtube_dlc/extractor/discovery.py rename to yt_dlp/extractor/discovery.py diff --git a/youtube_dlc/extractor/discoverygo.py b/yt_dlp/extractor/discoverygo.py similarity index 100% rename from youtube_dlc/extractor/discoverygo.py rename to yt_dlp/extractor/discoverygo.py diff --git a/youtube_dlc/extractor/discoverynetworks.py b/yt_dlp/extractor/discoverynetworks.py similarity index 100% rename from youtube_dlc/extractor/discoverynetworks.py rename to yt_dlp/extractor/discoverynetworks.py diff --git a/youtube_dlc/extractor/discoveryvr.py b/yt_dlp/extractor/discoveryvr.py similarity index 100% rename from youtube_dlc/extractor/discoveryvr.py rename to yt_dlp/extractor/discoveryvr.py diff --git a/youtube_dlc/extractor/disney.py b/yt_dlp/extractor/disney.py similarity index 100% rename from youtube_dlc/extractor/disney.py rename to yt_dlp/extractor/disney.py diff --git a/youtube_dlc/extractor/dispeak.py b/yt_dlp/extractor/dispeak.py similarity index 100% rename from youtube_dlc/extractor/dispeak.py rename to yt_dlp/extractor/dispeak.py diff --git a/youtube_dlc/extractor/dlive.py b/yt_dlp/extractor/dlive.py similarity index 100% rename from youtube_dlc/extractor/dlive.py rename to yt_dlp/extractor/dlive.py diff --git a/youtube_dlc/extractor/doodstream.py b/yt_dlp/extractor/doodstream.py similarity index 100% rename from youtube_dlc/extractor/doodstream.py rename to yt_dlp/extractor/doodstream.py diff --git a/youtube_dlc/extractor/dotsub.py b/yt_dlp/extractor/dotsub.py similarity index 100% rename from youtube_dlc/extractor/dotsub.py rename to yt_dlp/extractor/dotsub.py diff --git a/youtube_dlc/extractor/douyutv.py b/yt_dlp/extractor/douyutv.py similarity index 100% rename from youtube_dlc/extractor/douyutv.py rename to yt_dlp/extractor/douyutv.py diff --git a/youtube_dlc/extractor/dplay.py b/yt_dlp/extractor/dplay.py similarity index 100% rename from youtube_dlc/extractor/dplay.py rename to yt_dlp/extractor/dplay.py diff --git a/youtube_dlc/extractor/drbonanza.py b/yt_dlp/extractor/drbonanza.py similarity index 100% rename from youtube_dlc/extractor/drbonanza.py rename to yt_dlp/extractor/drbonanza.py diff --git a/youtube_dlc/extractor/dreisat.py b/yt_dlp/extractor/dreisat.py similarity index 100% rename from youtube_dlc/extractor/dreisat.py rename to yt_dlp/extractor/dreisat.py diff --git a/youtube_dlc/extractor/dropbox.py b/yt_dlp/extractor/dropbox.py similarity index 90% rename from youtube_dlc/extractor/dropbox.py rename to yt_dlp/extractor/dropbox.py index 9dc6614c58..14b6c00b0b 100644 --- a/youtube_dlc/extractor/dropbox.py +++ b/yt_dlp/extractor/dropbox.py @@ -13,11 +13,11 @@ class DropboxIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P[a-zA-Z0-9]{15})/.*' _TESTS = [ { - 'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dlc%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0', + 'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0', 'info_dict': { 'id': 'nelirfsxnmcfbfh', 'ext': 'mp4', - 'title': 'youtube-dlc test video \'ä"BaW_jenozKc' + 'title': 'youtube-dl test video \'ä"BaW_jenozKc' } }, { 'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v', diff --git a/youtube_dlc/extractor/drtuber.py b/yt_dlp/extractor/drtuber.py similarity index 100% rename from youtube_dlc/extractor/drtuber.py rename to yt_dlp/extractor/drtuber.py diff --git a/youtube_dlc/extractor/drtv.py b/yt_dlp/extractor/drtv.py similarity index 100% rename from youtube_dlc/extractor/drtv.py rename to yt_dlp/extractor/drtv.py diff --git a/youtube_dlc/extractor/dtube.py b/yt_dlp/extractor/dtube.py similarity index 100% rename from youtube_dlc/extractor/dtube.py rename to yt_dlp/extractor/dtube.py diff --git a/youtube_dlc/extractor/duboku.py b/yt_dlp/extractor/duboku.py similarity index 100% rename from youtube_dlc/extractor/duboku.py rename to yt_dlp/extractor/duboku.py diff --git a/youtube_dlc/extractor/dumpert.py b/yt_dlp/extractor/dumpert.py similarity index 100% rename from youtube_dlc/extractor/dumpert.py rename to yt_dlp/extractor/dumpert.py diff --git a/youtube_dlc/extractor/dvtv.py b/yt_dlp/extractor/dvtv.py similarity index 100% rename from youtube_dlc/extractor/dvtv.py rename to yt_dlp/extractor/dvtv.py diff --git a/youtube_dlc/extractor/dw.py b/yt_dlp/extractor/dw.py similarity index 100% rename from youtube_dlc/extractor/dw.py rename to yt_dlp/extractor/dw.py diff --git a/youtube_dlc/extractor/eagleplatform.py b/yt_dlp/extractor/eagleplatform.py similarity index 100% rename from youtube_dlc/extractor/eagleplatform.py rename to yt_dlp/extractor/eagleplatform.py diff --git a/youtube_dlc/extractor/ebaumsworld.py b/yt_dlp/extractor/ebaumsworld.py similarity index 100% rename from youtube_dlc/extractor/ebaumsworld.py rename to yt_dlp/extractor/ebaumsworld.py diff --git a/youtube_dlc/extractor/echomsk.py b/yt_dlp/extractor/echomsk.py similarity index 100% rename from youtube_dlc/extractor/echomsk.py rename to yt_dlp/extractor/echomsk.py diff --git a/youtube_dlc/extractor/egghead.py b/yt_dlp/extractor/egghead.py similarity index 100% rename from youtube_dlc/extractor/egghead.py rename to yt_dlp/extractor/egghead.py diff --git a/youtube_dlc/extractor/ehow.py b/yt_dlp/extractor/ehow.py similarity index 100% rename from youtube_dlc/extractor/ehow.py rename to yt_dlp/extractor/ehow.py diff --git a/youtube_dlc/extractor/eighttracks.py b/yt_dlp/extractor/eighttracks.py similarity index 85% rename from youtube_dlc/extractor/eighttracks.py rename to yt_dlp/extractor/eighttracks.py index 5ededd31da..9a44f89f3f 100644 --- a/youtube_dlc/extractor/eighttracks.py +++ b/yt_dlp/extractor/eighttracks.py @@ -18,12 +18,12 @@ class EightTracksIE(InfoExtractor): _VALID_URL = r'https?://8tracks\.com/(?P[^/]+)/(?P[^/#]+)(?:#.*)?$' _TEST = { 'name': 'EightTracks', - 'url': 'http://8tracks.com/ytdl/youtube-dlc-test-tracks-a', + 'url': 'http://8tracks.com/ytdl/youtube-dl-test-tracks-a', 'info_dict': { 'id': '1336550', - 'display_id': 'youtube-dlc-test-tracks-a', + 'display_id': 'youtube-dl-test-tracks-a', 'description': "test chars: \"'/\\ä↭", - 'title': "youtube-dlc test tracks \"'/\\ä↭<>", + 'title': "youtube-dl test tracks \"'/\\ä↭<>", }, 'playlist': [ { @@ -31,7 +31,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885610', 'ext': 'm4a', - 'title': "youtue-dl project<>\"' - youtube-dlc test track 1 \"'/\\\u00e4\u21ad", + 'title': "youtue-dl project<>\"' - youtube-dl test track 1 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } }, @@ -40,7 +40,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885608', 'ext': 'm4a', - 'title': "youtube-dlc project - youtube-dlc test track 2 \"'/\\\u00e4\u21ad", + 'title': "youtube-dl project - youtube-dl test track 2 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } }, @@ -49,7 +49,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885679', 'ext': 'm4a', - 'title': "youtube-dlc project as well - youtube-dlc test track 3 \"'/\\\u00e4\u21ad", + 'title': "youtube-dl project as well - youtube-dl test track 3 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } }, @@ -58,7 +58,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885680', 'ext': 'm4a', - 'title': "youtube-dlc project as well - youtube-dlc test track 4 \"'/\\\u00e4\u21ad", + 'title': "youtube-dl project as well - youtube-dl test track 4 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } }, @@ -67,7 +67,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885682', 'ext': 'm4a', - 'title': "PH - youtube-dlc test track 5 \"'/\\\u00e4\u21ad", + 'title': "PH - youtube-dl test track 5 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } }, @@ -76,7 +76,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885683', 'ext': 'm4a', - 'title': "PH - youtube-dlc test track 6 \"'/\\\u00e4\u21ad", + 'title': "PH - youtube-dl test track 6 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } }, @@ -85,7 +85,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885684', 'ext': 'm4a', - 'title': "phihag - youtube-dlc test track 7 \"'/\\\u00e4\u21ad", + 'title': "phihag - youtube-dl test track 7 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } }, @@ -94,7 +94,7 @@ class EightTracksIE(InfoExtractor): 'info_dict': { 'id': '11885685', 'ext': 'm4a', - 'title': "phihag - youtube-dlc test track 8 \"'/\\\u00e4\u21ad", + 'title': "phihag - youtube-dl test track 8 \"'/\\\u00e4\u21ad", 'uploader_id': 'ytdl' } } diff --git a/youtube_dlc/extractor/einthusan.py b/yt_dlp/extractor/einthusan.py similarity index 100% rename from youtube_dlc/extractor/einthusan.py rename to yt_dlp/extractor/einthusan.py diff --git a/youtube_dlc/extractor/eitb.py b/yt_dlp/extractor/eitb.py similarity index 100% rename from youtube_dlc/extractor/eitb.py rename to yt_dlp/extractor/eitb.py diff --git a/youtube_dlc/extractor/ellentube.py b/yt_dlp/extractor/ellentube.py similarity index 100% rename from youtube_dlc/extractor/ellentube.py rename to yt_dlp/extractor/ellentube.py diff --git a/youtube_dlc/extractor/elonet.py b/yt_dlp/extractor/elonet.py similarity index 100% rename from youtube_dlc/extractor/elonet.py rename to yt_dlp/extractor/elonet.py diff --git a/youtube_dlc/extractor/elpais.py b/yt_dlp/extractor/elpais.py similarity index 100% rename from youtube_dlc/extractor/elpais.py rename to yt_dlp/extractor/elpais.py diff --git a/youtube_dlc/extractor/embedly.py b/yt_dlp/extractor/embedly.py similarity index 100% rename from youtube_dlc/extractor/embedly.py rename to yt_dlp/extractor/embedly.py diff --git a/youtube_dlc/extractor/engadget.py b/yt_dlp/extractor/engadget.py similarity index 100% rename from youtube_dlc/extractor/engadget.py rename to yt_dlp/extractor/engadget.py diff --git a/youtube_dlc/extractor/eporner.py b/yt_dlp/extractor/eporner.py similarity index 100% rename from youtube_dlc/extractor/eporner.py rename to yt_dlp/extractor/eporner.py diff --git a/youtube_dlc/extractor/eroprofile.py b/yt_dlp/extractor/eroprofile.py similarity index 100% rename from youtube_dlc/extractor/eroprofile.py rename to yt_dlp/extractor/eroprofile.py diff --git a/youtube_dlc/extractor/escapist.py b/yt_dlp/extractor/escapist.py similarity index 100% rename from youtube_dlc/extractor/escapist.py rename to yt_dlp/extractor/escapist.py diff --git a/youtube_dlc/extractor/espn.py b/yt_dlp/extractor/espn.py similarity index 100% rename from youtube_dlc/extractor/espn.py rename to yt_dlp/extractor/espn.py diff --git a/youtube_dlc/extractor/esri.py b/yt_dlp/extractor/esri.py similarity index 100% rename from youtube_dlc/extractor/esri.py rename to yt_dlp/extractor/esri.py diff --git a/youtube_dlc/extractor/europa.py b/yt_dlp/extractor/europa.py similarity index 100% rename from youtube_dlc/extractor/europa.py rename to yt_dlp/extractor/europa.py diff --git a/youtube_dlc/extractor/everyonesmixtape.py b/yt_dlp/extractor/everyonesmixtape.py similarity index 100% rename from youtube_dlc/extractor/everyonesmixtape.py rename to yt_dlp/extractor/everyonesmixtape.py diff --git a/youtube_dlc/extractor/expotv.py b/yt_dlp/extractor/expotv.py similarity index 100% rename from youtube_dlc/extractor/expotv.py rename to yt_dlp/extractor/expotv.py diff --git a/youtube_dlc/extractor/expressen.py b/yt_dlp/extractor/expressen.py similarity index 100% rename from youtube_dlc/extractor/expressen.py rename to yt_dlp/extractor/expressen.py diff --git a/youtube_dlc/extractor/extractors.py b/yt_dlp/extractor/extractors.py similarity index 100% rename from youtube_dlc/extractor/extractors.py rename to yt_dlp/extractor/extractors.py diff --git a/youtube_dlc/extractor/extremetube.py b/yt_dlp/extractor/extremetube.py similarity index 100% rename from youtube_dlc/extractor/extremetube.py rename to yt_dlp/extractor/extremetube.py diff --git a/youtube_dlc/extractor/eyedotv.py b/yt_dlp/extractor/eyedotv.py similarity index 100% rename from youtube_dlc/extractor/eyedotv.py rename to yt_dlp/extractor/eyedotv.py diff --git a/youtube_dlc/extractor/facebook.py b/yt_dlp/extractor/facebook.py similarity index 100% rename from youtube_dlc/extractor/facebook.py rename to yt_dlp/extractor/facebook.py diff --git a/youtube_dlc/extractor/faz.py b/yt_dlp/extractor/faz.py similarity index 100% rename from youtube_dlc/extractor/faz.py rename to yt_dlp/extractor/faz.py diff --git a/youtube_dlc/extractor/fc2.py b/yt_dlp/extractor/fc2.py similarity index 100% rename from youtube_dlc/extractor/fc2.py rename to yt_dlp/extractor/fc2.py diff --git a/youtube_dlc/extractor/fczenit.py b/yt_dlp/extractor/fczenit.py similarity index 100% rename from youtube_dlc/extractor/fczenit.py rename to yt_dlp/extractor/fczenit.py diff --git a/youtube_dlc/extractor/filmon.py b/yt_dlp/extractor/filmon.py similarity index 100% rename from youtube_dlc/extractor/filmon.py rename to yt_dlp/extractor/filmon.py diff --git a/youtube_dlc/extractor/filmweb.py b/yt_dlp/extractor/filmweb.py similarity index 100% rename from youtube_dlc/extractor/filmweb.py rename to yt_dlp/extractor/filmweb.py diff --git a/youtube_dlc/extractor/firsttv.py b/yt_dlp/extractor/firsttv.py similarity index 100% rename from youtube_dlc/extractor/firsttv.py rename to yt_dlp/extractor/firsttv.py diff --git a/youtube_dlc/extractor/fivemin.py b/yt_dlp/extractor/fivemin.py similarity index 100% rename from youtube_dlc/extractor/fivemin.py rename to yt_dlp/extractor/fivemin.py diff --git a/youtube_dlc/extractor/fivetv.py b/yt_dlp/extractor/fivetv.py similarity index 100% rename from youtube_dlc/extractor/fivetv.py rename to yt_dlp/extractor/fivetv.py diff --git a/youtube_dlc/extractor/flickr.py b/yt_dlp/extractor/flickr.py similarity index 100% rename from youtube_dlc/extractor/flickr.py rename to yt_dlp/extractor/flickr.py diff --git a/youtube_dlc/extractor/folketinget.py b/yt_dlp/extractor/folketinget.py similarity index 100% rename from youtube_dlc/extractor/folketinget.py rename to yt_dlp/extractor/folketinget.py diff --git a/youtube_dlc/extractor/footyroom.py b/yt_dlp/extractor/footyroom.py similarity index 100% rename from youtube_dlc/extractor/footyroom.py rename to yt_dlp/extractor/footyroom.py diff --git a/youtube_dlc/extractor/formula1.py b/yt_dlp/extractor/formula1.py similarity index 100% rename from youtube_dlc/extractor/formula1.py rename to yt_dlp/extractor/formula1.py diff --git a/youtube_dlc/extractor/fourtube.py b/yt_dlp/extractor/fourtube.py similarity index 100% rename from youtube_dlc/extractor/fourtube.py rename to yt_dlp/extractor/fourtube.py diff --git a/youtube_dlc/extractor/fox.py b/yt_dlp/extractor/fox.py similarity index 100% rename from youtube_dlc/extractor/fox.py rename to yt_dlp/extractor/fox.py diff --git a/youtube_dlc/extractor/fox9.py b/yt_dlp/extractor/fox9.py similarity index 100% rename from youtube_dlc/extractor/fox9.py rename to yt_dlp/extractor/fox9.py diff --git a/youtube_dlc/extractor/foxgay.py b/yt_dlp/extractor/foxgay.py similarity index 100% rename from youtube_dlc/extractor/foxgay.py rename to yt_dlp/extractor/foxgay.py diff --git a/youtube_dlc/extractor/foxnews.py b/yt_dlp/extractor/foxnews.py similarity index 100% rename from youtube_dlc/extractor/foxnews.py rename to yt_dlp/extractor/foxnews.py diff --git a/youtube_dlc/extractor/foxsports.py b/yt_dlp/extractor/foxsports.py similarity index 100% rename from youtube_dlc/extractor/foxsports.py rename to yt_dlp/extractor/foxsports.py diff --git a/youtube_dlc/extractor/franceculture.py b/yt_dlp/extractor/franceculture.py similarity index 100% rename from youtube_dlc/extractor/franceculture.py rename to yt_dlp/extractor/franceculture.py diff --git a/youtube_dlc/extractor/franceinter.py b/yt_dlp/extractor/franceinter.py similarity index 100% rename from youtube_dlc/extractor/franceinter.py rename to yt_dlp/extractor/franceinter.py diff --git a/youtube_dlc/extractor/francetv.py b/yt_dlp/extractor/francetv.py similarity index 100% rename from youtube_dlc/extractor/francetv.py rename to yt_dlp/extractor/francetv.py diff --git a/youtube_dlc/extractor/freesound.py b/yt_dlp/extractor/freesound.py similarity index 100% rename from youtube_dlc/extractor/freesound.py rename to yt_dlp/extractor/freesound.py diff --git a/youtube_dlc/extractor/freespeech.py b/yt_dlp/extractor/freespeech.py similarity index 100% rename from youtube_dlc/extractor/freespeech.py rename to yt_dlp/extractor/freespeech.py diff --git a/youtube_dlc/extractor/freshlive.py b/yt_dlp/extractor/freshlive.py similarity index 100% rename from youtube_dlc/extractor/freshlive.py rename to yt_dlp/extractor/freshlive.py diff --git a/youtube_dlc/extractor/frontendmasters.py b/yt_dlp/extractor/frontendmasters.py similarity index 100% rename from youtube_dlc/extractor/frontendmasters.py rename to yt_dlp/extractor/frontendmasters.py diff --git a/youtube_dlc/extractor/fujitv.py b/yt_dlp/extractor/fujitv.py similarity index 100% rename from youtube_dlc/extractor/fujitv.py rename to yt_dlp/extractor/fujitv.py diff --git a/youtube_dlc/extractor/funimation.py b/yt_dlp/extractor/funimation.py similarity index 100% rename from youtube_dlc/extractor/funimation.py rename to yt_dlp/extractor/funimation.py diff --git a/youtube_dlc/extractor/funk.py b/yt_dlp/extractor/funk.py similarity index 100% rename from youtube_dlc/extractor/funk.py rename to yt_dlp/extractor/funk.py diff --git a/youtube_dlc/extractor/fusion.py b/yt_dlp/extractor/fusion.py similarity index 100% rename from youtube_dlc/extractor/fusion.py rename to yt_dlp/extractor/fusion.py diff --git a/youtube_dlc/extractor/fxnetworks.py b/yt_dlp/extractor/fxnetworks.py similarity index 100% rename from youtube_dlc/extractor/fxnetworks.py rename to yt_dlp/extractor/fxnetworks.py diff --git a/youtube_dlc/extractor/gaia.py b/yt_dlp/extractor/gaia.py similarity index 100% rename from youtube_dlc/extractor/gaia.py rename to yt_dlp/extractor/gaia.py diff --git a/youtube_dlc/extractor/gameinformer.py b/yt_dlp/extractor/gameinformer.py similarity index 100% rename from youtube_dlc/extractor/gameinformer.py rename to yt_dlp/extractor/gameinformer.py diff --git a/youtube_dlc/extractor/gamespot.py b/yt_dlp/extractor/gamespot.py similarity index 100% rename from youtube_dlc/extractor/gamespot.py rename to yt_dlp/extractor/gamespot.py diff --git a/youtube_dlc/extractor/gamestar.py b/yt_dlp/extractor/gamestar.py similarity index 100% rename from youtube_dlc/extractor/gamestar.py rename to yt_dlp/extractor/gamestar.py diff --git a/youtube_dlc/extractor/gaskrank.py b/yt_dlp/extractor/gaskrank.py similarity index 100% rename from youtube_dlc/extractor/gaskrank.py rename to yt_dlp/extractor/gaskrank.py diff --git a/youtube_dlc/extractor/gazeta.py b/yt_dlp/extractor/gazeta.py similarity index 100% rename from youtube_dlc/extractor/gazeta.py rename to yt_dlp/extractor/gazeta.py diff --git a/youtube_dlc/extractor/gdcvault.py b/yt_dlp/extractor/gdcvault.py similarity index 100% rename from youtube_dlc/extractor/gdcvault.py rename to yt_dlp/extractor/gdcvault.py diff --git a/youtube_dlc/extractor/gedi.py b/yt_dlp/extractor/gedi.py similarity index 100% rename from youtube_dlc/extractor/gedi.py rename to yt_dlp/extractor/gedi.py diff --git a/youtube_dlc/extractor/generic.py b/yt_dlp/extractor/generic.py similarity index 99% rename from youtube_dlc/extractor/generic.py rename to yt_dlp/extractor/generic.py index 8cde11d2b8..7ecc5b3bdf 100644 --- a/youtube_dlc/extractor/generic.py +++ b/yt_dlp/extractor/generic.py @@ -1997,7 +1997,7 @@ class GenericIE(InfoExtractor): }, { # vshare embed - 'url': 'https://youtube-dlc-demo.neocities.org/vshare.html', + 'url': 'https://youtube-dl-demo.neocities.org/vshare.html', 'md5': '17b39f55b5497ae8b59f5fbce8e35886', 'info_dict': { 'id': '0f64ce6', @@ -2372,7 +2372,7 @@ class GenericIE(InfoExtractor): if default_search == 'auto_warning': if re.match(r'^(?:url|URL)$', url): raise ExtractorError( - 'Invalid URL: %r . Call youtube-dlc like this: youtube-dlc -v "https://www.youtube.com/watch?v=BaW_jenozKc" ' % url, + 'Invalid URL: %r . Call yt-dlp like this: yt-dlp -v "https://www.youtube.com/watch?v=BaW_jenozKc" ' % url, expected=True) else: self._downloader.report_warning( @@ -2382,7 +2382,7 @@ class GenericIE(InfoExtractor): if default_search in ('error', 'fixup_error'): raise ExtractorError( '%r is not a valid URL. ' - 'Set --default-search "ytsearch" (or run youtube-dlc "ytsearch:%s" ) to search YouTube' + 'Set --default-search "ytsearch" (or run yt-dlp "ytsearch:%s" ) to search YouTube' % (url, url), expected=True) else: if ':' not in default_search: @@ -2458,7 +2458,7 @@ class GenericIE(InfoExtractor): request = sanitized_Request(url) # Some webservers may serve compressed content of rather big size (e.g. gzipped flac) # making it impossible to download only chunk of the file (yet we need only 512kB to - # test whether it's HTML or not). According to youtube-dlc default Accept-Encoding + # test whether it's HTML or not). According to yt-dlp default Accept-Encoding # that will always result in downloading the whole file that is not desirable. # Therefore for extraction pass we have to override Accept-Encoding to any in order # to accept raw bytes and being able to download only a chunk. @@ -3521,7 +3521,7 @@ class GenericIE(InfoExtractor): if not found: # twitter:player is a https URL to iframe player that may or may not - # be supported by youtube-dlc thus this is checked the very last (see + # be supported by yt-dlp thus this is checked the very last (see # https://dev.twitter.com/cards/types/player#On_twitter.com_via_desktop_browser) embed_url = self._html_search_meta('twitter:player', webpage, default=None) if embed_url and embed_url != url: diff --git a/youtube_dlc/extractor/gfycat.py b/yt_dlp/extractor/gfycat.py similarity index 100% rename from youtube_dlc/extractor/gfycat.py rename to yt_dlp/extractor/gfycat.py diff --git a/youtube_dlc/extractor/giantbomb.py b/yt_dlp/extractor/giantbomb.py similarity index 100% rename from youtube_dlc/extractor/giantbomb.py rename to yt_dlp/extractor/giantbomb.py diff --git a/youtube_dlc/extractor/giga.py b/yt_dlp/extractor/giga.py similarity index 100% rename from youtube_dlc/extractor/giga.py rename to yt_dlp/extractor/giga.py diff --git a/youtube_dlc/extractor/gigya.py b/yt_dlp/extractor/gigya.py similarity index 100% rename from youtube_dlc/extractor/gigya.py rename to yt_dlp/extractor/gigya.py diff --git a/youtube_dlc/extractor/glide.py b/yt_dlp/extractor/glide.py similarity index 100% rename from youtube_dlc/extractor/glide.py rename to yt_dlp/extractor/glide.py diff --git a/youtube_dlc/extractor/globo.py b/yt_dlp/extractor/globo.py similarity index 100% rename from youtube_dlc/extractor/globo.py rename to yt_dlp/extractor/globo.py diff --git a/youtube_dlc/extractor/go.py b/yt_dlp/extractor/go.py similarity index 100% rename from youtube_dlc/extractor/go.py rename to yt_dlp/extractor/go.py diff --git a/youtube_dlc/extractor/godtube.py b/yt_dlp/extractor/godtube.py similarity index 100% rename from youtube_dlc/extractor/godtube.py rename to yt_dlp/extractor/godtube.py diff --git a/youtube_dlc/extractor/golem.py b/yt_dlp/extractor/golem.py similarity index 100% rename from youtube_dlc/extractor/golem.py rename to yt_dlp/extractor/golem.py diff --git a/youtube_dlc/extractor/googledrive.py b/yt_dlp/extractor/googledrive.py similarity index 100% rename from youtube_dlc/extractor/googledrive.py rename to yt_dlp/extractor/googledrive.py diff --git a/youtube_dlc/extractor/googlepodcasts.py b/yt_dlp/extractor/googlepodcasts.py similarity index 100% rename from youtube_dlc/extractor/googlepodcasts.py rename to yt_dlp/extractor/googlepodcasts.py diff --git a/youtube_dlc/extractor/googlesearch.py b/yt_dlp/extractor/googlesearch.py similarity index 100% rename from youtube_dlc/extractor/googlesearch.py rename to yt_dlp/extractor/googlesearch.py diff --git a/youtube_dlc/extractor/goshgay.py b/yt_dlp/extractor/goshgay.py similarity index 100% rename from youtube_dlc/extractor/goshgay.py rename to yt_dlp/extractor/goshgay.py diff --git a/youtube_dlc/extractor/gputechconf.py b/yt_dlp/extractor/gputechconf.py similarity index 100% rename from youtube_dlc/extractor/gputechconf.py rename to yt_dlp/extractor/gputechconf.py diff --git a/youtube_dlc/extractor/groupon.py b/yt_dlp/extractor/groupon.py similarity index 100% rename from youtube_dlc/extractor/groupon.py rename to yt_dlp/extractor/groupon.py diff --git a/youtube_dlc/extractor/hbo.py b/yt_dlp/extractor/hbo.py similarity index 100% rename from youtube_dlc/extractor/hbo.py rename to yt_dlp/extractor/hbo.py diff --git a/youtube_dlc/extractor/hearthisat.py b/yt_dlp/extractor/hearthisat.py similarity index 100% rename from youtube_dlc/extractor/hearthisat.py rename to yt_dlp/extractor/hearthisat.py diff --git a/youtube_dlc/extractor/heise.py b/yt_dlp/extractor/heise.py similarity index 100% rename from youtube_dlc/extractor/heise.py rename to yt_dlp/extractor/heise.py diff --git a/youtube_dlc/extractor/hellporno.py b/yt_dlp/extractor/hellporno.py similarity index 100% rename from youtube_dlc/extractor/hellporno.py rename to yt_dlp/extractor/hellporno.py diff --git a/youtube_dlc/extractor/helsinki.py b/yt_dlp/extractor/helsinki.py similarity index 100% rename from youtube_dlc/extractor/helsinki.py rename to yt_dlp/extractor/helsinki.py diff --git a/youtube_dlc/extractor/hentaistigma.py b/yt_dlp/extractor/hentaistigma.py similarity index 100% rename from youtube_dlc/extractor/hentaistigma.py rename to yt_dlp/extractor/hentaistigma.py diff --git a/youtube_dlc/extractor/hgtv.py b/yt_dlp/extractor/hgtv.py similarity index 100% rename from youtube_dlc/extractor/hgtv.py rename to yt_dlp/extractor/hgtv.py diff --git a/youtube_dlc/extractor/hidive.py b/yt_dlp/extractor/hidive.py similarity index 100% rename from youtube_dlc/extractor/hidive.py rename to yt_dlp/extractor/hidive.py diff --git a/youtube_dlc/extractor/historicfilms.py b/yt_dlp/extractor/historicfilms.py similarity index 100% rename from youtube_dlc/extractor/historicfilms.py rename to yt_dlp/extractor/historicfilms.py diff --git a/youtube_dlc/extractor/hitbox.py b/yt_dlp/extractor/hitbox.py similarity index 100% rename from youtube_dlc/extractor/hitbox.py rename to yt_dlp/extractor/hitbox.py diff --git a/youtube_dlc/extractor/hitrecord.py b/yt_dlp/extractor/hitrecord.py similarity index 100% rename from youtube_dlc/extractor/hitrecord.py rename to yt_dlp/extractor/hitrecord.py diff --git a/youtube_dlc/extractor/hketv.py b/yt_dlp/extractor/hketv.py similarity index 100% rename from youtube_dlc/extractor/hketv.py rename to yt_dlp/extractor/hketv.py diff --git a/youtube_dlc/extractor/hornbunny.py b/yt_dlp/extractor/hornbunny.py similarity index 100% rename from youtube_dlc/extractor/hornbunny.py rename to yt_dlp/extractor/hornbunny.py diff --git a/youtube_dlc/extractor/hotnewhiphop.py b/yt_dlp/extractor/hotnewhiphop.py similarity index 100% rename from youtube_dlc/extractor/hotnewhiphop.py rename to yt_dlp/extractor/hotnewhiphop.py diff --git a/youtube_dlc/extractor/hotstar.py b/yt_dlp/extractor/hotstar.py similarity index 100% rename from youtube_dlc/extractor/hotstar.py rename to yt_dlp/extractor/hotstar.py diff --git a/youtube_dlc/extractor/howcast.py b/yt_dlp/extractor/howcast.py similarity index 100% rename from youtube_dlc/extractor/howcast.py rename to yt_dlp/extractor/howcast.py diff --git a/youtube_dlc/extractor/howstuffworks.py b/yt_dlp/extractor/howstuffworks.py similarity index 100% rename from youtube_dlc/extractor/howstuffworks.py rename to yt_dlp/extractor/howstuffworks.py diff --git a/youtube_dlc/extractor/hrfensehen.py b/yt_dlp/extractor/hrfensehen.py similarity index 98% rename from youtube_dlc/extractor/hrfensehen.py rename to yt_dlp/extractor/hrfensehen.py index 805345e695..a04a5b0ffc 100644 --- a/youtube_dlc/extractor/hrfensehen.py +++ b/yt_dlp/extractor/hrfensehen.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import json import re -from youtube_dlc.utils import int_or_none, unified_timestamp, unescapeHTML +from yt_dlp.utils import int_or_none, unified_timestamp, unescapeHTML from .common import InfoExtractor diff --git a/youtube_dlc/extractor/hrti.py b/yt_dlp/extractor/hrti.py similarity index 100% rename from youtube_dlc/extractor/hrti.py rename to yt_dlp/extractor/hrti.py diff --git a/youtube_dlc/extractor/huajiao.py b/yt_dlp/extractor/huajiao.py similarity index 100% rename from youtube_dlc/extractor/huajiao.py rename to yt_dlp/extractor/huajiao.py diff --git a/youtube_dlc/extractor/huffpost.py b/yt_dlp/extractor/huffpost.py similarity index 100% rename from youtube_dlc/extractor/huffpost.py rename to yt_dlp/extractor/huffpost.py diff --git a/youtube_dlc/extractor/hungama.py b/yt_dlp/extractor/hungama.py similarity index 100% rename from youtube_dlc/extractor/hungama.py rename to yt_dlp/extractor/hungama.py diff --git a/youtube_dlc/extractor/hypem.py b/yt_dlp/extractor/hypem.py similarity index 100% rename from youtube_dlc/extractor/hypem.py rename to yt_dlp/extractor/hypem.py diff --git a/youtube_dlc/extractor/ign.py b/yt_dlp/extractor/ign.py similarity index 100% rename from youtube_dlc/extractor/ign.py rename to yt_dlp/extractor/ign.py diff --git a/youtube_dlc/extractor/iheart.py b/yt_dlp/extractor/iheart.py similarity index 100% rename from youtube_dlc/extractor/iheart.py rename to yt_dlp/extractor/iheart.py diff --git a/youtube_dlc/extractor/imdb.py b/yt_dlp/extractor/imdb.py similarity index 100% rename from youtube_dlc/extractor/imdb.py rename to yt_dlp/extractor/imdb.py diff --git a/youtube_dlc/extractor/imggaming.py b/yt_dlp/extractor/imggaming.py similarity index 100% rename from youtube_dlc/extractor/imggaming.py rename to yt_dlp/extractor/imggaming.py diff --git a/youtube_dlc/extractor/imgur.py b/yt_dlp/extractor/imgur.py similarity index 97% rename from youtube_dlc/extractor/imgur.py rename to yt_dlp/extractor/imgur.py index 20fe6667bb..dfa4737522 100644 --- a/youtube_dlc/extractor/imgur.py +++ b/yt_dlp/extractor/imgur.py @@ -60,7 +60,7 @@ class ImgurIE(InfoExtractor): 'width': width, 'height': height, 'http_headers': { - 'User-Agent': 'youtube-dlc (like wget)', + 'User-Agent': 'yt-dlp (like wget)', }, }) @@ -82,7 +82,7 @@ class ImgurIE(InfoExtractor): 'url': self._proto_relative_url(gifd['gifUrl']), 'filesize': gifd.get('size'), 'http_headers': { - 'User-Agent': 'youtube-dlc (like wget)', + 'User-Agent': 'yt-dlp (like wget)', }, }) diff --git a/youtube_dlc/extractor/ina.py b/yt_dlp/extractor/ina.py similarity index 100% rename from youtube_dlc/extractor/ina.py rename to yt_dlp/extractor/ina.py diff --git a/youtube_dlc/extractor/inc.py b/yt_dlp/extractor/inc.py similarity index 100% rename from youtube_dlc/extractor/inc.py rename to yt_dlp/extractor/inc.py diff --git a/youtube_dlc/extractor/indavideo.py b/yt_dlp/extractor/indavideo.py similarity index 100% rename from youtube_dlc/extractor/indavideo.py rename to yt_dlp/extractor/indavideo.py diff --git a/youtube_dlc/extractor/infoq.py b/yt_dlp/extractor/infoq.py similarity index 100% rename from youtube_dlc/extractor/infoq.py rename to yt_dlp/extractor/infoq.py diff --git a/youtube_dlc/extractor/instagram.py b/yt_dlp/extractor/instagram.py similarity index 100% rename from youtube_dlc/extractor/instagram.py rename to yt_dlp/extractor/instagram.py diff --git a/youtube_dlc/extractor/internazionale.py b/yt_dlp/extractor/internazionale.py similarity index 100% rename from youtube_dlc/extractor/internazionale.py rename to yt_dlp/extractor/internazionale.py diff --git a/youtube_dlc/extractor/internetvideoarchive.py b/yt_dlp/extractor/internetvideoarchive.py similarity index 100% rename from youtube_dlc/extractor/internetvideoarchive.py rename to yt_dlp/extractor/internetvideoarchive.py diff --git a/youtube_dlc/extractor/iprima.py b/yt_dlp/extractor/iprima.py similarity index 100% rename from youtube_dlc/extractor/iprima.py rename to yt_dlp/extractor/iprima.py diff --git a/youtube_dlc/extractor/iqiyi.py b/yt_dlp/extractor/iqiyi.py similarity index 100% rename from youtube_dlc/extractor/iqiyi.py rename to yt_dlp/extractor/iqiyi.py diff --git a/youtube_dlc/extractor/ir90tv.py b/yt_dlp/extractor/ir90tv.py similarity index 100% rename from youtube_dlc/extractor/ir90tv.py rename to yt_dlp/extractor/ir90tv.py diff --git a/youtube_dlc/extractor/itv.py b/yt_dlp/extractor/itv.py similarity index 100% rename from youtube_dlc/extractor/itv.py rename to yt_dlp/extractor/itv.py diff --git a/youtube_dlc/extractor/ivi.py b/yt_dlp/extractor/ivi.py similarity index 99% rename from youtube_dlc/extractor/ivi.py rename to yt_dlp/extractor/ivi.py index 580cf41cd0..69711f877e 100644 --- a/youtube_dlc/extractor/ivi.py +++ b/yt_dlp/extractor/ivi.py @@ -142,7 +142,7 @@ class IviIE(InfoExtractor): continue elif bundled: raise ExtractorError( - 'This feature does not work from bundled exe. Run youtube-dlc from sources.', + 'This feature does not work from bundled exe. Run yt-dlp from sources.', expected=True) elif not pycryptodomex_found: raise ExtractorError( diff --git a/youtube_dlc/extractor/ivideon.py b/yt_dlp/extractor/ivideon.py similarity index 100% rename from youtube_dlc/extractor/ivideon.py rename to yt_dlp/extractor/ivideon.py diff --git a/youtube_dlc/extractor/iwara.py b/yt_dlp/extractor/iwara.py similarity index 100% rename from youtube_dlc/extractor/iwara.py rename to yt_dlp/extractor/iwara.py diff --git a/youtube_dlc/extractor/izlesene.py b/yt_dlp/extractor/izlesene.py similarity index 100% rename from youtube_dlc/extractor/izlesene.py rename to yt_dlp/extractor/izlesene.py diff --git a/youtube_dlc/extractor/jamendo.py b/yt_dlp/extractor/jamendo.py similarity index 100% rename from youtube_dlc/extractor/jamendo.py rename to yt_dlp/extractor/jamendo.py diff --git a/youtube_dlc/extractor/jeuxvideo.py b/yt_dlp/extractor/jeuxvideo.py similarity index 100% rename from youtube_dlc/extractor/jeuxvideo.py rename to yt_dlp/extractor/jeuxvideo.py diff --git a/youtube_dlc/extractor/joj.py b/yt_dlp/extractor/joj.py similarity index 100% rename from youtube_dlc/extractor/joj.py rename to yt_dlp/extractor/joj.py diff --git a/youtube_dlc/extractor/jove.py b/yt_dlp/extractor/jove.py similarity index 100% rename from youtube_dlc/extractor/jove.py rename to yt_dlp/extractor/jove.py diff --git a/youtube_dlc/extractor/jwplatform.py b/yt_dlp/extractor/jwplatform.py similarity index 100% rename from youtube_dlc/extractor/jwplatform.py rename to yt_dlp/extractor/jwplatform.py diff --git a/youtube_dlc/extractor/kakao.py b/yt_dlp/extractor/kakao.py similarity index 100% rename from youtube_dlc/extractor/kakao.py rename to yt_dlp/extractor/kakao.py diff --git a/youtube_dlc/extractor/kaltura.py b/yt_dlp/extractor/kaltura.py similarity index 100% rename from youtube_dlc/extractor/kaltura.py rename to yt_dlp/extractor/kaltura.py diff --git a/youtube_dlc/extractor/kanalplay.py b/yt_dlp/extractor/kanalplay.py similarity index 100% rename from youtube_dlc/extractor/kanalplay.py rename to yt_dlp/extractor/kanalplay.py diff --git a/youtube_dlc/extractor/kankan.py b/yt_dlp/extractor/kankan.py similarity index 100% rename from youtube_dlc/extractor/kankan.py rename to yt_dlp/extractor/kankan.py diff --git a/youtube_dlc/extractor/karaoketv.py b/yt_dlp/extractor/karaoketv.py similarity index 100% rename from youtube_dlc/extractor/karaoketv.py rename to yt_dlp/extractor/karaoketv.py diff --git a/youtube_dlc/extractor/karrierevideos.py b/yt_dlp/extractor/karrierevideos.py similarity index 100% rename from youtube_dlc/extractor/karrierevideos.py rename to yt_dlp/extractor/karrierevideos.py diff --git a/youtube_dlc/extractor/keezmovies.py b/yt_dlp/extractor/keezmovies.py similarity index 100% rename from youtube_dlc/extractor/keezmovies.py rename to yt_dlp/extractor/keezmovies.py diff --git a/youtube_dlc/extractor/ketnet.py b/yt_dlp/extractor/ketnet.py similarity index 100% rename from youtube_dlc/extractor/ketnet.py rename to yt_dlp/extractor/ketnet.py diff --git a/youtube_dlc/extractor/khanacademy.py b/yt_dlp/extractor/khanacademy.py similarity index 100% rename from youtube_dlc/extractor/khanacademy.py rename to yt_dlp/extractor/khanacademy.py diff --git a/youtube_dlc/extractor/kickstarter.py b/yt_dlp/extractor/kickstarter.py similarity index 100% rename from youtube_dlc/extractor/kickstarter.py rename to yt_dlp/extractor/kickstarter.py diff --git a/youtube_dlc/extractor/kinja.py b/yt_dlp/extractor/kinja.py similarity index 100% rename from youtube_dlc/extractor/kinja.py rename to yt_dlp/extractor/kinja.py diff --git a/youtube_dlc/extractor/kinopoisk.py b/yt_dlp/extractor/kinopoisk.py similarity index 100% rename from youtube_dlc/extractor/kinopoisk.py rename to yt_dlp/extractor/kinopoisk.py diff --git a/youtube_dlc/extractor/konserthusetplay.py b/yt_dlp/extractor/konserthusetplay.py similarity index 100% rename from youtube_dlc/extractor/konserthusetplay.py rename to yt_dlp/extractor/konserthusetplay.py diff --git a/youtube_dlc/extractor/krasview.py b/yt_dlp/extractor/krasview.py similarity index 100% rename from youtube_dlc/extractor/krasview.py rename to yt_dlp/extractor/krasview.py diff --git a/youtube_dlc/extractor/ku6.py b/yt_dlp/extractor/ku6.py similarity index 100% rename from youtube_dlc/extractor/ku6.py rename to yt_dlp/extractor/ku6.py diff --git a/youtube_dlc/extractor/kusi.py b/yt_dlp/extractor/kusi.py similarity index 100% rename from youtube_dlc/extractor/kusi.py rename to yt_dlp/extractor/kusi.py diff --git a/youtube_dlc/extractor/kuwo.py b/yt_dlp/extractor/kuwo.py similarity index 100% rename from youtube_dlc/extractor/kuwo.py rename to yt_dlp/extractor/kuwo.py diff --git a/youtube_dlc/extractor/la7.py b/yt_dlp/extractor/la7.py similarity index 100% rename from youtube_dlc/extractor/la7.py rename to yt_dlp/extractor/la7.py diff --git a/youtube_dlc/extractor/laola1tv.py b/yt_dlp/extractor/laola1tv.py similarity index 100% rename from youtube_dlc/extractor/laola1tv.py rename to yt_dlp/extractor/laola1tv.py diff --git a/youtube_dlc/extractor/lbry.py b/yt_dlp/extractor/lbry.py similarity index 100% rename from youtube_dlc/extractor/lbry.py rename to yt_dlp/extractor/lbry.py diff --git a/youtube_dlc/extractor/lci.py b/yt_dlp/extractor/lci.py similarity index 100% rename from youtube_dlc/extractor/lci.py rename to yt_dlp/extractor/lci.py diff --git a/youtube_dlc/extractor/lcp.py b/yt_dlp/extractor/lcp.py similarity index 100% rename from youtube_dlc/extractor/lcp.py rename to yt_dlp/extractor/lcp.py diff --git a/youtube_dlc/extractor/lecture2go.py b/yt_dlp/extractor/lecture2go.py similarity index 100% rename from youtube_dlc/extractor/lecture2go.py rename to yt_dlp/extractor/lecture2go.py diff --git a/youtube_dlc/extractor/lecturio.py b/yt_dlp/extractor/lecturio.py similarity index 100% rename from youtube_dlc/extractor/lecturio.py rename to yt_dlp/extractor/lecturio.py diff --git a/youtube_dlc/extractor/leeco.py b/yt_dlp/extractor/leeco.py similarity index 100% rename from youtube_dlc/extractor/leeco.py rename to yt_dlp/extractor/leeco.py diff --git a/youtube_dlc/extractor/lego.py b/yt_dlp/extractor/lego.py similarity index 100% rename from youtube_dlc/extractor/lego.py rename to yt_dlp/extractor/lego.py diff --git a/youtube_dlc/extractor/lemonde.py b/yt_dlp/extractor/lemonde.py similarity index 100% rename from youtube_dlc/extractor/lemonde.py rename to yt_dlp/extractor/lemonde.py diff --git a/youtube_dlc/extractor/lenta.py b/yt_dlp/extractor/lenta.py similarity index 100% rename from youtube_dlc/extractor/lenta.py rename to yt_dlp/extractor/lenta.py diff --git a/youtube_dlc/extractor/libraryofcongress.py b/yt_dlp/extractor/libraryofcongress.py similarity index 100% rename from youtube_dlc/extractor/libraryofcongress.py rename to yt_dlp/extractor/libraryofcongress.py diff --git a/youtube_dlc/extractor/libsyn.py b/yt_dlp/extractor/libsyn.py similarity index 100% rename from youtube_dlc/extractor/libsyn.py rename to yt_dlp/extractor/libsyn.py diff --git a/youtube_dlc/extractor/lifenews.py b/yt_dlp/extractor/lifenews.py similarity index 100% rename from youtube_dlc/extractor/lifenews.py rename to yt_dlp/extractor/lifenews.py diff --git a/youtube_dlc/extractor/limelight.py b/yt_dlp/extractor/limelight.py similarity index 100% rename from youtube_dlc/extractor/limelight.py rename to yt_dlp/extractor/limelight.py diff --git a/youtube_dlc/extractor/line.py b/yt_dlp/extractor/line.py similarity index 100% rename from youtube_dlc/extractor/line.py rename to yt_dlp/extractor/line.py diff --git a/youtube_dlc/extractor/linkedin.py b/yt_dlp/extractor/linkedin.py similarity index 100% rename from youtube_dlc/extractor/linkedin.py rename to yt_dlp/extractor/linkedin.py diff --git a/youtube_dlc/extractor/linuxacademy.py b/yt_dlp/extractor/linuxacademy.py similarity index 100% rename from youtube_dlc/extractor/linuxacademy.py rename to yt_dlp/extractor/linuxacademy.py diff --git a/youtube_dlc/extractor/litv.py b/yt_dlp/extractor/litv.py similarity index 100% rename from youtube_dlc/extractor/litv.py rename to yt_dlp/extractor/litv.py diff --git a/youtube_dlc/extractor/livejournal.py b/yt_dlp/extractor/livejournal.py similarity index 100% rename from youtube_dlc/extractor/livejournal.py rename to yt_dlp/extractor/livejournal.py diff --git a/youtube_dlc/extractor/liveleak.py b/yt_dlp/extractor/liveleak.py similarity index 100% rename from youtube_dlc/extractor/liveleak.py rename to yt_dlp/extractor/liveleak.py diff --git a/youtube_dlc/extractor/livestream.py b/yt_dlp/extractor/livestream.py similarity index 100% rename from youtube_dlc/extractor/livestream.py rename to yt_dlp/extractor/livestream.py diff --git a/youtube_dlc/extractor/lnkgo.py b/yt_dlp/extractor/lnkgo.py similarity index 100% rename from youtube_dlc/extractor/lnkgo.py rename to yt_dlp/extractor/lnkgo.py diff --git a/youtube_dlc/extractor/localnews8.py b/yt_dlp/extractor/localnews8.py similarity index 100% rename from youtube_dlc/extractor/localnews8.py rename to yt_dlp/extractor/localnews8.py diff --git a/youtube_dlc/extractor/lovehomeporn.py b/yt_dlp/extractor/lovehomeporn.py similarity index 100% rename from youtube_dlc/extractor/lovehomeporn.py rename to yt_dlp/extractor/lovehomeporn.py diff --git a/youtube_dlc/extractor/lrt.py b/yt_dlp/extractor/lrt.py similarity index 100% rename from youtube_dlc/extractor/lrt.py rename to yt_dlp/extractor/lrt.py diff --git a/youtube_dlc/extractor/lynda.py b/yt_dlp/extractor/lynda.py similarity index 100% rename from youtube_dlc/extractor/lynda.py rename to yt_dlp/extractor/lynda.py diff --git a/youtube_dlc/extractor/m6.py b/yt_dlp/extractor/m6.py similarity index 100% rename from youtube_dlc/extractor/m6.py rename to yt_dlp/extractor/m6.py diff --git a/youtube_dlc/extractor/magentamusik360.py b/yt_dlp/extractor/magentamusik360.py similarity index 100% rename from youtube_dlc/extractor/magentamusik360.py rename to yt_dlp/extractor/magentamusik360.py diff --git a/youtube_dlc/extractor/mailru.py b/yt_dlp/extractor/mailru.py similarity index 100% rename from youtube_dlc/extractor/mailru.py rename to yt_dlp/extractor/mailru.py diff --git a/youtube_dlc/extractor/malltv.py b/yt_dlp/extractor/malltv.py similarity index 100% rename from youtube_dlc/extractor/malltv.py rename to yt_dlp/extractor/malltv.py diff --git a/youtube_dlc/extractor/mangomolo.py b/yt_dlp/extractor/mangomolo.py similarity index 100% rename from youtube_dlc/extractor/mangomolo.py rename to yt_dlp/extractor/mangomolo.py diff --git a/youtube_dlc/extractor/manyvids.py b/yt_dlp/extractor/manyvids.py similarity index 100% rename from youtube_dlc/extractor/manyvids.py rename to yt_dlp/extractor/manyvids.py diff --git a/youtube_dlc/extractor/markiza.py b/yt_dlp/extractor/markiza.py similarity index 100% rename from youtube_dlc/extractor/markiza.py rename to yt_dlp/extractor/markiza.py diff --git a/youtube_dlc/extractor/massengeschmacktv.py b/yt_dlp/extractor/massengeschmacktv.py similarity index 100% rename from youtube_dlc/extractor/massengeschmacktv.py rename to yt_dlp/extractor/massengeschmacktv.py diff --git a/youtube_dlc/extractor/matchtv.py b/yt_dlp/extractor/matchtv.py similarity index 100% rename from youtube_dlc/extractor/matchtv.py rename to yt_dlp/extractor/matchtv.py diff --git a/youtube_dlc/extractor/mdr.py b/yt_dlp/extractor/mdr.py similarity index 100% rename from youtube_dlc/extractor/mdr.py rename to yt_dlp/extractor/mdr.py diff --git a/youtube_dlc/extractor/medaltv.py b/yt_dlp/extractor/medaltv.py similarity index 100% rename from youtube_dlc/extractor/medaltv.py rename to yt_dlp/extractor/medaltv.py diff --git a/youtube_dlc/extractor/medialaan.py b/yt_dlp/extractor/medialaan.py similarity index 100% rename from youtube_dlc/extractor/medialaan.py rename to yt_dlp/extractor/medialaan.py diff --git a/youtube_dlc/extractor/mediaset.py b/yt_dlp/extractor/mediaset.py similarity index 100% rename from youtube_dlc/extractor/mediaset.py rename to yt_dlp/extractor/mediaset.py diff --git a/youtube_dlc/extractor/mediasite.py b/yt_dlp/extractor/mediasite.py similarity index 100% rename from youtube_dlc/extractor/mediasite.py rename to yt_dlp/extractor/mediasite.py diff --git a/youtube_dlc/extractor/medici.py b/yt_dlp/extractor/medici.py similarity index 100% rename from youtube_dlc/extractor/medici.py rename to yt_dlp/extractor/medici.py diff --git a/youtube_dlc/extractor/megaphone.py b/yt_dlp/extractor/megaphone.py similarity index 100% rename from youtube_dlc/extractor/megaphone.py rename to yt_dlp/extractor/megaphone.py diff --git a/youtube_dlc/extractor/meipai.py b/yt_dlp/extractor/meipai.py similarity index 100% rename from youtube_dlc/extractor/meipai.py rename to yt_dlp/extractor/meipai.py diff --git a/youtube_dlc/extractor/melonvod.py b/yt_dlp/extractor/melonvod.py similarity index 100% rename from youtube_dlc/extractor/melonvod.py rename to yt_dlp/extractor/melonvod.py diff --git a/youtube_dlc/extractor/meta.py b/yt_dlp/extractor/meta.py similarity index 100% rename from youtube_dlc/extractor/meta.py rename to yt_dlp/extractor/meta.py diff --git a/youtube_dlc/extractor/metacafe.py b/yt_dlp/extractor/metacafe.py similarity index 100% rename from youtube_dlc/extractor/metacafe.py rename to yt_dlp/extractor/metacafe.py diff --git a/youtube_dlc/extractor/metacritic.py b/yt_dlp/extractor/metacritic.py similarity index 100% rename from youtube_dlc/extractor/metacritic.py rename to yt_dlp/extractor/metacritic.py diff --git a/youtube_dlc/extractor/mgoon.py b/yt_dlp/extractor/mgoon.py similarity index 100% rename from youtube_dlc/extractor/mgoon.py rename to yt_dlp/extractor/mgoon.py diff --git a/youtube_dlc/extractor/mgtv.py b/yt_dlp/extractor/mgtv.py similarity index 100% rename from youtube_dlc/extractor/mgtv.py rename to yt_dlp/extractor/mgtv.py diff --git a/youtube_dlc/extractor/miaopai.py b/yt_dlp/extractor/miaopai.py similarity index 100% rename from youtube_dlc/extractor/miaopai.py rename to yt_dlp/extractor/miaopai.py diff --git a/youtube_dlc/extractor/microsoftvirtualacademy.py b/yt_dlp/extractor/microsoftvirtualacademy.py similarity index 100% rename from youtube_dlc/extractor/microsoftvirtualacademy.py rename to yt_dlp/extractor/microsoftvirtualacademy.py diff --git a/youtube_dlc/extractor/mildom.py b/yt_dlp/extractor/mildom.py similarity index 100% rename from youtube_dlc/extractor/mildom.py rename to yt_dlp/extractor/mildom.py diff --git a/youtube_dlc/extractor/minds.py b/yt_dlp/extractor/minds.py similarity index 100% rename from youtube_dlc/extractor/minds.py rename to yt_dlp/extractor/minds.py diff --git a/youtube_dlc/extractor/ministrygrid.py b/yt_dlp/extractor/ministrygrid.py similarity index 100% rename from youtube_dlc/extractor/ministrygrid.py rename to yt_dlp/extractor/ministrygrid.py diff --git a/youtube_dlc/extractor/minoto.py b/yt_dlp/extractor/minoto.py similarity index 100% rename from youtube_dlc/extractor/minoto.py rename to yt_dlp/extractor/minoto.py diff --git a/youtube_dlc/extractor/miomio.py b/yt_dlp/extractor/miomio.py similarity index 100% rename from youtube_dlc/extractor/miomio.py rename to yt_dlp/extractor/miomio.py diff --git a/youtube_dlc/extractor/mit.py b/yt_dlp/extractor/mit.py similarity index 100% rename from youtube_dlc/extractor/mit.py rename to yt_dlp/extractor/mit.py diff --git a/youtube_dlc/extractor/mitele.py b/yt_dlp/extractor/mitele.py similarity index 100% rename from youtube_dlc/extractor/mitele.py rename to yt_dlp/extractor/mitele.py diff --git a/youtube_dlc/extractor/mixcloud.py b/yt_dlp/extractor/mixcloud.py similarity index 100% rename from youtube_dlc/extractor/mixcloud.py rename to yt_dlp/extractor/mixcloud.py diff --git a/youtube_dlc/extractor/mlb.py b/yt_dlp/extractor/mlb.py similarity index 100% rename from youtube_dlc/extractor/mlb.py rename to yt_dlp/extractor/mlb.py diff --git a/youtube_dlc/extractor/mnet.py b/yt_dlp/extractor/mnet.py similarity index 100% rename from youtube_dlc/extractor/mnet.py rename to yt_dlp/extractor/mnet.py diff --git a/youtube_dlc/extractor/moevideo.py b/yt_dlp/extractor/moevideo.py similarity index 100% rename from youtube_dlc/extractor/moevideo.py rename to yt_dlp/extractor/moevideo.py diff --git a/youtube_dlc/extractor/mofosex.py b/yt_dlp/extractor/mofosex.py similarity index 100% rename from youtube_dlc/extractor/mofosex.py rename to yt_dlp/extractor/mofosex.py diff --git a/youtube_dlc/extractor/mojvideo.py b/yt_dlp/extractor/mojvideo.py similarity index 100% rename from youtube_dlc/extractor/mojvideo.py rename to yt_dlp/extractor/mojvideo.py diff --git a/youtube_dlc/extractor/morningstar.py b/yt_dlp/extractor/morningstar.py similarity index 100% rename from youtube_dlc/extractor/morningstar.py rename to yt_dlp/extractor/morningstar.py diff --git a/youtube_dlc/extractor/motherless.py b/yt_dlp/extractor/motherless.py similarity index 100% rename from youtube_dlc/extractor/motherless.py rename to yt_dlp/extractor/motherless.py diff --git a/youtube_dlc/extractor/motorsport.py b/yt_dlp/extractor/motorsport.py similarity index 100% rename from youtube_dlc/extractor/motorsport.py rename to yt_dlp/extractor/motorsport.py diff --git a/youtube_dlc/extractor/movieclips.py b/yt_dlp/extractor/movieclips.py similarity index 100% rename from youtube_dlc/extractor/movieclips.py rename to yt_dlp/extractor/movieclips.py diff --git a/youtube_dlc/extractor/moviezine.py b/yt_dlp/extractor/moviezine.py similarity index 100% rename from youtube_dlc/extractor/moviezine.py rename to yt_dlp/extractor/moviezine.py diff --git a/youtube_dlc/extractor/movingimage.py b/yt_dlp/extractor/movingimage.py similarity index 100% rename from youtube_dlc/extractor/movingimage.py rename to yt_dlp/extractor/movingimage.py diff --git a/youtube_dlc/extractor/msn.py b/yt_dlp/extractor/msn.py similarity index 100% rename from youtube_dlc/extractor/msn.py rename to yt_dlp/extractor/msn.py diff --git a/youtube_dlc/extractor/mtv.py b/yt_dlp/extractor/mtv.py similarity index 100% rename from youtube_dlc/extractor/mtv.py rename to yt_dlp/extractor/mtv.py diff --git a/youtube_dlc/extractor/muenchentv.py b/yt_dlp/extractor/muenchentv.py similarity index 100% rename from youtube_dlc/extractor/muenchentv.py rename to yt_dlp/extractor/muenchentv.py diff --git a/youtube_dlc/extractor/mwave.py b/yt_dlp/extractor/mwave.py similarity index 100% rename from youtube_dlc/extractor/mwave.py rename to yt_dlp/extractor/mwave.py diff --git a/youtube_dlc/extractor/mychannels.py b/yt_dlp/extractor/mychannels.py similarity index 100% rename from youtube_dlc/extractor/mychannels.py rename to yt_dlp/extractor/mychannels.py diff --git a/youtube_dlc/extractor/myspace.py b/yt_dlp/extractor/myspace.py similarity index 100% rename from youtube_dlc/extractor/myspace.py rename to yt_dlp/extractor/myspace.py diff --git a/youtube_dlc/extractor/myspass.py b/yt_dlp/extractor/myspass.py similarity index 100% rename from youtube_dlc/extractor/myspass.py rename to yt_dlp/extractor/myspass.py diff --git a/youtube_dlc/extractor/myvi.py b/yt_dlp/extractor/myvi.py similarity index 100% rename from youtube_dlc/extractor/myvi.py rename to yt_dlp/extractor/myvi.py diff --git a/youtube_dlc/extractor/myvideoge.py b/yt_dlp/extractor/myvideoge.py similarity index 100% rename from youtube_dlc/extractor/myvideoge.py rename to yt_dlp/extractor/myvideoge.py diff --git a/youtube_dlc/extractor/myvidster.py b/yt_dlp/extractor/myvidster.py similarity index 100% rename from youtube_dlc/extractor/myvidster.py rename to yt_dlp/extractor/myvidster.py diff --git a/youtube_dlc/extractor/nationalgeographic.py b/yt_dlp/extractor/nationalgeographic.py similarity index 100% rename from youtube_dlc/extractor/nationalgeographic.py rename to yt_dlp/extractor/nationalgeographic.py diff --git a/youtube_dlc/extractor/naver.py b/yt_dlp/extractor/naver.py similarity index 100% rename from youtube_dlc/extractor/naver.py rename to yt_dlp/extractor/naver.py diff --git a/youtube_dlc/extractor/nba.py b/yt_dlp/extractor/nba.py similarity index 100% rename from youtube_dlc/extractor/nba.py rename to yt_dlp/extractor/nba.py diff --git a/youtube_dlc/extractor/nbc.py b/yt_dlp/extractor/nbc.py similarity index 100% rename from youtube_dlc/extractor/nbc.py rename to yt_dlp/extractor/nbc.py diff --git a/youtube_dlc/extractor/ndr.py b/yt_dlp/extractor/ndr.py similarity index 100% rename from youtube_dlc/extractor/ndr.py rename to yt_dlp/extractor/ndr.py diff --git a/youtube_dlc/extractor/ndtv.py b/yt_dlp/extractor/ndtv.py similarity index 100% rename from youtube_dlc/extractor/ndtv.py rename to yt_dlp/extractor/ndtv.py diff --git a/youtube_dlc/extractor/nerdcubed.py b/yt_dlp/extractor/nerdcubed.py similarity index 100% rename from youtube_dlc/extractor/nerdcubed.py rename to yt_dlp/extractor/nerdcubed.py diff --git a/youtube_dlc/extractor/neteasemusic.py b/yt_dlp/extractor/neteasemusic.py similarity index 100% rename from youtube_dlc/extractor/neteasemusic.py rename to yt_dlp/extractor/neteasemusic.py diff --git a/youtube_dlc/extractor/netzkino.py b/yt_dlp/extractor/netzkino.py similarity index 100% rename from youtube_dlc/extractor/netzkino.py rename to yt_dlp/extractor/netzkino.py diff --git a/youtube_dlc/extractor/newgrounds.py b/yt_dlp/extractor/newgrounds.py similarity index 100% rename from youtube_dlc/extractor/newgrounds.py rename to yt_dlp/extractor/newgrounds.py diff --git a/youtube_dlc/extractor/newstube.py b/yt_dlp/extractor/newstube.py similarity index 100% rename from youtube_dlc/extractor/newstube.py rename to yt_dlp/extractor/newstube.py diff --git a/youtube_dlc/extractor/nextmedia.py b/yt_dlp/extractor/nextmedia.py similarity index 100% rename from youtube_dlc/extractor/nextmedia.py rename to yt_dlp/extractor/nextmedia.py diff --git a/youtube_dlc/extractor/nexx.py b/yt_dlp/extractor/nexx.py similarity index 100% rename from youtube_dlc/extractor/nexx.py rename to yt_dlp/extractor/nexx.py diff --git a/youtube_dlc/extractor/nfl.py b/yt_dlp/extractor/nfl.py similarity index 100% rename from youtube_dlc/extractor/nfl.py rename to yt_dlp/extractor/nfl.py diff --git a/youtube_dlc/extractor/nhk.py b/yt_dlp/extractor/nhk.py similarity index 100% rename from youtube_dlc/extractor/nhk.py rename to yt_dlp/extractor/nhk.py diff --git a/youtube_dlc/extractor/nhl.py b/yt_dlp/extractor/nhl.py similarity index 100% rename from youtube_dlc/extractor/nhl.py rename to yt_dlp/extractor/nhl.py diff --git a/youtube_dlc/extractor/nick.py b/yt_dlp/extractor/nick.py similarity index 100% rename from youtube_dlc/extractor/nick.py rename to yt_dlp/extractor/nick.py diff --git a/youtube_dlc/extractor/niconico.py b/yt_dlp/extractor/niconico.py similarity index 100% rename from youtube_dlc/extractor/niconico.py rename to yt_dlp/extractor/niconico.py diff --git a/youtube_dlc/extractor/ninecninemedia.py b/yt_dlp/extractor/ninecninemedia.py similarity index 100% rename from youtube_dlc/extractor/ninecninemedia.py rename to yt_dlp/extractor/ninecninemedia.py diff --git a/youtube_dlc/extractor/ninegag.py b/yt_dlp/extractor/ninegag.py similarity index 100% rename from youtube_dlc/extractor/ninegag.py rename to yt_dlp/extractor/ninegag.py diff --git a/youtube_dlc/extractor/ninenow.py b/yt_dlp/extractor/ninenow.py similarity index 100% rename from youtube_dlc/extractor/ninenow.py rename to yt_dlp/extractor/ninenow.py diff --git a/youtube_dlc/extractor/nintendo.py b/yt_dlp/extractor/nintendo.py similarity index 100% rename from youtube_dlc/extractor/nintendo.py rename to yt_dlp/extractor/nintendo.py diff --git a/youtube_dlc/extractor/nitter.py b/yt_dlp/extractor/nitter.py similarity index 100% rename from youtube_dlc/extractor/nitter.py rename to yt_dlp/extractor/nitter.py diff --git a/youtube_dlc/extractor/njpwworld.py b/yt_dlp/extractor/njpwworld.py similarity index 100% rename from youtube_dlc/extractor/njpwworld.py rename to yt_dlp/extractor/njpwworld.py diff --git a/youtube_dlc/extractor/nobelprize.py b/yt_dlp/extractor/nobelprize.py similarity index 100% rename from youtube_dlc/extractor/nobelprize.py rename to yt_dlp/extractor/nobelprize.py diff --git a/youtube_dlc/extractor/noco.py b/yt_dlp/extractor/noco.py similarity index 100% rename from youtube_dlc/extractor/noco.py rename to yt_dlp/extractor/noco.py diff --git a/youtube_dlc/extractor/nonktube.py b/yt_dlp/extractor/nonktube.py similarity index 100% rename from youtube_dlc/extractor/nonktube.py rename to yt_dlp/extractor/nonktube.py diff --git a/youtube_dlc/extractor/noovo.py b/yt_dlp/extractor/noovo.py similarity index 100% rename from youtube_dlc/extractor/noovo.py rename to yt_dlp/extractor/noovo.py diff --git a/youtube_dlc/extractor/normalboots.py b/yt_dlp/extractor/normalboots.py similarity index 100% rename from youtube_dlc/extractor/normalboots.py rename to yt_dlp/extractor/normalboots.py diff --git a/youtube_dlc/extractor/nosvideo.py b/yt_dlp/extractor/nosvideo.py similarity index 100% rename from youtube_dlc/extractor/nosvideo.py rename to yt_dlp/extractor/nosvideo.py diff --git a/youtube_dlc/extractor/nova.py b/yt_dlp/extractor/nova.py similarity index 100% rename from youtube_dlc/extractor/nova.py rename to yt_dlp/extractor/nova.py diff --git a/youtube_dlc/extractor/nowness.py b/yt_dlp/extractor/nowness.py similarity index 98% rename from youtube_dlc/extractor/nowness.py rename to yt_dlp/extractor/nowness.py index c136bc8c0b..b2c715f413 100644 --- a/youtube_dlc/extractor/nowness.py +++ b/yt_dlp/extractor/nowness.py @@ -37,7 +37,7 @@ class NownessBaseIE(InfoExtractor): elif source == 'youtube': return self.url_result(video_id, 'Youtube') elif source == 'cinematique': - # youtube-dlc currently doesn't support cinematique + # yt-dlp currently doesn't support cinematique # return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique') pass diff --git a/youtube_dlc/extractor/noz.py b/yt_dlp/extractor/noz.py similarity index 100% rename from youtube_dlc/extractor/noz.py rename to yt_dlp/extractor/noz.py diff --git a/youtube_dlc/extractor/npo.py b/yt_dlp/extractor/npo.py similarity index 100% rename from youtube_dlc/extractor/npo.py rename to yt_dlp/extractor/npo.py diff --git a/youtube_dlc/extractor/npr.py b/yt_dlp/extractor/npr.py similarity index 100% rename from youtube_dlc/extractor/npr.py rename to yt_dlp/extractor/npr.py diff --git a/youtube_dlc/extractor/nrk.py b/yt_dlp/extractor/nrk.py similarity index 100% rename from youtube_dlc/extractor/nrk.py rename to yt_dlp/extractor/nrk.py diff --git a/youtube_dlc/extractor/nrl.py b/yt_dlp/extractor/nrl.py similarity index 100% rename from youtube_dlc/extractor/nrl.py rename to yt_dlp/extractor/nrl.py diff --git a/youtube_dlc/extractor/ntvcojp.py b/yt_dlp/extractor/ntvcojp.py similarity index 100% rename from youtube_dlc/extractor/ntvcojp.py rename to yt_dlp/extractor/ntvcojp.py diff --git a/youtube_dlc/extractor/ntvde.py b/yt_dlp/extractor/ntvde.py similarity index 100% rename from youtube_dlc/extractor/ntvde.py rename to yt_dlp/extractor/ntvde.py diff --git a/youtube_dlc/extractor/ntvru.py b/yt_dlp/extractor/ntvru.py similarity index 100% rename from youtube_dlc/extractor/ntvru.py rename to yt_dlp/extractor/ntvru.py diff --git a/youtube_dlc/extractor/nuevo.py b/yt_dlp/extractor/nuevo.py similarity index 100% rename from youtube_dlc/extractor/nuevo.py rename to yt_dlp/extractor/nuevo.py diff --git a/youtube_dlc/extractor/nuvid.py b/yt_dlp/extractor/nuvid.py similarity index 100% rename from youtube_dlc/extractor/nuvid.py rename to yt_dlp/extractor/nuvid.py diff --git a/youtube_dlc/extractor/nytimes.py b/yt_dlp/extractor/nytimes.py similarity index 100% rename from youtube_dlc/extractor/nytimes.py rename to yt_dlp/extractor/nytimes.py diff --git a/youtube_dlc/extractor/nzz.py b/yt_dlp/extractor/nzz.py similarity index 100% rename from youtube_dlc/extractor/nzz.py rename to yt_dlp/extractor/nzz.py diff --git a/youtube_dlc/extractor/odatv.py b/yt_dlp/extractor/odatv.py similarity index 100% rename from youtube_dlc/extractor/odatv.py rename to yt_dlp/extractor/odatv.py diff --git a/youtube_dlc/extractor/odnoklassniki.py b/yt_dlp/extractor/odnoklassniki.py similarity index 100% rename from youtube_dlc/extractor/odnoklassniki.py rename to yt_dlp/extractor/odnoklassniki.py diff --git a/youtube_dlc/extractor/oktoberfesttv.py b/yt_dlp/extractor/oktoberfesttv.py similarity index 100% rename from youtube_dlc/extractor/oktoberfesttv.py rename to yt_dlp/extractor/oktoberfesttv.py diff --git a/youtube_dlc/extractor/once.py b/yt_dlp/extractor/once.py similarity index 100% rename from youtube_dlc/extractor/once.py rename to yt_dlp/extractor/once.py diff --git a/youtube_dlc/extractor/ondemandkorea.py b/yt_dlp/extractor/ondemandkorea.py similarity index 100% rename from youtube_dlc/extractor/ondemandkorea.py rename to yt_dlp/extractor/ondemandkorea.py diff --git a/youtube_dlc/extractor/onet.py b/yt_dlp/extractor/onet.py similarity index 100% rename from youtube_dlc/extractor/onet.py rename to yt_dlp/extractor/onet.py diff --git a/youtube_dlc/extractor/onionstudios.py b/yt_dlp/extractor/onionstudios.py similarity index 100% rename from youtube_dlc/extractor/onionstudios.py rename to yt_dlp/extractor/onionstudios.py diff --git a/youtube_dlc/extractor/ooyala.py b/yt_dlp/extractor/ooyala.py similarity index 100% rename from youtube_dlc/extractor/ooyala.py rename to yt_dlp/extractor/ooyala.py diff --git a/youtube_dlc/extractor/openload.py b/yt_dlp/extractor/openload.py similarity index 100% rename from youtube_dlc/extractor/openload.py rename to yt_dlp/extractor/openload.py diff --git a/youtube_dlc/extractor/ora.py b/yt_dlp/extractor/ora.py similarity index 100% rename from youtube_dlc/extractor/ora.py rename to yt_dlp/extractor/ora.py diff --git a/youtube_dlc/extractor/orf.py b/yt_dlp/extractor/orf.py similarity index 100% rename from youtube_dlc/extractor/orf.py rename to yt_dlp/extractor/orf.py diff --git a/youtube_dlc/extractor/outsidetv.py b/yt_dlp/extractor/outsidetv.py similarity index 100% rename from youtube_dlc/extractor/outsidetv.py rename to yt_dlp/extractor/outsidetv.py diff --git a/youtube_dlc/extractor/packtpub.py b/yt_dlp/extractor/packtpub.py similarity index 100% rename from youtube_dlc/extractor/packtpub.py rename to yt_dlp/extractor/packtpub.py diff --git a/youtube_dlc/extractor/pandoratv.py b/yt_dlp/extractor/pandoratv.py similarity index 100% rename from youtube_dlc/extractor/pandoratv.py rename to yt_dlp/extractor/pandoratv.py diff --git a/youtube_dlc/extractor/parliamentliveuk.py b/yt_dlp/extractor/parliamentliveuk.py similarity index 100% rename from youtube_dlc/extractor/parliamentliveuk.py rename to yt_dlp/extractor/parliamentliveuk.py diff --git a/youtube_dlc/extractor/patreon.py b/yt_dlp/extractor/patreon.py similarity index 100% rename from youtube_dlc/extractor/patreon.py rename to yt_dlp/extractor/patreon.py diff --git a/youtube_dlc/extractor/pbs.py b/yt_dlp/extractor/pbs.py similarity index 100% rename from youtube_dlc/extractor/pbs.py rename to yt_dlp/extractor/pbs.py diff --git a/youtube_dlc/extractor/pearvideo.py b/yt_dlp/extractor/pearvideo.py similarity index 100% rename from youtube_dlc/extractor/pearvideo.py rename to yt_dlp/extractor/pearvideo.py diff --git a/youtube_dlc/extractor/peertube.py b/yt_dlp/extractor/peertube.py similarity index 100% rename from youtube_dlc/extractor/peertube.py rename to yt_dlp/extractor/peertube.py diff --git a/youtube_dlc/extractor/people.py b/yt_dlp/extractor/people.py similarity index 100% rename from youtube_dlc/extractor/people.py rename to yt_dlp/extractor/people.py diff --git a/youtube_dlc/extractor/performgroup.py b/yt_dlp/extractor/performgroup.py similarity index 100% rename from youtube_dlc/extractor/performgroup.py rename to yt_dlp/extractor/performgroup.py diff --git a/youtube_dlc/extractor/periscope.py b/yt_dlp/extractor/periscope.py similarity index 100% rename from youtube_dlc/extractor/periscope.py rename to yt_dlp/extractor/periscope.py diff --git a/youtube_dlc/extractor/philharmoniedeparis.py b/yt_dlp/extractor/philharmoniedeparis.py similarity index 100% rename from youtube_dlc/extractor/philharmoniedeparis.py rename to yt_dlp/extractor/philharmoniedeparis.py diff --git a/youtube_dlc/extractor/phoenix.py b/yt_dlp/extractor/phoenix.py similarity index 100% rename from youtube_dlc/extractor/phoenix.py rename to yt_dlp/extractor/phoenix.py diff --git a/youtube_dlc/extractor/photobucket.py b/yt_dlp/extractor/photobucket.py similarity index 100% rename from youtube_dlc/extractor/photobucket.py rename to yt_dlp/extractor/photobucket.py diff --git a/youtube_dlc/extractor/picarto.py b/yt_dlp/extractor/picarto.py similarity index 100% rename from youtube_dlc/extractor/picarto.py rename to yt_dlp/extractor/picarto.py diff --git a/youtube_dlc/extractor/piksel.py b/yt_dlp/extractor/piksel.py similarity index 100% rename from youtube_dlc/extractor/piksel.py rename to yt_dlp/extractor/piksel.py diff --git a/youtube_dlc/extractor/pinkbike.py b/yt_dlp/extractor/pinkbike.py similarity index 100% rename from youtube_dlc/extractor/pinkbike.py rename to yt_dlp/extractor/pinkbike.py diff --git a/youtube_dlc/extractor/pinterest.py b/yt_dlp/extractor/pinterest.py similarity index 100% rename from youtube_dlc/extractor/pinterest.py rename to yt_dlp/extractor/pinterest.py diff --git a/youtube_dlc/extractor/pladform.py b/yt_dlp/extractor/pladform.py similarity index 100% rename from youtube_dlc/extractor/pladform.py rename to yt_dlp/extractor/pladform.py diff --git a/youtube_dlc/extractor/platzi.py b/yt_dlp/extractor/platzi.py similarity index 100% rename from youtube_dlc/extractor/platzi.py rename to yt_dlp/extractor/platzi.py diff --git a/youtube_dlc/extractor/playfm.py b/yt_dlp/extractor/playfm.py similarity index 100% rename from youtube_dlc/extractor/playfm.py rename to yt_dlp/extractor/playfm.py diff --git a/youtube_dlc/extractor/playplustv.py b/yt_dlp/extractor/playplustv.py similarity index 100% rename from youtube_dlc/extractor/playplustv.py rename to yt_dlp/extractor/playplustv.py diff --git a/youtube_dlc/extractor/plays.py b/yt_dlp/extractor/plays.py similarity index 100% rename from youtube_dlc/extractor/plays.py rename to yt_dlp/extractor/plays.py diff --git a/youtube_dlc/extractor/playtvak.py b/yt_dlp/extractor/playtvak.py similarity index 100% rename from youtube_dlc/extractor/playtvak.py rename to yt_dlp/extractor/playtvak.py diff --git a/youtube_dlc/extractor/playvid.py b/yt_dlp/extractor/playvid.py similarity index 100% rename from youtube_dlc/extractor/playvid.py rename to yt_dlp/extractor/playvid.py diff --git a/youtube_dlc/extractor/playwire.py b/yt_dlp/extractor/playwire.py similarity index 100% rename from youtube_dlc/extractor/playwire.py rename to yt_dlp/extractor/playwire.py diff --git a/youtube_dlc/extractor/pluralsight.py b/yt_dlp/extractor/pluralsight.py similarity index 100% rename from youtube_dlc/extractor/pluralsight.py rename to yt_dlp/extractor/pluralsight.py diff --git a/youtube_dlc/extractor/podomatic.py b/yt_dlp/extractor/podomatic.py similarity index 100% rename from youtube_dlc/extractor/podomatic.py rename to yt_dlp/extractor/podomatic.py diff --git a/youtube_dlc/extractor/pokemon.py b/yt_dlp/extractor/pokemon.py similarity index 100% rename from youtube_dlc/extractor/pokemon.py rename to yt_dlp/extractor/pokemon.py diff --git a/youtube_dlc/extractor/polskieradio.py b/yt_dlp/extractor/polskieradio.py similarity index 100% rename from youtube_dlc/extractor/polskieradio.py rename to yt_dlp/extractor/polskieradio.py diff --git a/youtube_dlc/extractor/popcorntimes.py b/yt_dlp/extractor/popcorntimes.py similarity index 100% rename from youtube_dlc/extractor/popcorntimes.py rename to yt_dlp/extractor/popcorntimes.py diff --git a/youtube_dlc/extractor/popcorntv.py b/yt_dlp/extractor/popcorntv.py similarity index 100% rename from youtube_dlc/extractor/popcorntv.py rename to yt_dlp/extractor/popcorntv.py diff --git a/youtube_dlc/extractor/porn91.py b/yt_dlp/extractor/porn91.py similarity index 100% rename from youtube_dlc/extractor/porn91.py rename to yt_dlp/extractor/porn91.py diff --git a/youtube_dlc/extractor/porncom.py b/yt_dlp/extractor/porncom.py similarity index 100% rename from youtube_dlc/extractor/porncom.py rename to yt_dlp/extractor/porncom.py diff --git a/youtube_dlc/extractor/pornhd.py b/yt_dlp/extractor/pornhd.py similarity index 100% rename from youtube_dlc/extractor/pornhd.py rename to yt_dlp/extractor/pornhd.py diff --git a/youtube_dlc/extractor/pornhub.py b/yt_dlp/extractor/pornhub.py similarity index 100% rename from youtube_dlc/extractor/pornhub.py rename to yt_dlp/extractor/pornhub.py diff --git a/youtube_dlc/extractor/pornotube.py b/yt_dlp/extractor/pornotube.py similarity index 100% rename from youtube_dlc/extractor/pornotube.py rename to yt_dlp/extractor/pornotube.py diff --git a/youtube_dlc/extractor/pornovoisines.py b/yt_dlp/extractor/pornovoisines.py similarity index 100% rename from youtube_dlc/extractor/pornovoisines.py rename to yt_dlp/extractor/pornovoisines.py diff --git a/youtube_dlc/extractor/pornoxo.py b/yt_dlp/extractor/pornoxo.py similarity index 100% rename from youtube_dlc/extractor/pornoxo.py rename to yt_dlp/extractor/pornoxo.py diff --git a/youtube_dlc/extractor/presstv.py b/yt_dlp/extractor/presstv.py similarity index 100% rename from youtube_dlc/extractor/presstv.py rename to yt_dlp/extractor/presstv.py diff --git a/youtube_dlc/extractor/prosiebensat1.py b/yt_dlp/extractor/prosiebensat1.py similarity index 100% rename from youtube_dlc/extractor/prosiebensat1.py rename to yt_dlp/extractor/prosiebensat1.py diff --git a/youtube_dlc/extractor/puhutv.py b/yt_dlp/extractor/puhutv.py similarity index 100% rename from youtube_dlc/extractor/puhutv.py rename to yt_dlp/extractor/puhutv.py diff --git a/youtube_dlc/extractor/puls4.py b/yt_dlp/extractor/puls4.py similarity index 100% rename from youtube_dlc/extractor/puls4.py rename to yt_dlp/extractor/puls4.py diff --git a/youtube_dlc/extractor/pyvideo.py b/yt_dlp/extractor/pyvideo.py similarity index 100% rename from youtube_dlc/extractor/pyvideo.py rename to yt_dlp/extractor/pyvideo.py diff --git a/youtube_dlc/extractor/qqmusic.py b/yt_dlp/extractor/qqmusic.py similarity index 100% rename from youtube_dlc/extractor/qqmusic.py rename to yt_dlp/extractor/qqmusic.py diff --git a/youtube_dlc/extractor/r7.py b/yt_dlp/extractor/r7.py similarity index 100% rename from youtube_dlc/extractor/r7.py rename to yt_dlp/extractor/r7.py diff --git a/youtube_dlc/extractor/radiobremen.py b/yt_dlp/extractor/radiobremen.py similarity index 100% rename from youtube_dlc/extractor/radiobremen.py rename to yt_dlp/extractor/radiobremen.py diff --git a/youtube_dlc/extractor/radiocanada.py b/yt_dlp/extractor/radiocanada.py similarity index 100% rename from youtube_dlc/extractor/radiocanada.py rename to yt_dlp/extractor/radiocanada.py diff --git a/youtube_dlc/extractor/radiode.py b/yt_dlp/extractor/radiode.py similarity index 100% rename from youtube_dlc/extractor/radiode.py rename to yt_dlp/extractor/radiode.py diff --git a/youtube_dlc/extractor/radiofrance.py b/yt_dlp/extractor/radiofrance.py similarity index 100% rename from youtube_dlc/extractor/radiofrance.py rename to yt_dlp/extractor/radiofrance.py diff --git a/youtube_dlc/extractor/radiojavan.py b/yt_dlp/extractor/radiojavan.py similarity index 100% rename from youtube_dlc/extractor/radiojavan.py rename to yt_dlp/extractor/radiojavan.py diff --git a/youtube_dlc/extractor/rai.py b/yt_dlp/extractor/rai.py similarity index 100% rename from youtube_dlc/extractor/rai.py rename to yt_dlp/extractor/rai.py diff --git a/youtube_dlc/extractor/raywenderlich.py b/yt_dlp/extractor/raywenderlich.py similarity index 100% rename from youtube_dlc/extractor/raywenderlich.py rename to yt_dlp/extractor/raywenderlich.py diff --git a/youtube_dlc/extractor/rbmaradio.py b/yt_dlp/extractor/rbmaradio.py similarity index 100% rename from youtube_dlc/extractor/rbmaradio.py rename to yt_dlp/extractor/rbmaradio.py diff --git a/youtube_dlc/extractor/rcs.py b/yt_dlp/extractor/rcs.py similarity index 100% rename from youtube_dlc/extractor/rcs.py rename to yt_dlp/extractor/rcs.py diff --git a/youtube_dlc/extractor/rds.py b/yt_dlp/extractor/rds.py similarity index 100% rename from youtube_dlc/extractor/rds.py rename to yt_dlp/extractor/rds.py diff --git a/youtube_dlc/extractor/redbulltv.py b/yt_dlp/extractor/redbulltv.py similarity index 100% rename from youtube_dlc/extractor/redbulltv.py rename to yt_dlp/extractor/redbulltv.py diff --git a/youtube_dlc/extractor/reddit.py b/yt_dlp/extractor/reddit.py similarity index 100% rename from youtube_dlc/extractor/reddit.py rename to yt_dlp/extractor/reddit.py diff --git a/youtube_dlc/extractor/redtube.py b/yt_dlp/extractor/redtube.py similarity index 100% rename from youtube_dlc/extractor/redtube.py rename to yt_dlp/extractor/redtube.py diff --git a/youtube_dlc/extractor/regiotv.py b/yt_dlp/extractor/regiotv.py similarity index 100% rename from youtube_dlc/extractor/regiotv.py rename to yt_dlp/extractor/regiotv.py diff --git a/youtube_dlc/extractor/rentv.py b/yt_dlp/extractor/rentv.py similarity index 100% rename from youtube_dlc/extractor/rentv.py rename to yt_dlp/extractor/rentv.py diff --git a/youtube_dlc/extractor/restudy.py b/yt_dlp/extractor/restudy.py similarity index 100% rename from youtube_dlc/extractor/restudy.py rename to yt_dlp/extractor/restudy.py diff --git a/youtube_dlc/extractor/reuters.py b/yt_dlp/extractor/reuters.py similarity index 100% rename from youtube_dlc/extractor/reuters.py rename to yt_dlp/extractor/reuters.py diff --git a/youtube_dlc/extractor/reverbnation.py b/yt_dlp/extractor/reverbnation.py similarity index 100% rename from youtube_dlc/extractor/reverbnation.py rename to yt_dlp/extractor/reverbnation.py diff --git a/youtube_dlc/extractor/rice.py b/yt_dlp/extractor/rice.py similarity index 100% rename from youtube_dlc/extractor/rice.py rename to yt_dlp/extractor/rice.py diff --git a/youtube_dlc/extractor/rmcdecouverte.py b/yt_dlp/extractor/rmcdecouverte.py similarity index 100% rename from youtube_dlc/extractor/rmcdecouverte.py rename to yt_dlp/extractor/rmcdecouverte.py diff --git a/youtube_dlc/extractor/ro220.py b/yt_dlp/extractor/ro220.py similarity index 100% rename from youtube_dlc/extractor/ro220.py rename to yt_dlp/extractor/ro220.py diff --git a/youtube_dlc/extractor/rockstargames.py b/yt_dlp/extractor/rockstargames.py similarity index 100% rename from youtube_dlc/extractor/rockstargames.py rename to yt_dlp/extractor/rockstargames.py diff --git a/youtube_dlc/extractor/roosterteeth.py b/yt_dlp/extractor/roosterteeth.py similarity index 100% rename from youtube_dlc/extractor/roosterteeth.py rename to yt_dlp/extractor/roosterteeth.py diff --git a/youtube_dlc/extractor/rottentomatoes.py b/yt_dlp/extractor/rottentomatoes.py similarity index 100% rename from youtube_dlc/extractor/rottentomatoes.py rename to yt_dlp/extractor/rottentomatoes.py diff --git a/youtube_dlc/extractor/roxwel.py b/yt_dlp/extractor/roxwel.py similarity index 100% rename from youtube_dlc/extractor/roxwel.py rename to yt_dlp/extractor/roxwel.py diff --git a/youtube_dlc/extractor/rozhlas.py b/yt_dlp/extractor/rozhlas.py similarity index 100% rename from youtube_dlc/extractor/rozhlas.py rename to yt_dlp/extractor/rozhlas.py diff --git a/youtube_dlc/extractor/rtbf.py b/yt_dlp/extractor/rtbf.py similarity index 100% rename from youtube_dlc/extractor/rtbf.py rename to yt_dlp/extractor/rtbf.py diff --git a/youtube_dlc/extractor/rte.py b/yt_dlp/extractor/rte.py similarity index 100% rename from youtube_dlc/extractor/rte.py rename to yt_dlp/extractor/rte.py diff --git a/youtube_dlc/extractor/rtl2.py b/yt_dlp/extractor/rtl2.py similarity index 100% rename from youtube_dlc/extractor/rtl2.py rename to yt_dlp/extractor/rtl2.py diff --git a/youtube_dlc/extractor/rtlnl.py b/yt_dlp/extractor/rtlnl.py similarity index 100% rename from youtube_dlc/extractor/rtlnl.py rename to yt_dlp/extractor/rtlnl.py diff --git a/youtube_dlc/extractor/rtp.py b/yt_dlp/extractor/rtp.py similarity index 100% rename from youtube_dlc/extractor/rtp.py rename to yt_dlp/extractor/rtp.py diff --git a/youtube_dlc/extractor/rts.py b/yt_dlp/extractor/rts.py similarity index 100% rename from youtube_dlc/extractor/rts.py rename to yt_dlp/extractor/rts.py diff --git a/youtube_dlc/extractor/rtve.py b/yt_dlp/extractor/rtve.py similarity index 100% rename from youtube_dlc/extractor/rtve.py rename to yt_dlp/extractor/rtve.py diff --git a/youtube_dlc/extractor/rtvnh.py b/yt_dlp/extractor/rtvnh.py similarity index 100% rename from youtube_dlc/extractor/rtvnh.py rename to yt_dlp/extractor/rtvnh.py diff --git a/youtube_dlc/extractor/rtvs.py b/yt_dlp/extractor/rtvs.py similarity index 100% rename from youtube_dlc/extractor/rtvs.py rename to yt_dlp/extractor/rtvs.py diff --git a/youtube_dlc/extractor/ruhd.py b/yt_dlp/extractor/ruhd.py similarity index 100% rename from youtube_dlc/extractor/ruhd.py rename to yt_dlp/extractor/ruhd.py diff --git a/youtube_dlc/extractor/rumble.py b/yt_dlp/extractor/rumble.py similarity index 100% rename from youtube_dlc/extractor/rumble.py rename to yt_dlp/extractor/rumble.py diff --git a/youtube_dlc/extractor/rutube.py b/yt_dlp/extractor/rutube.py similarity index 100% rename from youtube_dlc/extractor/rutube.py rename to yt_dlp/extractor/rutube.py diff --git a/youtube_dlc/extractor/rutv.py b/yt_dlp/extractor/rutv.py similarity index 100% rename from youtube_dlc/extractor/rutv.py rename to yt_dlp/extractor/rutv.py diff --git a/youtube_dlc/extractor/ruutu.py b/yt_dlp/extractor/ruutu.py similarity index 100% rename from youtube_dlc/extractor/ruutu.py rename to yt_dlp/extractor/ruutu.py diff --git a/youtube_dlc/extractor/ruv.py b/yt_dlp/extractor/ruv.py similarity index 100% rename from youtube_dlc/extractor/ruv.py rename to yt_dlp/extractor/ruv.py diff --git a/youtube_dlc/extractor/safari.py b/yt_dlp/extractor/safari.py similarity index 100% rename from youtube_dlc/extractor/safari.py rename to yt_dlp/extractor/safari.py diff --git a/youtube_dlc/extractor/sapo.py b/yt_dlp/extractor/sapo.py similarity index 100% rename from youtube_dlc/extractor/sapo.py rename to yt_dlp/extractor/sapo.py diff --git a/youtube_dlc/extractor/savefrom.py b/yt_dlp/extractor/savefrom.py similarity index 100% rename from youtube_dlc/extractor/savefrom.py rename to yt_dlp/extractor/savefrom.py diff --git a/youtube_dlc/extractor/sbs.py b/yt_dlp/extractor/sbs.py similarity index 100% rename from youtube_dlc/extractor/sbs.py rename to yt_dlp/extractor/sbs.py diff --git a/youtube_dlc/extractor/screencast.py b/yt_dlp/extractor/screencast.py similarity index 100% rename from youtube_dlc/extractor/screencast.py rename to yt_dlp/extractor/screencast.py diff --git a/youtube_dlc/extractor/screencastomatic.py b/yt_dlp/extractor/screencastomatic.py similarity index 100% rename from youtube_dlc/extractor/screencastomatic.py rename to yt_dlp/extractor/screencastomatic.py diff --git a/youtube_dlc/extractor/scrippsnetworks.py b/yt_dlp/extractor/scrippsnetworks.py similarity index 100% rename from youtube_dlc/extractor/scrippsnetworks.py rename to yt_dlp/extractor/scrippsnetworks.py diff --git a/youtube_dlc/extractor/scte.py b/yt_dlp/extractor/scte.py similarity index 100% rename from youtube_dlc/extractor/scte.py rename to yt_dlp/extractor/scte.py diff --git a/youtube_dlc/extractor/seeker.py b/yt_dlp/extractor/seeker.py similarity index 100% rename from youtube_dlc/extractor/seeker.py rename to yt_dlp/extractor/seeker.py diff --git a/youtube_dlc/extractor/senateisvp.py b/yt_dlp/extractor/senateisvp.py similarity index 100% rename from youtube_dlc/extractor/senateisvp.py rename to yt_dlp/extractor/senateisvp.py diff --git a/youtube_dlc/extractor/sendtonews.py b/yt_dlp/extractor/sendtonews.py similarity index 100% rename from youtube_dlc/extractor/sendtonews.py rename to yt_dlp/extractor/sendtonews.py diff --git a/youtube_dlc/extractor/servus.py b/yt_dlp/extractor/servus.py similarity index 100% rename from youtube_dlc/extractor/servus.py rename to yt_dlp/extractor/servus.py diff --git a/youtube_dlc/extractor/sevenplus.py b/yt_dlp/extractor/sevenplus.py similarity index 100% rename from youtube_dlc/extractor/sevenplus.py rename to yt_dlp/extractor/sevenplus.py diff --git a/youtube_dlc/extractor/sexu.py b/yt_dlp/extractor/sexu.py similarity index 100% rename from youtube_dlc/extractor/sexu.py rename to yt_dlp/extractor/sexu.py diff --git a/youtube_dlc/extractor/seznamzpravy.py b/yt_dlp/extractor/seznamzpravy.py similarity index 100% rename from youtube_dlc/extractor/seznamzpravy.py rename to yt_dlp/extractor/seznamzpravy.py diff --git a/youtube_dlc/extractor/shahid.py b/yt_dlp/extractor/shahid.py similarity index 100% rename from youtube_dlc/extractor/shahid.py rename to yt_dlp/extractor/shahid.py diff --git a/youtube_dlc/extractor/shared.py b/yt_dlp/extractor/shared.py similarity index 100% rename from youtube_dlc/extractor/shared.py rename to yt_dlp/extractor/shared.py diff --git a/youtube_dlc/extractor/showroomlive.py b/yt_dlp/extractor/showroomlive.py similarity index 100% rename from youtube_dlc/extractor/showroomlive.py rename to yt_dlp/extractor/showroomlive.py diff --git a/youtube_dlc/extractor/simplecast.py b/yt_dlp/extractor/simplecast.py similarity index 100% rename from youtube_dlc/extractor/simplecast.py rename to yt_dlp/extractor/simplecast.py diff --git a/youtube_dlc/extractor/sina.py b/yt_dlp/extractor/sina.py similarity index 100% rename from youtube_dlc/extractor/sina.py rename to yt_dlp/extractor/sina.py diff --git a/youtube_dlc/extractor/sixplay.py b/yt_dlp/extractor/sixplay.py similarity index 100% rename from youtube_dlc/extractor/sixplay.py rename to yt_dlp/extractor/sixplay.py diff --git a/youtube_dlc/extractor/sky.py b/yt_dlp/extractor/sky.py similarity index 100% rename from youtube_dlc/extractor/sky.py rename to yt_dlp/extractor/sky.py diff --git a/youtube_dlc/extractor/skyit.py b/yt_dlp/extractor/skyit.py similarity index 100% rename from youtube_dlc/extractor/skyit.py rename to yt_dlp/extractor/skyit.py diff --git a/youtube_dlc/extractor/skylinewebcams.py b/yt_dlp/extractor/skylinewebcams.py similarity index 100% rename from youtube_dlc/extractor/skylinewebcams.py rename to yt_dlp/extractor/skylinewebcams.py diff --git a/youtube_dlc/extractor/skynewsarabia.py b/yt_dlp/extractor/skynewsarabia.py similarity index 100% rename from youtube_dlc/extractor/skynewsarabia.py rename to yt_dlp/extractor/skynewsarabia.py diff --git a/youtube_dlc/extractor/slideshare.py b/yt_dlp/extractor/slideshare.py similarity index 100% rename from youtube_dlc/extractor/slideshare.py rename to yt_dlp/extractor/slideshare.py diff --git a/youtube_dlc/extractor/slideslive.py b/yt_dlp/extractor/slideslive.py similarity index 100% rename from youtube_dlc/extractor/slideslive.py rename to yt_dlp/extractor/slideslive.py diff --git a/youtube_dlc/extractor/slutload.py b/yt_dlp/extractor/slutload.py similarity index 100% rename from youtube_dlc/extractor/slutload.py rename to yt_dlp/extractor/slutload.py diff --git a/youtube_dlc/extractor/snotr.py b/yt_dlp/extractor/snotr.py similarity index 100% rename from youtube_dlc/extractor/snotr.py rename to yt_dlp/extractor/snotr.py diff --git a/youtube_dlc/extractor/sohu.py b/yt_dlp/extractor/sohu.py similarity index 99% rename from youtube_dlc/extractor/sohu.py rename to yt_dlp/extractor/sohu.py index 76b3cc6b6b..a62ed84f1e 100644 --- a/youtube_dlc/extractor/sohu.py +++ b/yt_dlp/extractor/sohu.py @@ -77,7 +77,7 @@ class SohuIE(InfoExtractor): 'info_dict': { 'id': '78932792', 'ext': 'mp4', - 'title': 'youtube-dlc testing video', + 'title': 'youtube-dl testing video', }, 'params': { 'skip_download': True diff --git a/youtube_dlc/extractor/sonyliv.py b/yt_dlp/extractor/sonyliv.py similarity index 100% rename from youtube_dlc/extractor/sonyliv.py rename to yt_dlp/extractor/sonyliv.py diff --git a/youtube_dlc/extractor/soundcloud.py b/yt_dlp/extractor/soundcloud.py similarity index 99% rename from youtube_dlc/extractor/soundcloud.py rename to yt_dlp/extractor/soundcloud.py index 72562379bb..d72a02dca6 100644 --- a/youtube_dlc/extractor/soundcloud.py +++ b/yt_dlp/extractor/soundcloud.py @@ -122,7 +122,7 @@ class SoundcloudIE(InfoExtractor): }, # private link { - 'url': 'https://soundcloud.com/jaimemf/youtube-dlc-test-video-a-y-baw/s-8Pjrp', + 'url': 'https://soundcloud.com/jaimemf/youtube-dl-test-video-a-y-baw/s-8Pjrp', 'md5': 'aa0dd32bfea9b0c5ef4f02aacd080604', 'info_dict': { 'id': '123998367', diff --git a/youtube_dlc/extractor/soundgasm.py b/yt_dlp/extractor/soundgasm.py similarity index 100% rename from youtube_dlc/extractor/soundgasm.py rename to yt_dlp/extractor/soundgasm.py diff --git a/youtube_dlc/extractor/southpark.py b/yt_dlp/extractor/southpark.py similarity index 100% rename from youtube_dlc/extractor/southpark.py rename to yt_dlp/extractor/southpark.py diff --git a/youtube_dlc/extractor/spankbang.py b/yt_dlp/extractor/spankbang.py similarity index 100% rename from youtube_dlc/extractor/spankbang.py rename to yt_dlp/extractor/spankbang.py diff --git a/youtube_dlc/extractor/spankwire.py b/yt_dlp/extractor/spankwire.py similarity index 100% rename from youtube_dlc/extractor/spankwire.py rename to yt_dlp/extractor/spankwire.py diff --git a/youtube_dlc/extractor/spiegel.py b/yt_dlp/extractor/spiegel.py similarity index 100% rename from youtube_dlc/extractor/spiegel.py rename to yt_dlp/extractor/spiegel.py diff --git a/youtube_dlc/extractor/spiegeltv.py b/yt_dlp/extractor/spiegeltv.py similarity index 100% rename from youtube_dlc/extractor/spiegeltv.py rename to yt_dlp/extractor/spiegeltv.py diff --git a/youtube_dlc/extractor/spike.py b/yt_dlp/extractor/spike.py similarity index 100% rename from youtube_dlc/extractor/spike.py rename to yt_dlp/extractor/spike.py diff --git a/youtube_dlc/extractor/sport5.py b/yt_dlp/extractor/sport5.py similarity index 100% rename from youtube_dlc/extractor/sport5.py rename to yt_dlp/extractor/sport5.py diff --git a/youtube_dlc/extractor/sportbox.py b/yt_dlp/extractor/sportbox.py similarity index 100% rename from youtube_dlc/extractor/sportbox.py rename to yt_dlp/extractor/sportbox.py diff --git a/youtube_dlc/extractor/sportdeutschland.py b/yt_dlp/extractor/sportdeutschland.py similarity index 100% rename from youtube_dlc/extractor/sportdeutschland.py rename to yt_dlp/extractor/sportdeutschland.py diff --git a/youtube_dlc/extractor/spotify.py b/yt_dlp/extractor/spotify.py similarity index 100% rename from youtube_dlc/extractor/spotify.py rename to yt_dlp/extractor/spotify.py diff --git a/youtube_dlc/extractor/spreaker.py b/yt_dlp/extractor/spreaker.py similarity index 100% rename from youtube_dlc/extractor/spreaker.py rename to yt_dlp/extractor/spreaker.py diff --git a/youtube_dlc/extractor/springboardplatform.py b/yt_dlp/extractor/springboardplatform.py similarity index 100% rename from youtube_dlc/extractor/springboardplatform.py rename to yt_dlp/extractor/springboardplatform.py diff --git a/youtube_dlc/extractor/sprout.py b/yt_dlp/extractor/sprout.py similarity index 100% rename from youtube_dlc/extractor/sprout.py rename to yt_dlp/extractor/sprout.py diff --git a/youtube_dlc/extractor/srgssr.py b/yt_dlp/extractor/srgssr.py similarity index 100% rename from youtube_dlc/extractor/srgssr.py rename to yt_dlp/extractor/srgssr.py diff --git a/youtube_dlc/extractor/srmediathek.py b/yt_dlp/extractor/srmediathek.py similarity index 100% rename from youtube_dlc/extractor/srmediathek.py rename to yt_dlp/extractor/srmediathek.py diff --git a/youtube_dlc/extractor/stanfordoc.py b/yt_dlp/extractor/stanfordoc.py similarity index 100% rename from youtube_dlc/extractor/stanfordoc.py rename to yt_dlp/extractor/stanfordoc.py diff --git a/youtube_dlc/extractor/steam.py b/yt_dlp/extractor/steam.py similarity index 100% rename from youtube_dlc/extractor/steam.py rename to yt_dlp/extractor/steam.py diff --git a/youtube_dlc/extractor/stitcher.py b/yt_dlp/extractor/stitcher.py similarity index 100% rename from youtube_dlc/extractor/stitcher.py rename to yt_dlp/extractor/stitcher.py diff --git a/youtube_dlc/extractor/storyfire.py b/yt_dlp/extractor/storyfire.py similarity index 100% rename from youtube_dlc/extractor/storyfire.py rename to yt_dlp/extractor/storyfire.py diff --git a/youtube_dlc/extractor/streamable.py b/yt_dlp/extractor/streamable.py similarity index 100% rename from youtube_dlc/extractor/streamable.py rename to yt_dlp/extractor/streamable.py diff --git a/youtube_dlc/extractor/streamcloud.py b/yt_dlp/extractor/streamcloud.py similarity index 93% rename from youtube_dlc/extractor/streamcloud.py rename to yt_dlp/extractor/streamcloud.py index 32eb2b92d3..b97bb43741 100644 --- a/youtube_dlc/extractor/streamcloud.py +++ b/yt_dlp/extractor/streamcloud.py @@ -15,12 +15,12 @@ class StreamcloudIE(InfoExtractor): _VALID_URL = r'https?://streamcloud\.eu/(?P[a-zA-Z0-9_-]+)(?:/(?P[^#?]*)\.html)?' _TESTS = [{ - 'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dlc_test_video_____________-BaW_jenozKc.mp4.html', + 'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html', 'md5': '6bea4c7fa5daaacc2a946b7146286686', 'info_dict': { 'id': 'skp9j99s4bpz', 'ext': 'mp4', - 'title': 'youtube-dlc test video \'/\\ ä ↭', + 'title': 'youtube-dl test video \'/\\ ä ↭', }, 'skip': 'Only available from the EU' }, { diff --git a/youtube_dlc/extractor/streamcz.py b/yt_dlp/extractor/streamcz.py similarity index 100% rename from youtube_dlc/extractor/streamcz.py rename to yt_dlp/extractor/streamcz.py diff --git a/youtube_dlc/extractor/streetvoice.py b/yt_dlp/extractor/streetvoice.py similarity index 100% rename from youtube_dlc/extractor/streetvoice.py rename to yt_dlp/extractor/streetvoice.py diff --git a/youtube_dlc/extractor/stretchinternet.py b/yt_dlp/extractor/stretchinternet.py similarity index 100% rename from youtube_dlc/extractor/stretchinternet.py rename to yt_dlp/extractor/stretchinternet.py diff --git a/youtube_dlc/extractor/stv.py b/yt_dlp/extractor/stv.py similarity index 100% rename from youtube_dlc/extractor/stv.py rename to yt_dlp/extractor/stv.py diff --git a/youtube_dlc/extractor/sunporno.py b/yt_dlp/extractor/sunporno.py similarity index 100% rename from youtube_dlc/extractor/sunporno.py rename to yt_dlp/extractor/sunporno.py diff --git a/youtube_dlc/extractor/sverigesradio.py b/yt_dlp/extractor/sverigesradio.py similarity index 100% rename from youtube_dlc/extractor/sverigesradio.py rename to yt_dlp/extractor/sverigesradio.py diff --git a/youtube_dlc/extractor/svt.py b/yt_dlp/extractor/svt.py similarity index 100% rename from youtube_dlc/extractor/svt.py rename to yt_dlp/extractor/svt.py diff --git a/youtube_dlc/extractor/swrmediathek.py b/yt_dlp/extractor/swrmediathek.py similarity index 100% rename from youtube_dlc/extractor/swrmediathek.py rename to yt_dlp/extractor/swrmediathek.py diff --git a/youtube_dlc/extractor/syfy.py b/yt_dlp/extractor/syfy.py similarity index 100% rename from youtube_dlc/extractor/syfy.py rename to yt_dlp/extractor/syfy.py diff --git a/youtube_dlc/extractor/sztvhu.py b/yt_dlp/extractor/sztvhu.py similarity index 100% rename from youtube_dlc/extractor/sztvhu.py rename to yt_dlp/extractor/sztvhu.py diff --git a/youtube_dlc/extractor/tagesschau.py b/yt_dlp/extractor/tagesschau.py similarity index 100% rename from youtube_dlc/extractor/tagesschau.py rename to yt_dlp/extractor/tagesschau.py diff --git a/youtube_dlc/extractor/tass.py b/yt_dlp/extractor/tass.py similarity index 100% rename from youtube_dlc/extractor/tass.py rename to yt_dlp/extractor/tass.py diff --git a/youtube_dlc/extractor/tastytrade.py b/yt_dlp/extractor/tastytrade.py similarity index 100% rename from youtube_dlc/extractor/tastytrade.py rename to yt_dlp/extractor/tastytrade.py diff --git a/youtube_dlc/extractor/tbs.py b/yt_dlp/extractor/tbs.py similarity index 100% rename from youtube_dlc/extractor/tbs.py rename to yt_dlp/extractor/tbs.py diff --git a/youtube_dlc/extractor/tdslifeway.py b/yt_dlp/extractor/tdslifeway.py similarity index 100% rename from youtube_dlc/extractor/tdslifeway.py rename to yt_dlp/extractor/tdslifeway.py diff --git a/youtube_dlc/extractor/teachable.py b/yt_dlp/extractor/teachable.py similarity index 100% rename from youtube_dlc/extractor/teachable.py rename to yt_dlp/extractor/teachable.py diff --git a/youtube_dlc/extractor/teachertube.py b/yt_dlp/extractor/teachertube.py similarity index 100% rename from youtube_dlc/extractor/teachertube.py rename to yt_dlp/extractor/teachertube.py diff --git a/youtube_dlc/extractor/teachingchannel.py b/yt_dlp/extractor/teachingchannel.py similarity index 100% rename from youtube_dlc/extractor/teachingchannel.py rename to yt_dlp/extractor/teachingchannel.py diff --git a/youtube_dlc/extractor/teamcoco.py b/yt_dlp/extractor/teamcoco.py similarity index 100% rename from youtube_dlc/extractor/teamcoco.py rename to yt_dlp/extractor/teamcoco.py diff --git a/youtube_dlc/extractor/teamtreehouse.py b/yt_dlp/extractor/teamtreehouse.py similarity index 100% rename from youtube_dlc/extractor/teamtreehouse.py rename to yt_dlp/extractor/teamtreehouse.py diff --git a/youtube_dlc/extractor/techtalks.py b/yt_dlp/extractor/techtalks.py similarity index 100% rename from youtube_dlc/extractor/techtalks.py rename to yt_dlp/extractor/techtalks.py diff --git a/youtube_dlc/extractor/ted.py b/yt_dlp/extractor/ted.py similarity index 100% rename from youtube_dlc/extractor/ted.py rename to yt_dlp/extractor/ted.py diff --git a/youtube_dlc/extractor/tele13.py b/yt_dlp/extractor/tele13.py similarity index 100% rename from youtube_dlc/extractor/tele13.py rename to yt_dlp/extractor/tele13.py diff --git a/youtube_dlc/extractor/tele5.py b/yt_dlp/extractor/tele5.py similarity index 100% rename from youtube_dlc/extractor/tele5.py rename to yt_dlp/extractor/tele5.py diff --git a/youtube_dlc/extractor/telebruxelles.py b/yt_dlp/extractor/telebruxelles.py similarity index 100% rename from youtube_dlc/extractor/telebruxelles.py rename to yt_dlp/extractor/telebruxelles.py diff --git a/youtube_dlc/extractor/telecinco.py b/yt_dlp/extractor/telecinco.py similarity index 100% rename from youtube_dlc/extractor/telecinco.py rename to yt_dlp/extractor/telecinco.py diff --git a/youtube_dlc/extractor/telegraaf.py b/yt_dlp/extractor/telegraaf.py similarity index 100% rename from youtube_dlc/extractor/telegraaf.py rename to yt_dlp/extractor/telegraaf.py diff --git a/youtube_dlc/extractor/telemb.py b/yt_dlp/extractor/telemb.py similarity index 100% rename from youtube_dlc/extractor/telemb.py rename to yt_dlp/extractor/telemb.py diff --git a/youtube_dlc/extractor/telequebec.py b/yt_dlp/extractor/telequebec.py similarity index 100% rename from youtube_dlc/extractor/telequebec.py rename to yt_dlp/extractor/telequebec.py diff --git a/youtube_dlc/extractor/teletask.py b/yt_dlp/extractor/teletask.py similarity index 100% rename from youtube_dlc/extractor/teletask.py rename to yt_dlp/extractor/teletask.py diff --git a/youtube_dlc/extractor/telewebion.py b/yt_dlp/extractor/telewebion.py similarity index 100% rename from youtube_dlc/extractor/telewebion.py rename to yt_dlp/extractor/telewebion.py diff --git a/youtube_dlc/extractor/tennistv.py b/yt_dlp/extractor/tennistv.py similarity index 100% rename from youtube_dlc/extractor/tennistv.py rename to yt_dlp/extractor/tennistv.py diff --git a/youtube_dlc/extractor/tenplay.py b/yt_dlp/extractor/tenplay.py similarity index 100% rename from youtube_dlc/extractor/tenplay.py rename to yt_dlp/extractor/tenplay.py diff --git a/youtube_dlc/extractor/testurl.py b/yt_dlp/extractor/testurl.py similarity index 100% rename from youtube_dlc/extractor/testurl.py rename to yt_dlp/extractor/testurl.py diff --git a/youtube_dlc/extractor/tf1.py b/yt_dlp/extractor/tf1.py similarity index 100% rename from youtube_dlc/extractor/tf1.py rename to yt_dlp/extractor/tf1.py diff --git a/youtube_dlc/extractor/tfo.py b/yt_dlp/extractor/tfo.py similarity index 100% rename from youtube_dlc/extractor/tfo.py rename to yt_dlp/extractor/tfo.py diff --git a/youtube_dlc/extractor/theintercept.py b/yt_dlp/extractor/theintercept.py similarity index 100% rename from youtube_dlc/extractor/theintercept.py rename to yt_dlp/extractor/theintercept.py diff --git a/youtube_dlc/extractor/theplatform.py b/yt_dlp/extractor/theplatform.py similarity index 100% rename from youtube_dlc/extractor/theplatform.py rename to yt_dlp/extractor/theplatform.py diff --git a/youtube_dlc/extractor/thescene.py b/yt_dlp/extractor/thescene.py similarity index 100% rename from youtube_dlc/extractor/thescene.py rename to yt_dlp/extractor/thescene.py diff --git a/youtube_dlc/extractor/thestar.py b/yt_dlp/extractor/thestar.py similarity index 100% rename from youtube_dlc/extractor/thestar.py rename to yt_dlp/extractor/thestar.py diff --git a/youtube_dlc/extractor/thesun.py b/yt_dlp/extractor/thesun.py similarity index 100% rename from youtube_dlc/extractor/thesun.py rename to yt_dlp/extractor/thesun.py diff --git a/youtube_dlc/extractor/theweatherchannel.py b/yt_dlp/extractor/theweatherchannel.py similarity index 100% rename from youtube_dlc/extractor/theweatherchannel.py rename to yt_dlp/extractor/theweatherchannel.py diff --git a/youtube_dlc/extractor/thisamericanlife.py b/yt_dlp/extractor/thisamericanlife.py similarity index 100% rename from youtube_dlc/extractor/thisamericanlife.py rename to yt_dlp/extractor/thisamericanlife.py diff --git a/youtube_dlc/extractor/thisav.py b/yt_dlp/extractor/thisav.py similarity index 100% rename from youtube_dlc/extractor/thisav.py rename to yt_dlp/extractor/thisav.py diff --git a/youtube_dlc/extractor/thisoldhouse.py b/yt_dlp/extractor/thisoldhouse.py similarity index 100% rename from youtube_dlc/extractor/thisoldhouse.py rename to yt_dlp/extractor/thisoldhouse.py diff --git a/youtube_dlc/extractor/thisvid.py b/yt_dlp/extractor/thisvid.py similarity index 100% rename from youtube_dlc/extractor/thisvid.py rename to yt_dlp/extractor/thisvid.py diff --git a/youtube_dlc/extractor/threeqsdn.py b/yt_dlp/extractor/threeqsdn.py similarity index 100% rename from youtube_dlc/extractor/threeqsdn.py rename to yt_dlp/extractor/threeqsdn.py diff --git a/youtube_dlc/extractor/tiktok.py b/yt_dlp/extractor/tiktok.py similarity index 100% rename from youtube_dlc/extractor/tiktok.py rename to yt_dlp/extractor/tiktok.py diff --git a/youtube_dlc/extractor/tinypic.py b/yt_dlp/extractor/tinypic.py similarity index 100% rename from youtube_dlc/extractor/tinypic.py rename to yt_dlp/extractor/tinypic.py diff --git a/youtube_dlc/extractor/tmz.py b/yt_dlp/extractor/tmz.py similarity index 100% rename from youtube_dlc/extractor/tmz.py rename to yt_dlp/extractor/tmz.py diff --git a/youtube_dlc/extractor/tnaflix.py b/yt_dlp/extractor/tnaflix.py similarity index 100% rename from youtube_dlc/extractor/tnaflix.py rename to yt_dlp/extractor/tnaflix.py diff --git a/youtube_dlc/extractor/toggle.py b/yt_dlp/extractor/toggle.py similarity index 100% rename from youtube_dlc/extractor/toggle.py rename to yt_dlp/extractor/toggle.py diff --git a/youtube_dlc/extractor/tonline.py b/yt_dlp/extractor/tonline.py similarity index 100% rename from youtube_dlc/extractor/tonline.py rename to yt_dlp/extractor/tonline.py diff --git a/youtube_dlc/extractor/toongoggles.py b/yt_dlp/extractor/toongoggles.py similarity index 100% rename from youtube_dlc/extractor/toongoggles.py rename to yt_dlp/extractor/toongoggles.py diff --git a/youtube_dlc/extractor/toutv.py b/yt_dlp/extractor/toutv.py similarity index 100% rename from youtube_dlc/extractor/toutv.py rename to yt_dlp/extractor/toutv.py diff --git a/youtube_dlc/extractor/toypics.py b/yt_dlp/extractor/toypics.py similarity index 100% rename from youtube_dlc/extractor/toypics.py rename to yt_dlp/extractor/toypics.py diff --git a/youtube_dlc/extractor/traileraddict.py b/yt_dlp/extractor/traileraddict.py similarity index 100% rename from youtube_dlc/extractor/traileraddict.py rename to yt_dlp/extractor/traileraddict.py diff --git a/youtube_dlc/extractor/trilulilu.py b/yt_dlp/extractor/trilulilu.py similarity index 100% rename from youtube_dlc/extractor/trilulilu.py rename to yt_dlp/extractor/trilulilu.py diff --git a/youtube_dlc/extractor/trovo.py b/yt_dlp/extractor/trovo.py similarity index 100% rename from youtube_dlc/extractor/trovo.py rename to yt_dlp/extractor/trovo.py diff --git a/youtube_dlc/extractor/trovolive.py b/yt_dlp/extractor/trovolive.py similarity index 100% rename from youtube_dlc/extractor/trovolive.py rename to yt_dlp/extractor/trovolive.py diff --git a/youtube_dlc/extractor/trunews.py b/yt_dlp/extractor/trunews.py similarity index 100% rename from youtube_dlc/extractor/trunews.py rename to yt_dlp/extractor/trunews.py diff --git a/youtube_dlc/extractor/trutv.py b/yt_dlp/extractor/trutv.py similarity index 100% rename from youtube_dlc/extractor/trutv.py rename to yt_dlp/extractor/trutv.py diff --git a/youtube_dlc/extractor/tube8.py b/yt_dlp/extractor/tube8.py similarity index 100% rename from youtube_dlc/extractor/tube8.py rename to yt_dlp/extractor/tube8.py diff --git a/youtube_dlc/extractor/tubitv.py b/yt_dlp/extractor/tubitv.py similarity index 100% rename from youtube_dlc/extractor/tubitv.py rename to yt_dlp/extractor/tubitv.py diff --git a/youtube_dlc/extractor/tudou.py b/yt_dlp/extractor/tudou.py similarity index 100% rename from youtube_dlc/extractor/tudou.py rename to yt_dlp/extractor/tudou.py diff --git a/youtube_dlc/extractor/tumblr.py b/yt_dlp/extractor/tumblr.py similarity index 100% rename from youtube_dlc/extractor/tumblr.py rename to yt_dlp/extractor/tumblr.py diff --git a/youtube_dlc/extractor/tunein.py b/yt_dlp/extractor/tunein.py similarity index 100% rename from youtube_dlc/extractor/tunein.py rename to yt_dlp/extractor/tunein.py diff --git a/youtube_dlc/extractor/tunepk.py b/yt_dlp/extractor/tunepk.py similarity index 100% rename from youtube_dlc/extractor/tunepk.py rename to yt_dlp/extractor/tunepk.py diff --git a/youtube_dlc/extractor/turbo.py b/yt_dlp/extractor/turbo.py similarity index 100% rename from youtube_dlc/extractor/turbo.py rename to yt_dlp/extractor/turbo.py diff --git a/youtube_dlc/extractor/turner.py b/yt_dlp/extractor/turner.py similarity index 100% rename from youtube_dlc/extractor/turner.py rename to yt_dlp/extractor/turner.py diff --git a/youtube_dlc/extractor/tv2.py b/yt_dlp/extractor/tv2.py similarity index 100% rename from youtube_dlc/extractor/tv2.py rename to yt_dlp/extractor/tv2.py diff --git a/youtube_dlc/extractor/tv2dk.py b/yt_dlp/extractor/tv2dk.py similarity index 100% rename from youtube_dlc/extractor/tv2dk.py rename to yt_dlp/extractor/tv2dk.py diff --git a/youtube_dlc/extractor/tv2hu.py b/yt_dlp/extractor/tv2hu.py similarity index 100% rename from youtube_dlc/extractor/tv2hu.py rename to yt_dlp/extractor/tv2hu.py diff --git a/youtube_dlc/extractor/tv4.py b/yt_dlp/extractor/tv4.py similarity index 100% rename from youtube_dlc/extractor/tv4.py rename to yt_dlp/extractor/tv4.py diff --git a/youtube_dlc/extractor/tv5mondeplus.py b/yt_dlp/extractor/tv5mondeplus.py similarity index 100% rename from youtube_dlc/extractor/tv5mondeplus.py rename to yt_dlp/extractor/tv5mondeplus.py diff --git a/youtube_dlc/extractor/tv5unis.py b/yt_dlp/extractor/tv5unis.py similarity index 100% rename from youtube_dlc/extractor/tv5unis.py rename to yt_dlp/extractor/tv5unis.py diff --git a/youtube_dlc/extractor/tva.py b/yt_dlp/extractor/tva.py similarity index 100% rename from youtube_dlc/extractor/tva.py rename to yt_dlp/extractor/tva.py diff --git a/youtube_dlc/extractor/tvanouvelles.py b/yt_dlp/extractor/tvanouvelles.py similarity index 100% rename from youtube_dlc/extractor/tvanouvelles.py rename to yt_dlp/extractor/tvanouvelles.py diff --git a/youtube_dlc/extractor/tvc.py b/yt_dlp/extractor/tvc.py similarity index 100% rename from youtube_dlc/extractor/tvc.py rename to yt_dlp/extractor/tvc.py diff --git a/youtube_dlc/extractor/tver.py b/yt_dlp/extractor/tver.py similarity index 100% rename from youtube_dlc/extractor/tver.py rename to yt_dlp/extractor/tver.py diff --git a/youtube_dlc/extractor/tvigle.py b/yt_dlp/extractor/tvigle.py similarity index 100% rename from youtube_dlc/extractor/tvigle.py rename to yt_dlp/extractor/tvigle.py diff --git a/youtube_dlc/extractor/tvland.py b/yt_dlp/extractor/tvland.py similarity index 100% rename from youtube_dlc/extractor/tvland.py rename to yt_dlp/extractor/tvland.py diff --git a/youtube_dlc/extractor/tvn24.py b/yt_dlp/extractor/tvn24.py similarity index 100% rename from youtube_dlc/extractor/tvn24.py rename to yt_dlp/extractor/tvn24.py diff --git a/youtube_dlc/extractor/tvnet.py b/yt_dlp/extractor/tvnet.py similarity index 100% rename from youtube_dlc/extractor/tvnet.py rename to yt_dlp/extractor/tvnet.py diff --git a/youtube_dlc/extractor/tvnoe.py b/yt_dlp/extractor/tvnoe.py similarity index 100% rename from youtube_dlc/extractor/tvnoe.py rename to yt_dlp/extractor/tvnoe.py diff --git a/youtube_dlc/extractor/tvnow.py b/yt_dlp/extractor/tvnow.py similarity index 100% rename from youtube_dlc/extractor/tvnow.py rename to yt_dlp/extractor/tvnow.py diff --git a/youtube_dlc/extractor/tvp.py b/yt_dlp/extractor/tvp.py similarity index 100% rename from youtube_dlc/extractor/tvp.py rename to yt_dlp/extractor/tvp.py diff --git a/youtube_dlc/extractor/tvplay.py b/yt_dlp/extractor/tvplay.py similarity index 100% rename from youtube_dlc/extractor/tvplay.py rename to yt_dlp/extractor/tvplay.py diff --git a/youtube_dlc/extractor/tvplayer.py b/yt_dlp/extractor/tvplayer.py similarity index 100% rename from youtube_dlc/extractor/tvplayer.py rename to yt_dlp/extractor/tvplayer.py diff --git a/youtube_dlc/extractor/tweakers.py b/yt_dlp/extractor/tweakers.py similarity index 100% rename from youtube_dlc/extractor/tweakers.py rename to yt_dlp/extractor/tweakers.py diff --git a/youtube_dlc/extractor/twentyfourvideo.py b/yt_dlp/extractor/twentyfourvideo.py similarity index 100% rename from youtube_dlc/extractor/twentyfourvideo.py rename to yt_dlp/extractor/twentyfourvideo.py diff --git a/youtube_dlc/extractor/twentymin.py b/yt_dlp/extractor/twentymin.py similarity index 100% rename from youtube_dlc/extractor/twentymin.py rename to yt_dlp/extractor/twentymin.py diff --git a/youtube_dlc/extractor/twentythreevideo.py b/yt_dlp/extractor/twentythreevideo.py similarity index 100% rename from youtube_dlc/extractor/twentythreevideo.py rename to yt_dlp/extractor/twentythreevideo.py diff --git a/youtube_dlc/extractor/twitcasting.py b/yt_dlp/extractor/twitcasting.py similarity index 100% rename from youtube_dlc/extractor/twitcasting.py rename to yt_dlp/extractor/twitcasting.py diff --git a/youtube_dlc/extractor/twitch.py b/yt_dlp/extractor/twitch.py similarity index 100% rename from youtube_dlc/extractor/twitch.py rename to yt_dlp/extractor/twitch.py diff --git a/youtube_dlc/extractor/twitter.py b/yt_dlp/extractor/twitter.py similarity index 100% rename from youtube_dlc/extractor/twitter.py rename to yt_dlp/extractor/twitter.py diff --git a/youtube_dlc/extractor/udemy.py b/yt_dlp/extractor/udemy.py similarity index 99% rename from youtube_dlc/extractor/udemy.py rename to yt_dlp/extractor/udemy.py index 5b81aa365c..25b28e98ee 100644 --- a/youtube_dlc/extractor/udemy.py +++ b/yt_dlp/extractor/udemy.py @@ -143,7 +143,7 @@ class UdemyIE(InfoExtractor): raise ExtractorError( 'Udemy asks you to solve a CAPTCHA. Login with browser, ' 'solve CAPTCHA, then export cookies and pass cookie file to ' - 'youtube-dlc with --cookies.', expected=True) + 'yt-dlp with --cookies.', expected=True) return ret def _download_json(self, url_or_request, *args, **kwargs): diff --git a/youtube_dlc/extractor/udn.py b/yt_dlp/extractor/udn.py similarity index 100% rename from youtube_dlc/extractor/udn.py rename to yt_dlp/extractor/udn.py diff --git a/youtube_dlc/extractor/ufctv.py b/yt_dlp/extractor/ufctv.py similarity index 100% rename from youtube_dlc/extractor/ufctv.py rename to yt_dlp/extractor/ufctv.py diff --git a/youtube_dlc/extractor/uktvplay.py b/yt_dlp/extractor/uktvplay.py similarity index 100% rename from youtube_dlc/extractor/uktvplay.py rename to yt_dlp/extractor/uktvplay.py diff --git a/youtube_dlc/extractor/umg.py b/yt_dlp/extractor/umg.py similarity index 100% rename from youtube_dlc/extractor/umg.py rename to yt_dlp/extractor/umg.py diff --git a/youtube_dlc/extractor/unistra.py b/yt_dlp/extractor/unistra.py similarity index 100% rename from youtube_dlc/extractor/unistra.py rename to yt_dlp/extractor/unistra.py diff --git a/youtube_dlc/extractor/unity.py b/yt_dlp/extractor/unity.py similarity index 100% rename from youtube_dlc/extractor/unity.py rename to yt_dlp/extractor/unity.py diff --git a/youtube_dlc/extractor/uol.py b/yt_dlp/extractor/uol.py similarity index 100% rename from youtube_dlc/extractor/uol.py rename to yt_dlp/extractor/uol.py diff --git a/youtube_dlc/extractor/uplynk.py b/yt_dlp/extractor/uplynk.py similarity index 100% rename from youtube_dlc/extractor/uplynk.py rename to yt_dlp/extractor/uplynk.py diff --git a/youtube_dlc/extractor/urort.py b/yt_dlp/extractor/urort.py similarity index 100% rename from youtube_dlc/extractor/urort.py rename to yt_dlp/extractor/urort.py diff --git a/youtube_dlc/extractor/urplay.py b/yt_dlp/extractor/urplay.py similarity index 100% rename from youtube_dlc/extractor/urplay.py rename to yt_dlp/extractor/urplay.py diff --git a/youtube_dlc/extractor/usanetwork.py b/yt_dlp/extractor/usanetwork.py similarity index 100% rename from youtube_dlc/extractor/usanetwork.py rename to yt_dlp/extractor/usanetwork.py diff --git a/youtube_dlc/extractor/usatoday.py b/yt_dlp/extractor/usatoday.py similarity index 100% rename from youtube_dlc/extractor/usatoday.py rename to yt_dlp/extractor/usatoday.py diff --git a/youtube_dlc/extractor/ustream.py b/yt_dlp/extractor/ustream.py similarity index 100% rename from youtube_dlc/extractor/ustream.py rename to yt_dlp/extractor/ustream.py diff --git a/youtube_dlc/extractor/ustudio.py b/yt_dlp/extractor/ustudio.py similarity index 100% rename from youtube_dlc/extractor/ustudio.py rename to yt_dlp/extractor/ustudio.py diff --git a/youtube_dlc/extractor/varzesh3.py b/yt_dlp/extractor/varzesh3.py similarity index 100% rename from youtube_dlc/extractor/varzesh3.py rename to yt_dlp/extractor/varzesh3.py diff --git a/youtube_dlc/extractor/vbox7.py b/yt_dlp/extractor/vbox7.py similarity index 100% rename from youtube_dlc/extractor/vbox7.py rename to yt_dlp/extractor/vbox7.py diff --git a/youtube_dlc/extractor/veehd.py b/yt_dlp/extractor/veehd.py similarity index 100% rename from youtube_dlc/extractor/veehd.py rename to yt_dlp/extractor/veehd.py diff --git a/youtube_dlc/extractor/veoh.py b/yt_dlp/extractor/veoh.py similarity index 100% rename from youtube_dlc/extractor/veoh.py rename to yt_dlp/extractor/veoh.py diff --git a/youtube_dlc/extractor/vesti.py b/yt_dlp/extractor/vesti.py similarity index 100% rename from youtube_dlc/extractor/vesti.py rename to yt_dlp/extractor/vesti.py diff --git a/youtube_dlc/extractor/vevo.py b/yt_dlp/extractor/vevo.py similarity index 100% rename from youtube_dlc/extractor/vevo.py rename to yt_dlp/extractor/vevo.py diff --git a/youtube_dlc/extractor/vgtv.py b/yt_dlp/extractor/vgtv.py similarity index 100% rename from youtube_dlc/extractor/vgtv.py rename to yt_dlp/extractor/vgtv.py diff --git a/youtube_dlc/extractor/vh1.py b/yt_dlp/extractor/vh1.py similarity index 100% rename from youtube_dlc/extractor/vh1.py rename to yt_dlp/extractor/vh1.py diff --git a/youtube_dlc/extractor/vice.py b/yt_dlp/extractor/vice.py similarity index 100% rename from youtube_dlc/extractor/vice.py rename to yt_dlp/extractor/vice.py diff --git a/youtube_dlc/extractor/vidbit.py b/yt_dlp/extractor/vidbit.py similarity index 100% rename from youtube_dlc/extractor/vidbit.py rename to yt_dlp/extractor/vidbit.py diff --git a/youtube_dlc/extractor/viddler.py b/yt_dlp/extractor/viddler.py similarity index 100% rename from youtube_dlc/extractor/viddler.py rename to yt_dlp/extractor/viddler.py diff --git a/youtube_dlc/extractor/videa.py b/yt_dlp/extractor/videa.py similarity index 100% rename from youtube_dlc/extractor/videa.py rename to yt_dlp/extractor/videa.py diff --git a/youtube_dlc/extractor/videodetective.py b/yt_dlp/extractor/videodetective.py similarity index 100% rename from youtube_dlc/extractor/videodetective.py rename to yt_dlp/extractor/videodetective.py diff --git a/youtube_dlc/extractor/videofyme.py b/yt_dlp/extractor/videofyme.py similarity index 100% rename from youtube_dlc/extractor/videofyme.py rename to yt_dlp/extractor/videofyme.py diff --git a/youtube_dlc/extractor/videomore.py b/yt_dlp/extractor/videomore.py similarity index 100% rename from youtube_dlc/extractor/videomore.py rename to yt_dlp/extractor/videomore.py diff --git a/youtube_dlc/extractor/videopress.py b/yt_dlp/extractor/videopress.py similarity index 100% rename from youtube_dlc/extractor/videopress.py rename to yt_dlp/extractor/videopress.py diff --git a/youtube_dlc/extractor/vidio.py b/yt_dlp/extractor/vidio.py similarity index 100% rename from youtube_dlc/extractor/vidio.py rename to yt_dlp/extractor/vidio.py diff --git a/youtube_dlc/extractor/vidlii.py b/yt_dlp/extractor/vidlii.py similarity index 100% rename from youtube_dlc/extractor/vidlii.py rename to yt_dlp/extractor/vidlii.py diff --git a/youtube_dlc/extractor/vidme.py b/yt_dlp/extractor/vidme.py similarity index 100% rename from youtube_dlc/extractor/vidme.py rename to yt_dlp/extractor/vidme.py diff --git a/youtube_dlc/extractor/vidzi.py b/yt_dlp/extractor/vidzi.py similarity index 96% rename from youtube_dlc/extractor/vidzi.py rename to yt_dlp/extractor/vidzi.py index 4e79a0b84b..42ea4952c3 100644 --- a/youtube_dlc/extractor/vidzi.py +++ b/yt_dlp/extractor/vidzi.py @@ -20,7 +20,7 @@ class VidziIE(InfoExtractor): 'info_dict': { 'id': 'cghql9yq6emu', 'ext': 'mp4', - 'title': 'youtube-dlc test video 1\\\\2\'3/4<5\\\\6ä7↭', + 'title': 'youtube-dl test video 1\\\\2\'3/4<5\\\\6ä7↭', }, 'params': { # m3u8 download diff --git a/youtube_dlc/extractor/vier.py b/yt_dlp/extractor/vier.py similarity index 100% rename from youtube_dlc/extractor/vier.py rename to yt_dlp/extractor/vier.py diff --git a/youtube_dlc/extractor/viewlift.py b/yt_dlp/extractor/viewlift.py similarity index 100% rename from youtube_dlc/extractor/viewlift.py rename to yt_dlp/extractor/viewlift.py diff --git a/youtube_dlc/extractor/viidea.py b/yt_dlp/extractor/viidea.py similarity index 100% rename from youtube_dlc/extractor/viidea.py rename to yt_dlp/extractor/viidea.py diff --git a/youtube_dlc/extractor/viki.py b/yt_dlp/extractor/viki.py similarity index 100% rename from youtube_dlc/extractor/viki.py rename to yt_dlp/extractor/viki.py diff --git a/youtube_dlc/extractor/vimeo.py b/yt_dlp/extractor/vimeo.py similarity index 99% rename from youtube_dlc/extractor/vimeo.py rename to yt_dlp/extractor/vimeo.py index ecfb5f0c5f..d64b6c3005 100644 --- a/youtube_dlc/extractor/vimeo.py +++ b/yt_dlp/extractor/vimeo.py @@ -602,7 +602,7 @@ class VimeoIE(VimeoBaseInfoExtractor): if b'Because of its privacy settings, this video cannot be played here' in errmsg: raise ExtractorError( 'Cannot download embed-only video without embedding ' - 'URL. Please call youtube-dlc with the URL of the page ' + 'URL. Please call yt-dlp with the URL of the page ' 'that embeds this video.', expected=True) raise diff --git a/youtube_dlc/extractor/vimple.py b/yt_dlp/extractor/vimple.py similarity index 100% rename from youtube_dlc/extractor/vimple.py rename to yt_dlp/extractor/vimple.py diff --git a/youtube_dlc/extractor/vine.py b/yt_dlp/extractor/vine.py similarity index 100% rename from youtube_dlc/extractor/vine.py rename to yt_dlp/extractor/vine.py diff --git a/youtube_dlc/extractor/viqeo.py b/yt_dlp/extractor/viqeo.py similarity index 100% rename from youtube_dlc/extractor/viqeo.py rename to yt_dlp/extractor/viqeo.py diff --git a/youtube_dlc/extractor/viu.py b/yt_dlp/extractor/viu.py similarity index 100% rename from youtube_dlc/extractor/viu.py rename to yt_dlp/extractor/viu.py diff --git a/youtube_dlc/extractor/vk.py b/yt_dlp/extractor/vk.py similarity index 100% rename from youtube_dlc/extractor/vk.py rename to yt_dlp/extractor/vk.py diff --git a/youtube_dlc/extractor/vlive.py b/yt_dlp/extractor/vlive.py similarity index 100% rename from youtube_dlc/extractor/vlive.py rename to yt_dlp/extractor/vlive.py diff --git a/youtube_dlc/extractor/vodlocker.py b/yt_dlp/extractor/vodlocker.py similarity index 100% rename from youtube_dlc/extractor/vodlocker.py rename to yt_dlp/extractor/vodlocker.py diff --git a/youtube_dlc/extractor/vodpl.py b/yt_dlp/extractor/vodpl.py similarity index 100% rename from youtube_dlc/extractor/vodpl.py rename to yt_dlp/extractor/vodpl.py diff --git a/youtube_dlc/extractor/vodplatform.py b/yt_dlp/extractor/vodplatform.py similarity index 100% rename from youtube_dlc/extractor/vodplatform.py rename to yt_dlp/extractor/vodplatform.py diff --git a/youtube_dlc/extractor/voicerepublic.py b/yt_dlp/extractor/voicerepublic.py similarity index 100% rename from youtube_dlc/extractor/voicerepublic.py rename to yt_dlp/extractor/voicerepublic.py diff --git a/youtube_dlc/extractor/voot.py b/yt_dlp/extractor/voot.py similarity index 100% rename from youtube_dlc/extractor/voot.py rename to yt_dlp/extractor/voot.py diff --git a/youtube_dlc/extractor/voxmedia.py b/yt_dlp/extractor/voxmedia.py similarity index 100% rename from youtube_dlc/extractor/voxmedia.py rename to yt_dlp/extractor/voxmedia.py diff --git a/youtube_dlc/extractor/vrak.py b/yt_dlp/extractor/vrak.py similarity index 100% rename from youtube_dlc/extractor/vrak.py rename to yt_dlp/extractor/vrak.py diff --git a/youtube_dlc/extractor/vrt.py b/yt_dlp/extractor/vrt.py similarity index 100% rename from youtube_dlc/extractor/vrt.py rename to yt_dlp/extractor/vrt.py diff --git a/youtube_dlc/extractor/vrv.py b/yt_dlp/extractor/vrv.py similarity index 100% rename from youtube_dlc/extractor/vrv.py rename to yt_dlp/extractor/vrv.py diff --git a/youtube_dlc/extractor/vshare.py b/yt_dlp/extractor/vshare.py similarity index 100% rename from youtube_dlc/extractor/vshare.py rename to yt_dlp/extractor/vshare.py diff --git a/youtube_dlc/extractor/vtm.py b/yt_dlp/extractor/vtm.py similarity index 100% rename from youtube_dlc/extractor/vtm.py rename to yt_dlp/extractor/vtm.py diff --git a/youtube_dlc/extractor/vube.py b/yt_dlp/extractor/vube.py similarity index 100% rename from youtube_dlc/extractor/vube.py rename to yt_dlp/extractor/vube.py diff --git a/youtube_dlc/extractor/vuclip.py b/yt_dlp/extractor/vuclip.py similarity index 100% rename from youtube_dlc/extractor/vuclip.py rename to yt_dlp/extractor/vuclip.py diff --git a/youtube_dlc/extractor/vvvvid.py b/yt_dlp/extractor/vvvvid.py similarity index 100% rename from youtube_dlc/extractor/vvvvid.py rename to yt_dlp/extractor/vvvvid.py diff --git a/youtube_dlc/extractor/vyborymos.py b/yt_dlp/extractor/vyborymos.py similarity index 100% rename from youtube_dlc/extractor/vyborymos.py rename to yt_dlp/extractor/vyborymos.py diff --git a/youtube_dlc/extractor/vzaar.py b/yt_dlp/extractor/vzaar.py similarity index 100% rename from youtube_dlc/extractor/vzaar.py rename to yt_dlp/extractor/vzaar.py diff --git a/youtube_dlc/extractor/wakanim.py b/yt_dlp/extractor/wakanim.py similarity index 100% rename from youtube_dlc/extractor/wakanim.py rename to yt_dlp/extractor/wakanim.py diff --git a/youtube_dlc/extractor/walla.py b/yt_dlp/extractor/walla.py similarity index 100% rename from youtube_dlc/extractor/walla.py rename to yt_dlp/extractor/walla.py diff --git a/youtube_dlc/extractor/washingtonpost.py b/yt_dlp/extractor/washingtonpost.py similarity index 100% rename from youtube_dlc/extractor/washingtonpost.py rename to yt_dlp/extractor/washingtonpost.py diff --git a/youtube_dlc/extractor/wat.py b/yt_dlp/extractor/wat.py similarity index 100% rename from youtube_dlc/extractor/wat.py rename to yt_dlp/extractor/wat.py diff --git a/youtube_dlc/extractor/watchbox.py b/yt_dlp/extractor/watchbox.py similarity index 100% rename from youtube_dlc/extractor/watchbox.py rename to yt_dlp/extractor/watchbox.py diff --git a/youtube_dlc/extractor/watchindianporn.py b/yt_dlp/extractor/watchindianporn.py similarity index 100% rename from youtube_dlc/extractor/watchindianporn.py rename to yt_dlp/extractor/watchindianporn.py diff --git a/youtube_dlc/extractor/wdr.py b/yt_dlp/extractor/wdr.py similarity index 100% rename from youtube_dlc/extractor/wdr.py rename to yt_dlp/extractor/wdr.py diff --git a/youtube_dlc/extractor/webcaster.py b/yt_dlp/extractor/webcaster.py similarity index 100% rename from youtube_dlc/extractor/webcaster.py rename to yt_dlp/extractor/webcaster.py diff --git a/youtube_dlc/extractor/webofstories.py b/yt_dlp/extractor/webofstories.py similarity index 100% rename from youtube_dlc/extractor/webofstories.py rename to yt_dlp/extractor/webofstories.py diff --git a/youtube_dlc/extractor/weibo.py b/yt_dlp/extractor/weibo.py similarity index 100% rename from youtube_dlc/extractor/weibo.py rename to yt_dlp/extractor/weibo.py diff --git a/youtube_dlc/extractor/weiqitv.py b/yt_dlp/extractor/weiqitv.py similarity index 100% rename from youtube_dlc/extractor/weiqitv.py rename to yt_dlp/extractor/weiqitv.py diff --git a/youtube_dlc/extractor/wistia.py b/yt_dlp/extractor/wistia.py similarity index 100% rename from youtube_dlc/extractor/wistia.py rename to yt_dlp/extractor/wistia.py diff --git a/youtube_dlc/extractor/worldstarhiphop.py b/yt_dlp/extractor/worldstarhiphop.py similarity index 100% rename from youtube_dlc/extractor/worldstarhiphop.py rename to yt_dlp/extractor/worldstarhiphop.py diff --git a/youtube_dlc/extractor/wsj.py b/yt_dlp/extractor/wsj.py similarity index 100% rename from youtube_dlc/extractor/wsj.py rename to yt_dlp/extractor/wsj.py diff --git a/youtube_dlc/extractor/wwe.py b/yt_dlp/extractor/wwe.py similarity index 100% rename from youtube_dlc/extractor/wwe.py rename to yt_dlp/extractor/wwe.py diff --git a/youtube_dlc/extractor/xbef.py b/yt_dlp/extractor/xbef.py similarity index 100% rename from youtube_dlc/extractor/xbef.py rename to yt_dlp/extractor/xbef.py diff --git a/youtube_dlc/extractor/xboxclips.py b/yt_dlp/extractor/xboxclips.py similarity index 100% rename from youtube_dlc/extractor/xboxclips.py rename to yt_dlp/extractor/xboxclips.py diff --git a/youtube_dlc/extractor/xfileshare.py b/yt_dlp/extractor/xfileshare.py similarity index 100% rename from youtube_dlc/extractor/xfileshare.py rename to yt_dlp/extractor/xfileshare.py diff --git a/youtube_dlc/extractor/xhamster.py b/yt_dlp/extractor/xhamster.py similarity index 100% rename from youtube_dlc/extractor/xhamster.py rename to yt_dlp/extractor/xhamster.py diff --git a/youtube_dlc/extractor/xiami.py b/yt_dlp/extractor/xiami.py similarity index 100% rename from youtube_dlc/extractor/xiami.py rename to yt_dlp/extractor/xiami.py diff --git a/youtube_dlc/extractor/ximalaya.py b/yt_dlp/extractor/ximalaya.py similarity index 100% rename from youtube_dlc/extractor/ximalaya.py rename to yt_dlp/extractor/ximalaya.py diff --git a/youtube_dlc/extractor/xminus.py b/yt_dlp/extractor/xminus.py similarity index 100% rename from youtube_dlc/extractor/xminus.py rename to yt_dlp/extractor/xminus.py diff --git a/youtube_dlc/extractor/xnxx.py b/yt_dlp/extractor/xnxx.py similarity index 100% rename from youtube_dlc/extractor/xnxx.py rename to yt_dlp/extractor/xnxx.py diff --git a/youtube_dlc/extractor/xstream.py b/yt_dlp/extractor/xstream.py similarity index 100% rename from youtube_dlc/extractor/xstream.py rename to yt_dlp/extractor/xstream.py diff --git a/youtube_dlc/extractor/xtube.py b/yt_dlp/extractor/xtube.py similarity index 100% rename from youtube_dlc/extractor/xtube.py rename to yt_dlp/extractor/xtube.py diff --git a/youtube_dlc/extractor/xuite.py b/yt_dlp/extractor/xuite.py similarity index 100% rename from youtube_dlc/extractor/xuite.py rename to yt_dlp/extractor/xuite.py diff --git a/youtube_dlc/extractor/xvideos.py b/yt_dlp/extractor/xvideos.py similarity index 100% rename from youtube_dlc/extractor/xvideos.py rename to yt_dlp/extractor/xvideos.py diff --git a/youtube_dlc/extractor/xxxymovies.py b/yt_dlp/extractor/xxxymovies.py similarity index 100% rename from youtube_dlc/extractor/xxxymovies.py rename to yt_dlp/extractor/xxxymovies.py diff --git a/youtube_dlc/extractor/yahoo.py b/yt_dlp/extractor/yahoo.py similarity index 100% rename from youtube_dlc/extractor/yahoo.py rename to yt_dlp/extractor/yahoo.py diff --git a/youtube_dlc/extractor/yandexdisk.py b/yt_dlp/extractor/yandexdisk.py similarity index 100% rename from youtube_dlc/extractor/yandexdisk.py rename to yt_dlp/extractor/yandexdisk.py diff --git a/youtube_dlc/extractor/yandexmusic.py b/yt_dlp/extractor/yandexmusic.py similarity index 99% rename from youtube_dlc/extractor/yandexmusic.py rename to yt_dlp/extractor/yandexmusic.py index 4bcbaa4dbb..c30c438f8b 100644 --- a/youtube_dlc/extractor/yandexmusic.py +++ b/yt_dlp/extractor/yandexmusic.py @@ -30,12 +30,12 @@ class YandexMusicBaseIE(InfoExtractor): @staticmethod def _raise_captcha(): raise ExtractorError( - 'YandexMusic has considered youtube-dlc requests automated and ' + 'YandexMusic has considered yt-dlp requests automated and ' 'asks you to solve a CAPTCHA. You can either wait for some ' 'time until unblocked and optionally use --sleep-interval ' 'in future or alternatively you can go to https://music.yandex.ru/ ' 'solve CAPTCHA, then export cookies and pass cookie file to ' - 'youtube-dlc with --cookies', + 'yt-dlp with --cookies', expected=True) def _download_webpage_handle(self, *args, **kwargs): diff --git a/youtube_dlc/extractor/yandexvideo.py b/yt_dlp/extractor/yandexvideo.py similarity index 100% rename from youtube_dlc/extractor/yandexvideo.py rename to yt_dlp/extractor/yandexvideo.py diff --git a/youtube_dlc/extractor/yapfiles.py b/yt_dlp/extractor/yapfiles.py similarity index 100% rename from youtube_dlc/extractor/yapfiles.py rename to yt_dlp/extractor/yapfiles.py diff --git a/youtube_dlc/extractor/yesjapan.py b/yt_dlp/extractor/yesjapan.py similarity index 100% rename from youtube_dlc/extractor/yesjapan.py rename to yt_dlp/extractor/yesjapan.py diff --git a/youtube_dlc/extractor/yinyuetai.py b/yt_dlp/extractor/yinyuetai.py similarity index 100% rename from youtube_dlc/extractor/yinyuetai.py rename to yt_dlp/extractor/yinyuetai.py diff --git a/youtube_dlc/extractor/ynet.py b/yt_dlp/extractor/ynet.py similarity index 100% rename from youtube_dlc/extractor/ynet.py rename to yt_dlp/extractor/ynet.py diff --git a/youtube_dlc/extractor/youjizz.py b/yt_dlp/extractor/youjizz.py similarity index 100% rename from youtube_dlc/extractor/youjizz.py rename to yt_dlp/extractor/youjizz.py diff --git a/youtube_dlc/extractor/youku.py b/yt_dlp/extractor/youku.py similarity index 100% rename from youtube_dlc/extractor/youku.py rename to yt_dlp/extractor/youku.py diff --git a/youtube_dlc/extractor/younow.py b/yt_dlp/extractor/younow.py similarity index 100% rename from youtube_dlc/extractor/younow.py rename to yt_dlp/extractor/younow.py diff --git a/youtube_dlc/extractor/youporn.py b/yt_dlp/extractor/youporn.py similarity index 100% rename from youtube_dlc/extractor/youporn.py rename to yt_dlp/extractor/youporn.py diff --git a/youtube_dlc/extractor/yourporn.py b/yt_dlp/extractor/yourporn.py similarity index 100% rename from youtube_dlc/extractor/yourporn.py rename to yt_dlp/extractor/yourporn.py diff --git a/youtube_dlc/extractor/yourupload.py b/yt_dlp/extractor/yourupload.py similarity index 100% rename from youtube_dlc/extractor/yourupload.py rename to yt_dlp/extractor/yourupload.py diff --git a/youtube_dlc/extractor/youtube.py b/yt_dlp/extractor/youtube.py similarity index 100% rename from youtube_dlc/extractor/youtube.py rename to yt_dlp/extractor/youtube.py diff --git a/youtube_dlc/extractor/zapiks.py b/yt_dlp/extractor/zapiks.py similarity index 100% rename from youtube_dlc/extractor/zapiks.py rename to yt_dlp/extractor/zapiks.py diff --git a/youtube_dlc/extractor/zaq1.py b/yt_dlp/extractor/zaq1.py similarity index 100% rename from youtube_dlc/extractor/zaq1.py rename to yt_dlp/extractor/zaq1.py diff --git a/youtube_dlc/extractor/zattoo.py b/yt_dlp/extractor/zattoo.py similarity index 100% rename from youtube_dlc/extractor/zattoo.py rename to yt_dlp/extractor/zattoo.py diff --git a/youtube_dlc/extractor/zdf.py b/yt_dlp/extractor/zdf.py similarity index 100% rename from youtube_dlc/extractor/zdf.py rename to yt_dlp/extractor/zdf.py diff --git a/youtube_dlc/extractor/zee5.py b/yt_dlp/extractor/zee5.py similarity index 100% rename from youtube_dlc/extractor/zee5.py rename to yt_dlp/extractor/zee5.py diff --git a/youtube_dlc/extractor/zhihu.py b/yt_dlp/extractor/zhihu.py similarity index 100% rename from youtube_dlc/extractor/zhihu.py rename to yt_dlp/extractor/zhihu.py diff --git a/youtube_dlc/extractor/zingmp3.py b/yt_dlp/extractor/zingmp3.py similarity index 100% rename from youtube_dlc/extractor/zingmp3.py rename to yt_dlp/extractor/zingmp3.py diff --git a/youtube_dlc/extractor/zoom.py b/yt_dlp/extractor/zoom.py similarity index 100% rename from youtube_dlc/extractor/zoom.py rename to yt_dlp/extractor/zoom.py diff --git a/youtube_dlc/extractor/zype.py b/yt_dlp/extractor/zype.py similarity index 100% rename from youtube_dlc/extractor/zype.py rename to yt_dlp/extractor/zype.py diff --git a/youtube_dlc/jsinterp.py b/yt_dlp/jsinterp.py similarity index 100% rename from youtube_dlc/jsinterp.py rename to yt_dlp/jsinterp.py diff --git a/youtube_dlc/options.py b/yt_dlp/options.py similarity index 98% rename from youtube_dlc/options.py rename to yt_dlp/options.py index 26df62ca50..00bc02c2d2 100644 --- a/youtube_dlc/options.py +++ b/yt_dlp/options.py @@ -408,7 +408,7 @@ def parseOpts(overrideArguments=None): authentication.add_option( '-p', '--password', dest='password', metavar='PASSWORD', - help='Account password. If this option is left out, youtube-dlc will ask interactively') + help='Account password. If this option is left out, yt-dlp will ask interactively') authentication.add_option( '-2', '--twofactor', dest='twofactor', metavar='TWOFACTOR', @@ -434,7 +434,7 @@ def parseOpts(overrideArguments=None): adobe_pass.add_option( '--ap-password', dest='ap_password', metavar='PASSWORD', - help='Multiple-system operator account password. If this option is left out, youtube-dlc will ask interactively') + help='Multiple-system operator account password. If this option is left out, yt-dlp will ask interactively') adobe_pass.add_option( '--ap-list-mso', action='store_true', dest='ap_list_mso', default=False, @@ -812,12 +812,12 @@ def parseOpts(overrideArguments=None): verbosity.add_option( '-C', '--call-home', dest='call_home', action='store_true', default=False, - # help='[Broken] Contact the youtube-dlc server for debugging') + # help='[Broken] Contact the yt-dlp server for debugging') help=optparse.SUPPRESS_HELP) verbosity.add_option( '--no-call-home', dest='call_home', action='store_false', - # help='Do not contact the youtube-dlc server for debugging (default)') + # help='Do not contact the yt-dlp server for debugging (default)') help=optparse.SUPPRESS_HELP) filesystem = optparse.OptionGroup(parser, 'Filesystem Options') @@ -1167,7 +1167,7 @@ def parseOpts(overrideArguments=None): help='Convert the subtitles to other format (currently supported: srt|ass|vtt|lrc)') sponskrub = optparse.OptionGroup(parser, 'SponSkrub (SponsorBlock) Options', description=( - 'SponSkrub (https://github.com/pukkandan/SponSkrub) is a utility to mark/remove sponsor segments ' + 'SponSkrub (https://github.com/yt-dlp/SponSkrub) is a utility to mark/remove sponsor segments ' 'from downloaded YouTube videos using SponsorBlock API (https://sponsor.ajay.app)')) sponskrub.add_option( '--sponskrub', @@ -1276,7 +1276,7 @@ def parseOpts(overrideArguments=None): if '--config-location' in configs['command-line']: location = compat_expanduser(opts.config_location) if os.path.isdir(location): - location = os.path.join(location, 'youtube-dlc.conf') + location = os.path.join(location, 'yt-dlp.conf') if not os.path.exists(location): parser.error('config-location %s does not exist.' % location) configs['custom'] = _readOptions(location, default=None) @@ -1290,7 +1290,10 @@ def parseOpts(overrideArguments=None): return def read_options(path, user=False): - for package in ('yt-dlp', 'youtube-dlc'): + # Multiple package names can be given here + # Eg: ('yt-dlp', 'youtube-dlc', 'youtube-dl') will look for + # the configuration file of any of these three packages + for package in ('yt-dlp',): if user: config, current_path = _readUserConf(package, default=None) else: diff --git a/youtube_dlc/postprocessor/__init__.py b/yt_dlp/postprocessor/__init__.py similarity index 100% rename from youtube_dlc/postprocessor/__init__.py rename to yt_dlp/postprocessor/__init__.py diff --git a/youtube_dlc/postprocessor/common.py b/yt_dlp/postprocessor/common.py similarity index 100% rename from youtube_dlc/postprocessor/common.py rename to yt_dlp/postprocessor/common.py diff --git a/youtube_dlc/postprocessor/embedthumbnail.py b/yt_dlp/postprocessor/embedthumbnail.py similarity index 100% rename from youtube_dlc/postprocessor/embedthumbnail.py rename to yt_dlp/postprocessor/embedthumbnail.py diff --git a/youtube_dlc/postprocessor/execafterdownload.py b/yt_dlp/postprocessor/execafterdownload.py similarity index 100% rename from youtube_dlc/postprocessor/execafterdownload.py rename to yt_dlp/postprocessor/execafterdownload.py diff --git a/youtube_dlc/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py similarity index 99% rename from youtube_dlc/postprocessor/ffmpeg.py rename to yt_dlp/postprocessor/ffmpeg.py index b0615ddb28..944a4bc177 100644 --- a/youtube_dlc/postprocessor/ffmpeg.py +++ b/yt_dlp/postprocessor/ffmpeg.py @@ -251,7 +251,7 @@ class FFmpegPostProcessor(PostProcessor): + [encodeFilename(self._ffmpeg_filename_argument(file), True)]) for i, path in enumerate(input_paths): - cmd += make_args(path, post=['-i'], exe='%s_i%d' % (self.basename, i+1), use_default_arg=False) + cmd += make_args(path, post=['-i'], exe='%s_i%d' % (self.basename, i + 1), use_default_arg=False) cmd += make_args(out_path, pre=opts, exe=self.basename) self.write_debug('ffmpeg command line: %s' % shell_quote(cmd)) @@ -633,7 +633,7 @@ class FFmpegMergerPP(FFmpegPostProcessor): if is_outdated_version( self._versions[self.basename], required_version): warning = ('Your copy of %s is outdated and unable to properly mux separate video and audio files, ' - 'youtube-dlc will download single file media. ' + 'yt-dlp will download single file media. ' 'Update %s to version %s or newer to fix this.') % ( self.basename, self.basename, required_version) self.report_warning(warning) diff --git a/youtube_dlc/postprocessor/metadatafromfield.py b/yt_dlp/postprocessor/metadatafromfield.py similarity index 100% rename from youtube_dlc/postprocessor/metadatafromfield.py rename to yt_dlp/postprocessor/metadatafromfield.py diff --git a/youtube_dlc/postprocessor/movefilesafterdownload.py b/yt_dlp/postprocessor/movefilesafterdownload.py similarity index 100% rename from youtube_dlc/postprocessor/movefilesafterdownload.py rename to yt_dlp/postprocessor/movefilesafterdownload.py diff --git a/youtube_dlc/postprocessor/sponskrub.py b/yt_dlp/postprocessor/sponskrub.py similarity index 100% rename from youtube_dlc/postprocessor/sponskrub.py rename to yt_dlp/postprocessor/sponskrub.py diff --git a/youtube_dlc/postprocessor/xattrpp.py b/yt_dlp/postprocessor/xattrpp.py similarity index 100% rename from youtube_dlc/postprocessor/xattrpp.py rename to yt_dlp/postprocessor/xattrpp.py diff --git a/youtube_dlc/socks.py b/yt_dlp/socks.py similarity index 100% rename from youtube_dlc/socks.py rename to yt_dlp/socks.py diff --git a/youtube_dlc/swfinterp.py b/yt_dlp/swfinterp.py similarity index 100% rename from youtube_dlc/swfinterp.py rename to yt_dlp/swfinterp.py diff --git a/youtube_dlc/update.py b/yt_dlp/update.py similarity index 88% rename from youtube_dlc/update.py rename to yt_dlp/update.py index 402fefb678..81c9013a19 100644 --- a/youtube_dlc/update.py +++ b/yt_dlp/update.py @@ -38,7 +38,7 @@ def update_self(to_screen, verbose, opener): Returns whether the program should terminate """ - JSON_URL = 'https://api.github.com/repos/pukkandan/yt-dlp/releases/latest' + JSON_URL = 'https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest' def calc_sha256sum(path): h = hashlib.sha256() @@ -63,7 +63,7 @@ def update_self(to_screen, verbose, opener): if verbose: to_screen(encode_compat_str(traceback.format_exc())) to_screen('ERROR: can\'t obtain versions info. Please try again later.') - to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest') + to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') return def version_tuple(version_str): @@ -87,8 +87,8 @@ def update_self(to_screen, verbose, opener): def get_bin_info(bin_or_exe, version): label = version_labels['%s_%s' % (bin_or_exe, version)] return next( - (i for i in version_info['assets'] - if i['name'] in ('yt-dlp%s' % label, 'youtube-dlc%s' % label)), {}) + (i for i in version_info['assets'] if i['name'] == 'yt-dlp%s' % label), + {}) def get_sha256sum(bin_or_exe, version): label = version_labels['%s_%s' % (bin_or_exe, version)] @@ -100,8 +100,8 @@ def update_self(to_screen, verbose, opener): hash_data = opener.open(urlh).read().decode('utf-8') hashes = list(map(lambda x: x.split(':'), hash_data.splitlines())) return next( - (i[1] for i in hashes - if i[0] in ('yt-dlp%s' % label, 'youtube-dlc%s' % label)), None) + (i[1] for i in hashes if i[0] == 'yt-dlp%s' % label), + None) # sys.executable is set to the full pathname of the exe-file for py2exe # though symlinks are not followed so that we need to do this manually @@ -125,7 +125,7 @@ def update_self(to_screen, verbose, opener): url = get_bin_info('exe', arch).get('browser_download_url') if not url: to_screen('ERROR: unable to fetch updates') - to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest') + to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') return urlh = opener.open(url) newcontent = urlh.read() @@ -134,7 +134,7 @@ def update_self(to_screen, verbose, opener): if verbose: to_screen(encode_compat_str(traceback.format_exc())) to_screen('ERROR: unable to download latest version') - to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest') + to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') return try: @@ -151,7 +151,7 @@ def update_self(to_screen, verbose, opener): to_screen('WARNING: no hash information found for the release') elif calc_sha256sum(exe + '.new') != expected_sum: to_screen('ERROR: unable to verify the new executable') - to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest') + to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') try: os.remove(exe + '.new') except OSError: @@ -186,7 +186,7 @@ def update_self(to_screen, verbose, opener): url = get_bin_info('zip', py_ver).get('browser_download_url') if not url: to_screen('ERROR: unable to fetch updates') - to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest') + to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') return urlh = opener.open(url) newcontent = urlh.read() @@ -195,7 +195,7 @@ def update_self(to_screen, verbose, opener): if verbose: to_screen(encode_compat_str(traceback.format_exc())) to_screen('ERROR: unable to download latest version') - to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest') + to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') return try: @@ -210,7 +210,7 @@ def update_self(to_screen, verbose, opener): expected_sum = get_sha256sum('zip', py_ver) if expected_sum and calc_sha256sum(filename + '.new') != expected_sum: to_screen('ERROR: unable to verify the new zip') - to_screen('Visit https://github.com/pukkandan/yt-dlp/releases/latest') + to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') try: os.remove(filename + '.new') except OSError: @@ -223,7 +223,7 @@ def update_self(to_screen, verbose, opener): to_screen('ERROR: unable to overwrite current version') return - to_screen('Updated yt-dlp. Restart youtube-dlc to use the new version.') + to_screen('Updated yt-dlp. Restart yt-dlp to use the new version.') ''' # UNUSED diff --git a/youtube_dlc/utils.py b/yt_dlp/utils.py similarity index 99% rename from youtube_dlc/utils.py rename to yt_dlp/utils.py index b33a40fa6a..0dbb854673 100644 --- a/youtube_dlc/utils.py +++ b/yt_dlp/utils.py @@ -2341,12 +2341,12 @@ def make_HTTPS_handler(params, **kwargs): def bug_reports_message(): if ytdl_is_updateable(): - update_cmd = 'type youtube-dlc -U to update' + update_cmd = 'type yt-dlp -U to update' else: - update_cmd = 'see https://github.com/pukkandan/yt-dlp on how to update' - msg = '; please report this issue on https://github.com/pukkandan/yt-dlp .' + update_cmd = 'see https://github.com/yt-dlp/yt-dlp on how to update' + msg = '; please report this issue on https://github.com/yt-dlp/yt-dlp .' msg += ' Make sure you are using the latest version; %s.' % update_cmd - msg += ' Be sure to call youtube-dlc with the --verbose flag and include its complete output.' + msg += ' Be sure to call yt-dlp with the --verbose flag and include its complete output.' return msg @@ -2360,7 +2360,7 @@ class ExtractorError(YoutubeDLError): def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None): """ tb, if given, is the original traceback (so that it can be printed out). - If expected is set, this is a normal error message and most likely not a bug in youtube-dlc. + If expected is set, this is a normal error message and most likely not a bug in yt-dlp. """ if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError): @@ -2782,7 +2782,7 @@ class YoutubeDLCookieJar(compat_cookiejar.MozillaCookieJar): _HTTPONLY_PREFIX = '#HttpOnly_' _ENTRY_LEN = 7 _HEADER = '''# Netscape HTTP Cookie File -# This file is generated by youtube-dlc. Do not edit. +# This file is generated by yt-dlp. Do not edit. ''' _CookieFileEntry = collections.namedtuple( @@ -3787,7 +3787,7 @@ def get_exe_version(exe, args=['--version'], or False if the executable is not present """ try: # STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers - # SIGTTOU if youtube-dlc is run in the background. + # SIGTTOU if yt-dlp is run in the background. # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656 out, _ = process_communicate_or_kill(subprocess.Popen( [encodeArgument(exe)] + args, @@ -4218,7 +4218,7 @@ def is_outdated_version(version, limit, assume_new=True): def ytdl_is_updateable(): - """ Returns if youtube-dlc can be updated with -U """ + """ Returns if yt-dlp can be updated with -U """ return False from zipimport import zipimporter @@ -4695,7 +4695,7 @@ def cli_valueless_option(params, command_option, param, expected_value=True): def cli_configuration_args(argdict, key, default=[], exe=None, use_default_arg=True): # use_default_arg can be True, False, or 'no_compat' if isinstance(argdict, (list, tuple)): # for backward compatibility - if use_default_arg == True: + if use_default_arg is True: return argdict else: argdict = None @@ -5468,7 +5468,7 @@ class PerRequestProxyHandler(compat_urllib_request.ProxyHandler): return None # No Proxy if compat_urlparse.urlparse(proxy).scheme.lower() in ('socks', 'socks4', 'socks4a', 'socks5'): req.add_header('Ytdl-socks-proxy', proxy) - # youtube-dlc's http/https handlers do wrapping the socket with socks + # yt-dlp's http/https handlers do wrapping the socket with socks return None return compat_urllib_request.ProxyHandler.proxy_open( self, req, proxy, type) @@ -5741,7 +5741,7 @@ def write_xattr(path, key, value): # TODO: fallback to CLI tools raise XAttrUnavailableError( 'python-pyxattr is detected but is too old. ' - 'youtube-dlc requires %s or above while your version is %s. ' + 'yt-dlp requires %s or above while your version is %s. ' 'Falling back to other xattr implementations' % ( pyxattr_required_version, xattr.__version__)) diff --git a/youtube_dlc/version.py b/yt_dlp/version.py similarity index 100% rename from youtube_dlc/version.py rename to yt_dlp/version.py diff --git a/ytdlp_plugins/extractor/sample.py b/ytdlp_plugins/extractor/sample.py index 321f3fed19..5d8df1df50 100644 --- a/ytdlp_plugins/extractor/sample.py +++ b/ytdlp_plugins/extractor/sample.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals # Don't use relative imports -from youtube_dlc.extractor.common import InfoExtractor +from yt_dlp.extractor.common import InfoExtractor # See https://github.com/ytdl-org/youtube-dl#adding-support-for-a-new-site