]> jfr.im git - yt-dlp.git/commitdiff
Merge branch 'master' of https://github.com/zubearc/youtube-dl into zubearc
authorTom-Oliver Heidel <redacted>
Sat, 5 Sep 2020 23:52:20 +0000 (01:52 +0200)
committerTom-Oliver Heidel <redacted>
Sat, 5 Sep 2020 23:52:20 +0000 (01:52 +0200)
869 files changed:
.github/workflows/python-publish.yml [new file with mode: 0644]
.gitignore
.travis.yml
MANIFEST.in
Makefile
README.md
bin/youtube-dl [deleted file]
devscripts/bash-completion.in
devscripts/bash-completion.py
devscripts/buildserver.py
devscripts/check-porn.py
devscripts/create-github-release.py
devscripts/fish-completion.in
devscripts/fish-completion.py
devscripts/generate_aes_testdata.py
devscripts/gh-pages/add-version.py
devscripts/gh-pages/update-feed.py
devscripts/gh-pages/update-sites.py
devscripts/make_contributing.py
devscripts/make_issue_template.py
devscripts/make_lazy_extractors.py
devscripts/make_readme.py
devscripts/make_supportedsites.py
devscripts/prepare_manpage.py
devscripts/release.sh
devscripts/show-downloads-statistics.py
devscripts/zsh-completion.in
devscripts/zsh-completion.py
docs/Makefile
docs/conf.py
docs/index.rst
docs/module_guide.rst
docs/supportedsites.md
make_win.bat [new file with mode: 0644]
setup.cfg
setup.py
test/helper.py
test/test_InfoExtractor.py
test/test_YoutubeDL.py
test/test_YoutubeDLCookieJar.py
test/test_aes.py
test/test_age_restriction.py
test/test_all_urls.py
test/test_cache.py
test/test_compat.py
test/test_download.py
test/test_downloader_http.py
test/test_execution.py
test/test_http.py
test/test_iqiyi_sdk_interpreter.py
test/test_jsinterp.py
test/test_netrc.py
test/test_options.py
test/test_postprocessors.py
test/test_socks.py
test/test_subtitles.py
test/test_swfinterp.py
test/test_update.py
test/test_utils.py
test/test_verbose_output.py
test/test_write_annotations.py
test/test_youtube_chapters.py
test/test_youtube_lists.py
test/test_youtube_signature.py
tox.ini
youtube-dl.plugin.zsh [deleted file]
youtube_dl/extractor/deezer.py [deleted file]
youtube_dl/extractor/dreisat.py [deleted file]
youtube_dl/extractor/phoenix.py [deleted file]
youtube_dlc/YoutubeDL.py [moved from youtube_dl/YoutubeDL.py with 98% similarity, mode: 0644]
youtube_dlc/__init__.py [moved from youtube_dl/__init__.py with 99% similarity]
youtube_dlc/__main__.py [moved from youtube_dl/__main__.py with 73% similarity, mode: 0644]
youtube_dlc/aes.py [moved from youtube_dl/aes.py with 100% similarity]
youtube_dlc/cache.py [moved from youtube_dl/cache.py with 98% similarity]
youtube_dlc/compat.py [moved from youtube_dl/compat.py with 99% similarity]
youtube_dlc/downloader/__init__.py [moved from youtube_dl/downloader/__init__.py with 93% similarity]
youtube_dlc/downloader/common.py [moved from youtube_dl/downloader/common.py with 99% similarity]
youtube_dlc/downloader/dash.py [moved from youtube_dl/downloader/dash.py with 100% similarity]
youtube_dlc/downloader/external.py [moved from youtube_dl/downloader/external.py with 100% similarity]
youtube_dlc/downloader/f4m.py [moved from youtube_dl/downloader/f4m.py with 100% similarity]
youtube_dlc/downloader/fragment.py [moved from youtube_dl/downloader/fragment.py with 98% similarity]
youtube_dlc/downloader/hls.py [moved from youtube_dl/downloader/hls.py with 100% similarity]
youtube_dlc/downloader/http.py [moved from youtube_dl/downloader/http.py with 100% similarity]
youtube_dlc/downloader/ism.py [moved from youtube_dl/downloader/ism.py with 100% similarity]
youtube_dlc/downloader/rtmp.py [moved from youtube_dl/downloader/rtmp.py with 100% similarity]
youtube_dlc/downloader/rtsp.py [moved from youtube_dl/downloader/rtsp.py with 100% similarity]
youtube_dlc/downloader/youtube_live_chat.py [new file with mode: 0644]
youtube_dlc/extractor/__init__.py [moved from youtube_dl/extractor/__init__.py with 100% similarity]
youtube_dlc/extractor/abc.py [moved from youtube_dl/extractor/abc.py with 100% similarity]
youtube_dlc/extractor/abcnews.py [moved from youtube_dl/extractor/abcnews.py with 100% similarity]
youtube_dlc/extractor/abcotvs.py [moved from youtube_dl/extractor/abcotvs.py with 100% similarity]
youtube_dlc/extractor/academicearth.py [moved from youtube_dl/extractor/academicearth.py with 100% similarity]
youtube_dlc/extractor/acast.py [moved from youtube_dl/extractor/acast.py with 100% similarity]
youtube_dlc/extractor/adn.py [moved from youtube_dl/extractor/adn.py with 100% similarity]
youtube_dlc/extractor/adobeconnect.py [moved from youtube_dl/extractor/adobeconnect.py with 100% similarity]
youtube_dlc/extractor/adobepass.py [moved from youtube_dl/extractor/adobepass.py with 100% similarity]
youtube_dlc/extractor/adobetv.py [moved from youtube_dl/extractor/adobetv.py with 100% similarity]
youtube_dlc/extractor/adultswim.py [moved from youtube_dl/extractor/adultswim.py with 100% similarity]
youtube_dlc/extractor/aenetworks.py [moved from youtube_dl/extractor/aenetworks.py with 100% similarity]
youtube_dlc/extractor/afreecatv.py [moved from youtube_dl/extractor/afreecatv.py with 100% similarity]
youtube_dlc/extractor/airmozilla.py [moved from youtube_dl/extractor/airmozilla.py with 100% similarity]
youtube_dlc/extractor/aliexpress.py [moved from youtube_dl/extractor/aliexpress.py with 100% similarity]
youtube_dlc/extractor/aljazeera.py [moved from youtube_dl/extractor/aljazeera.py with 100% similarity]
youtube_dlc/extractor/allocine.py [moved from youtube_dl/extractor/allocine.py with 100% similarity]
youtube_dlc/extractor/alphaporno.py [moved from youtube_dl/extractor/alphaporno.py with 100% similarity]
youtube_dlc/extractor/amcnetworks.py [moved from youtube_dl/extractor/amcnetworks.py with 100% similarity]
youtube_dlc/extractor/americastestkitchen.py [moved from youtube_dl/extractor/americastestkitchen.py with 100% similarity]
youtube_dlc/extractor/amp.py [moved from youtube_dl/extractor/amp.py with 100% similarity]
youtube_dlc/extractor/animeondemand.py [moved from youtube_dl/extractor/animeondemand.py with 100% similarity]
youtube_dlc/extractor/anvato.py [moved from youtube_dl/extractor/anvato.py with 100% similarity]
youtube_dlc/extractor/aol.py [moved from youtube_dl/extractor/aol.py with 100% similarity]
youtube_dlc/extractor/apa.py [moved from youtube_dl/extractor/apa.py with 100% similarity]
youtube_dlc/extractor/aparat.py [moved from youtube_dl/extractor/aparat.py with 100% similarity]
youtube_dlc/extractor/appleconnect.py [moved from youtube_dl/extractor/appleconnect.py with 100% similarity]
youtube_dlc/extractor/appletrailers.py [moved from youtube_dl/extractor/appletrailers.py with 99% similarity]
youtube_dlc/extractor/archiveorg.py [moved from youtube_dl/extractor/archiveorg.py with 100% similarity]
youtube_dlc/extractor/ard.py [moved from youtube_dl/extractor/ard.py with 100% similarity]
youtube_dlc/extractor/arkena.py [moved from youtube_dl/extractor/arkena.py with 100% similarity]
youtube_dlc/extractor/arte.py [moved from youtube_dl/extractor/arte.py with 100% similarity]
youtube_dlc/extractor/asiancrush.py [moved from youtube_dl/extractor/asiancrush.py with 100% similarity]
youtube_dlc/extractor/atresplayer.py [moved from youtube_dl/extractor/atresplayer.py with 100% similarity]
youtube_dlc/extractor/atttechchannel.py [moved from youtube_dl/extractor/atttechchannel.py with 100% similarity]
youtube_dlc/extractor/atvat.py [moved from youtube_dl/extractor/atvat.py with 100% similarity]
youtube_dlc/extractor/audimedia.py [moved from youtube_dl/extractor/audimedia.py with 100% similarity]
youtube_dlc/extractor/audioboom.py [moved from youtube_dl/extractor/audioboom.py with 100% similarity]
youtube_dlc/extractor/audiomack.py [moved from youtube_dl/extractor/audiomack.py with 100% similarity]
youtube_dlc/extractor/awaan.py [moved from youtube_dl/extractor/awaan.py with 100% similarity]
youtube_dlc/extractor/aws.py [moved from youtube_dl/extractor/aws.py with 100% similarity]
youtube_dlc/extractor/azmedien.py [moved from youtube_dl/extractor/azmedien.py with 100% similarity]
youtube_dlc/extractor/baidu.py [moved from youtube_dl/extractor/baidu.py with 100% similarity]
youtube_dlc/extractor/bandcamp.py [moved from youtube_dl/extractor/bandcamp.py with 98% similarity]
youtube_dlc/extractor/bbc.py [moved from youtube_dl/extractor/bbc.py with 100% similarity]
youtube_dlc/extractor/beampro.py [moved from youtube_dl/extractor/beampro.py with 100% similarity]
youtube_dlc/extractor/beatport.py [moved from youtube_dl/extractor/beatport.py with 100% similarity]
youtube_dlc/extractor/beeg.py [moved from youtube_dl/extractor/beeg.py with 100% similarity]
youtube_dlc/extractor/behindkink.py [moved from youtube_dl/extractor/behindkink.py with 100% similarity]
youtube_dlc/extractor/bellmedia.py [moved from youtube_dl/extractor/bellmedia.py with 100% similarity]
youtube_dlc/extractor/bet.py [moved from youtube_dl/extractor/bet.py with 100% similarity]
youtube_dlc/extractor/bfi.py [moved from youtube_dl/extractor/bfi.py with 100% similarity]
youtube_dlc/extractor/bigflix.py [moved from youtube_dl/extractor/bigflix.py with 100% similarity]
youtube_dlc/extractor/bild.py [moved from youtube_dl/extractor/bild.py with 100% similarity]
youtube_dlc/extractor/bilibili.py [moved from youtube_dl/extractor/bilibili.py with 99% similarity]
youtube_dlc/extractor/biobiochiletv.py [moved from youtube_dl/extractor/biobiochiletv.py with 100% similarity]
youtube_dlc/extractor/biqle.py [moved from youtube_dl/extractor/biqle.py with 100% similarity]
youtube_dlc/extractor/bitchute.py [moved from youtube_dl/extractor/bitchute.py with 100% similarity]
youtube_dlc/extractor/bleacherreport.py [moved from youtube_dl/extractor/bleacherreport.py with 100% similarity]
youtube_dlc/extractor/blinkx.py [moved from youtube_dl/extractor/blinkx.py with 100% similarity]
youtube_dlc/extractor/bloomberg.py [moved from youtube_dl/extractor/bloomberg.py with 100% similarity]
youtube_dlc/extractor/bokecc.py [moved from youtube_dl/extractor/bokecc.py with 100% similarity]
youtube_dlc/extractor/bostonglobe.py [moved from youtube_dl/extractor/bostonglobe.py with 100% similarity]
youtube_dlc/extractor/bpb.py [moved from youtube_dl/extractor/bpb.py with 100% similarity]
youtube_dlc/extractor/br.py [moved from youtube_dl/extractor/br.py with 100% similarity]
youtube_dlc/extractor/bravotv.py [moved from youtube_dl/extractor/bravotv.py with 100% similarity]
youtube_dlc/extractor/breakcom.py [moved from youtube_dl/extractor/breakcom.py with 100% similarity]
youtube_dlc/extractor/brightcove.py [moved from youtube_dl/extractor/brightcove.py with 100% similarity]
youtube_dlc/extractor/businessinsider.py [moved from youtube_dl/extractor/businessinsider.py with 100% similarity]
youtube_dlc/extractor/buzzfeed.py [moved from youtube_dl/extractor/buzzfeed.py with 100% similarity]
youtube_dlc/extractor/byutv.py [moved from youtube_dl/extractor/byutv.py with 100% similarity]
youtube_dlc/extractor/c56.py [moved from youtube_dl/extractor/c56.py with 100% similarity]
youtube_dlc/extractor/camdemy.py [moved from youtube_dl/extractor/camdemy.py with 100% similarity]
youtube_dlc/extractor/cammodels.py [moved from youtube_dl/extractor/cammodels.py with 100% similarity]
youtube_dlc/extractor/camtube.py [moved from youtube_dl/extractor/camtube.py with 100% similarity]
youtube_dlc/extractor/camwithher.py [moved from youtube_dl/extractor/camwithher.py with 100% similarity]
youtube_dlc/extractor/canalc2.py [moved from youtube_dl/extractor/canalc2.py with 100% similarity]
youtube_dlc/extractor/canalplus.py [moved from youtube_dl/extractor/canalplus.py with 100% similarity]
youtube_dlc/extractor/canvas.py [moved from youtube_dl/extractor/canvas.py with 100% similarity]
youtube_dlc/extractor/carambatv.py [moved from youtube_dl/extractor/carambatv.py with 100% similarity]
youtube_dlc/extractor/cartoonnetwork.py [moved from youtube_dl/extractor/cartoonnetwork.py with 100% similarity]
youtube_dlc/extractor/cbc.py [moved from youtube_dl/extractor/cbc.py with 100% similarity]
youtube_dlc/extractor/cbs.py [moved from youtube_dl/extractor/cbs.py with 100% similarity]
youtube_dlc/extractor/cbsinteractive.py [moved from youtube_dl/extractor/cbsinteractive.py with 100% similarity]
youtube_dlc/extractor/cbslocal.py [moved from youtube_dl/extractor/cbslocal.py with 100% similarity]
youtube_dlc/extractor/cbsnews.py [moved from youtube_dl/extractor/cbsnews.py with 100% similarity]
youtube_dlc/extractor/cbssports.py [moved from youtube_dl/extractor/cbssports.py with 100% similarity]
youtube_dlc/extractor/ccc.py [moved from youtube_dl/extractor/ccc.py with 100% similarity]
youtube_dlc/extractor/ccma.py [moved from youtube_dl/extractor/ccma.py with 100% similarity]
youtube_dlc/extractor/cctv.py [moved from youtube_dl/extractor/cctv.py with 100% similarity]
youtube_dlc/extractor/cda.py [moved from youtube_dl/extractor/cda.py with 100% similarity]
youtube_dlc/extractor/ceskatelevize.py [moved from youtube_dl/extractor/ceskatelevize.py with 100% similarity]
youtube_dlc/extractor/channel9.py [moved from youtube_dl/extractor/channel9.py with 100% similarity]
youtube_dlc/extractor/charlierose.py [moved from youtube_dl/extractor/charlierose.py with 100% similarity]
youtube_dlc/extractor/chaturbate.py [moved from youtube_dl/extractor/chaturbate.py with 100% similarity]
youtube_dlc/extractor/chilloutzone.py [moved from youtube_dl/extractor/chilloutzone.py with 100% similarity]
youtube_dlc/extractor/chirbit.py [moved from youtube_dl/extractor/chirbit.py with 100% similarity]
youtube_dlc/extractor/cinchcast.py [moved from youtube_dl/extractor/cinchcast.py with 100% similarity]
youtube_dlc/extractor/cinemax.py [moved from youtube_dl/extractor/cinemax.py with 100% similarity]
youtube_dlc/extractor/ciscolive.py [moved from youtube_dl/extractor/ciscolive.py with 100% similarity]
youtube_dlc/extractor/cjsw.py [moved from youtube_dl/extractor/cjsw.py with 100% similarity]
youtube_dlc/extractor/cliphunter.py [moved from youtube_dl/extractor/cliphunter.py with 100% similarity]
youtube_dlc/extractor/clippit.py [moved from youtube_dl/extractor/clippit.py with 100% similarity]
youtube_dlc/extractor/cliprs.py [moved from youtube_dl/extractor/cliprs.py with 100% similarity]
youtube_dlc/extractor/clipsyndicate.py [moved from youtube_dl/extractor/clipsyndicate.py with 100% similarity]
youtube_dlc/extractor/closertotruth.py [moved from youtube_dl/extractor/closertotruth.py with 100% similarity]
youtube_dlc/extractor/cloudflarestream.py [moved from youtube_dl/extractor/cloudflarestream.py with 100% similarity]
youtube_dlc/extractor/cloudy.py [moved from youtube_dl/extractor/cloudy.py with 100% similarity]
youtube_dlc/extractor/clubic.py [moved from youtube_dl/extractor/clubic.py with 100% similarity]
youtube_dlc/extractor/clyp.py [moved from youtube_dl/extractor/clyp.py with 100% similarity]
youtube_dlc/extractor/cmt.py [moved from youtube_dl/extractor/cmt.py with 100% similarity]
youtube_dlc/extractor/cnbc.py [moved from youtube_dl/extractor/cnbc.py with 100% similarity]
youtube_dlc/extractor/cnn.py [moved from youtube_dl/extractor/cnn.py with 100% similarity]
youtube_dlc/extractor/comedycentral.py [moved from youtube_dl/extractor/comedycentral.py with 100% similarity]
youtube_dlc/extractor/common.py [moved from youtube_dl/extractor/common.py with 99% similarity]
youtube_dlc/extractor/commonmistakes.py [moved from youtube_dl/extractor/commonmistakes.py with 92% similarity]
youtube_dlc/extractor/commonprotocols.py [moved from youtube_dl/extractor/commonprotocols.py with 100% similarity]
youtube_dlc/extractor/condenast.py [moved from youtube_dl/extractor/condenast.py with 100% similarity]
youtube_dlc/extractor/contv.py [moved from youtube_dl/extractor/contv.py with 100% similarity]
youtube_dlc/extractor/corus.py [moved from youtube_dl/extractor/corus.py with 100% similarity]
youtube_dlc/extractor/coub.py [moved from youtube_dl/extractor/coub.py with 100% similarity]
youtube_dlc/extractor/cracked.py [moved from youtube_dl/extractor/cracked.py with 100% similarity]
youtube_dlc/extractor/crackle.py [moved from youtube_dl/extractor/crackle.py with 100% similarity]
youtube_dlc/extractor/crooksandliars.py [moved from youtube_dl/extractor/crooksandliars.py with 100% similarity]
youtube_dlc/extractor/crunchyroll.py [moved from youtube_dl/extractor/crunchyroll.py with 100% similarity]
youtube_dlc/extractor/cspan.py [moved from youtube_dl/extractor/cspan.py with 100% similarity]
youtube_dlc/extractor/ctsnews.py [moved from youtube_dl/extractor/ctsnews.py with 100% similarity]
youtube_dlc/extractor/ctvnews.py [moved from youtube_dl/extractor/ctvnews.py with 100% similarity]
youtube_dlc/extractor/cultureunplugged.py [moved from youtube_dl/extractor/cultureunplugged.py with 100% similarity]
youtube_dlc/extractor/curiositystream.py [moved from youtube_dl/extractor/curiositystream.py with 100% similarity]
youtube_dlc/extractor/cwtv.py [moved from youtube_dl/extractor/cwtv.py with 100% similarity]
youtube_dlc/extractor/dailymail.py [moved from youtube_dl/extractor/dailymail.py with 100% similarity]
youtube_dlc/extractor/dailymotion.py [moved from youtube_dl/extractor/dailymotion.py with 100% similarity]
youtube_dlc/extractor/daum.py [moved from youtube_dl/extractor/daum.py with 100% similarity]
youtube_dlc/extractor/dbtv.py [moved from youtube_dl/extractor/dbtv.py with 100% similarity]
youtube_dlc/extractor/dctp.py [moved from youtube_dl/extractor/dctp.py with 100% similarity]
youtube_dlc/extractor/deezer.py [new file with mode: 0644]
youtube_dlc/extractor/defense.py [moved from youtube_dl/extractor/defense.py with 100% similarity]
youtube_dlc/extractor/democracynow.py [moved from youtube_dl/extractor/democracynow.py with 100% similarity]
youtube_dlc/extractor/dfb.py [moved from youtube_dl/extractor/dfb.py with 100% similarity]
youtube_dlc/extractor/dhm.py [moved from youtube_dl/extractor/dhm.py with 100% similarity]
youtube_dlc/extractor/digg.py [moved from youtube_dl/extractor/digg.py with 100% similarity]
youtube_dlc/extractor/digiteka.py [moved from youtube_dl/extractor/digiteka.py with 100% similarity]
youtube_dlc/extractor/discovery.py [moved from youtube_dl/extractor/discovery.py with 100% similarity]
youtube_dlc/extractor/discoverygo.py [moved from youtube_dl/extractor/discoverygo.py with 100% similarity]
youtube_dlc/extractor/discoverynetworks.py [moved from youtube_dl/extractor/discoverynetworks.py with 100% similarity]
youtube_dlc/extractor/discoveryvr.py [moved from youtube_dl/extractor/discoveryvr.py with 100% similarity]
youtube_dlc/extractor/disney.py [moved from youtube_dl/extractor/disney.py with 100% similarity]
youtube_dlc/extractor/dispeak.py [moved from youtube_dl/extractor/dispeak.py with 100% similarity]
youtube_dlc/extractor/dlive.py [moved from youtube_dl/extractor/dlive.py with 100% similarity]
youtube_dlc/extractor/doodstream.py [new file with mode: 0644]
youtube_dlc/extractor/dotsub.py [moved from youtube_dl/extractor/dotsub.py with 100% similarity]
youtube_dlc/extractor/douyutv.py [moved from youtube_dl/extractor/douyutv.py with 100% similarity]
youtube_dlc/extractor/dplay.py [moved from youtube_dl/extractor/dplay.py with 100% similarity]
youtube_dlc/extractor/drbonanza.py [moved from youtube_dl/extractor/drbonanza.py with 100% similarity]
youtube_dlc/extractor/dropbox.py [moved from youtube_dl/extractor/dropbox.py with 90% similarity]
youtube_dlc/extractor/drtuber.py [moved from youtube_dl/extractor/drtuber.py with 100% similarity]
youtube_dlc/extractor/drtv.py [moved from youtube_dl/extractor/drtv.py with 100% similarity]
youtube_dlc/extractor/dtube.py [moved from youtube_dl/extractor/dtube.py with 100% similarity]
youtube_dlc/extractor/dumpert.py [moved from youtube_dl/extractor/dumpert.py with 100% similarity]
youtube_dlc/extractor/dvtv.py [moved from youtube_dl/extractor/dvtv.py with 100% similarity]
youtube_dlc/extractor/dw.py [moved from youtube_dl/extractor/dw.py with 100% similarity]
youtube_dlc/extractor/eagleplatform.py [moved from youtube_dl/extractor/eagleplatform.py with 100% similarity]
youtube_dlc/extractor/ebaumsworld.py [moved from youtube_dl/extractor/ebaumsworld.py with 100% similarity]
youtube_dlc/extractor/echomsk.py [moved from youtube_dl/extractor/echomsk.py with 100% similarity]
youtube_dlc/extractor/egghead.py [moved from youtube_dl/extractor/egghead.py with 100% similarity]
youtube_dlc/extractor/ehow.py [moved from youtube_dl/extractor/ehow.py with 100% similarity]
youtube_dlc/extractor/eighttracks.py [moved from youtube_dl/extractor/eighttracks.py with 85% similarity]
youtube_dlc/extractor/einthusan.py [moved from youtube_dl/extractor/einthusan.py with 100% similarity]
youtube_dlc/extractor/eitb.py [moved from youtube_dl/extractor/eitb.py with 100% similarity]
youtube_dlc/extractor/ellentube.py [moved from youtube_dl/extractor/ellentube.py with 100% similarity]
youtube_dlc/extractor/elpais.py [moved from youtube_dl/extractor/elpais.py with 100% similarity]
youtube_dlc/extractor/embedly.py [moved from youtube_dl/extractor/embedly.py with 100% similarity]
youtube_dlc/extractor/engadget.py [moved from youtube_dl/extractor/engadget.py with 100% similarity]
youtube_dlc/extractor/eporner.py [moved from youtube_dl/extractor/eporner.py with 100% similarity]
youtube_dlc/extractor/eroprofile.py [moved from youtube_dl/extractor/eroprofile.py with 100% similarity]
youtube_dlc/extractor/escapist.py [moved from youtube_dl/extractor/escapist.py with 100% similarity]
youtube_dlc/extractor/espn.py [moved from youtube_dl/extractor/espn.py with 100% similarity]
youtube_dlc/extractor/esri.py [moved from youtube_dl/extractor/esri.py with 100% similarity]
youtube_dlc/extractor/europa.py [moved from youtube_dl/extractor/europa.py with 100% similarity]
youtube_dlc/extractor/everyonesmixtape.py [moved from youtube_dl/extractor/everyonesmixtape.py with 100% similarity]
youtube_dlc/extractor/expotv.py [moved from youtube_dl/extractor/expotv.py with 100% similarity]
youtube_dlc/extractor/expressen.py [moved from youtube_dl/extractor/expressen.py with 100% similarity]
youtube_dlc/extractor/extractors.py [moved from youtube_dl/extractor/extractors.py with 99% similarity]
youtube_dlc/extractor/extremetube.py [moved from youtube_dl/extractor/extremetube.py with 100% similarity]
youtube_dlc/extractor/eyedotv.py [moved from youtube_dl/extractor/eyedotv.py with 100% similarity]
youtube_dlc/extractor/facebook.py [moved from youtube_dl/extractor/facebook.py with 100% similarity]
youtube_dlc/extractor/faz.py [moved from youtube_dl/extractor/faz.py with 100% similarity]
youtube_dlc/extractor/fc2.py [moved from youtube_dl/extractor/fc2.py with 100% similarity]
youtube_dlc/extractor/fczenit.py [moved from youtube_dl/extractor/fczenit.py with 100% similarity]
youtube_dlc/extractor/filmon.py [moved from youtube_dl/extractor/filmon.py with 100% similarity]
youtube_dlc/extractor/filmweb.py [moved from youtube_dl/extractor/filmweb.py with 100% similarity]
youtube_dlc/extractor/firsttv.py [moved from youtube_dl/extractor/firsttv.py with 100% similarity]
youtube_dlc/extractor/fivemin.py [moved from youtube_dl/extractor/fivemin.py with 100% similarity]
youtube_dlc/extractor/fivetv.py [moved from youtube_dl/extractor/fivetv.py with 100% similarity]
youtube_dlc/extractor/flickr.py [moved from youtube_dl/extractor/flickr.py with 100% similarity]
youtube_dlc/extractor/folketinget.py [moved from youtube_dl/extractor/folketinget.py with 100% similarity]
youtube_dlc/extractor/footyroom.py [moved from youtube_dl/extractor/footyroom.py with 100% similarity]
youtube_dlc/extractor/formula1.py [moved from youtube_dl/extractor/formula1.py with 100% similarity]
youtube_dlc/extractor/fourtube.py [moved from youtube_dl/extractor/fourtube.py with 100% similarity]
youtube_dlc/extractor/fox.py [moved from youtube_dl/extractor/fox.py with 100% similarity]
youtube_dlc/extractor/fox9.py [moved from youtube_dl/extractor/fox9.py with 100% similarity]
youtube_dlc/extractor/foxgay.py [moved from youtube_dl/extractor/foxgay.py with 100% similarity]
youtube_dlc/extractor/foxnews.py [moved from youtube_dl/extractor/foxnews.py with 100% similarity]
youtube_dlc/extractor/foxsports.py [moved from youtube_dl/extractor/foxsports.py with 100% similarity]
youtube_dlc/extractor/franceculture.py [moved from youtube_dl/extractor/franceculture.py with 100% similarity]
youtube_dlc/extractor/franceinter.py [moved from youtube_dl/extractor/franceinter.py with 100% similarity]
youtube_dlc/extractor/francetv.py [moved from youtube_dl/extractor/francetv.py with 98% similarity]
youtube_dlc/extractor/freesound.py [moved from youtube_dl/extractor/freesound.py with 100% similarity]
youtube_dlc/extractor/freespeech.py [moved from youtube_dl/extractor/freespeech.py with 100% similarity]
youtube_dlc/extractor/freshlive.py [moved from youtube_dl/extractor/freshlive.py with 100% similarity]
youtube_dlc/extractor/frontendmasters.py [moved from youtube_dl/extractor/frontendmasters.py with 100% similarity]
youtube_dlc/extractor/funimation.py [moved from youtube_dl/extractor/funimation.py with 100% similarity]
youtube_dlc/extractor/funk.py [moved from youtube_dl/extractor/funk.py with 100% similarity]
youtube_dlc/extractor/fusion.py [moved from youtube_dl/extractor/fusion.py with 100% similarity]
youtube_dlc/extractor/fxnetworks.py [moved from youtube_dl/extractor/fxnetworks.py with 100% similarity]
youtube_dlc/extractor/gaia.py [moved from youtube_dl/extractor/gaia.py with 100% similarity]
youtube_dlc/extractor/gameinformer.py [moved from youtube_dl/extractor/gameinformer.py with 100% similarity]
youtube_dlc/extractor/gamespot.py [moved from youtube_dl/extractor/gamespot.py with 100% similarity]
youtube_dlc/extractor/gamestar.py [moved from youtube_dl/extractor/gamestar.py with 100% similarity]
youtube_dlc/extractor/gaskrank.py [moved from youtube_dl/extractor/gaskrank.py with 100% similarity]
youtube_dlc/extractor/gazeta.py [moved from youtube_dl/extractor/gazeta.py with 100% similarity]
youtube_dlc/extractor/gdcvault.py [moved from youtube_dl/extractor/gdcvault.py with 100% similarity]
youtube_dlc/extractor/generic.py [moved from youtube_dl/extractor/generic.py with 99% similarity]
youtube_dlc/extractor/gfycat.py [moved from youtube_dl/extractor/gfycat.py with 100% similarity]
youtube_dlc/extractor/giantbomb.py [moved from youtube_dl/extractor/giantbomb.py with 100% similarity]
youtube_dlc/extractor/giga.py [moved from youtube_dl/extractor/giga.py with 100% similarity]
youtube_dlc/extractor/gigya.py [moved from youtube_dl/extractor/gigya.py with 100% similarity]
youtube_dlc/extractor/glide.py [moved from youtube_dl/extractor/glide.py with 100% similarity]
youtube_dlc/extractor/globo.py [moved from youtube_dl/extractor/globo.py with 100% similarity]
youtube_dlc/extractor/go.py [moved from youtube_dl/extractor/go.py with 100% similarity]
youtube_dlc/extractor/godtube.py [moved from youtube_dl/extractor/godtube.py with 100% similarity]
youtube_dlc/extractor/golem.py [moved from youtube_dl/extractor/golem.py with 100% similarity]
youtube_dlc/extractor/googledrive.py [moved from youtube_dl/extractor/googledrive.py with 100% similarity]
youtube_dlc/extractor/googleplus.py [moved from youtube_dl/extractor/googleplus.py with 100% similarity]
youtube_dlc/extractor/googlesearch.py [moved from youtube_dl/extractor/googlesearch.py with 100% similarity]
youtube_dlc/extractor/goshgay.py [moved from youtube_dl/extractor/goshgay.py with 100% similarity]
youtube_dlc/extractor/gputechconf.py [moved from youtube_dl/extractor/gputechconf.py with 100% similarity]
youtube_dlc/extractor/groupon.py [moved from youtube_dl/extractor/groupon.py with 100% similarity]
youtube_dlc/extractor/hbo.py [moved from youtube_dl/extractor/hbo.py with 100% similarity]
youtube_dlc/extractor/hearthisat.py [moved from youtube_dl/extractor/hearthisat.py with 100% similarity]
youtube_dlc/extractor/heise.py [moved from youtube_dl/extractor/heise.py with 100% similarity]
youtube_dlc/extractor/hellporno.py [moved from youtube_dl/extractor/hellporno.py with 100% similarity]
youtube_dlc/extractor/helsinki.py [moved from youtube_dl/extractor/helsinki.py with 100% similarity]
youtube_dlc/extractor/hentaistigma.py [moved from youtube_dl/extractor/hentaistigma.py with 100% similarity]
youtube_dlc/extractor/hgtv.py [moved from youtube_dl/extractor/hgtv.py with 100% similarity]
youtube_dlc/extractor/hidive.py [moved from youtube_dl/extractor/hidive.py with 100% similarity]
youtube_dlc/extractor/historicfilms.py [moved from youtube_dl/extractor/historicfilms.py with 100% similarity]
youtube_dlc/extractor/hitbox.py [moved from youtube_dl/extractor/hitbox.py with 100% similarity]
youtube_dlc/extractor/hitrecord.py [moved from youtube_dl/extractor/hitrecord.py with 100% similarity]
youtube_dlc/extractor/hketv.py [moved from youtube_dl/extractor/hketv.py with 100% similarity]
youtube_dlc/extractor/hornbunny.py [moved from youtube_dl/extractor/hornbunny.py with 100% similarity]
youtube_dlc/extractor/hotnewhiphop.py [moved from youtube_dl/extractor/hotnewhiphop.py with 100% similarity]
youtube_dlc/extractor/hotstar.py [moved from youtube_dl/extractor/hotstar.py with 100% similarity]
youtube_dlc/extractor/howcast.py [moved from youtube_dl/extractor/howcast.py with 100% similarity]
youtube_dlc/extractor/howstuffworks.py [moved from youtube_dl/extractor/howstuffworks.py with 100% similarity]
youtube_dlc/extractor/hrfensehen.py [new file with mode: 0644]
youtube_dlc/extractor/hrti.py [moved from youtube_dl/extractor/hrti.py with 100% similarity]
youtube_dlc/extractor/huajiao.py [moved from youtube_dl/extractor/huajiao.py with 100% similarity]
youtube_dlc/extractor/huffpost.py [moved from youtube_dl/extractor/huffpost.py with 100% similarity]
youtube_dlc/extractor/hungama.py [moved from youtube_dl/extractor/hungama.py with 100% similarity]
youtube_dlc/extractor/hypem.py [moved from youtube_dl/extractor/hypem.py with 100% similarity]
youtube_dlc/extractor/ign.py [moved from youtube_dl/extractor/ign.py with 100% similarity]
youtube_dlc/extractor/imdb.py [moved from youtube_dl/extractor/imdb.py with 100% similarity]
youtube_dlc/extractor/imggaming.py [moved from youtube_dl/extractor/imggaming.py with 100% similarity]
youtube_dlc/extractor/imgur.py [moved from youtube_dl/extractor/imgur.py with 97% similarity]
youtube_dlc/extractor/ina.py [moved from youtube_dl/extractor/ina.py with 100% similarity]
youtube_dlc/extractor/inc.py [moved from youtube_dl/extractor/inc.py with 100% similarity]
youtube_dlc/extractor/indavideo.py [moved from youtube_dl/extractor/indavideo.py with 100% similarity]
youtube_dlc/extractor/infoq.py [moved from youtube_dl/extractor/infoq.py with 100% similarity]
youtube_dlc/extractor/instagram.py [moved from youtube_dl/extractor/instagram.py with 100% similarity]
youtube_dlc/extractor/internazionale.py [moved from youtube_dl/extractor/internazionale.py with 100% similarity]
youtube_dlc/extractor/internetvideoarchive.py [moved from youtube_dl/extractor/internetvideoarchive.py with 100% similarity]
youtube_dlc/extractor/iprima.py [moved from youtube_dl/extractor/iprima.py with 100% similarity]
youtube_dlc/extractor/iqiyi.py [moved from youtube_dl/extractor/iqiyi.py with 100% similarity]
youtube_dlc/extractor/ir90tv.py [moved from youtube_dl/extractor/ir90tv.py with 100% similarity]
youtube_dlc/extractor/itv.py [moved from youtube_dl/extractor/itv.py with 100% similarity]
youtube_dlc/extractor/ivi.py [moved from youtube_dl/extractor/ivi.py with 99% similarity]
youtube_dlc/extractor/ivideon.py [moved from youtube_dl/extractor/ivideon.py with 100% similarity]
youtube_dlc/extractor/iwara.py [moved from youtube_dl/extractor/iwara.py with 100% similarity]
youtube_dlc/extractor/izlesene.py [moved from youtube_dl/extractor/izlesene.py with 100% similarity]
youtube_dlc/extractor/jamendo.py [moved from youtube_dl/extractor/jamendo.py with 100% similarity]
youtube_dlc/extractor/jeuxvideo.py [moved from youtube_dl/extractor/jeuxvideo.py with 100% similarity]
youtube_dlc/extractor/joj.py [moved from youtube_dl/extractor/joj.py with 97% similarity]
youtube_dlc/extractor/jove.py [moved from youtube_dl/extractor/jove.py with 100% similarity]
youtube_dlc/extractor/jwplatform.py [moved from youtube_dl/extractor/jwplatform.py with 100% similarity]
youtube_dlc/extractor/kakao.py [moved from youtube_dl/extractor/kakao.py with 100% similarity]
youtube_dlc/extractor/kaltura.py [moved from youtube_dl/extractor/kaltura.py with 100% similarity]
youtube_dlc/extractor/kanalplay.py [moved from youtube_dl/extractor/kanalplay.py with 100% similarity]
youtube_dlc/extractor/kankan.py [moved from youtube_dl/extractor/kankan.py with 100% similarity]
youtube_dlc/extractor/karaoketv.py [moved from youtube_dl/extractor/karaoketv.py with 100% similarity]
youtube_dlc/extractor/karrierevideos.py [moved from youtube_dl/extractor/karrierevideos.py with 100% similarity]
youtube_dlc/extractor/keezmovies.py [moved from youtube_dl/extractor/keezmovies.py with 100% similarity]
youtube_dlc/extractor/ketnet.py [moved from youtube_dl/extractor/ketnet.py with 100% similarity]
youtube_dlc/extractor/khanacademy.py [moved from youtube_dl/extractor/khanacademy.py with 100% similarity]
youtube_dlc/extractor/kickstarter.py [moved from youtube_dl/extractor/kickstarter.py with 100% similarity]
youtube_dlc/extractor/kinja.py [moved from youtube_dl/extractor/kinja.py with 100% similarity]
youtube_dlc/extractor/kinopoisk.py [moved from youtube_dl/extractor/kinopoisk.py with 100% similarity]
youtube_dlc/extractor/konserthusetplay.py [moved from youtube_dl/extractor/konserthusetplay.py with 100% similarity]
youtube_dlc/extractor/krasview.py [moved from youtube_dl/extractor/krasview.py with 100% similarity]
youtube_dlc/extractor/ku6.py [moved from youtube_dl/extractor/ku6.py with 100% similarity]
youtube_dlc/extractor/kusi.py [moved from youtube_dl/extractor/kusi.py with 100% similarity]
youtube_dlc/extractor/kuwo.py [moved from youtube_dl/extractor/kuwo.py with 100% similarity]
youtube_dlc/extractor/la7.py [moved from youtube_dl/extractor/la7.py with 100% similarity]
youtube_dlc/extractor/laola1tv.py [moved from youtube_dl/extractor/laola1tv.py with 100% similarity]
youtube_dlc/extractor/lci.py [moved from youtube_dl/extractor/lci.py with 100% similarity]
youtube_dlc/extractor/lcp.py [moved from youtube_dl/extractor/lcp.py with 100% similarity]
youtube_dlc/extractor/lecture2go.py [moved from youtube_dl/extractor/lecture2go.py with 100% similarity]
youtube_dlc/extractor/lecturio.py [moved from youtube_dl/extractor/lecturio.py with 100% similarity]
youtube_dlc/extractor/leeco.py [moved from youtube_dl/extractor/leeco.py with 100% similarity]
youtube_dlc/extractor/lego.py [moved from youtube_dl/extractor/lego.py with 100% similarity]
youtube_dlc/extractor/lemonde.py [moved from youtube_dl/extractor/lemonde.py with 100% similarity]
youtube_dlc/extractor/lenta.py [moved from youtube_dl/extractor/lenta.py with 100% similarity]
youtube_dlc/extractor/libraryofcongress.py [moved from youtube_dl/extractor/libraryofcongress.py with 100% similarity]
youtube_dlc/extractor/libsyn.py [moved from youtube_dl/extractor/libsyn.py with 100% similarity]
youtube_dlc/extractor/lifenews.py [moved from youtube_dl/extractor/lifenews.py with 100% similarity]
youtube_dlc/extractor/limelight.py [moved from youtube_dl/extractor/limelight.py with 100% similarity]
youtube_dlc/extractor/line.py [moved from youtube_dl/extractor/line.py with 100% similarity]
youtube_dlc/extractor/linkedin.py [moved from youtube_dl/extractor/linkedin.py with 100% similarity]
youtube_dlc/extractor/linuxacademy.py [moved from youtube_dl/extractor/linuxacademy.py with 100% similarity]
youtube_dlc/extractor/litv.py [moved from youtube_dl/extractor/litv.py with 100% similarity]
youtube_dlc/extractor/livejournal.py [moved from youtube_dl/extractor/livejournal.py with 100% similarity]
youtube_dlc/extractor/liveleak.py [moved from youtube_dl/extractor/liveleak.py with 100% similarity]
youtube_dlc/extractor/livestream.py [moved from youtube_dl/extractor/livestream.py with 100% similarity]
youtube_dlc/extractor/lnkgo.py [moved from youtube_dl/extractor/lnkgo.py with 100% similarity]
youtube_dlc/extractor/localnews8.py [moved from youtube_dl/extractor/localnews8.py with 100% similarity]
youtube_dlc/extractor/lovehomeporn.py [moved from youtube_dl/extractor/lovehomeporn.py with 100% similarity]
youtube_dlc/extractor/lrt.py [moved from youtube_dl/extractor/lrt.py with 100% similarity]
youtube_dlc/extractor/lynda.py [moved from youtube_dl/extractor/lynda.py with 100% similarity]
youtube_dlc/extractor/m6.py [moved from youtube_dl/extractor/m6.py with 100% similarity]
youtube_dlc/extractor/mailru.py [moved from youtube_dl/extractor/mailru.py with 100% similarity]
youtube_dlc/extractor/malltv.py [moved from youtube_dl/extractor/malltv.py with 100% similarity]
youtube_dlc/extractor/mangomolo.py [moved from youtube_dl/extractor/mangomolo.py with 100% similarity]
youtube_dlc/extractor/manyvids.py [moved from youtube_dl/extractor/manyvids.py with 100% similarity]
youtube_dlc/extractor/markiza.py [moved from youtube_dl/extractor/markiza.py with 100% similarity]
youtube_dlc/extractor/massengeschmacktv.py [moved from youtube_dl/extractor/massengeschmacktv.py with 100% similarity]
youtube_dlc/extractor/matchtv.py [moved from youtube_dl/extractor/matchtv.py with 100% similarity]
youtube_dlc/extractor/mdr.py [moved from youtube_dl/extractor/mdr.py with 100% similarity]
youtube_dlc/extractor/medialaan.py [moved from youtube_dl/extractor/medialaan.py with 100% similarity]
youtube_dlc/extractor/mediaset.py [moved from youtube_dl/extractor/mediaset.py with 100% similarity]
youtube_dlc/extractor/mediasite.py [moved from youtube_dl/extractor/mediasite.py with 100% similarity]
youtube_dlc/extractor/medici.py [moved from youtube_dl/extractor/medici.py with 100% similarity]
youtube_dlc/extractor/megaphone.py [moved from youtube_dl/extractor/megaphone.py with 100% similarity]
youtube_dlc/extractor/meipai.py [moved from youtube_dl/extractor/meipai.py with 100% similarity]
youtube_dlc/extractor/melonvod.py [moved from youtube_dl/extractor/melonvod.py with 100% similarity]
youtube_dlc/extractor/meta.py [moved from youtube_dl/extractor/meta.py with 100% similarity]
youtube_dlc/extractor/metacafe.py [moved from youtube_dl/extractor/metacafe.py with 100% similarity]
youtube_dlc/extractor/metacritic.py [moved from youtube_dl/extractor/metacritic.py with 100% similarity]
youtube_dlc/extractor/mgoon.py [moved from youtube_dl/extractor/mgoon.py with 100% similarity]
youtube_dlc/extractor/mgtv.py [moved from youtube_dl/extractor/mgtv.py with 100% similarity]
youtube_dlc/extractor/miaopai.py [moved from youtube_dl/extractor/miaopai.py with 100% similarity]
youtube_dlc/extractor/microsoftvirtualacademy.py [moved from youtube_dl/extractor/microsoftvirtualacademy.py with 100% similarity]
youtube_dlc/extractor/ministrygrid.py [moved from youtube_dl/extractor/ministrygrid.py with 100% similarity]
youtube_dlc/extractor/minoto.py [moved from youtube_dl/extractor/minoto.py with 100% similarity]
youtube_dlc/extractor/miomio.py [moved from youtube_dl/extractor/miomio.py with 100% similarity]
youtube_dlc/extractor/mit.py [moved from youtube_dl/extractor/mit.py with 100% similarity]
youtube_dlc/extractor/mitele.py [moved from youtube_dl/extractor/mitele.py with 100% similarity]
youtube_dlc/extractor/mixcloud.py [moved from youtube_dl/extractor/mixcloud.py with 100% similarity]
youtube_dlc/extractor/mlb.py [moved from youtube_dl/extractor/mlb.py with 100% similarity]
youtube_dlc/extractor/mnet.py [moved from youtube_dl/extractor/mnet.py with 100% similarity]
youtube_dlc/extractor/moevideo.py [moved from youtube_dl/extractor/moevideo.py with 100% similarity]
youtube_dlc/extractor/mofosex.py [moved from youtube_dl/extractor/mofosex.py with 100% similarity]
youtube_dlc/extractor/mojvideo.py [moved from youtube_dl/extractor/mojvideo.py with 100% similarity]
youtube_dlc/extractor/morningstar.py [moved from youtube_dl/extractor/morningstar.py with 100% similarity]
youtube_dlc/extractor/motherless.py [moved from youtube_dl/extractor/motherless.py with 100% similarity]
youtube_dlc/extractor/motorsport.py [moved from youtube_dl/extractor/motorsport.py with 100% similarity]
youtube_dlc/extractor/movieclips.py [moved from youtube_dl/extractor/movieclips.py with 100% similarity]
youtube_dlc/extractor/moviezine.py [moved from youtube_dl/extractor/moviezine.py with 100% similarity]
youtube_dlc/extractor/movingimage.py [moved from youtube_dl/extractor/movingimage.py with 100% similarity]
youtube_dlc/extractor/msn.py [moved from youtube_dl/extractor/msn.py with 100% similarity]
youtube_dlc/extractor/mtv.py [moved from youtube_dl/extractor/mtv.py with 100% similarity]
youtube_dlc/extractor/muenchentv.py [moved from youtube_dl/extractor/muenchentv.py with 100% similarity]
youtube_dlc/extractor/mwave.py [moved from youtube_dl/extractor/mwave.py with 100% similarity]
youtube_dlc/extractor/mychannels.py [moved from youtube_dl/extractor/mychannels.py with 100% similarity]
youtube_dlc/extractor/myspace.py [moved from youtube_dl/extractor/myspace.py with 100% similarity]
youtube_dlc/extractor/myspass.py [moved from youtube_dl/extractor/myspass.py with 100% similarity]
youtube_dlc/extractor/myvi.py [moved from youtube_dl/extractor/myvi.py with 100% similarity]
youtube_dlc/extractor/myvidster.py [moved from youtube_dl/extractor/myvidster.py with 100% similarity]
youtube_dlc/extractor/nationalgeographic.py [moved from youtube_dl/extractor/nationalgeographic.py with 100% similarity]
youtube_dlc/extractor/naver.py [moved from youtube_dl/extractor/naver.py with 100% similarity]
youtube_dlc/extractor/nba.py [moved from youtube_dl/extractor/nba.py with 100% similarity]
youtube_dlc/extractor/nbc.py [moved from youtube_dl/extractor/nbc.py with 100% similarity]
youtube_dlc/extractor/ndr.py [moved from youtube_dl/extractor/ndr.py with 100% similarity]
youtube_dlc/extractor/ndtv.py [moved from youtube_dl/extractor/ndtv.py with 100% similarity]
youtube_dlc/extractor/nerdcubed.py [moved from youtube_dl/extractor/nerdcubed.py with 100% similarity]
youtube_dlc/extractor/neteasemusic.py [moved from youtube_dl/extractor/neteasemusic.py with 100% similarity]
youtube_dlc/extractor/netzkino.py [moved from youtube_dl/extractor/netzkino.py with 100% similarity]
youtube_dlc/extractor/newgrounds.py [moved from youtube_dl/extractor/newgrounds.py with 100% similarity]
youtube_dlc/extractor/newstube.py [moved from youtube_dl/extractor/newstube.py with 100% similarity]
youtube_dlc/extractor/nextmedia.py [moved from youtube_dl/extractor/nextmedia.py with 100% similarity]
youtube_dlc/extractor/nexx.py [moved from youtube_dl/extractor/nexx.py with 100% similarity]
youtube_dlc/extractor/nfl.py [moved from youtube_dl/extractor/nfl.py with 100% similarity]
youtube_dlc/extractor/nhk.py [moved from youtube_dl/extractor/nhk.py with 100% similarity]
youtube_dlc/extractor/nhl.py [moved from youtube_dl/extractor/nhl.py with 100% similarity]
youtube_dlc/extractor/nick.py [moved from youtube_dl/extractor/nick.py with 100% similarity]
youtube_dlc/extractor/niconico.py [moved from youtube_dl/extractor/niconico.py with 100% similarity]
youtube_dlc/extractor/ninecninemedia.py [moved from youtube_dl/extractor/ninecninemedia.py with 100% similarity]
youtube_dlc/extractor/ninegag.py [moved from youtube_dl/extractor/ninegag.py with 100% similarity]
youtube_dlc/extractor/ninenow.py [moved from youtube_dl/extractor/ninenow.py with 100% similarity]
youtube_dlc/extractor/nintendo.py [moved from youtube_dl/extractor/nintendo.py with 100% similarity]
youtube_dlc/extractor/njpwworld.py [moved from youtube_dl/extractor/njpwworld.py with 100% similarity]
youtube_dlc/extractor/nobelprize.py [moved from youtube_dl/extractor/nobelprize.py with 100% similarity]
youtube_dlc/extractor/noco.py [moved from youtube_dl/extractor/noco.py with 100% similarity]
youtube_dlc/extractor/nonktube.py [moved from youtube_dl/extractor/nonktube.py with 100% similarity]
youtube_dlc/extractor/noovo.py [moved from youtube_dl/extractor/noovo.py with 100% similarity]
youtube_dlc/extractor/normalboots.py [moved from youtube_dl/extractor/normalboots.py with 100% similarity]
youtube_dlc/extractor/nosvideo.py [moved from youtube_dl/extractor/nosvideo.py with 100% similarity]
youtube_dlc/extractor/nova.py [moved from youtube_dl/extractor/nova.py with 100% similarity]
youtube_dlc/extractor/nowness.py [moved from youtube_dl/extractor/nowness.py with 98% similarity]
youtube_dlc/extractor/noz.py [moved from youtube_dl/extractor/noz.py with 100% similarity]
youtube_dlc/extractor/npo.py [moved from youtube_dl/extractor/npo.py with 100% similarity]
youtube_dlc/extractor/npr.py [moved from youtube_dl/extractor/npr.py with 100% similarity]
youtube_dlc/extractor/nrk.py [moved from youtube_dl/extractor/nrk.py with 100% similarity]
youtube_dlc/extractor/nrl.py [moved from youtube_dl/extractor/nrl.py with 100% similarity]
youtube_dlc/extractor/ntvcojp.py [moved from youtube_dl/extractor/ntvcojp.py with 100% similarity]
youtube_dlc/extractor/ntvde.py [moved from youtube_dl/extractor/ntvde.py with 100% similarity]
youtube_dlc/extractor/ntvru.py [moved from youtube_dl/extractor/ntvru.py with 100% similarity]
youtube_dlc/extractor/nuevo.py [moved from youtube_dl/extractor/nuevo.py with 100% similarity]
youtube_dlc/extractor/nuvid.py [moved from youtube_dl/extractor/nuvid.py with 100% similarity]
youtube_dlc/extractor/nytimes.py [moved from youtube_dl/extractor/nytimes.py with 100% similarity]
youtube_dlc/extractor/nzz.py [moved from youtube_dl/extractor/nzz.py with 100% similarity]
youtube_dlc/extractor/odatv.py [moved from youtube_dl/extractor/odatv.py with 100% similarity]
youtube_dlc/extractor/odnoklassniki.py [moved from youtube_dl/extractor/odnoklassniki.py with 100% similarity]
youtube_dlc/extractor/oktoberfesttv.py [moved from youtube_dl/extractor/oktoberfesttv.py with 100% similarity]
youtube_dlc/extractor/once.py [moved from youtube_dl/extractor/once.py with 100% similarity]
youtube_dlc/extractor/ondemandkorea.py [moved from youtube_dl/extractor/ondemandkorea.py with 100% similarity]
youtube_dlc/extractor/onet.py [moved from youtube_dl/extractor/onet.py with 100% similarity]
youtube_dlc/extractor/onionstudios.py [moved from youtube_dl/extractor/onionstudios.py with 100% similarity]
youtube_dlc/extractor/ooyala.py [moved from youtube_dl/extractor/ooyala.py with 100% similarity]
youtube_dlc/extractor/openload.py [moved from youtube_dl/extractor/openload.py with 100% similarity]
youtube_dlc/extractor/ora.py [moved from youtube_dl/extractor/ora.py with 100% similarity]
youtube_dlc/extractor/orf.py [moved from youtube_dl/extractor/orf.py with 100% similarity]
youtube_dlc/extractor/outsidetv.py [moved from youtube_dl/extractor/outsidetv.py with 100% similarity]
youtube_dlc/extractor/packtpub.py [moved from youtube_dl/extractor/packtpub.py with 100% similarity]
youtube_dlc/extractor/pandoratv.py [moved from youtube_dl/extractor/pandoratv.py with 100% similarity]
youtube_dlc/extractor/parliamentliveuk.py [moved from youtube_dl/extractor/parliamentliveuk.py with 100% similarity]
youtube_dlc/extractor/patreon.py [moved from youtube_dl/extractor/patreon.py with 100% similarity]
youtube_dlc/extractor/pbs.py [moved from youtube_dl/extractor/pbs.py with 100% similarity]
youtube_dlc/extractor/pearvideo.py [moved from youtube_dl/extractor/pearvideo.py with 100% similarity]
youtube_dlc/extractor/peertube.py [moved from youtube_dl/extractor/peertube.py with 100% similarity]
youtube_dlc/extractor/people.py [moved from youtube_dl/extractor/people.py with 100% similarity]
youtube_dlc/extractor/performgroup.py [moved from youtube_dl/extractor/performgroup.py with 100% similarity]
youtube_dlc/extractor/periscope.py [moved from youtube_dl/extractor/periscope.py with 100% similarity]
youtube_dlc/extractor/philharmoniedeparis.py [moved from youtube_dl/extractor/philharmoniedeparis.py with 100% similarity]
youtube_dlc/extractor/phoenix.py [new file with mode: 0644]
youtube_dlc/extractor/photobucket.py [moved from youtube_dl/extractor/photobucket.py with 100% similarity]
youtube_dlc/extractor/picarto.py [moved from youtube_dl/extractor/picarto.py with 100% similarity]
youtube_dlc/extractor/piksel.py [moved from youtube_dl/extractor/piksel.py with 100% similarity]
youtube_dlc/extractor/pinkbike.py [moved from youtube_dl/extractor/pinkbike.py with 100% similarity]
youtube_dlc/extractor/pladform.py [moved from youtube_dl/extractor/pladform.py with 100% similarity]
youtube_dlc/extractor/platzi.py [moved from youtube_dl/extractor/platzi.py with 100% similarity]
youtube_dlc/extractor/playfm.py [moved from youtube_dl/extractor/playfm.py with 100% similarity]
youtube_dlc/extractor/playplustv.py [moved from youtube_dl/extractor/playplustv.py with 100% similarity]
youtube_dlc/extractor/plays.py [moved from youtube_dl/extractor/plays.py with 100% similarity]
youtube_dlc/extractor/playtvak.py [moved from youtube_dl/extractor/playtvak.py with 100% similarity]
youtube_dlc/extractor/playvid.py [moved from youtube_dl/extractor/playvid.py with 100% similarity]
youtube_dlc/extractor/playwire.py [moved from youtube_dl/extractor/playwire.py with 100% similarity]
youtube_dlc/extractor/pluralsight.py [moved from youtube_dl/extractor/pluralsight.py with 100% similarity]
youtube_dlc/extractor/podomatic.py [moved from youtube_dl/extractor/podomatic.py with 100% similarity]
youtube_dlc/extractor/pokemon.py [moved from youtube_dl/extractor/pokemon.py with 53% similarity]
youtube_dlc/extractor/polskieradio.py [moved from youtube_dl/extractor/polskieradio.py with 100% similarity]
youtube_dlc/extractor/popcorntimes.py [moved from youtube_dl/extractor/popcorntimes.py with 100% similarity]
youtube_dlc/extractor/popcorntv.py [moved from youtube_dl/extractor/popcorntv.py with 100% similarity]
youtube_dlc/extractor/porn91.py [moved from youtube_dl/extractor/porn91.py with 100% similarity]
youtube_dlc/extractor/porncom.py [moved from youtube_dl/extractor/porncom.py with 100% similarity]
youtube_dlc/extractor/pornhd.py [moved from youtube_dl/extractor/pornhd.py with 100% similarity]
youtube_dlc/extractor/pornhub.py [moved from youtube_dl/extractor/pornhub.py with 100% similarity]
youtube_dlc/extractor/pornotube.py [moved from youtube_dl/extractor/pornotube.py with 100% similarity]
youtube_dlc/extractor/pornovoisines.py [moved from youtube_dl/extractor/pornovoisines.py with 100% similarity]
youtube_dlc/extractor/pornoxo.py [moved from youtube_dl/extractor/pornoxo.py with 100% similarity]
youtube_dlc/extractor/presstv.py [moved from youtube_dl/extractor/presstv.py with 100% similarity]
youtube_dlc/extractor/prosiebensat1.py [moved from youtube_dl/extractor/prosiebensat1.py with 100% similarity]
youtube_dlc/extractor/puhutv.py [moved from youtube_dl/extractor/puhutv.py with 100% similarity]
youtube_dlc/extractor/puls4.py [moved from youtube_dl/extractor/puls4.py with 100% similarity]
youtube_dlc/extractor/pyvideo.py [moved from youtube_dl/extractor/pyvideo.py with 100% similarity]
youtube_dlc/extractor/qqmusic.py [moved from youtube_dl/extractor/qqmusic.py with 100% similarity]
youtube_dlc/extractor/r7.py [moved from youtube_dl/extractor/r7.py with 100% similarity]
youtube_dlc/extractor/radiobremen.py [moved from youtube_dl/extractor/radiobremen.py with 100% similarity]
youtube_dlc/extractor/radiocanada.py [moved from youtube_dl/extractor/radiocanada.py with 100% similarity]
youtube_dlc/extractor/radiode.py [moved from youtube_dl/extractor/radiode.py with 100% similarity]
youtube_dlc/extractor/radiofrance.py [moved from youtube_dl/extractor/radiofrance.py with 100% similarity]
youtube_dlc/extractor/radiojavan.py [moved from youtube_dl/extractor/radiojavan.py with 100% similarity]
youtube_dlc/extractor/rai.py [moved from youtube_dl/extractor/rai.py with 100% similarity]
youtube_dlc/extractor/raywenderlich.py [moved from youtube_dl/extractor/raywenderlich.py with 100% similarity]
youtube_dlc/extractor/rbmaradio.py [moved from youtube_dl/extractor/rbmaradio.py with 100% similarity]
youtube_dlc/extractor/rds.py [moved from youtube_dl/extractor/rds.py with 100% similarity]
youtube_dlc/extractor/redbulltv.py [moved from youtube_dl/extractor/redbulltv.py with 100% similarity]
youtube_dlc/extractor/reddit.py [moved from youtube_dl/extractor/reddit.py with 100% similarity]
youtube_dlc/extractor/redtube.py [moved from youtube_dl/extractor/redtube.py with 100% similarity]
youtube_dlc/extractor/regiotv.py [moved from youtube_dl/extractor/regiotv.py with 100% similarity]
youtube_dlc/extractor/rentv.py [moved from youtube_dl/extractor/rentv.py with 100% similarity]
youtube_dlc/extractor/restudy.py [moved from youtube_dl/extractor/restudy.py with 100% similarity]
youtube_dlc/extractor/reuters.py [moved from youtube_dl/extractor/reuters.py with 100% similarity]
youtube_dlc/extractor/reverbnation.py [moved from youtube_dl/extractor/reverbnation.py with 100% similarity]
youtube_dlc/extractor/rice.py [moved from youtube_dl/extractor/rice.py with 100% similarity]
youtube_dlc/extractor/rmcdecouverte.py [moved from youtube_dl/extractor/rmcdecouverte.py with 100% similarity]
youtube_dlc/extractor/ro220.py [moved from youtube_dl/extractor/ro220.py with 100% similarity]
youtube_dlc/extractor/rockstargames.py [moved from youtube_dl/extractor/rockstargames.py with 100% similarity]
youtube_dlc/extractor/roosterteeth.py [moved from youtube_dl/extractor/roosterteeth.py with 100% similarity]
youtube_dlc/extractor/rottentomatoes.py [moved from youtube_dl/extractor/rottentomatoes.py with 100% similarity]
youtube_dlc/extractor/roxwel.py [moved from youtube_dl/extractor/roxwel.py with 100% similarity]
youtube_dlc/extractor/rozhlas.py [moved from youtube_dl/extractor/rozhlas.py with 100% similarity]
youtube_dlc/extractor/rtbf.py [moved from youtube_dl/extractor/rtbf.py with 100% similarity]
youtube_dlc/extractor/rte.py [moved from youtube_dl/extractor/rte.py with 100% similarity]
youtube_dlc/extractor/rtl2.py [moved from youtube_dl/extractor/rtl2.py with 100% similarity]
youtube_dlc/extractor/rtlnl.py [moved from youtube_dl/extractor/rtlnl.py with 100% similarity]
youtube_dlc/extractor/rtp.py [moved from youtube_dl/extractor/rtp.py with 100% similarity]
youtube_dlc/extractor/rts.py [moved from youtube_dl/extractor/rts.py with 100% similarity]
youtube_dlc/extractor/rtve.py [moved from youtube_dl/extractor/rtve.py with 100% similarity]
youtube_dlc/extractor/rtvnh.py [moved from youtube_dl/extractor/rtvnh.py with 100% similarity]
youtube_dlc/extractor/rtvs.py [moved from youtube_dl/extractor/rtvs.py with 100% similarity]
youtube_dlc/extractor/ruhd.py [moved from youtube_dl/extractor/ruhd.py with 100% similarity]
youtube_dlc/extractor/rutube.py [moved from youtube_dl/extractor/rutube.py with 100% similarity]
youtube_dlc/extractor/rutv.py [moved from youtube_dl/extractor/rutv.py with 100% similarity]
youtube_dlc/extractor/ruutu.py [moved from youtube_dl/extractor/ruutu.py with 100% similarity]
youtube_dlc/extractor/ruv.py [moved from youtube_dl/extractor/ruv.py with 100% similarity]
youtube_dlc/extractor/safari.py [moved from youtube_dl/extractor/safari.py with 100% similarity]
youtube_dlc/extractor/sapo.py [moved from youtube_dl/extractor/sapo.py with 100% similarity]
youtube_dlc/extractor/savefrom.py [moved from youtube_dl/extractor/savefrom.py with 100% similarity]
youtube_dlc/extractor/sbs.py [moved from youtube_dl/extractor/sbs.py with 100% similarity]
youtube_dlc/extractor/screencast.py [moved from youtube_dl/extractor/screencast.py with 100% similarity]
youtube_dlc/extractor/screencastomatic.py [moved from youtube_dl/extractor/screencastomatic.py with 100% similarity]
youtube_dlc/extractor/scrippsnetworks.py [moved from youtube_dl/extractor/scrippsnetworks.py with 100% similarity]
youtube_dlc/extractor/scte.py [moved from youtube_dl/extractor/scte.py with 100% similarity]
youtube_dlc/extractor/seeker.py [moved from youtube_dl/extractor/seeker.py with 100% similarity]
youtube_dlc/extractor/senateisvp.py [moved from youtube_dl/extractor/senateisvp.py with 100% similarity]
youtube_dlc/extractor/sendtonews.py [moved from youtube_dl/extractor/sendtonews.py with 100% similarity]
youtube_dlc/extractor/servus.py [moved from youtube_dl/extractor/servus.py with 100% similarity]
youtube_dlc/extractor/sevenplus.py [moved from youtube_dl/extractor/sevenplus.py with 100% similarity]
youtube_dlc/extractor/sexu.py [moved from youtube_dl/extractor/sexu.py with 100% similarity]
youtube_dlc/extractor/seznamzpravy.py [moved from youtube_dl/extractor/seznamzpravy.py with 100% similarity]
youtube_dlc/extractor/shahid.py [moved from youtube_dl/extractor/shahid.py with 100% similarity]
youtube_dlc/extractor/shared.py [moved from youtube_dl/extractor/shared.py with 100% similarity]
youtube_dlc/extractor/showroomlive.py [moved from youtube_dl/extractor/showroomlive.py with 100% similarity]
youtube_dlc/extractor/sina.py [moved from youtube_dl/extractor/sina.py with 100% similarity]
youtube_dlc/extractor/sixplay.py [moved from youtube_dl/extractor/sixplay.py with 100% similarity]
youtube_dlc/extractor/sky.py [moved from youtube_dl/extractor/sky.py with 100% similarity]
youtube_dlc/extractor/skylinewebcams.py [moved from youtube_dl/extractor/skylinewebcams.py with 100% similarity]
youtube_dlc/extractor/skynewsarabia.py [moved from youtube_dl/extractor/skynewsarabia.py with 100% similarity]
youtube_dlc/extractor/slideshare.py [moved from youtube_dl/extractor/slideshare.py with 100% similarity]
youtube_dlc/extractor/slideslive.py [moved from youtube_dl/extractor/slideslive.py with 100% similarity]
youtube_dlc/extractor/slutload.py [moved from youtube_dl/extractor/slutload.py with 100% similarity]
youtube_dlc/extractor/smotri.py [moved from youtube_dl/extractor/smotri.py with 100% similarity]
youtube_dlc/extractor/snotr.py [moved from youtube_dl/extractor/snotr.py with 100% similarity]
youtube_dlc/extractor/sohu.py [moved from youtube_dl/extractor/sohu.py with 99% similarity]
youtube_dlc/extractor/sonyliv.py [moved from youtube_dl/extractor/sonyliv.py with 100% similarity]
youtube_dlc/extractor/soundcloud.py [moved from youtube_dl/extractor/soundcloud.py with 88% similarity]
youtube_dlc/extractor/soundgasm.py [moved from youtube_dl/extractor/soundgasm.py with 100% similarity]
youtube_dlc/extractor/southpark.py [moved from youtube_dl/extractor/southpark.py with 100% similarity]
youtube_dlc/extractor/spankbang.py [moved from youtube_dl/extractor/spankbang.py with 100% similarity]
youtube_dlc/extractor/spankwire.py [moved from youtube_dl/extractor/spankwire.py with 100% similarity]
youtube_dlc/extractor/spiegel.py [moved from youtube_dl/extractor/spiegel.py with 100% similarity]
youtube_dlc/extractor/spiegeltv.py [moved from youtube_dl/extractor/spiegeltv.py with 100% similarity]
youtube_dlc/extractor/spike.py [moved from youtube_dl/extractor/spike.py with 100% similarity]
youtube_dlc/extractor/sport5.py [moved from youtube_dl/extractor/sport5.py with 100% similarity]
youtube_dlc/extractor/sportbox.py [moved from youtube_dl/extractor/sportbox.py with 100% similarity]
youtube_dlc/extractor/sportdeutschland.py [moved from youtube_dl/extractor/sportdeutschland.py with 100% similarity]
youtube_dlc/extractor/springboardplatform.py [moved from youtube_dl/extractor/springboardplatform.py with 100% similarity]
youtube_dlc/extractor/sprout.py [moved from youtube_dl/extractor/sprout.py with 100% similarity]
youtube_dlc/extractor/srgssr.py [moved from youtube_dl/extractor/srgssr.py with 100% similarity]
youtube_dlc/extractor/srmediathek.py [moved from youtube_dl/extractor/srmediathek.py with 100% similarity]
youtube_dlc/extractor/stanfordoc.py [moved from youtube_dl/extractor/stanfordoc.py with 100% similarity]
youtube_dlc/extractor/steam.py [moved from youtube_dl/extractor/steam.py with 100% similarity]
youtube_dlc/extractor/stitcher.py [moved from youtube_dl/extractor/stitcher.py with 100% similarity]
youtube_dlc/extractor/storyfire.py [new file with mode: 0644]
youtube_dlc/extractor/streamable.py [moved from youtube_dl/extractor/streamable.py with 100% similarity]
youtube_dlc/extractor/streamcloud.py [moved from youtube_dl/extractor/streamcloud.py with 93% similarity]
youtube_dlc/extractor/streamcz.py [moved from youtube_dl/extractor/streamcz.py with 100% similarity]
youtube_dlc/extractor/streetvoice.py [moved from youtube_dl/extractor/streetvoice.py with 100% similarity]
youtube_dlc/extractor/stretchinternet.py [moved from youtube_dl/extractor/stretchinternet.py with 100% similarity]
youtube_dlc/extractor/stv.py [moved from youtube_dl/extractor/stv.py with 100% similarity]
youtube_dlc/extractor/sunporno.py [moved from youtube_dl/extractor/sunporno.py with 100% similarity]
youtube_dlc/extractor/sverigesradio.py [moved from youtube_dl/extractor/sverigesradio.py with 100% similarity]
youtube_dlc/extractor/svt.py [moved from youtube_dl/extractor/svt.py with 100% similarity]
youtube_dlc/extractor/swrmediathek.py [moved from youtube_dl/extractor/swrmediathek.py with 100% similarity]
youtube_dlc/extractor/syfy.py [moved from youtube_dl/extractor/syfy.py with 100% similarity]
youtube_dlc/extractor/sztvhu.py [moved from youtube_dl/extractor/sztvhu.py with 100% similarity]
youtube_dlc/extractor/tagesschau.py [moved from youtube_dl/extractor/tagesschau.py with 100% similarity]
youtube_dlc/extractor/tass.py [moved from youtube_dl/extractor/tass.py with 100% similarity]
youtube_dlc/extractor/tastytrade.py [moved from youtube_dl/extractor/tastytrade.py with 100% similarity]
youtube_dlc/extractor/tbs.py [moved from youtube_dl/extractor/tbs.py with 100% similarity]
youtube_dlc/extractor/tdslifeway.py [moved from youtube_dl/extractor/tdslifeway.py with 100% similarity]
youtube_dlc/extractor/teachable.py [moved from youtube_dl/extractor/teachable.py with 100% similarity]
youtube_dlc/extractor/teachertube.py [moved from youtube_dl/extractor/teachertube.py with 100% similarity]
youtube_dlc/extractor/teachingchannel.py [moved from youtube_dl/extractor/teachingchannel.py with 100% similarity]
youtube_dlc/extractor/teamcoco.py [moved from youtube_dl/extractor/teamcoco.py with 100% similarity]
youtube_dlc/extractor/teamtreehouse.py [moved from youtube_dl/extractor/teamtreehouse.py with 100% similarity]
youtube_dlc/extractor/techtalks.py [moved from youtube_dl/extractor/techtalks.py with 100% similarity]
youtube_dlc/extractor/ted.py [moved from youtube_dl/extractor/ted.py with 100% similarity]
youtube_dlc/extractor/tele13.py [moved from youtube_dl/extractor/tele13.py with 100% similarity]
youtube_dlc/extractor/tele5.py [moved from youtube_dl/extractor/tele5.py with 100% similarity]
youtube_dlc/extractor/telebruxelles.py [moved from youtube_dl/extractor/telebruxelles.py with 100% similarity]
youtube_dlc/extractor/telecinco.py [moved from youtube_dl/extractor/telecinco.py with 100% similarity]
youtube_dlc/extractor/telegraaf.py [moved from youtube_dl/extractor/telegraaf.py with 100% similarity]
youtube_dlc/extractor/telemb.py [moved from youtube_dl/extractor/telemb.py with 100% similarity]
youtube_dlc/extractor/telequebec.py [moved from youtube_dl/extractor/telequebec.py with 100% similarity]
youtube_dlc/extractor/teletask.py [moved from youtube_dl/extractor/teletask.py with 100% similarity]
youtube_dlc/extractor/telewebion.py [moved from youtube_dl/extractor/telewebion.py with 100% similarity]
youtube_dlc/extractor/tennistv.py [moved from youtube_dl/extractor/tennistv.py with 100% similarity]
youtube_dlc/extractor/tenplay.py [moved from youtube_dl/extractor/tenplay.py with 100% similarity]
youtube_dlc/extractor/testurl.py [moved from youtube_dl/extractor/testurl.py with 100% similarity]
youtube_dlc/extractor/tf1.py [moved from youtube_dl/extractor/tf1.py with 100% similarity]
youtube_dlc/extractor/tfo.py [moved from youtube_dl/extractor/tfo.py with 100% similarity]
youtube_dlc/extractor/theintercept.py [moved from youtube_dl/extractor/theintercept.py with 100% similarity]
youtube_dlc/extractor/theplatform.py [moved from youtube_dl/extractor/theplatform.py with 100% similarity]
youtube_dlc/extractor/thescene.py [moved from youtube_dl/extractor/thescene.py with 100% similarity]
youtube_dlc/extractor/thestar.py [moved from youtube_dl/extractor/thestar.py with 100% similarity]
youtube_dlc/extractor/thesun.py [moved from youtube_dl/extractor/thesun.py with 100% similarity]
youtube_dlc/extractor/theweatherchannel.py [moved from youtube_dl/extractor/theweatherchannel.py with 100% similarity]
youtube_dlc/extractor/thisamericanlife.py [moved from youtube_dl/extractor/thisamericanlife.py with 100% similarity]
youtube_dlc/extractor/thisav.py [moved from youtube_dl/extractor/thisav.py with 100% similarity]
youtube_dlc/extractor/thisoldhouse.py [moved from youtube_dl/extractor/thisoldhouse.py with 100% similarity]
youtube_dlc/extractor/threeqsdn.py [moved from youtube_dl/extractor/threeqsdn.py with 100% similarity]
youtube_dlc/extractor/tiktok.py [moved from youtube_dl/extractor/tiktok.py with 100% similarity]
youtube_dlc/extractor/tinypic.py [moved from youtube_dl/extractor/tinypic.py with 100% similarity]
youtube_dlc/extractor/tmz.py [moved from youtube_dl/extractor/tmz.py with 100% similarity]
youtube_dlc/extractor/tnaflix.py [moved from youtube_dl/extractor/tnaflix.py with 100% similarity]
youtube_dlc/extractor/toggle.py [moved from youtube_dl/extractor/toggle.py with 100% similarity]
youtube_dlc/extractor/tonline.py [moved from youtube_dl/extractor/tonline.py with 100% similarity]
youtube_dlc/extractor/toongoggles.py [moved from youtube_dl/extractor/toongoggles.py with 100% similarity]
youtube_dlc/extractor/toutv.py [moved from youtube_dl/extractor/toutv.py with 100% similarity]
youtube_dlc/extractor/toypics.py [moved from youtube_dl/extractor/toypics.py with 100% similarity]
youtube_dlc/extractor/traileraddict.py [moved from youtube_dl/extractor/traileraddict.py with 100% similarity]
youtube_dlc/extractor/trilulilu.py [moved from youtube_dl/extractor/trilulilu.py with 100% similarity]
youtube_dlc/extractor/trunews.py [moved from youtube_dl/extractor/trunews.py with 100% similarity]
youtube_dlc/extractor/trutv.py [moved from youtube_dl/extractor/trutv.py with 100% similarity]
youtube_dlc/extractor/tube8.py [moved from youtube_dl/extractor/tube8.py with 100% similarity]
youtube_dlc/extractor/tubitv.py [moved from youtube_dl/extractor/tubitv.py with 100% similarity]
youtube_dlc/extractor/tudou.py [moved from youtube_dl/extractor/tudou.py with 100% similarity]
youtube_dlc/extractor/tumblr.py [moved from youtube_dl/extractor/tumblr.py with 100% similarity]
youtube_dlc/extractor/tunein.py [moved from youtube_dl/extractor/tunein.py with 100% similarity]
youtube_dlc/extractor/tunepk.py [moved from youtube_dl/extractor/tunepk.py with 100% similarity]
youtube_dlc/extractor/turbo.py [moved from youtube_dl/extractor/turbo.py with 100% similarity]
youtube_dlc/extractor/turner.py [moved from youtube_dl/extractor/turner.py with 100% similarity]
youtube_dlc/extractor/tv2.py [moved from youtube_dl/extractor/tv2.py with 100% similarity]
youtube_dlc/extractor/tv2dk.py [moved from youtube_dl/extractor/tv2dk.py with 100% similarity]
youtube_dlc/extractor/tv2hu.py [moved from youtube_dl/extractor/tv2hu.py with 100% similarity]
youtube_dlc/extractor/tv4.py [moved from youtube_dl/extractor/tv4.py with 100% similarity]
youtube_dlc/extractor/tv5mondeplus.py [moved from youtube_dl/extractor/tv5mondeplus.py with 100% similarity]
youtube_dlc/extractor/tva.py [moved from youtube_dl/extractor/tva.py with 100% similarity]
youtube_dlc/extractor/tvanouvelles.py [moved from youtube_dl/extractor/tvanouvelles.py with 100% similarity]
youtube_dlc/extractor/tvc.py [moved from youtube_dl/extractor/tvc.py with 100% similarity]
youtube_dlc/extractor/tvigle.py [moved from youtube_dl/extractor/tvigle.py with 100% similarity]
youtube_dlc/extractor/tvland.py [moved from youtube_dl/extractor/tvland.py with 100% similarity]
youtube_dlc/extractor/tvn24.py [moved from youtube_dl/extractor/tvn24.py with 100% similarity]
youtube_dlc/extractor/tvnet.py [moved from youtube_dl/extractor/tvnet.py with 100% similarity]
youtube_dlc/extractor/tvnoe.py [moved from youtube_dl/extractor/tvnoe.py with 100% similarity]
youtube_dlc/extractor/tvnow.py [moved from youtube_dl/extractor/tvnow.py with 76% similarity]
youtube_dlc/extractor/tvp.py [moved from youtube_dl/extractor/tvp.py with 100% similarity]
youtube_dlc/extractor/tvplay.py [moved from youtube_dl/extractor/tvplay.py with 100% similarity]
youtube_dlc/extractor/tvplayer.py [moved from youtube_dl/extractor/tvplayer.py with 100% similarity]
youtube_dlc/extractor/tweakers.py [moved from youtube_dl/extractor/tweakers.py with 100% similarity]
youtube_dlc/extractor/twentyfourvideo.py [moved from youtube_dl/extractor/twentyfourvideo.py with 100% similarity]
youtube_dlc/extractor/twentymin.py [moved from youtube_dl/extractor/twentymin.py with 100% similarity]
youtube_dlc/extractor/twentythreevideo.py [moved from youtube_dl/extractor/twentythreevideo.py with 100% similarity]
youtube_dlc/extractor/twitcasting.py [moved from youtube_dl/extractor/twitcasting.py with 100% similarity]
youtube_dlc/extractor/twitch.py [moved from youtube_dl/extractor/twitch.py with 94% similarity]
youtube_dlc/extractor/twitter.py [moved from youtube_dl/extractor/twitter.py with 100% similarity]
youtube_dlc/extractor/udemy.py [moved from youtube_dl/extractor/udemy.py with 99% similarity]
youtube_dlc/extractor/udn.py [moved from youtube_dl/extractor/udn.py with 100% similarity]
youtube_dlc/extractor/ufctv.py [moved from youtube_dl/extractor/ufctv.py with 100% similarity]
youtube_dlc/extractor/uktvplay.py [moved from youtube_dl/extractor/uktvplay.py with 100% similarity]
youtube_dlc/extractor/umg.py [moved from youtube_dl/extractor/umg.py with 100% similarity]
youtube_dlc/extractor/unistra.py [moved from youtube_dl/extractor/unistra.py with 100% similarity]
youtube_dlc/extractor/unity.py [moved from youtube_dl/extractor/unity.py with 100% similarity]
youtube_dlc/extractor/uol.py [moved from youtube_dl/extractor/uol.py with 100% similarity]
youtube_dlc/extractor/uplynk.py [moved from youtube_dl/extractor/uplynk.py with 100% similarity]
youtube_dlc/extractor/urort.py [moved from youtube_dl/extractor/urort.py with 100% similarity]
youtube_dlc/extractor/urplay.py [moved from youtube_dl/extractor/urplay.py with 100% similarity]
youtube_dlc/extractor/usanetwork.py [moved from youtube_dl/extractor/usanetwork.py with 100% similarity]
youtube_dlc/extractor/usatoday.py [moved from youtube_dl/extractor/usatoday.py with 100% similarity]
youtube_dlc/extractor/ustream.py [moved from youtube_dl/extractor/ustream.py with 100% similarity]
youtube_dlc/extractor/ustudio.py [moved from youtube_dl/extractor/ustudio.py with 100% similarity]
youtube_dlc/extractor/varzesh3.py [moved from youtube_dl/extractor/varzesh3.py with 100% similarity]
youtube_dlc/extractor/vbox7.py [moved from youtube_dl/extractor/vbox7.py with 100% similarity]
youtube_dlc/extractor/veehd.py [moved from youtube_dl/extractor/veehd.py with 100% similarity]
youtube_dlc/extractor/veoh.py [moved from youtube_dl/extractor/veoh.py with 100% similarity]
youtube_dlc/extractor/vesti.py [moved from youtube_dl/extractor/vesti.py with 100% similarity]
youtube_dlc/extractor/vevo.py [moved from youtube_dl/extractor/vevo.py with 100% similarity]
youtube_dlc/extractor/vgtv.py [moved from youtube_dl/extractor/vgtv.py with 100% similarity]
youtube_dlc/extractor/vh1.py [moved from youtube_dl/extractor/vh1.py with 100% similarity]
youtube_dlc/extractor/vice.py [moved from youtube_dl/extractor/vice.py with 100% similarity]
youtube_dlc/extractor/vidbit.py [moved from youtube_dl/extractor/vidbit.py with 100% similarity]
youtube_dlc/extractor/viddler.py [moved from youtube_dl/extractor/viddler.py with 100% similarity]
youtube_dlc/extractor/videa.py [moved from youtube_dl/extractor/videa.py with 58% similarity]
youtube_dlc/extractor/videodetective.py [moved from youtube_dl/extractor/videodetective.py with 100% similarity]
youtube_dlc/extractor/videofyme.py [moved from youtube_dl/extractor/videofyme.py with 100% similarity]
youtube_dlc/extractor/videomore.py [moved from youtube_dl/extractor/videomore.py with 100% similarity]
youtube_dlc/extractor/videopress.py [moved from youtube_dl/extractor/videopress.py with 100% similarity]
youtube_dlc/extractor/vidio.py [moved from youtube_dl/extractor/vidio.py with 100% similarity]
youtube_dlc/extractor/vidlii.py [moved from youtube_dl/extractor/vidlii.py with 100% similarity]
youtube_dlc/extractor/vidme.py [moved from youtube_dl/extractor/vidme.py with 100% similarity]
youtube_dlc/extractor/vidzi.py [moved from youtube_dl/extractor/vidzi.py with 96% similarity]
youtube_dlc/extractor/vier.py [moved from youtube_dl/extractor/vier.py with 100% similarity]
youtube_dlc/extractor/viewlift.py [moved from youtube_dl/extractor/viewlift.py with 100% similarity]
youtube_dlc/extractor/viidea.py [moved from youtube_dl/extractor/viidea.py with 100% similarity]
youtube_dlc/extractor/viki.py [moved from youtube_dl/extractor/viki.py with 98% similarity]
youtube_dlc/extractor/vimeo.py [moved from youtube_dl/extractor/vimeo.py with 99% similarity]
youtube_dlc/extractor/vimple.py [moved from youtube_dl/extractor/vimple.py with 100% similarity]
youtube_dlc/extractor/vine.py [moved from youtube_dl/extractor/vine.py with 100% similarity]
youtube_dlc/extractor/viqeo.py [moved from youtube_dl/extractor/viqeo.py with 100% similarity]
youtube_dlc/extractor/viu.py [moved from youtube_dl/extractor/viu.py with 100% similarity]
youtube_dlc/extractor/vk.py [moved from youtube_dl/extractor/vk.py with 100% similarity]
youtube_dlc/extractor/vlive.py [moved from youtube_dl/extractor/vlive.py with 100% similarity]
youtube_dlc/extractor/vodlocker.py [moved from youtube_dl/extractor/vodlocker.py with 100% similarity]
youtube_dlc/extractor/vodpl.py [moved from youtube_dl/extractor/vodpl.py with 100% similarity]
youtube_dlc/extractor/vodplatform.py [moved from youtube_dl/extractor/vodplatform.py with 100% similarity]
youtube_dlc/extractor/voicerepublic.py [moved from youtube_dl/extractor/voicerepublic.py with 100% similarity]
youtube_dlc/extractor/voot.py [moved from youtube_dl/extractor/voot.py with 100% similarity]
youtube_dlc/extractor/voxmedia.py [moved from youtube_dl/extractor/voxmedia.py with 100% similarity]
youtube_dlc/extractor/vrak.py [moved from youtube_dl/extractor/vrak.py with 100% similarity]
youtube_dlc/extractor/vrt.py [moved from youtube_dl/extractor/vrt.py with 100% similarity]
youtube_dlc/extractor/vrv.py [moved from youtube_dl/extractor/vrv.py with 100% similarity]
youtube_dlc/extractor/vshare.py [moved from youtube_dl/extractor/vshare.py with 100% similarity]
youtube_dlc/extractor/vube.py [moved from youtube_dl/extractor/vube.py with 100% similarity]
youtube_dlc/extractor/vuclip.py [moved from youtube_dl/extractor/vuclip.py with 100% similarity]
youtube_dlc/extractor/vvvvid.py [moved from youtube_dl/extractor/vvvvid.py with 100% similarity]
youtube_dlc/extractor/vyborymos.py [moved from youtube_dl/extractor/vyborymos.py with 100% similarity]
youtube_dlc/extractor/vzaar.py [moved from youtube_dl/extractor/vzaar.py with 100% similarity]
youtube_dlc/extractor/wakanim.py [moved from youtube_dl/extractor/wakanim.py with 100% similarity]
youtube_dlc/extractor/walla.py [moved from youtube_dl/extractor/walla.py with 100% similarity]
youtube_dlc/extractor/washingtonpost.py [moved from youtube_dl/extractor/washingtonpost.py with 100% similarity]
youtube_dlc/extractor/wat.py [moved from youtube_dl/extractor/wat.py with 100% similarity]
youtube_dlc/extractor/watchbox.py [moved from youtube_dl/extractor/watchbox.py with 100% similarity]
youtube_dlc/extractor/watchindianporn.py [moved from youtube_dl/extractor/watchindianporn.py with 100% similarity]
youtube_dlc/extractor/wdr.py [moved from youtube_dl/extractor/wdr.py with 97% similarity]
youtube_dlc/extractor/webcaster.py [moved from youtube_dl/extractor/webcaster.py with 100% similarity]
youtube_dlc/extractor/webofstories.py [moved from youtube_dl/extractor/webofstories.py with 100% similarity]
youtube_dlc/extractor/weibo.py [moved from youtube_dl/extractor/weibo.py with 100% similarity]
youtube_dlc/extractor/weiqitv.py [moved from youtube_dl/extractor/weiqitv.py with 100% similarity]
youtube_dlc/extractor/wistia.py [moved from youtube_dl/extractor/wistia.py with 100% similarity]
youtube_dlc/extractor/worldstarhiphop.py [moved from youtube_dl/extractor/worldstarhiphop.py with 100% similarity]
youtube_dlc/extractor/wsj.py [moved from youtube_dl/extractor/wsj.py with 100% similarity]
youtube_dlc/extractor/wwe.py [moved from youtube_dl/extractor/wwe.py with 100% similarity]
youtube_dlc/extractor/xbef.py [moved from youtube_dl/extractor/xbef.py with 100% similarity]
youtube_dlc/extractor/xboxclips.py [moved from youtube_dl/extractor/xboxclips.py with 100% similarity]
youtube_dlc/extractor/xfileshare.py [moved from youtube_dl/extractor/xfileshare.py with 100% similarity]
youtube_dlc/extractor/xhamster.py [moved from youtube_dl/extractor/xhamster.py with 100% similarity]
youtube_dlc/extractor/xiami.py [moved from youtube_dl/extractor/xiami.py with 100% similarity]
youtube_dlc/extractor/ximalaya.py [moved from youtube_dl/extractor/ximalaya.py with 100% similarity]
youtube_dlc/extractor/xminus.py [moved from youtube_dl/extractor/xminus.py with 100% similarity]
youtube_dlc/extractor/xnxx.py [moved from youtube_dl/extractor/xnxx.py with 100% similarity]
youtube_dlc/extractor/xstream.py [moved from youtube_dl/extractor/xstream.py with 100% similarity]
youtube_dlc/extractor/xtube.py [moved from youtube_dl/extractor/xtube.py with 100% similarity]
youtube_dlc/extractor/xuite.py [moved from youtube_dl/extractor/xuite.py with 100% similarity]
youtube_dlc/extractor/xvideos.py [moved from youtube_dl/extractor/xvideos.py with 100% similarity]
youtube_dlc/extractor/xxxymovies.py [moved from youtube_dl/extractor/xxxymovies.py with 100% similarity]
youtube_dlc/extractor/yahoo.py [moved from youtube_dl/extractor/yahoo.py with 100% similarity]
youtube_dlc/extractor/yandexdisk.py [moved from youtube_dl/extractor/yandexdisk.py with 100% similarity]
youtube_dlc/extractor/yandexmusic.py [moved from youtube_dl/extractor/yandexmusic.py with 99% similarity]
youtube_dlc/extractor/yandexvideo.py [moved from youtube_dl/extractor/yandexvideo.py with 100% similarity]
youtube_dlc/extractor/yapfiles.py [moved from youtube_dl/extractor/yapfiles.py with 100% similarity]
youtube_dlc/extractor/yesjapan.py [moved from youtube_dl/extractor/yesjapan.py with 100% similarity]
youtube_dlc/extractor/yinyuetai.py [moved from youtube_dl/extractor/yinyuetai.py with 100% similarity]
youtube_dlc/extractor/ynet.py [moved from youtube_dl/extractor/ynet.py with 100% similarity]
youtube_dlc/extractor/youjizz.py [moved from youtube_dl/extractor/youjizz.py with 100% similarity]
youtube_dlc/extractor/youku.py [moved from youtube_dl/extractor/youku.py with 100% similarity]
youtube_dlc/extractor/younow.py [moved from youtube_dl/extractor/younow.py with 100% similarity]
youtube_dlc/extractor/youporn.py [moved from youtube_dl/extractor/youporn.py with 100% similarity]
youtube_dlc/extractor/yourporn.py [moved from youtube_dl/extractor/yourporn.py with 100% similarity]
youtube_dlc/extractor/yourupload.py [moved from youtube_dl/extractor/yourupload.py with 100% similarity]
youtube_dlc/extractor/youtube.py [moved from youtube_dl/extractor/youtube.py with 98% similarity]
youtube_dlc/extractor/zapiks.py [moved from youtube_dl/extractor/zapiks.py with 100% similarity]
youtube_dlc/extractor/zaq1.py [moved from youtube_dl/extractor/zaq1.py with 100% similarity]
youtube_dlc/extractor/zattoo.py [moved from youtube_dl/extractor/zattoo.py with 100% similarity]
youtube_dlc/extractor/zdf.py [moved from youtube_dl/extractor/zdf.py with 95% similarity]
youtube_dlc/extractor/zingmp3.py [moved from youtube_dl/extractor/zingmp3.py with 100% similarity]
youtube_dlc/extractor/zype.py [moved from youtube_dl/extractor/zype.py with 100% similarity]
youtube_dlc/jsinterp.py [moved from youtube_dl/jsinterp.py with 100% similarity]
youtube_dlc/options.py [moved from youtube_dl/options.py with 96% similarity]
youtube_dlc/postprocessor/__init__.py [moved from youtube_dl/postprocessor/__init__.py with 100% similarity]
youtube_dlc/postprocessor/common.py [moved from youtube_dl/postprocessor/common.py with 100% similarity]
youtube_dlc/postprocessor/embedthumbnail.py [moved from youtube_dl/postprocessor/embedthumbnail.py with 72% similarity]
youtube_dlc/postprocessor/execafterdownload.py [moved from youtube_dl/postprocessor/execafterdownload.py with 100% similarity]
youtube_dlc/postprocessor/ffmpeg.py [moved from youtube_dl/postprocessor/ffmpeg.py with 99% similarity]
youtube_dlc/postprocessor/metadatafromtitle.py [moved from youtube_dl/postprocessor/metadatafromtitle.py with 100% similarity]
youtube_dlc/postprocessor/xattrpp.py [moved from youtube_dl/postprocessor/xattrpp.py with 100% similarity]
youtube_dlc/socks.py [moved from youtube_dl/socks.py with 100% similarity]
youtube_dlc/swfinterp.py [moved from youtube_dl/swfinterp.py with 100% similarity]
youtube_dlc/update.py [moved from youtube_dl/update.py with 93% similarity]
youtube_dlc/utils.py [moved from youtube_dl/utils.py with 99% similarity]
youtube_dlc/version.py [moved from youtube_dl/version.py with 58% similarity]

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
new file mode 100644 (file)
index 0000000..224a002
--- /dev/null
@@ -0,0 +1,33 @@
+# This workflows will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+name: Upload Python Package
+
+on:
+  push:
+    branches:
+      - release
+
+jobs:
+  deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        rm -rf dist/*
+        python setup.py sdist bdist_wheel
+        twine upload dist/*
index c4870a6baf478ed5526c76cf4088dabf09ecba6f..9d371d9978fe7fa089524604ae5d412c79e11ad8 100644 (file)
@@ -11,12 +11,20 @@ dist/
 MANIFEST
 README.txt
 youtube-dl.1
+youtube-dlc.1
 youtube-dl.bash-completion
+youtube-dlc.bash-completion
 youtube-dl.fish
+youtube-dlc.fish
 youtube_dl/extractor/lazy_extractors.py
+youtube_dlc/extractor/lazy_extractors.py
 youtube-dl
+youtube-dlc
 youtube-dl.exe
+youtube-dlc.exe
 youtube-dl.tar.gz
+youtube-dlc.tar.gz
+youtube-dlc.spec
 .coverage
 cover/
 updates_key.pem
@@ -41,6 +49,7 @@ updates_key.pem
 test/local_parameters.json
 .tox
 youtube-dl.zsh
+youtube-dlc.zsh
 
 # IntelliJ related files
 .idea
index 51afd469afe569df116d0dd5c200c426f36546b6..fb499845e4b652edf2661a724bb9f7e515d4f056 100644 (file)
@@ -12,29 +12,18 @@ python:
 dist: trusty
 env:
   - YTDL_TEST_SET=core
-  - YTDL_TEST_SET=download
 jobs:
   include:
     - python: 3.7
       dist: xenial
       env: YTDL_TEST_SET=core
-    - python: 3.7
-      dist: xenial
-      env: YTDL_TEST_SET=download
     - python: 3.8
       dist: xenial
       env: YTDL_TEST_SET=core
-    - python: 3.8
-      dist: xenial
-      env: YTDL_TEST_SET=download
     - python: 3.8-dev
       dist: xenial
       env: YTDL_TEST_SET=core
-    - python: 3.8-dev
-      dist: xenial
-      env: YTDL_TEST_SET=download
     - env: JYTHON=true; YTDL_TEST_SET=core
-    - env: JYTHON=true; YTDL_TEST_SET=download
     - name: flake8
       python: 3.8
       dist: xenial
@@ -44,7 +33,6 @@ jobs:
   allow_failures:
     - env: YTDL_TEST_SET=download
     - env: JYTHON=true; YTDL_TEST_SET=core
-    - env: JYTHON=true; YTDL_TEST_SET=download
 before_install:
   - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi
 script: ./devscripts/run_tests.sh
index 4e43e99f394dfc8506447ea4e8328467f5f6a8f5..d2cce9a1cc718446475b4a7e95919d41fbf70731 100644 (file)
@@ -2,8 +2,8 @@ include README.md
 include LICENSE
 include AUTHORS
 include ChangeLog
-include youtube-dl.bash-completion
-include youtube-dl.fish
-include youtube-dl.1
+include youtube-dlc.bash-completion
+include youtube-dlc.fish
+include youtube-dlc.1
 recursive-include docs Makefile conf.py *.rst
 recursive-include test *
index 3e17365b83d62cf320f70bc45189e78937ec89d3..9588657c15b0360f258a807f767ce22981218230 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-all: youtube-dl README.md CONTRIBUTING.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
+all: youtube-dlc README.md CONTRIBUTING.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
 
 clean:
-       rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish youtube_dl/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
+       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 CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
        find . -name "*.pyc" -delete
        find . -name "*.class" -delete
 
@@ -17,23 +17,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-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
+install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
        install -d $(DESTDIR)$(BINDIR)
-       install -m 755 youtube-dl $(DESTDIR)$(BINDIR)
+       install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
        install -d $(DESTDIR)$(MANDIR)/man1
-       install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
+       install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
        install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
-       install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
+       install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
        install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
-       install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl
+       install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc
        install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
-       install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
+       install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish
 
 codetest:
        flake8 .
 
 test:
-       #nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
+       #nosetests --with-coverage --cover-package=youtube_dlc --cover-html --verbose --processes 4 test
        nosetests --verbose test
        $(MAKE) codetest
 
@@ -51,34 +51,34 @@ offlinetest: codetest
                --exclude test_youtube_lists.py \
                --exclude test_youtube_signature.py
 
-tar: youtube-dl.tar.gz
+tar: youtube-dlc.tar.gz
 
 .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
 
-pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish
+pypi-files: youtube-dlc.bash-completion README.txt youtube-dlc.1 youtube-dlc.fish
 
-youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
+youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
        mkdir -p zip
-       for d in youtube_dl youtube_dl/downloader youtube_dl/extractor youtube_dl/postprocessor ; do \
+       for d in youtube_dlc youtube_dlc/downloader youtube_dlc/extractor youtube_dlc/postprocessor ; do \
          mkdir -p zip/$$d ;\
          cp -pPR $$d/*.py zip/$$d/ ;\
        done
-       touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py
-       mv zip/youtube_dl/__main__.py zip/
-       cd zip ; zip -q ../youtube-dl youtube_dl/*.py youtube_dl/*/*.py __main__.py
+       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
        rm -rf zip
-       echo '#!$(PYTHON)' > youtube-dl
-       cat youtube-dl.zip >> youtube-dl
-       rm youtube-dl.zip
-       chmod a+x youtube-dl
+       echo '#!$(PYTHON)' > youtube-dlc
+       cat youtube-dlc.zip >> youtube-dlc
+       rm youtube-dlc.zip
+       chmod a+x youtube-dlc
 
-README.md: youtube_dl/*.py youtube_dl/*/*.py
-       COLUMNS=80 $(PYTHON) youtube_dl/__main__.py --help | $(PYTHON) devscripts/make_readme.py
+README.md: youtube_dlc/*.py youtube_dlc/*/*.py
+       COLUMNS=80 $(PYTHON) youtube_dlc/__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_dl/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 youtube_dlc/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
@@ -91,34 +91,34 @@ supportedsites:
 README.txt: README.md
        pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-youtube-dl.1: README.md
-       $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
-       pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1
-       rm -f youtube-dl.1.temp.md
+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
 
-youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
+youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
        $(PYTHON) devscripts/bash-completion.py
 
-bash-completion: youtube-dl.bash-completion
+bash-completion: youtube-dlc.bash-completion
 
-youtube-dl.zsh: youtube_dl/*.py youtube_dl/*/*.py devscripts/zsh-completion.in
+youtube-dlc.zsh: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/zsh-completion.in
        $(PYTHON) devscripts/zsh-completion.py
 
-zsh-completion: youtube-dl.zsh
+zsh-completion: youtube-dlc.zsh
 
-youtube-dl.fish: youtube_dl/*.py youtube_dl/*/*.py devscripts/fish-completion.in
+youtube-dlc.fish: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/fish-completion.in
        $(PYTHON) devscripts/fish-completion.py
 
-fish-completion: youtube-dl.fish
+fish-completion: youtube-dlc.fish
 
-lazy-extractors: youtube_dl/extractor/lazy_extractors.py
+lazy-extractors: youtube_dlc/extractor/lazy_extractors.py
 
-_EXTRACTOR_FILES = $(shell find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
-youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
+_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)
        $(PYTHON) devscripts/make_lazy_extractors.py $@
 
-youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish ChangeLog AUTHORS
-       @tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
+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 \
                --exclude '*.DS_Store' \
                --exclude '*.kate-swp' \
                --exclude '*.pyc' \
@@ -128,8 +128,8 @@ youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-
                --exclude '.git' \
                --exclude 'docs/_build' \
                -- \
-               bin devscripts test youtube_dl docs \
+               bin devscripts test youtube_dlc docs \
                ChangeLog AUTHORS LICENSE README.md README.txt \
-               Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
-               youtube-dl.zsh youtube-dl.fish setup.py setup.cfg \
-               youtube-dl
+               Makefile MANIFEST.in youtube-dlc.1 youtube-dlc.bash-completion \
+               youtube-dlc.zsh youtube-dlc.fish setup.py setup.cfg \
+               youtube-dlc
index 45326c69ec5bf3fa6665cca18e808a06546ce8ea..6ca488016719a8f4004ddc79572c997e4183c2fd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,54 +1,57 @@
-[![Build Status](https://travis-ci.org/ytdl-org/youtube-dl.svg?branch=master)](https://travis-ci.org/ytdl-org/youtube-dl)
+[![PyPi](https://img.shields.io/pypi/v/youtube-dlc.svg)](https://pypi.org/project/youtube-dlc)
+[![Build Status](https://travis-ci.com/blackjack4494/youtube-dlc.svg?branch=master)](https://travis-ci.com/blackjack4494/youtube-dlc)
+[![Downloads](https://pepy.tech/badge/youtube-dlc)](https://pepy.tech/project/youtube-dlc)
 
-youtube-dl - download videos from youtube.com or other video platforms
+youtube-dlc - download videos from youtube.com or other video platforms
 
 - [INSTALLATION](#installation)
 - [DESCRIPTION](#description)
 - [OPTIONS](#options)
-- [CONFIGURATION](#configuration)
-- [OUTPUT TEMPLATE](#output-template)
-- [FORMAT SELECTION](#format-selection)
-- [VIDEO SELECTION](#video-selection)
-- [FAQ](#faq)
-- [DEVELOPER INSTRUCTIONS](#developer-instructions)
-- [EMBEDDING YOUTUBE-DL](#embedding-youtube-dl)
-- [BUGS](#bugs)
 - [COPYRIGHT](#copyright)
 
 # INSTALLATION
 
-To install it right away for all UNIX users (Linux, macOS, etc.), type:
+**All Platforms**  
+Preferred way using pip:  
+You may want to use `python3` instead of `python`
 
-    sudo curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl
-    sudo chmod a+rx /usr/local/bin/youtube-dl
+    python -m pip install --upgrade youtube-dlc
 
-If you do not have curl, you can alternatively use a recent wget:
+**UNIX** (Linux, macOS, etc.)  
+Using wget:
 
-    sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl
-    sudo chmod a+rx /usr/local/bin/youtube-dl
+    sudo wget https://github.com/blackjack4494/youtube-dlc/releases/latest/download/youtube-dlc -O /usr/local/bin/youtube-dlc
+    sudo chmod a+rx /usr/local/bin/youtube-dlc
 
-Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.exe) and place it in any location on their [PATH](https://en.wikipedia.org/wiki/PATH_%28variable%29) except for `%SYSTEMROOT%\System32` (e.g. **do not** put in `C:\Windows\System32`).
+Using curl:
 
-You can also use pip:
+    sudo curl -L https://github.com/blackjack4494/youtube-dlc/releases/latest/download/youtube-dlc -o /usr/local/bin/youtube-dlc
+    sudo chmod a+rx /usr/local/bin/youtube-dlc
 
-    sudo -H pip install --upgrade youtube-dl
-    
-This command will update youtube-dl if you have already installed it. See the [pypi page](https://pypi.python.org/pypi/youtube_dl) for more information.
 
-macOS users can install youtube-dl with [Homebrew](https://brew.sh/):
+**Windows** users can download [youtube-dlc.exe](https://github.com/blackjack4494/youtube-dlc/releases/latest/download/youtube-dlc.exe) (**do not** put in `C:\Windows\System32`!).  
+
+**Compile**
+To build the Windows executable yourself
 
-    brew install youtube-dl
+    python -m pip install --upgrade pyinstaller
+    pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
+    
+Or simply execute the `make_win.bat` if pyinstaller is installed.
+There will be a `youtube-dlc.exe` in `/dist`  
 
-Or with [MacPorts](https://www.macports.org/):
+For Unix:
+You will need the required build tools  
+python, make (GNU), pandoc, zip, nosetests  
+Then simply type this
 
-    sudo port install youtube-dl
+    make
 
-Alternatively, refer to the [developer instructions](#developer-instructions) for how to check out and work with the git repository. For further options, including PGP signatures, see the [youtube-dl Download Page](https://ytdl-org.github.io/youtube-dl/download.html).
 
 # DESCRIPTION
-**youtube-dl** is a command-line program to download videos from YouTube.com and a few more sites. 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** is a command-line program to download videos from YouTube.com and a few more sites. 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-dl [OPTIONS] URL [URL...]
+    youtube-dlc [OPTIONS] URL [URL...]
 
 # OPTIONS
     -h, --help                       Print this help text and exit
@@ -69,19 +72,19 @@ # OPTIONS
                                      extractor
     --default-search PREFIX          Use this prefix for unqualified URLs. For
                                      example "gvsearch2:" downloads two videos
-                                     from google videos for youtube-dl "large
+                                     from google videos for youtube-dlc "large
                                      apple". Use the value "auto" to let
-                                     youtube-dl guess ("auto_warning" to emit a
+                                     youtube-dlc guess ("auto_warning" to emit a
                                      warning when guessing). "error" just throws
                                      an error. The default value "fixup_error"
                                      repairs broken URLs, but emits an error if
                                      this is not possible instead of searching.
     --ignore-config                  Do not read configuration files. When given
                                      in the global configuration file
-                                     /etc/youtube-dl.conf: Do not read the user
+                                     /etc/youtube-dlc.conf: Do not read the user
                                      configuration in ~/.config/youtube-
-                                     dl/config (%APPDATA%/youtube-dl/config.txt
-                                     on Windows)
+                                     dlc/config (%APPDATA%/youtube-
+                                     dlc/config.txt on Windows)
     --config-location PATH           Location of the configuration file; either
                                      the path to the config or its containing
                                      directory.
@@ -238,7 +241,7 @@ ## Filesystem Options:
                                      filenames
     -w, --no-overwrites              Do not overwrite files
     -c, --continue                   Force resume of partially downloaded files.
-                                     By default, youtube-dl will resume
+                                     By default, youtube-dlc will resume
                                      downloads if possible.
     --no-continue                    Do not resume partially downloaded files
                                      (restart from beginning)
@@ -256,11 +259,11 @@ ## Filesystem Options:
                                      option)
     --cookies FILE                   File to read cookies from and dump cookie
                                      jar in
-    --cache-dir DIR                  Location in the filesystem where youtube-dl
-                                     can store some downloaded information
+    --cache-dir DIR                  Location in the filesystem where youtube-
+                                     dlc can store some downloaded information
                                      permanently. By default
-                                     $XDG_CACHE_HOME/youtube-dl or
-                                     ~/.cache/youtube-dl . At the moment, only
+                                     $XDG_CACHE_HOME/youtube-dlc or
+                                     ~/.cache/youtube-dlc . At the moment, only
                                      YouTube player files (for videos with
                                      obfuscated signatures) are cached, but that
                                      may change.
@@ -306,8 +309,9 @@ ## Verbosity / Simulation Options:
                                      files in the current directory to debug
                                      problems
     --print-traffic                  Display sent and read HTTP traffic
-    -C, --call-home                  Contact the youtube-dl server for debugging
-    --no-call-home                   Do NOT contact the youtube-dl server for
+    -C, --call-home                  Contact the youtube-dlc server for
+                                     debugging
+    --no-call-home                   Do NOT contact the youtube-dlc server for
                                      debugging
 
 ## Workarounds:
@@ -368,7 +372,7 @@ ## Subtitle Options:
 ## Authentication Options:
     -u, --username USERNAME          Login with this account ID
     -p, --password PASSWORD          Account password. If this option is left
-                                     out, youtube-dl will ask interactively.
+                                     out, youtube-dlc will ask interactively.
     -2, --twofactor TWOFACTOR        Two-factor authentication code
     -n, --netrc                      Use .netrc authentication data
     --video-password PASSWORD        Video password (vimeo, smotri, youku)
@@ -379,8 +383,8 @@ ## Adobe Pass Options:
                                      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-dl will
-                                     ask interactively.
+                                     If this option is left out, youtube-dlc
+                                     will ask interactively.
     --ap-list-mso                    List all supported multiple-system
                                      operators
 
@@ -440,1007 +444,3 @@ ## Post-processing Options:
     --convert-subs FORMAT            Convert the subtitles to other format
                                      (currently supported: srt|ass|vtt|lrc)
 
-# CONFIGURATION
-
-You can configure youtube-dl by placing any supported command line option to a configuration file. On Linux and macOS, the system wide configuration file is located at `/etc/youtube-dl.conf` and the user wide configuration file at `~/.config/youtube-dl/config`. On Windows, the user wide configuration file locations are `%APPDATA%\youtube-dl\config.txt` or `C:\Users\<user name>\youtube-dl.conf`. Note that by default configuration file may not exist so you may need to create it yourself.
-
-For example, with the following configuration file youtube-dl will always extract the audio, not copy the mtime, use a proxy and save all videos under `Movies` directory in your home directory:
-```
-# Lines starting with # are comments
-
-# Always extract audio
--x
-
-# Do not copy the mtime
---no-mtime
-
-# Use this proxy
---proxy 127.0.0.1:3128
-
-# Save all videos under Movies directory in your home directory
--o ~/Movies/%(title)s.%(ext)s
-```
-
-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 the configuration file for a particular youtube-dl run.
-
-You can also use `--config-location` if you want to use custom configuration file for a particular youtube-dl run.
-
-### 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-dl 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
-```
-After that you can add credentials for an extractor in the following format, where *extractor* is the name of the extractor in lowercase:
-```
-machine <extractor> login <login> password <password>
-```
-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-dl or place it in the [configuration file](#configuration).
-
-On Windows you may also need to setup the `%HOME%` environment variable manually. For example:
-```
-set HOME=%USERPROFILE%
-```
-
-# OUTPUT TEMPLATE
-
-The `-o` option allows users to indicate a template for the output file names.
-
-**tl;dr:** [navigate me to examples](#output-template-examples).
-
-The basic usage is not to set any template arguments when downloading a single file, like in `youtube-dl -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. Allowed names along with sequence type are:
-
- - `id` (string): Video identifier
- - `title` (string): Video title
- - `url` (string): Video URL
- - `ext` (string): Video filename extension
- - `alt_title` (string): A secondary title of the video
- - `display_id` (string): An alternative identifier for the video
- - `uploader` (string): Full name of the video uploader
- - `license` (string): License name the video is licensed under
- - `creator` (string): The creator of the video
- - `release_date` (string): The date (YYYYMMDD) when the video was released
- - `timestamp` (numeric): UNIX timestamp of the moment the video became available
- - `upload_date` (string): Video upload date (YYYYMMDD)
- - `uploader_id` (string): Nickname or id of the video uploader
- - `channel` (string): Full name of the channel the video is uploaded on
- - `channel_id` (string): Id of the channel
- - `location` (string): Physical location where the video was filmed
- - `duration` (numeric): Length of the video in seconds
- - `view_count` (numeric): How many users have watched the video on the platform
- - `like_count` (numeric): Number of positive ratings of the video
- - `dislike_count` (numeric): Number of negative ratings of the video
- - `repost_count` (numeric): Number of reposts of the video
- - `average_rating` (numeric): Average rating give by users, the scale used depends on the webpage
- - `comment_count` (numeric): Number of comments on the video
- - `age_limit` (numeric): Age restriction for the video (years)
- - `is_live` (boolean): Whether this video is a live stream or a fixed-length video
- - `start_time` (numeric): Time in seconds where the reproduction should start, as specified in the URL
- - `end_time` (numeric): Time in seconds where the reproduction should end, as specified in the URL
- - `format` (string): A human-readable description of the format 
- - `format_id` (string): Format code specified by `--format`
- - `format_note` (string): Additional info about the format
- - `width` (numeric): Width of the video
- - `height` (numeric): Height of the video
- - `resolution` (string): Textual description of width and height
- - `tbr` (numeric): Average bitrate of audio and video in KBit/s
- - `abr` (numeric): Average audio bitrate in KBit/s
- - `acodec` (string): Name of the audio codec in use
- - `asr` (numeric): Audio sampling rate in Hertz
- - `vbr` (numeric): Average video bitrate in KBit/s
- - `fps` (numeric): Frame rate
- - `vcodec` (string): Name of the video codec in use
- - `container` (string): Name of the container format
- - `filesize` (numeric): The number of bytes, if known in advance
- - `filesize_approx` (numeric): An estimate for the number of bytes
- - `protocol` (string): The protocol that will be used for the actual download
- - `extractor` (string): Name of the extractor
- - `extractor_key` (string): Key name of the extractor
- - `epoch` (numeric): Unix epoch when creating the file
- - `autonumber` (numeric): Five-digit number that will be increased with each download, starting at zero
- - `playlist` (string): Name or id of the playlist that contains the video
- - `playlist_index` (numeric): Index of the video in the playlist padded with leading zeros according to the total length of the playlist
- - `playlist_id` (string): Playlist identifier
- - `playlist_title` (string): Playlist title
- - `playlist_uploader` (string): Full name of the playlist uploader
- - `playlist_uploader_id` (string): Nickname or id of the playlist uploader
-
-Available for the video that belongs to some logical chapter or section:
-
- - `chapter` (string): Name or title of the chapter the video belongs to
- - `chapter_number` (numeric): Number of the chapter the video belongs to
- - `chapter_id` (string): Id of the chapter the video belongs to
-
-Available for the video that is an episode of some series or programme:
-
- - `series` (string): Title of the series or programme the video episode belongs to
- - `season` (string): Title of the season the video episode belongs to
- - `season_number` (numeric): Number of the season the video episode belongs to
- - `season_id` (string): Id of the season the video episode belongs to
- - `episode` (string): Title of the video episode
- - `episode_number` (numeric): Number of the video episode within a season
- - `episode_id` (string): Id of the video episode
-
-Available for the media that is a track or a part of a music album:
-
- - `track` (string): Title of the track
- - `track_number` (numeric): Number of the track within an album or a disc
- - `track_id` (string): Id of the track
- - `artist` (string): Artist(s) of the track
- - `genre` (string): Genre(s) of the track
- - `album` (string): Title of the album the track belongs to
- - `album_type` (string): Type of the album
- - `album_artist` (string): List of all artists appeared on the album
- - `disc_number` (numeric): Number of the disc or other physical medium the track belongs to
- - `release_year` (numeric): Year (YYYY) when the album was released
-
-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 `NA`.
-
-For example for `-o %(title)s-%(id)s.%(ext)s` and an mp4 video with title `youtube-dl test video` and id `BaW_jenozKcj`, this will result in a `youtube-dl 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`.
-
-Output templates can also contain arbitrary hierarchical path, e.g. `-o '%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s'` which will result in downloading each video in a directory corresponding to this path template. Any missing directory will be automatically created for you.
-
-To use percent literals in an output template use `%%`. To output to stdout use `-o -`.
-
-The current default template is `%(title)s-%(id)s.%(ext)s`.
-
-In some cases, you don't want special characters such as 中, spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the `--restrict-filenames` flag to get a shorter title:
-
-#### Output template and Windows batch files
-
-If you are using an output template inside a Windows batch file then you must escape plain percent characters (`%`) by doubling, so that `-o "%(title)s-%(id)s.%(ext)s"` should become `-o "%%(title)s-%%(id)s.%%(ext)s"`. However you should not touch `%`'s that are not plain characters, e.g. environment variables for expansion should stay intact: `-o "C:\%HOMEPATH%\Desktop\%%(title)s.%%(ext)s"`.
-
-#### Output template examples
-
-Note that on Windows you may need to use double quotes instead of single.
-
-```bash
-$ youtube-dl --get-filename -o '%(title)s.%(ext)s' BaW_jenozKc
-youtube-dl test video ''_ä↭𝕐.mp4    # All kinds of weird characters
-
-$ youtube-dl --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-dl -o '%(playlist)s/%(playlist_index)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-dl -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-dl -u user -p password -o '~/MyVideos/%(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-dl -o "C:/MyVideos/%(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-dl -o - BaW_jenozKc
-```
-
-# FORMAT SELECTION
-
-By default youtube-dl tries to download the best available quality, i.e. if you want the best quality you **don't need** to pass any special options, youtube-dl will guess it for you by **default**.
-
-But sometimes you may want to download in a different format, for example when you are on a slow or intermittent connection. The key mechanism for achieving this is so-called *format selection* based on which you can explicitly specify desired format, select formats based on some criterion or criteria, setup precedence and much more.
-
-The general syntax for format selection is `--format FORMAT` or shorter `-f FORMAT` where `FORMAT` is a *selector expression*, i.e. an expression that describes format or formats you would like to download.
-
-**tl;dr:** [navigate me to examples](#format-selection-examples).
-
-The simplest case is requesting a specific format, for example with `-f 22` you can download the format with format code equal to 22. You can get the list of available format codes for particular video using `--list-formats` or `-F`. Note that these format codes are extractor specific. 
-
-You can also use a file extension (currently `3gp`, `aac`, `flv`, `m4a`, `mp3`, `mp4`, `ogg`, `wav`, `webm` are supported) to download the best quality format of a particular file extension served as a single file, e.g. `-f webm` will download the best quality format with the `webm` extension served as a single file.
-
-You can also use special names to select particular edge case formats:
-
- - `best`: Select the best quality format represented by a single file with video and audio.
- - `worst`: Select the worst quality format represented by a single file with video and audio.
- - `bestvideo`: Select the best quality video-only format (e.g. DASH video). May not be available.
- - `worstvideo`: Select the worst quality video-only format. May not be available.
- - `bestaudio`: Select the best quality audio only-format. May not be available.
- - `worstaudio`: Select the worst quality audio only-format. May not be available.
-
-For example, to download the worst quality video-only format you can use `-f worstvideo`.
-
-If you want to download multiple videos and they don't have the same formats available, you can specify the order of preference using slashes. Note that slash is left-associative, i.e. formats on the left hand side are preferred, for example `-f 22/17/18` will download format 22 if it's available, otherwise it will download format 17 if it's available, otherwise it will download format 18 if it's available, otherwise it will complain that no suitable formats are available for download.
-
-If you want to download several formats of the same video use a comma as a separator, e.g. `-f 22,17,18` will download all these three formats, of course if they are available. Or a more sophisticated example combined with the precedence feature: `-f 136/137/mp4/bestvideo,140/m4a/bestaudio`.
-
-You can also filter the video formats by putting a condition in brackets, as in `-f "best[height=720]"` (or `-f "[filesize>10M]"`).
-
-The following numeric meta fields can be used with comparisons `<`, `<=`, `>`, `>=`, `=` (equals), `!=` (not equals):
-
- - `filesize`: The number of bytes, if known in advance
- - `width`: Width of the video, if known
- - `height`: Height of the video, if known
- - `tbr`: Average bitrate of audio and video in KBit/s
- - `abr`: Average audio bitrate in KBit/s
- - `vbr`: Average video bitrate in KBit/s
- - `asr`: Audio sampling rate in Hertz
- - `fps`: Frame rate
-
-Also filtering work for comparisons `=` (equals), `^=` (starts with), `$=` (ends with), `*=` (contains) and following string meta fields:
-
- - `ext`: File extension
- - `acodec`: Name of the audio codec in use
- - `vcodec`: Name of the video codec in use
- - `container`: Name of the container format
- - `protocol`: The protocol that will be used for the actual download, lower-case (`http`, `https`, `rtsp`, `rtmp`, `rtmpe`, `mms`, `f4m`, `ism`, `http_dash_segments`, `m3u8`, or `m3u8_native`)
- - `format_id`: A short description of the format
-
-Any string comparison may be prefixed with negation `!` in order to produce an opposite comparison, e.g. `!*=` (does not contain).
-
-Note that none of the aforementioned meta fields are guaranteed to be present since this solely depends on the metadata obtained by particular extractor, i.e. the metadata offered by the video hoster.
-
-Formats for which the value is not known are excluded unless you put a question mark (`?`) after the operator. You can combine format filters, so `-f "[height <=? 720][tbr>500]"` selects up to 720p videos (or videos where the height is not known) with a bitrate of at least 500 KBit/s.
-
-You can merge the video and audio of two formats into a single file using `-f <video-format>+<audio-format>` (requires ffmpeg or avconv installed), for example `-f bestvideo+bestaudio` will download the best video-only format, the best audio-only format and mux them together with ffmpeg/avconv.
-
-Format selectors can also be grouped using parentheses, for example if you want to download the best mp4 and webm formats with a height lower than 480 you can use `-f '(mp4,webm)[height<480]'`.
-
-Since the end of April 2015 and version 2015.04.26, youtube-dl uses `-f bestvideo+bestaudio/best` as the default format selection (see [#5447](https://github.com/ytdl-org/youtube-dl/issues/5447), [#5456](https://github.com/ytdl-org/youtube-dl/issues/5456)). If ffmpeg or avconv are installed this results in downloading `bestvideo` and `bestaudio` separately and muxing them together into a single file giving the best overall quality available. Otherwise it falls back to `best` and results in downloading the best available quality served as a single file. `best` is also needed for videos that don't come from YouTube because they don't provide the audio and video in two different files. If you want to only download some DASH formats (for example if you are not interested in getting videos with a resolution higher than 1080p), you can add `-f bestvideo[height<=?1080]+bestaudio/best` to your configuration file. Note that if you use youtube-dl to stream to `stdout` (and most likely to pipe it to your media player then), i.e. you explicitly specify output template as `-o -`, youtube-dl still uses `-f best` format selection in order to start content delivery immediately to your player and not to wait until `bestvideo` and `bestaudio` are downloaded and muxed.
-
-If you want to preserve the old format selection behavior (prior to youtube-dl 2015.04.26), i.e. you want to download the best available quality media served as a single file, you should explicitly specify your choice with `-f best`. You may want to add it to the [configuration file](#configuration) in order not to type it every time you run youtube-dl.
-
-#### Format selection examples
-
-Note that on Windows you may need to use double quotes instead of single.
-
-```bash
-# Download best mp4 format available or any other best if no mp4 available
-$ youtube-dl -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best'
-
-# Download best format available but no better than 480p
-$ youtube-dl -f 'bestvideo[height<=480]+bestaudio/best[height<=480]'
-
-# Download best video only format but no bigger than 50 MB
-$ youtube-dl -f 'best[filesize<50M]'
-
-# Download best format available via direct link over HTTP/HTTPS protocol
-$ youtube-dl -f '(bestvideo+bestaudio/best)[protocol^=http]'
-
-# Download the best video format and the best audio format without merging them
-$ youtube-dl -f 'bestvideo,bestaudio' -o '%(title)s.f%(format_id)s.%(ext)s'
-```
-Note that in the last example, an output template is recommended as bestvideo and bestaudio may have the same file name.
-
-
-# VIDEO SELECTION
-
-Videos can be filtered by their upload date using the options `--date`, `--datebefore` or `--dateafter`. They accept dates in two formats:
-
- - Absolute dates: Dates in the format `YYYYMMDD`.
- - Relative dates: Dates in the format `(now|today)[+-][0-9](day|week|month|year)(s)?`
-Examples:
-
-```bash
-# Download only the videos uploaded in the last 6 months
-$ youtube-dl --dateafter now-6months
-
-# Download only the videos uploaded on January 1, 1970
-$ youtube-dl --date 19700101
-
-$ # Download only the videos uploaded in the 200x decade
-$ youtube-dl --dateafter 20000101 --datebefore 20091231
-```
-
-# FAQ
-
-### How do I update youtube-dl?
-
-If you've followed [our manual installation instructions](https://ytdl-org.github.io/youtube-dl/download.html), you can simply run `youtube-dl -U` (or, on Linux, `sudo youtube-dl -U`).
-
-If you have used pip, a simple `sudo pip install -U youtube-dl` is sufficient to update.
-
-If you have installed youtube-dl using a package manager like *apt-get* or *yum*, use the standard system update mechanism to update. Note that distribution packages are often outdated. As a rule of thumb, youtube-dl releases at least once a month, and often weekly or even daily. Simply go to https://yt-dl.org to find out the current version. Unfortunately, there is nothing we youtube-dl developers can do if your distribution serves a really outdated version. You can (and should) complain to your distribution in their bugtracker or support forum.
-
-As a last resort, you can also uninstall the version installed by your package manager and follow our manual installation instructions. For that, remove the distribution's package, with a line like
-
-    sudo apt-get remove -y youtube-dl
-
-Afterwards, simply follow [our manual installation instructions](https://ytdl-org.github.io/youtube-dl/download.html):
-
-```
-sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl
-sudo chmod a+rx /usr/local/bin/youtube-dl
-hash -r
-```
-
-Again, from then on you'll be able to update with `sudo youtube-dl -U`.
-
-### youtube-dl is extremely slow to start on Windows
-
-Add a file exclusion for `youtube-dl.exe` in Windows Defender settings.
-
-### I'm getting an error `Unable to extract OpenGraph title` on YouTube playlists
-
-YouTube changed their playlist format in March 2014 and later on, so you'll need at least youtube-dl 2014.07.25 to download all YouTube videos.
-
-If you have installed youtube-dl with a package manager, pip, setup.py or a tarball, please use that to update. Note that Ubuntu packages do not seem to get updated anymore. Since we are not affiliated with Ubuntu, there is little we can do. Feel free to [report bugs](https://bugs.launchpad.net/ubuntu/+source/youtube-dl/+filebug) to the [Ubuntu packaging people](mailto:ubuntu-motu@lists.ubuntu.com?subject=outdated%20version%20of%20youtube-dl) - all they have to do is update the package to a somewhat recent version. See above for a way to update.
-
-### I'm getting an error when trying to use output template: `error: using output template conflicts with using title, video ID or auto number`
-
-Make sure you are not using `-o` with any of these options `-t`, `--title`, `--id`, `-A` or `--auto-number` set in command line or in a configuration file. Remove the latter if any.
-
-### Do I always have to pass `-citw`?
-
-By default, youtube-dl intends to have the best options (incidentally, if you have a convincing case that these should be different, [please file an issue where you explain that](https://yt-dl.org/bug)). Therefore, it is unnecessary and sometimes harmful to copy long option strings from webpages. In particular, the only option out of `-citw` that is regularly useful is `-i`.
-
-### Can you please put the `-b` option back?
-
-Most people asking this question are not aware that youtube-dl now defaults to downloading the highest available quality as reported by YouTube, which will be 1080p or 720p in some cases, so you no longer need the `-b` option. For some specific videos, maybe YouTube does not report them to be available in a specific high quality format you're interested in. In that case, simply request it with the `-f` option and youtube-dl will try to download it.
-
-### I get HTTP error 402 when trying to download a video. What's this?
-
-Apparently YouTube requires you to pass a CAPTCHA test if you download too much. We're [considering to provide a way to let you solve the CAPTCHA](https://github.com/ytdl-org/youtube-dl/issues/154), but at the moment, your best course of action is pointing a web browser to the youtube URL, solving the CAPTCHA, and restart youtube-dl.
-
-### Do I need any other programs?
-
-youtube-dl works fine on its own on most sites. However, if you want to convert video/audio, you'll need [avconv](https://libav.org/) or [ffmpeg](https://www.ffmpeg.org/). On some sites - most notably YouTube - videos can be retrieved in a higher quality format without sound. youtube-dl will detect whether avconv/ffmpeg is present and automatically pick the best option.
-
-Videos or video formats streamed via RTMP protocol can only be downloaded when [rtmpdump](https://rtmpdump.mplayerhq.hu/) is installed. Downloading MMS and RTSP videos requires either [mplayer](https://mplayerhq.hu/) or [mpv](https://mpv.io/) to be installed.
-
-### I have downloaded a video but how can I play it?
-
-Once the video is fully downloaded, use any video player, such as [mpv](https://mpv.io/), [vlc](https://www.videolan.org/) or [mplayer](https://www.mplayerhq.hu/).
-
-### I extracted a video URL with `-g`, but it does not play on another machine / in my web browser.
-
-It depends a lot on the service. In many cases, requests for the video (to download/play it) must come from the same IP address and with the same cookies and/or HTTP headers. Use the `--cookies` option to write the required cookies into a file, and advise your downloader to read cookies from that file. Some sites also require a common user agent to be used, use `--dump-user-agent` to see the one in use by youtube-dl. You can also get necessary cookies and HTTP headers from JSON output obtained with `--dump-json`.
-
-It may be beneficial to use IPv6; in some cases, the restrictions are only applied to IPv4. Some services (sometimes only for a subset of videos) do not restrict the video URL by IP address, cookie, or user-agent, but these are the exception rather than the rule.
-
-Please bear in mind that some URL protocols are **not** supported by browsers out of the box, including RTMP. If you are using `-g`, your own downloader must support these as well.
-
-If you want to play the video on a machine that is not running youtube-dl, you can relay the video content from the machine that runs youtube-dl. You can use `-o -` to let youtube-dl stream a video to stdout, or simply allow the player to download the files written by youtube-dl in turn.
-
-### ERROR: no fmt_url_map or conn information found in video info
-
-YouTube has switched to a new video info format in July 2011 which is not supported by old versions of youtube-dl. See [above](#how-do-i-update-youtube-dl) for how to update youtube-dl.
-
-### ERROR: unable to download video
-
-YouTube requires an additional signature since September 2012 which is not supported by old versions of youtube-dl. See [above](#how-do-i-update-youtube-dl) for how to update youtube-dl.
-
-### Video URL contains an ampersand and I'm getting some strange output `[1] 2839` or `'v' is not recognized as an internal or external command`
-
-That's actually the output from your shell. Since ampersand is one of the special shell characters it's interpreted by the shell preventing you from passing the whole URL to youtube-dl. To disable your shell from interpreting the ampersands (or any other special characters) you have to either put the whole URL in quotes or escape them with a backslash (which approach will work depends on your shell).
-
-For example if your URL is https://www.youtube.com/watch?t=4&v=BaW_jenozKc you should end up with following command:
-
-```youtube-dl 'https://www.youtube.com/watch?t=4&v=BaW_jenozKc'```
-
-or
-
-```youtube-dl https://www.youtube.com/watch?t=4\&v=BaW_jenozKc```
-
-For Windows you have to use the double quotes:
-
-```youtube-dl "https://www.youtube.com/watch?t=4&v=BaW_jenozKc"```
-
-### ExtractorError: Could not find JS function u'OF'
-
-In February 2015, the new YouTube player contained a character sequence in a string that was misinterpreted by old versions of youtube-dl. See [above](#how-do-i-update-youtube-dl) for how to update youtube-dl.
-
-### HTTP Error 429: Too Many Requests or 402: Payment Required
-
-These two error codes indicate that the service is blocking your IP address because of overuse. Usually this is a soft block meaning that you can gain access again after solving CAPTCHA. Just open a browser and solve a CAPTCHA the service suggests you and after that [pass cookies](#how-do-i-pass-cookies-to-youtube-dl) to youtube-dl. Note that if your machine has multiple external IPs then you should also pass exactly the same IP you've used for solving CAPTCHA with [`--source-address`](#network-options). Also you may need to pass a `User-Agent` HTTP header of your browser with [`--user-agent`](#workarounds).
-
-If this is not the case (no CAPTCHA suggested to solve by the service) then you can contact the service and ask them to unblock your IP address, or - if you have acquired a whitelisted IP address already - use the [`--proxy` or `--source-address` options](#network-options) to select another IP address.
-
-### SyntaxError: Non-ASCII character
-
-The error
-
-    File "youtube-dl", line 2
-    SyntaxError: Non-ASCII character '\x93' ...
-
-means you're using an outdated version of Python. Please update to Python 2.6 or 2.7.
-
-### What is this binary file? Where has the code gone?
-
-Since June 2012 ([#342](https://github.com/ytdl-org/youtube-dl/issues/342)) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repository, as laid out above. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make youtube-dl`.
-
-### The exe throws an error due to missing `MSVCR100.dll`
-
-To run the exe you need to install first the [Microsoft Visual C++ 2010 Redistributable Package (x86)](https://www.microsoft.com/en-US/download/details.aspx?id=5555).
-
-### On Windows, how should I set up ffmpeg and youtube-dl? Where should I put the exe files?
-
-If you put youtube-dl and ffmpeg in the same directory that you're running the command from, it will work, but that's rather cumbersome.
-
-To make a different directory work - either for ffmpeg, or for youtube-dl, or for both - simply create the directory (say, `C:\bin`, or `C:\Users\<User name>\bin`), put all the executables directly in there, and then [set your PATH environment variable](https://www.java.com/en/download/help/path.xml) to include that directory.
-
-From then on, after restarting your shell, you will be able to access both youtube-dl and ffmpeg (and youtube-dl will be able to find ffmpeg) by simply typing `youtube-dl` or `ffmpeg`, no matter what directory you're in.
-
-### How do I put downloads into a specific folder?
-
-Use the `-o` to specify an [output template](#output-template), for example `-o "/home/user/videos/%(title)s-%(id)s.%(ext)s"`. If you want this for all of your downloads, put the option into your [configuration file](#configuration).
-
-### How do I download a video starting with a `-`?
-
-Either prepend `https://www.youtube.com/watch?v=` or separate the ID from the options with `--`:
-
-    youtube-dl -- -wNyEUrxzFU
-    youtube-dl "https://www.youtube.com/watch?v=-wNyEUrxzFU"
-
-### How do I pass cookies to youtube-dl?
-
-Use the `--cookies` option, for example `--cookies /path/to/cookies/file.txt`.
-
-In order to extract cookies from browser use any conforming browser extension for exporting cookies. For example, [cookies.txt](https://chrome.google.com/webstore/detail/cookiestxt/njabckikapfpffapmjgojcnbfjonfjfg) (for Chrome) or [cookies.txt](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/) (for Firefox).
-
-Note that the cookies file must be in Mozilla/Netscape format and the first line of the cookies file must be either `# HTTP Cookie File` or `# Netscape HTTP Cookie File`. Make sure you have correct [newline format](https://en.wikipedia.org/wiki/Newline) in the cookies file and convert newlines if necessary to correspond with your OS, namely `CRLF` (`\r\n`) for Windows and `LF` (`\n`) for Unix and Unix-like systems (Linux, macOS, etc.). `HTTP Error 400: Bad Request` when using `--cookies` is a good sign of invalid newline format.
-
-Passing cookies to youtube-dl is a good way to workaround login when a particular extractor does not implement it explicitly. Another use case is working around [CAPTCHA](https://en.wikipedia.org/wiki/CAPTCHA) some websites require you to solve in particular cases in order to get access (e.g. YouTube, CloudFlare).
-
-### How do I stream directly to media player?
-
-You will first need to tell youtube-dl to stream media to stdout with `-o -`, and also tell your media player to read from stdin (it must be capable of this for streaming) and then pipe former to latter. For example, streaming to [vlc](https://www.videolan.org/) can be achieved with:
-
-    youtube-dl -o - "https://www.youtube.com/watch?v=BaW_jenozKcj" | vlc -
-
-### How do I download only new videos from a playlist?
-
-Use download-archive feature. With this feature you should initially download the complete playlist with `--download-archive /path/to/download/archive/file.txt` that will record identifiers of all the videos in a special file. Each subsequent run with the same `--download-archive` will download only new videos and skip all videos that have been downloaded before. Note that only successful downloads are recorded in the file.
-
-For example, at first,
-
-    youtube-dl --download-archive archive.txt "https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re"
-
-will download the complete `PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re` playlist and create a file `archive.txt`. Each subsequent run will only download new videos if any:
-
-    youtube-dl --download-archive archive.txt "https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re"
-
-### Should I add `--hls-prefer-native` into my config?
-
-When youtube-dl detects an HLS video, it can download it either with the built-in downloader or ffmpeg. Since many HLS streams are slightly invalid and ffmpeg/youtube-dl each handle some invalid cases better than the other, there is an option to switch the downloader if needed.
-
-When youtube-dl knows that one particular downloader works better for a given website, that downloader will be picked. Otherwise, youtube-dl will pick the best downloader for general compatibility, which at the moment happens to be ffmpeg. This choice may change in future versions of youtube-dl, with improvements of the built-in downloader and/or ffmpeg.
-
-In particular, the generic extractor (used when your website is not in the [list of supported sites by youtube-dl](https://ytdl-org.github.io/youtube-dl/supportedsites.html) cannot mandate one specific downloader.
-
-If you put either `--hls-prefer-native` or `--hls-prefer-ffmpeg` into your configuration, a different subset of videos will fail to download correctly. Instead, it is much better to [file an issue](https://yt-dl.org/bug) or a pull request which details why the native or the ffmpeg HLS downloader is a better choice for your use case.
-
-### Can you add support for this anime video site, or site which shows current movies for free?
-
-As a matter of policy (as well as legality), youtube-dl does not include support for services that specialize in infringing copyright. As a rule of thumb, if you cannot easily find a video that the service is quite obviously allowed to distribute (i.e. that has been uploaded by the creator, the creator's distributor, or is published under a free license), the service is probably unfit for inclusion to youtube-dl.
-
-A note on the service that they don't host the infringing content, but just link to those who do, is evidence that the service should **not** be included into youtube-dl. The same goes for any DMCA note when the whole front page of the service is filled with videos they are not allowed to distribute. A "fair use" note is equally unconvincing if the service shows copyright-protected videos in full without authorization.
-
-Support requests for services that **do** purchase the rights to distribute their content are perfectly fine though. If in doubt, you can simply include a source that mentions the legitimate purchase of content.
-
-### How can I speed up work on my issue?
-
-(Also known as: Help, my important issue not being solved!) The youtube-dl core developer team is quite small. While we do our best to solve as many issues as possible, sometimes that can take quite a while. To speed up your issue, here's what you can do:
-
-First of all, please do report the issue [at our issue tracker](https://yt-dl.org/bugs). That allows us to coordinate all efforts by users and developers, and serves as a unified point. Unfortunately, the youtube-dl project has grown too large to use personal email as an effective communication channel.
-
-Please read the [bug reporting instructions](#bugs) below. A lot of bugs lack all the necessary information. If you can, offer proxy, VPN, or shell access to the youtube-dl developers. If you are able to, test the issue from multiple computers in multiple countries to exclude local censorship or misconfiguration issues.
-
-If nobody is interested in solving your issue, you are welcome to take matters into your own hands and submit a pull request (or coerce/pay somebody else to do so).
-
-Feel free to bump the issue from time to time by writing a small comment ("Issue is still present in youtube-dl version ...from France, but fixed from Belgium"), but please not more than once a month. Please do not declare your issue as `important` or `urgent`.
-
-### How can I detect whether a given URL is supported by youtube-dl?
-
-For one, have a look at the [list of supported sites](docs/supportedsites.md). Note that it can sometimes happen that the site changes its URL scheme (say, from https://example.com/video/1234567 to https://example.com/v/1234567 ) and youtube-dl reports an URL of a service in that list as unsupported. In that case, simply report a bug.
-
-It is *not* possible to detect whether a URL is supported or not. That's because youtube-dl contains a generic extractor which matches **all** URLs. You may be tempted to disable, exclude, or remove the generic extractor, but the generic extractor not only allows users to extract videos from lots of websites that embed a video from another service, but may also be used to extract video from a service that it's hosting itself. Therefore, we neither recommend nor support disabling, excluding, or removing the generic extractor.
-
-If you want to find out whether a given URL is supported, simply call youtube-dl with it. If you get no videos back, chances are the URL is either not referring to a video or unsupported. You can find out which by examining the output (if you run youtube-dl on the console) or catching an `UnsupportedError` exception if you run it from a Python program.
-
-# Why do I need to go through that much red tape when filing bugs?
-
-Before we had the issue template, despite our extensive [bug reporting instructions](#bugs), about 80% of the issue reports we got were useless, for instance because people used ancient versions hundreds of releases old, because of simple syntactic errors (not in youtube-dl but in general shell usage), because the problem was already reported multiple times before, because people did not actually read an error message, even if it said "please install ffmpeg", because people did not mention the URL they were trying to download and many more simple, easy-to-avoid problems, many of whom were totally unrelated to youtube-dl.
-
-youtube-dl is an open-source project manned by too few volunteers, so we'd rather spend time fixing bugs where we are certain none of those simple problems apply, and where we can be reasonably confident to be able to reproduce the issue without asking the reporter repeatedly. As such, the output of `youtube-dl -v YOUR_URL_HERE` is really all that's required to file an issue. The issue template also guides you through some basic steps you can do, such as checking that your version of youtube-dl is current.
-
-# DEVELOPER INSTRUCTIONS
-
-Most users do not need to build youtube-dl and can [download the builds](https://ytdl-org.github.io/youtube-dl/download.html) or get them from their distribution.
-
-To run youtube-dl as a developer, you don't need to build anything either. Simply execute
-
-    python -m youtube_dl
-
-To run the test, simply invoke your favorite test runner, or execute a test file directly; any of the following work:
-
-    python -m unittest discover
-    python test/test_download.py
-    nosetests
-
-See item 6 of [new extractor tutorial](#adding-support-for-a-new-site) for how to run extractor specific test cases.
-
-If you want to create a build of youtube-dl yourself, you'll need
-
-* python
-* make (only GNU make is supported)
-* pandoc
-* zip
-* nosetests
-
-### Adding support for a new site
-
-If you want to add support for a new site, first of all **make sure** this site is **not dedicated to [copyright infringement](README.md#can-you-add-support-for-this-anime-video-site-or-site-which-shows-current-movies-for-free)**. youtube-dl does **not support** such sites thus pull requests adding support for them **will be rejected**.
-
-After you have ensured this site is distributing its content legally, you can follow this quick list (assuming your service is called `yourextractor`):
-
-1. [Fork this repository](https://github.com/ytdl-org/youtube-dl/fork)
-2. Check out the source code with:
-
-        git clone git@github.com:YOUR_GITHUB_USERNAME/youtube-dl.git
-
-3. Start a new git branch with
-
-        cd youtube-dl
-        git checkout -b yourextractor
-
-4. Start with this simple template and save it to `youtube_dl/extractor/yourextractor.py`:
-
-    ```python
-    # coding: utf-8
-    from __future__ import unicode_literals
-
-    from .common import InfoExtractor
-
-
-    class YourExtractorIE(InfoExtractor):
-        _VALID_URL = r'https?://(?:www\.)?yourextractor\.com/watch/(?P<id>[0-9]+)'
-        _TEST = {
-            'url': 'https://yourextractor.com/watch/42',
-            'md5': 'TODO: md5 sum of the first 10241 bytes of the video file (use --test)',
-            'info_dict': {
-                'id': '42',
-                'ext': 'mp4',
-                'title': 'Video title goes here',
-                'thumbnail': r're:^https?://.*\.jpg$',
-                # TODO more properties, either as:
-                # * A value
-                # * MD5 checksum; start the string with md5:
-                # * A regular expression; start the string with re:
-                # * Any Python type (for example int or float)
-            }
-        }
-
-        def _real_extract(self, url):
-            video_id = self._match_id(url)
-            webpage = self._download_webpage(url, video_id)
-
-            # TODO more code goes here, for example ...
-            title = self._html_search_regex(r'<h1>(.+?)</h1>', webpage, 'title')
-
-            return {
-                'id': video_id,
-                'title': title,
-                'description': self._og_search_description(webpage),
-                'uploader': self._search_regex(r'<div[^>]+id="uploader"[^>]*>([^<]+)<', webpage, 'uploader', fatal=False),
-                # TODO more properties (see youtube_dl/extractor/common.py)
-            }
-    ```
-5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
-6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
-7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
-8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
-
-        $ flake8 youtube_dl/extractor/yourextractor.py
-
-9. Make sure your code works under all [Python](https://www.python.org/) versions claimed supported by youtube-dl, namely 2.6, 2.7, and 3.2+.
-10. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files and [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
-
-        $ git add youtube_dl/extractor/extractors.py
-        $ git add youtube_dl/extractor/yourextractor.py
-        $ git commit -m '[yourextractor] Add new extractor'
-        $ git push origin yourextractor
-
-11. Finally, [create a pull request](https://help.github.com/articles/creating-a-pull-request). We'll then review and merge it.
-
-In any case, thank you very much for your contributions!
-
-## youtube-dl coding conventions
-
-This section introduces a guide lines for writing idiomatic, robust and future-proof extractor code.
-
-Extractors are very fragile by nature since they depend on the layout of the source data provided by 3rd party media hosters out of your control and this layout tends to change. As an extractor implementer your task is not only to write code that will extract media links and metadata correctly but also to minimize dependency on the source's layout and even to make the code foresee potential future changes and be ready for that. This is important because it will allow the extractor not to break on minor layout changes thus keeping old youtube-dl versions working. Even though this breakage issue is easily fixed by emitting a new version of youtube-dl with a fix incorporated, all the previous versions become broken in all repositories and distros' packages that may not be so prompt in fetching the update from us. Needless to say, some non rolling release distros may never receive an update at all.
-
-### Mandatory and optional metafields
-
-For extraction to work youtube-dl relies on metadata your extractor extracts and provides to youtube-dl expressed by an [information dictionary](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303) or simply *info dict*. Only the following meta fields in the *info dict* are considered mandatory for a successful extraction process by youtube-dl:
-
- - `id` (media identifier)
- - `title` (media title)
- - `url` (media download URL) or `formats`
-
-In fact only the last option is technically mandatory (i.e. if you can't figure out the download location of the media the extraction does not make any sense). But by convention youtube-dl also treats `id` and `title` as mandatory. Thus the aforementioned metafields are the critical data that the extraction does not make any sense without and if any of them fail to be extracted then the extractor is considered completely broken.
-
-[Any field](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L188-L303) apart from the aforementioned ones are considered **optional**. That means that extraction should be **tolerant** to situations when sources for these fields can potentially be unavailable (even if they are always available at the moment) and **future-proof** in order not to break the extraction of general purpose mandatory fields.
-
-#### Example
-
-Say you have some source dictionary `meta` that you've fetched as JSON with HTTP request and it has a key `summary`:
-
-```python
-meta = self._download_json(url, video_id)
-```
-    
-Assume at this point `meta`'s layout is:
-
-```python
-{
-    ...
-    "summary": "some fancy summary text",
-    ...
-}
-```
-
-Assume you want to extract `summary` and put it into the resulting info dict as `description`. Since `description` is an optional meta field you should be ready that this key may be missing from the `meta` dict, so that you should extract it like:
-
-```python
-description = meta.get('summary')  # correct
-```
-
-and not like:
-
-```python
-description = meta['summary']  # incorrect
-```
-
-The latter will break extraction process with `KeyError` if `summary` disappears from `meta` at some later time but with the former approach extraction will just go ahead with `description` set to `None` which is perfectly fine (remember `None` is equivalent to the absence of data).
-
-Similarly, you should pass `fatal=False` when extracting optional data from a webpage with `_search_regex`, `_html_search_regex` or similar methods, for instance:
-
-```python
-description = self._search_regex(
-    r'<span[^>]+id="title"[^>]*>([^<]+)<',
-    webpage, 'description', fatal=False)
-```
-
-With `fatal` set to `False` if `_search_regex` fails to extract `description` it will emit a warning and continue extraction.
-
-You can also pass `default=<some fallback value>`, for example:
-
-```python
-description = self._search_regex(
-    r'<span[^>]+id="title"[^>]*>([^<]+)<',
-    webpage, 'description', default=None)
-```
-
-On failure this code will silently continue the extraction with `description` set to `None`. That is useful for metafields that may or may not be present.
-### Provide fallbacks
-
-When extracting metadata try to do so from multiple sources. For example if `title` is present in several places, try extracting from at least some of them. This makes it more future-proof in case some of the sources become unavailable.
-
-#### Example
-
-Say `meta` from the previous example has a `title` and you are about to extract it. Since `title` is a mandatory meta field you should end up with something like:
-
-```python
-title = meta['title']
-```
-
-If `title` disappears from `meta` in future due to some changes on the hoster's side the extraction would fail since `title` is mandatory. That's expected.
-
-Assume that you have some another source you can extract `title` from, for example `og:title` HTML meta of a `webpage`. In this case you can provide a fallback scenario:
-
-```python
-title = meta.get('title') or self._og_search_title(webpage)
-```
-
-This code will try to extract from `meta` first and if it fails it will try extracting `og:title` from a `webpage`.
-
-### Regular expressions
-
-#### Don't capture groups you don't use
-
-Capturing group must be an indication that it's used somewhere in the code. Any group that is not used must be non capturing.
-
-##### Example
-
-Don't capture id attribute name here since you can't use it for anything anyway.
-
-Correct:
-
-```python
-r'(?:id|ID)=(?P<id>\d+)'
-```
-
-Incorrect:
-```python
-r'(id|ID)=(?P<id>\d+)'
-```
-
-
-#### Make regular expressions relaxed and flexible
-
-When using regular expressions try to write them fuzzy, relaxed and flexible, skipping insignificant parts that are more likely to change, allowing both single and double quotes for quoted values and so on.
-##### Example
-
-Say you need to extract `title` from the following HTML code:
-
-```html
-<span style="position: absolute; left: 910px; width: 90px; float: right; z-index: 9999;" class="title">some fancy title</span>
-```
-
-The code for that task should look similar to:
-
-```python
-title = self._search_regex(
-    r'<span[^>]+class="title"[^>]*>([^<]+)', webpage, 'title')
-```
-
-Or even better:
-
-```python
-title = self._search_regex(
-    r'<span[^>]+class=(["\'])title\1[^>]*>(?P<title>[^<]+)',
-    webpage, 'title', group='title')
-```
-
-Note how you tolerate potential changes in the `style` attribute's value or switch from using double quotes to single for `class` attribute: 
-
-The code definitely should not look like:
-
-```python
-title = self._search_regex(
-    r'<span style="position: absolute; left: 910px; width: 90px; float: right; z-index: 9999;" class="title">(.*?)</span>',
-    webpage, 'title', group='title')
-```
-
-### Long lines policy
-
-There is a soft limit to keep lines of code under 80 characters long. This means it should be respected if possible and if it does not make readability and code maintenance worse.
-
-For example, you should **never** split long string literals like URLs or some other often copied entities over multiple lines to fit this limit:
-
-Correct:
-
-```python
-'https://www.youtube.com/watch?v=FqZTN594JQw&list=PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4'
-```
-
-Incorrect:
-
-```python
-'https://www.youtube.com/watch?v=FqZTN594JQw&list='
-'PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4'
-```
-
-### Inline values
-
-Extracting variables is acceptable for reducing code duplication and improving readability of complex expressions. However, you should avoid extracting variables used only once and moving them to opposite parts of the extractor file, which makes reading the linear flow difficult.
-
-#### Example
-
-Correct:
-
-```python
-title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title')
-```
-
-Incorrect:
-
-```python
-TITLE_RE = r'<title>([^<]+)</title>'
-# ...some lines of code...
-title = self._html_search_regex(TITLE_RE, webpage, 'title')
-```
-
-### Collapse fallbacks
-
-Multiple fallback values can quickly become unwieldy. Collapse multiple fallback values into a single expression via a list of patterns.
-
-#### Example
-
-Good:
-
-```python
-description = self._html_search_meta(
-    ['og:description', 'description', 'twitter:description'],
-    webpage, 'description', default=None)
-```
-
-Unwieldy:
-
-```python
-description = (
-    self._og_search_description(webpage, default=None)
-    or self._html_search_meta('description', webpage, default=None)
-    or self._html_search_meta('twitter:description', webpage, default=None))
-```
-
-Methods supporting list of patterns are: `_search_regex`, `_html_search_regex`, `_og_search_property`, `_html_search_meta`.
-
-### Trailing parentheses
-
-Always move trailing parentheses after the last argument.
-
-#### Example
-
-Correct:
-
-```python
-    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
-    list)
-```
-
-Incorrect:
-
-```python
-    lambda x: x['ResultSet']['Result'][0]['VideoUrlSet']['VideoUrl'],
-    list,
-)
-```
-
-### Use convenience conversion and parsing functions
-
-Wrap all extracted numeric data into safe functions from [`youtube_dl/utils.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py): `int_or_none`, `float_or_none`. Use them for string to number conversions as well.
-
-Use `url_or_none` for safe URL processing.
-
-Use `try_get` for safe metadata extraction from parsed JSON.
-
-Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction. 
-
-Explore [`youtube_dl/utils.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py) for more useful convenience functions.
-
-#### More examples
-
-##### Safely extract optional description from parsed JSON
-```python
-description = try_get(response, lambda x: x['result']['video'][0]['summary'], compat_str)
-```
-
-##### Safely extract more optional metadata
-```python
-video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
-description = video.get('summary')
-duration = float_or_none(video.get('durationMs'), scale=1000)
-view_count = int_or_none(video.get('views'))
-```
-
-# EMBEDDING YOUTUBE-DL
-
-youtube-dl makes the best effort to be a good command-line program, and thus should be callable from any programming language. If you encounter any problems parsing its output, feel free to [create a report](https://github.com/ytdl-org/youtube-dl/issues/new).
-
-From a Python program, you can embed youtube-dl in a more powerful fashion, like this:
-
-```python
-from __future__ import unicode_literals
-import youtube_dl
-
-ydl_opts = {}
-with youtube_dl.YoutubeDL(ydl_opts) as ydl:
-    ydl.download(['https://www.youtube.com/watch?v=BaW_jenozKc'])
-```
-
-Most likely, you'll want to use various options. For a list of options available, have a look at [`youtube_dl/YoutubeDL.py`](https://github.com/ytdl-org/youtube-dl/blob/3e4cedf9e8cd3157df2457df7274d0c842421945/youtube_dl/YoutubeDL.py#L137-L312). For a start, if you want to intercept youtube-dl's output, set a `logger` object.
-
-Here's a more complete example of a program that outputs only errors (and a short message after the download is finished), and downloads/converts the video to an mp3 file:
-
-```python
-from __future__ import unicode_literals
-import youtube_dl
-
-
-class MyLogger(object):
-    def debug(self, msg):
-        pass
-
-    def warning(self, msg):
-        pass
-
-    def error(self, msg):
-        print(msg)
-
-
-def my_hook(d):
-    if d['status'] == 'finished':
-        print('Done downloading, now converting ...')
-
-
-ydl_opts = {
-    'format': 'bestaudio/best',
-    'postprocessors': [{
-        'key': 'FFmpegExtractAudio',
-        'preferredcodec': 'mp3',
-        'preferredquality': '192',
-    }],
-    'logger': MyLogger(),
-    'progress_hooks': [my_hook],
-}
-with youtube_dl.YoutubeDL(ydl_opts) as ydl:
-    ydl.download(['https://www.youtube.com/watch?v=BaW_jenozKc'])
-```
-
-# BUGS
-
-Bugs and suggestions should be reported at: <https://github.com/ytdl-org/youtube-dl/issues>. Unless you were prompted to or there is another pertinent reason (e.g. GitHub fails to accept the bug report), please do not send bug reports via personal email. For discussions, join us in the IRC channel [#youtube-dl](irc://chat.freenode.net/#youtube-dl) on freenode ([webchat](https://webchat.freenode.net/?randomnick=1&channels=youtube-dl)).
-
-**Please include the full output of youtube-dl when run with `-v`**, i.e. **add** `-v` flag to **your command line**, copy the **whole** output and post it in the issue body wrapped in \`\`\` for better formatting. It should look similar to this:
-```
-$ youtube-dl -v <your command line>
-[debug] System config: []
-[debug] User config: []
-[debug] Command-line args: [u'-v', u'https://www.youtube.com/watch?v=BaW_jenozKcj']
-[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
-[debug] youtube-dl version 2015.12.06
-[debug] Git HEAD: 135392e
-[debug] Python version 2.6.6 - Windows-2003Server-5.2.3790-SP2
-[debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
-[debug] Proxy map: {}
-...
-```
-**Do not post screenshots of verbose logs; only plain text is acceptable.**
-
-The output (including the first lines) contains important debugging information. Issues without the full output are often not reproducible and therefore do not get solved in short order, if ever.
-
-Please re-read your issue once again to avoid a couple of common mistakes (you can and should use this as a checklist):
-
-### Is the description of the issue itself sufficient?
-
-We often get issue reports that we cannot really decipher. While in most cases we eventually get the required information after asking back multiple times, this poses an unnecessary drain on our resources. Many contributors, including myself, are also not native speakers, so we may misread some parts.
-
-So please elaborate on what feature you are requesting, or what bug you want to be fixed. Make sure that it's obvious
-
-- What the problem is
-- How it could be fixed
-- How your proposed solution would look like
-
-If your report is shorter than two lines, it is almost certainly missing some of these, which makes it hard for us to respond to it. We're often too polite to close the issue outright, but the missing info makes misinterpretation likely. As a committer myself, I often get frustrated by these issues, since the only possible way for me to move forward on them is to ask for clarification over and over.
-
-For bug reports, this means that your report should contain the *complete* output of youtube-dl when called with the `-v` flag. The error message you get for (most) bugs even says so, but you would not believe how many of our bug reports do not contain this information.
-
-If your server has multiple IPs or you suspect censorship, adding `--call-home` may be a good idea to get more diagnostics. If the error is `ERROR: Unable to extract ...` and you cannot reproduce it from multiple countries, add `--dump-pages` (warning: this will yield a rather large output, redirect it to the file `log.txt` by adding `>log.txt 2>&1` to your command-line) or upload the `.dump` files you get when you add `--write-pages` [somewhere](https://gist.github.com/).
-
-**Site support requests must contain an example URL**. An example URL is a URL you might want to download, like `https://www.youtube.com/watch?v=BaW_jenozKc`. There should be an obvious video present. Except under very special circumstances, the main page of a video service (e.g. `https://www.youtube.com/`) is *not* an example URL.
-
-###  Are you using the latest version?
-
-Before reporting any issue, type `youtube-dl -U`. This should report that you're up-to-date. About 20% of the reports we receive are already fixed, but people are using outdated versions. This goes for feature requests as well.
-
-###  Is the issue already documented?
-
-Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/ytdl-org/youtube-dl/search?type=Issues) of this repository. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2015.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
-
-###  Why are existing options not enough?
-
-Before requesting a new feature, please have a quick peek at [the list of supported options](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#options). Many feature requests are for features that actually exist already! Please, absolutely do show off your work in the issue report and detail how the existing similar options do *not* solve your problem.
-
-###  Is there enough context in your bug report?
-
-People want to solve problems, and often think they do us a favor by breaking down their larger problems (e.g. wanting to skip already downloaded files) to a specific request (e.g. requesting us to look whether the file exists before downloading the info page). However, what often happens is that they break down the problem into two steps: One simple, and one impossible (or extremely complicated one).
-
-We are then presented with a very complicated request when the original problem could be solved far easier, e.g. by recording the downloaded video IDs in a separate file. To avoid this, you must include the greater context where it is non-obvious. In particular, every feature request that does not consist of adding support for a new site should contain a use case scenario that explains in what situation the missing feature would be useful.
-
-###  Does the issue involve one problem, and one problem only?
-
-Some of our users seem to think there is a limit of issues they can or should open. There is no limit of issues they can or should open. While it may seem appealing to be able to dump all your issues into one ticket, that means that someone who solves one of your issues cannot mark the issue as closed. Typically, reporting a bunch of issues leads to the ticket lingering since nobody wants to attack that behemoth, until someone mercifully splits the issue into multiple ones.
-
-In particular, every site support request issue should only pertain to services at one site (generally under a common domain, but always using the same backend technology). Do not request support for vimeo user videos, White house podcasts, and Google Plus pages in the same issue. Also, make sure that you don't post bug reports alongside feature requests. As a rule of thumb, a feature request does not include outputs of youtube-dl that are not immediately related to the feature at hand. Do not post reports of a network error alongside the request for a new video service.
-
-###  Is anyone going to need the feature?
-
-Only post features that you (or an incapacitated friend you can personally talk to) require. Do not post features because they seem like a good idea. If they are really useful, they will be requested by someone who requires them.
-
-###  Is your question about youtube-dl?
-
-It may sound strange, but some bug reports we receive are completely unrelated to youtube-dl and relate to a different, or even the reporter's own, application. Please make sure that you are actually using youtube-dl. If you are using a UI for youtube-dl, report the bug to the maintainer of the actual application providing the UI. On the other hand, if your UI for youtube-dl fails in some way you believe is related to youtube-dl, by all means, go ahead and report the bug.
-
-# COPYRIGHT
-
-youtube-dl is released into the public domain by the copyright holders.
-
-This README file was originally written by [Daniel Bolton](https://github.com/dbbolton) and is likewise released into the public domain.
diff --git a/bin/youtube-dl b/bin/youtube-dl
deleted file mode 100755 (executable)
index fc3cc8a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import youtube_dl
-
-if __name__ == '__main__':
-    youtube_dl.main()
index 28bd237278da5c0ade9ed96a4cb722c1b6973cf3..1bf41f2ccf9f576bfdcd6d521869e00b452107c4 100644 (file)
@@ -1,4 +1,4 @@
-__youtube_dl()
+__youtube_dlc()
 {
     local cur prev opts fileopts diropts keywords
     COMPREPLY=()
@@ -26,4 +26,4 @@ __youtube_dl()
     fi
 }
 
-complete -F __youtube_dl youtube-dl
+complete -F __youtube_dlc youtube-dlc
index 3d1391334bd38a23c7024192c6c36522acaa5613..d68c9b1ccec6498a798b965c04122cafd94b3c88 100755 (executable)
@@ -6,9 +6,9 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dl
+import youtube_dlc
 
-BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
+BASH_COMPLETION_FILE = "youtube-dlc.bash-completion"
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 
@@ -26,5 +26,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)
index 4a4295ba9cd3b8acf739c983248494c989781e63..62dbd2cb17590bbd2e05fc37a1d7ba6e24af5c46 100644 (file)
@@ -12,7 +12,7 @@
 import os.path
 
 sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
-from youtube_dl.compat import (
+from youtube_dlc.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-dl':
+        if self.repoName != 'youtube-dlc':
             raise BuildError('Invalid repository "%s"' % self.repoName)
         if self.user not in self.authorizedUsers:
             raise HTTPError('Unauthorized user "%s"' % self.user, 401)
index 740f04de0f22ad3ac6352b114b0e8f99cf717a9f..68a33d823f2308496123fd2e08c21ff39249008d 100644 (file)
@@ -15,8 +15,8 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import gettestcases
-from youtube_dl.utils import compat_urllib_parse_urlparse
-from youtube_dl.utils import compat_urllib_request
+from youtube_dlc.utils import compat_urllib_parse_urlparse
+from youtube_dlc.utils import compat_urllib_request
 
 if len(sys.argv) > 1:
     METHOD = 'LIST'
index 2ddfa109698864f642b97f8bcb9846f84631e4d9..4714d81a6ee17ea117a2a4378dd8b6c5f80fb968 100644 (file)
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_basestring,
     compat_getpass,
     compat_print,
     compat_urllib_request,
 )
-from youtube_dl.utils import (
+from youtube_dlc.utils import (
     make_HTTPS_handler,
     sanitized_Request,
 )
@@ -98,7 +98,7 @@ def main():
     releaser = GitHubReleaser()
 
     new_release = releaser.create_release(
-        version, name='youtube-dl %s' % version, body=body)
+        version, name='youtube-dlc %s' % version, body=body)
     release_id = new_release['id']
 
     for asset in os.listdir(build_path):
index eb79765da20b795fed35f5c02e41fb9ada630626..4f08b6d4a427eedec81d3cc78f34eb119df1ff6b 100644 (file)
@@ -2,4 +2,4 @@
 {{commands}}
 
 
-complete --command youtube-dl --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
+complete --command youtube-dlc --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
index 51d19dd33d3bf5c05fc86f3c63e23c00871fda90..a27ef44f8fe1474176291f69b31ff5a3ea46337c 100755 (executable)
@@ -7,10 +7,10 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dl
-from youtube_dl.utils import shell_quote
+import youtube_dlc
+from youtube_dlc.utils import shell_quote
 
-FISH_COMPLETION_FILE = 'youtube-dl.fish'
+FISH_COMPLETION_FILE = 'youtube-dlc.fish'
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
 EXTRA_ARGS = {
@@ -30,7 +30,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-dl', '--long-option', long_option]
+            complete_cmd = ['complete', '--command', 'youtube-dlc', '--long-option', long_option]
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
             if option.help != optparse.SUPPRESS_HELP:
@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)
index e3df42cc2da6c99d9104c9bd2bac776af5a61c46..c89bb547e78dc4b2cd615d7ed26c9faa4a708da6 100644 (file)
@@ -7,8 +7,8 @@
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.utils import intlist_to_bytes
-from youtube_dl.aes import aes_encrypt, key_expansion
+from youtube_dlc.utils import intlist_to_bytes
+from youtube_dlc.aes import aes_encrypt, key_expansion
 
 secret_msg = b'Secret message goes here'
 
index 867ea0048fb88f1ca1382f11b1c60b17110d4fc8..04588a5eec75e21035fd2d81c866a15d3afc7dcc 100755 (executable)
@@ -22,9 +22,9 @@
 new_version = {}
 
 filenames = {
-    'bin': 'youtube-dl',
-    'exe': 'youtube-dl.exe',
-    'tar': 'youtube-dl-%s.tar.gz' % version}
+    'bin': 'youtube-dlc',
+    'exe': 'youtube-dlc.exe',
+    'tar': 'youtube-dlc-%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)
index 506a623772e0c2195f6b3692575f5942e84c046c..b07f1e830c6191710ab3ea67d5a1c2b0e49bf54f 100755 (executable)
     <?xml version="1.0" encoding="utf-8"?>
     <feed xmlns="http://www.w3.org/2005/Atom">
         <link rel="self" href="http://ytdl-org.github.io/youtube-dl/update/releases.atom" />
-        <title>youtube-dl releases</title>
-        <id>https://yt-dl.org/feed/youtube-dl-updates-feed</id>
+        <title>youtube-dlc releases</title>
+        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed</id>
         <updated>@TIMESTAMP@</updated>
         @ENTRIES@
     </feed>""")
 
 entry_template = textwrap.dedent("""
     <entry>
-        <id>https://yt-dl.org/feed/youtube-dl-updates-feed/youtube-dl-@VERSION@</id>
+        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed/youtube-dlc-@VERSION@</id>
         <title>New version @VERSION@</title>
-        <link href="http://ytdl-org.github.io/youtube-dl" />
+        <link href="http://ytdl-org.github.io/youtube-dlc" />
         <content type="xhtml">
             <div xmlns="http://www.w3.org/1999/xhtml">
                 Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
             </div>
         </content>
         <author>
-            <name>The youtube-dl maintainers</name>
+            <name>The youtube-dlc maintainers</name>
         </author>
         <updated>@TIMESTAMP@</updated>
     </entry>
index 531c93c7089c1847a7e9018fcda5ca177f68547e..38acb5d9a2df82b9b5e892bb85d02b416f15c36c 100755 (executable)
@@ -5,10 +5,10 @@
 import os
 import textwrap
 
-# We must be able to import youtube_dl
+# We must be able to import youtube_dlc
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
-import youtube_dl
+import youtube_dlc
 
 
 def main():
@@ -16,7 +16,7 @@ def main():
         template = tmplf.read()
 
     ie_htmls = []
-    for ie in youtube_dl.list_extractors(age_limit=None):
+    for ie in youtube_dlc.list_extractors(age_limit=None):
         ie_html = '<b>{}</b>'.format(ie.IE_NAME)
         ie_desc = getattr(ie, 'IE_DESC', None)
         if ie_desc is False:
index 226d1a5d6644953982db6346a00a21ec45f9b089..80426fb0ace3f76ed2158ca7dd0cef0b1cef1358 100755 (executable)
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
-import io
+import io
 import optparse
-import re
+import re
 
 
 def main():
@@ -12,22 +12,22 @@ def main():
     if len(args) != 2:
         parser.error('Expected an input and an output filename')
 
-    infile, outfile = args
+
+"""     infile, outfile = args
 
     with io.open(infile, encoding='utf-8') as inf:
         readme = inf.read()
 
-    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-DL',
-        readme).group(1)
+    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',
+"""         readme).group(1)
 
     out = bug_text + dev_text
 
     with io.open(outfile, 'w', encoding='utf-8') as outf:
-        outf.write(out)
-
+        outf.write(out) """
 
 if __name__ == '__main__':
     main()
index b7ad23d8363005c7f62056822219d7772e1d91d5..37cb0d4ee11987ae690b5f61306b5de1517f0a02 100644 (file)
@@ -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_dl/version.py without importing the package
-    exec(compile(open('youtube_dl/version.py').read(),
-                 'youtube_dl/version.py', 'exec'))
+    # 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'))
 
     out = issue_template_tmpl % {'version': locals()['__version__']}
 
index 0a1762dbce85adf9049529ec15bdb61510787d0a..e6de72b33a2ad4e5bf3b8a2153b16119bf106634 100644 (file)
@@ -14,8 +14,8 @@
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 
-from youtube_dl.extractor import _ALL_CLASSES
-from youtube_dl.extractor.common import InfoExtractor, SearchInfoExtractor
+from youtube_dlc.extractor import _ALL_CLASSES
+from youtube_dlc.extractor.common import InfoExtractor, SearchInfoExtractor
 
 with open('devscripts/lazy_load_template.py', 'rt') as f:
     module_template = f.read()
index 8fbce07967c177217f5d39162d9f0958f1d41bf5..73f203582aea4ef1f7f31576cfd11b50dc96ebfe 100755 (executable)
@@ -14,7 +14,7 @@
     oldreadme = f.read()
 
 header = oldreadme[:oldreadme.index('# OPTIONS')]
-footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
+footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
 
 options = helptext[helptext.index('  General Options:') + 19:]
 options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)
@@ -23,4 +23,4 @@
 with io.open(README_FILE, 'w', encoding='utf-8') as f:
     f.write(header)
     f.write(options)
-    f.write(footer)
+    f.write(footer)
index 764795bc5b1e560b033c2e9a0c395cecb10b1242..0ae6f8aa3092041bec374cee522cd5de4129ab77 100644 (file)
@@ -7,10 +7,10 @@
 import sys
 
 
-# Import youtube_dl
+# Import youtube_dlc
 ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.insert(0, ROOT_DIR)
-import youtube_dl
+import youtube_dlc
 
 
 def main():
@@ -33,7 +33,7 @@ def gen_ies_md(ies):
                 ie_md += ' (Currently broken)'
             yield ie_md
 
-    ies = sorted(youtube_dl.gen_extractors(), key=lambda i: i.IE_NAME.lower())
+    ies = sorted(youtube_dlc.gen_extractors(), key=lambda i: i.IE_NAME.lower())
     out = '# Supported sites\n' + ''.join(
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))
index 76bf873e1bd70b7e5c3a20caf2ea80f0941a2dea..843ade482ef443ba0fb44dd4fdaaa88f41548b41 100644 (file)
@@ -8,7 +8,7 @@
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
 
-PREFIX = r'''%YOUTUBE-DL(1)
+PREFIX = r'''%youtube-dlc(1)
 
 # NAME
 
@@ -16,7 +16,7 @@
 
 # SYNOPSIS
 
-**youtube-dl** \[OPTIONS\] URL [URL...]
+**youtube-dlc** \[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-dl \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
+    readme = re.sub(r'\s+youtube-dlc \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
     readme = PREFIX + readme
 
     readme = filter_options(readme)
index f2411c92724f3df995d981f31eccb0a08d390cd0..04cb7fec1b6d185ddd126564804cf949a6f5dd63 100755 (executable)
@@ -53,8 +53,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_dl -type f -not -name '*.py')
-if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dl: $useless_files"; 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
 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
@@ -68,18 +68,18 @@ make clean
 if $skip_tests ; then
     echo 'SKIPPING TESTS'
 else
-    nosetests --verbose --with-coverage --cover-package=youtube_dl --cover-html test --stop || exit 1
+    nosetests --verbose --with-coverage --cover-package=youtube_dlc --cover-html test --stop || exit 1
 fi
 
 /bin/echo -e "\n### Changing version in version.py..."
-sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/version.py
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dlc/version.py
 
 /bin/echo -e "\n### Changing version in ChangeLog..."
 sed -i "s/<unreleased>/$version/" ChangeLog
 
-/bin/echo -e "\n### Committing documentation, templates and youtube_dl/version.py..."
+/bin/echo -e "\n### Committing documentation, templates and youtube_dlc/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_dl/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 youtube_dlc/version.py ChangeLog
 git commit $gpg_sign_commits -m "release $version"
 
 /bin/echo -e "\n### Now tagging, signing and pushing..."
@@ -94,13 +94,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-dl youtube-dl.tar.gz
+make youtube-dlc youtube-dlc.tar.gz
 read -p "VM running? (y/n) " -n 1
-wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dl.exe?rev=$REV" -O youtube-dl.exe
+wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dlc.exe?rev=$REV" -O youtube-dlc.exe
 mkdir -p "build/$version"
-mv youtube-dl youtube-dl.exe "build/$version"
-mv youtube-dl.tar.gz "build/$version/youtube-dl-$version.tar.gz"
-RELEASE_FILES="youtube-dl youtube-dl.exe youtube-dl-$version.tar.gz"
+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"
 (cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS)
 (cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS)
 (cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS)
index 6c8d1cc2d29219997de1e216bae08de2ef8a02fc..ef90a56ab2e01a9dfc71267fd242fdcc3f70bfa0 100644 (file)
@@ -9,11 +9,11 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_print,
     compat_urllib_request,
 )
-from youtube_dl.utils import format_bytes
+from youtube_dlc.utils import format_bytes
 
 
 def format_size(bytes):
@@ -36,9 +36,9 @@ def format_size(bytes):
             asset_name = asset['name']
             total_bytes += asset['download_count'] * asset['size']
             if all(not re.match(p, asset_name) for p in (
-                    r'^youtube-dl$',
-                    r'^youtube-dl-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
-                    r'^youtube-dl\.exe$')):
+                    r'^youtube-dlc$',
+                    r'^youtube-dlc-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
+                    r'^youtube-dlc\.exe$')):
                 continue
             compat_print(
                 ' %s size: %s downloads: %d'
index b394a1ae7447797273cda4178de08b27ced26735..bb021862fbec13415e8db41b755e5796ea74e741 100644 (file)
@@ -1,6 +1,6 @@
-#compdef youtube-dl
+#compdef youtube-dlc
 
-__youtube_dl() {
+__youtube_dlc() {
     local curcontext="$curcontext" fileopts diropts cur prev
     typeset -A opt_args
     fileopts="{{fileopts}}"
@@ -25,4 +25,4 @@ __youtube_dl() {
     esac
 }
 
-__youtube_dl
\ No newline at end of file
+__youtube_dlc
\ No newline at end of file
index 60aaf76cc3297adc6e80984890e33e4267b95c2b..8b957144f9c1dbb53328865e12e74c1780b57000 100755 (executable)
@@ -6,9 +6,9 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dl
+import youtube_dlc
 
-ZSH_COMPLETION_FILE = "youtube-dl.zsh"
+ZSH_COMPLETION_FILE = "youtube-dlc.zsh"
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 
@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(template)
 
 
-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]
 build_completion(parser)
index 712218045524bd65fe4e36870fee67ee8557ae9d..a7159ff4595eed29dab5f524b9f6064dc918b9c7 100644 (file)
@@ -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-dl.qhcp"
+       @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dlc.qhcp"
        @echo "To view the help file:"
-       @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dl.qhc"
+       @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dlc.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-dl"
-       @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dl"
+       @echo "# mkdir -p $$HOME/.local/share/devhelp/youtube-dlc"
+       @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dlc"
        @echo "# devhelp"
 
 epub:
index 0aaf1b8fcf8220301d63250e83cb1587b618388c..fa616ebbb6e19daa6f5d240614a5b89f2ac3fd00 100644 (file)
@@ -1,6 +1,6 @@
 # coding: utf-8
 #
-# youtube-dl documentation build configuration file, created by
+# 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
@@ -14,7 +14,7 @@
 
 import sys
 import os
-# Allows to import youtube_dl
+# Allows to import youtube_dlc
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 # -- General configuration ------------------------------------------------
@@ -36,7 +36,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'youtube-dl'
+project = u'youtube-dlc'
 copyright = u'2014, Ricardo Garcia Gonzalez'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -44,7 +44,7 @@
 # built documents.
 #
 # The short X.Y version.
-from youtube_dl.version import __version__
+from youtube_dlc.version import __version__
 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version
@@ -68,4 +68,4 @@
 html_static_path = ['_static']
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'youtube-dldoc'
+htmlhelp_basename = 'youtube-dlcdoc'
index b746ff95baf6679b93a5836a305dfb6fe7a92000..afa26fef1e7fe0df485be5933f04e8fa5bb45675 100644 (file)
@@ -1,13 +1,13 @@
-Welcome to youtube-dl's documentation!
+Welcome to youtube-dlc's documentation!
 ======================================
 
-*youtube-dl* is a command-line program to download videos from YouTube.com and more sites.
+*youtube-dlc* 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 *youtube-dl* from Python programs.
+This section contains information for using *youtube-dlc* from Python programs.
 
 .. toctree::
     :maxdepth: 2
index 03d72882e02f04866db41ad2b0bcb573b8c9f1dc..6413659cfdcf54b44fb6928e8fc58aa948496945 100644 (file)
@@ -1,11 +1,11 @@
-Using the ``youtube_dl`` module
+Using the ``youtube_dlc`` module
 ===============================
 
-When using the ``youtube_dl`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
+When using the ``youtube_dlc`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
 
 .. code-block:: python
 
-    >>> from youtube_dl import YoutubeDL
+    >>> from youtube_dlc 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-dl test video "\'/\\ä↭𝕐'
+    'youtube-dlc test video "\'/\\ä↭𝕐'
     >>> info['height'], info['width']
     (720, 1280)
 
index 35c1050e5499238917243f09b5c142328ed37969..32c4522673d941f35ca9043beb5135b6196662fd 100644 (file)
@@ -6,7 +6,6 @@ # Supported sites
  - **23video**
  - **24video**
  - **3qsdn**: 3Q SDN
- - **3sat**
  - **4tube**
  - **56.com**
  - **5min**
@@ -224,6 +223,7 @@ # Supported sites
  - **Disney**
  - **dlive:stream**
  - **dlive:vod**
+ - **DoodStream**
  - **Dotsub**
  - **DouyuShow**
  - **DouyuTV**: 斗鱼
@@ -352,6 +352,7 @@ # Supported sites
  - **hotstar:playlist**
  - **Howcast**
  - **HowStuffWorks**
+ - **hrfernsehen**
  - **HRTi**
  - **HRTiPlaylist**
  - **Huajiao**: 花椒直播
@@ -672,6 +673,7 @@ # Supported sites
  - **plus.google**: Google Plus
  - **podomatic**
  - **Pokemon**
+ - **PokemonWatch**
  - **PolskieRadio**
  - **PolskieRadioCategory**
  - **Popcorntimes**
@@ -835,6 +837,9 @@ # Supported sites
  - **stanfordoc**: Stanford Open ClassRoom
  - **Steam**
  - **Stitcher**
+ - **StoryFire**
+ - **StoryFireSeries**
+ - **StoryFireUser**
  - **Streamable**
  - **streamcloud.eu**
  - **StreamCZ**
@@ -1150,7 +1155,7 @@ # Supported sites
  - **Zaq1**
  - **Zattoo**
  - **ZattooLive**
- - **ZDF**
+ - **ZDF-3sat**
  - **ZDFChannel**
  - **zingmp3**: mp3.zing.vn
  - **Zype**
diff --git a/make_win.bat b/make_win.bat
new file mode 100644 (file)
index 0000000..c5caac0
--- /dev/null
@@ -0,0 +1 @@
+pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
\ No newline at end of file
index da78a9c471d548a01711d37012e209f421134a37..f658aaa0ace11ac7599e26fac1c6138bea0d18aa 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,5 +2,5 @@
 universal = True
 
 [flake8]
-exclude = youtube_dl/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv
+exclude = youtube_dlc/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv
 ignore = E402,E501,E731,E741,W503
index af68b485ef787f217fab474fbadbba2408707dc6..f5f0bae62401cecaa63d26ff7c72982b9812f182 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,68 +1,27 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from __future__ import print_function
-
+from setuptools import setup, Command, find_packages
 import os.path
 import warnings
 import sys
-
-try:
-    from setuptools import setup, Command
-    setuptools_available = True
-except ImportError:
-    from distutils.core import setup, Command
-    setuptools_available = False
 from distutils.spawn import spawn
 
-try:
-    # This will create an exe that needs Microsoft Visual C++ 2008
-    # Redistributable Package
-    import py2exe
-except ImportError:
-    if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
-        print('Cannot import py2exe', file=sys.stderr)
-        exit(1)
-
-py2exe_options = {
-    'bundle_files': 1,
-    'compressed': 1,
-    'optimize': 2,
-    'dist_dir': '.',
-    'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
-}
-
-# Get the version from youtube_dl/version.py without importing the package
-exec(compile(open('youtube_dl/version.py').read(),
-             'youtube_dl/version.py', 'exec'))
-
-DESCRIPTION = 'YouTube video downloader'
-LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites'
+# 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'))
 
-py2exe_console = [{
-    'script': './youtube_dl/__main__.py',
-    'dest_base': 'youtube-dl',
-    'version': __version__,
-    'description': DESCRIPTION,
-    'comments': LONG_DESCRIPTION,
-    'product_name': 'youtube-dl',
-    'product_version': __version__,
-}]
-
-py2exe_params = {
-    'console': py2exe_console,
-    'options': {'py2exe': py2exe_options},
-    'zipfile': None
-}
+DESCRIPTION = 'Media downloader supporting various sites such as youtube'
+LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites. Based on a more active community fork.'
 
 if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
-    params = py2exe_params
+    print("inv")
 else:
     files_spec = [
-        ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
-        ('etc/fish/completions', ['youtube-dl.fish']),
-        ('share/doc/youtube_dl', ['README.txt']),
-        ('share/man/man1', ['youtube-dl.1'])
+        ('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'])
     ]
     root = os.path.dirname(os.path.abspath(__file__))
     data_files = []
     params = {
         'data_files': data_files,
     }
-    if setuptools_available:
-        params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
-    else:
-        params['scripts'] = ['bin/youtube-dl']
+    #if setuptools_available:
+    params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dlc:main']}
+    #else:
+    #    params['scripts'] = ['bin/youtube-dlc']
 
 class build_lazy_extractors(Command):
     description = 'Build the extractor lazy loading module'
@@ -95,54 +54,50 @@ def finalize_options(self):
 
     def run(self):
         spawn(
-            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dl/extractor/lazy_extractors.py'],
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dlc/extractor/lazy_extractors.py'],
             dry_run=self.dry_run,
         )
 
 setup(
-    name='youtube_dl',
+    name="youtube_dlc",
     version=__version__,
+    maintainer="Tom-Oliver Heidel",
+    maintainer_email="theidel@uni-bremen.de",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    url='https://github.com/ytdl-org/youtube-dl',
-    author='Ricardo Garcia',
-    author_email='ytdl@yt-dl.org',
-    maintainer='Sergey M.',
-    maintainer_email='dstftw@gmail.com',
-    license='Unlicense',
-    packages=[
-        'youtube_dl',
-        'youtube_dl.extractor', 'youtube_dl.downloader',
-        'youtube_dl.postprocessor'],
-
-    # Provokes warning on most systems (why?!)
-    # test_suite = 'nose.collector',
-    # test_requires = ['nosetest'],
-
+    # long_description_content_type="text/markdown",
+    url="https://github.com/blackjack4494/youtube-dlc",
+    packages=find_packages(exclude=("youtube_dl",)),
+       #packages=[
+    #    'youtube_dlc',
+    #    'youtube_dlc.extractor', 'youtube_dlc.downloader',
+    #    'youtube_dlc.postprocessor'],
     classifiers=[
-        'Topic :: Multimedia :: Video',
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'License :: Public Domain',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: Implementation',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: IronPython',
-        'Programming Language :: Python :: Implementation :: Jython',
-        'Programming Language :: Python :: Implementation :: PyPy',
+           "Topic :: Multimedia :: Video",
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: IronPython",
+        "Programming Language :: Python :: Implementation :: Jython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "License :: Public Domain",
+        "Operating System :: OS Independent",
     ],
-
-    cmdclass={'build_lazy_extractors': build_lazy_extractors},
+    python_requires='>=2.6',
+       
+       cmdclass={'build_lazy_extractors': build_lazy_extractors},
     **params
-)
+)
\ No newline at end of file
index e62aab11e777cca955bb8a7a2149d7216430dbca..f45818b0f124d7e5ecaf70818176bc27fa46be5d 100644 (file)
 import ssl
 import sys
 
-import youtube_dl.extractor
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
+import youtube_dlc.extractor
+from youtube_dlc import YoutubeDL
+from youtube_dlc.compat import (
     compat_os_name,
     compat_str,
 )
-from youtube_dl.utils import (
+from youtube_dlc.utils import (
     preferredencoding,
     write_string,
 )
@@ -90,7 +90,7 @@ def report_warning(self, message):
 
 
 def gettestcases(include_onlymatching=False):
-    for ie in youtube_dl.extractor.gen_extractors():
+    for ie in youtube_dlc.extractor.gen_extractors():
         for tc in ie.get_testcases(include_onlymatching):
             yield tc
 
index 71f6608feae4a5bcad37e96d74e795e7535a5dc7..bdd01e41a3e767b0e75dfc23a204ecd7e727d535 100644 (file)
 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_dl.compat import compat_etree_fromstring, compat_http_server
-from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.extractor import YoutubeIE, get_info_extractor
-from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
+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
 import threading
 
 
index 1e204e551b499edead22ce65e371787ca22ffc35..6d02c2a54dbca10024ff75c7599ac2e267f63512 100644 (file)
 import copy
 
 from test.helper import FakeYDL, assertRegexpMatches
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import compat_str, compat_urllib_error
-from youtube_dl.extractor import YoutubeIE
-from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.postprocessor.common import PostProcessor
-from youtube_dl.utils import ExtractorError, match_filter_func
+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
 
 TEST_URL = 'http://localhost/sample.mp4'
 
index 05f48bd7417e478ab1ae9ae7eddaca4cbc7039c3..615d8a9d882d751ad9d5640da971d1353320cf0e 100644 (file)
@@ -10,7 +10,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.utils import YoutubeDLCookieJar
+from youtube_dlc.utils import YoutubeDLCookieJar
 
 
 class TestYoutubeDLCookieJar(unittest.TestCase):
index cc89fb6ab2770ebeb4b47b5458e20399ec37e765..ef1e1b189ccd31f88fef40339f2cdf9680860bad 100644 (file)
@@ -8,8 +8,8 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
-from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
+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
 import base64
 
 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py'
index 6f5513faa2c5551ce3f3c9d2967a55b28adad858..b73bdd7674cf79f40cb54792e007d806ab968af7 100644 (file)
@@ -10,7 +10,7 @@
 from test.helper import try_rm
 
 
-from youtube_dl import YoutubeDL
+from youtube_dlc import YoutubeDL
 
 
 def _download_restricted(url, filename, age):
index 81056a999d2014506b589ea4b31ab67951486f1b..7b6664cac31a0680944d7d85a2de9a1a7723313c 100644 (file)
@@ -12,7 +12,7 @@
 
 from test.helper import gettestcases
 
-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (
     FacebookIE,
     gen_extractors,
     YoutubeIE,
@@ -70,7 +70,7 @@ def test_youtube_show_matching(self):
 
     def test_youtube_search_matching(self):
         self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
-        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dlc+test+video&filters=video&lclk=video', ['youtube:search_url'])
 
     def test_youtube_extract(self):
         assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
index a161601420db336f949eacd68e2f846bcf8d3699..1167519d11ba1dae567567d030cbec31a54cd3ac 100644 (file)
@@ -13,7 +13,7 @@
 
 
 from test.helper import FakeYDL
-from youtube_dl.cache import Cache
+from youtube_dlc.cache import Cache
 
 
 def _is_empty(d):
index 86ff389fdfc560b987c2d82e98629a1aa7344002..8c49a001e5eabe6d058af188e1b566f7e3d58474 100644 (file)
@@ -10,7 +10,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_getenv,
     compat_setenv,
     compat_etree_Element,
 class TestCompat(unittest.TestCase):
     def test_compat_getenv(self):
         test_str = 'тест'
-        compat_setenv('YOUTUBE_DL_COMPAT_GETENV', test_str)
-        self.assertEqual(compat_getenv('YOUTUBE_DL_COMPAT_GETENV'), test_str)
+        compat_setenv('youtube_dlc_COMPAT_GETENV', test_str)
+        self.assertEqual(compat_getenv('youtube_dlc_COMPAT_GETENV'), test_str)
 
     def test_compat_setenv(self):
-        test_var = 'YOUTUBE_DL_COMPAT_SETENV'
+        test_var = 'youtube_dlc_COMPAT_SETENV'
         test_str = 'тест'
         compat_setenv(test_var, test_str)
         compat_getenv(test_var)
@@ -46,11 +46,11 @@ def test_compat_expanduser(self):
         compat_setenv('HOME', old_home or '')
 
     def test_all_present(self):
-        import youtube_dl.compat
-        all_names = youtube_dl.compat.__all__
+        import youtube_dlc.compat
+        all_names = youtube_dlc.compat.__all__
         present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),
-            dir(youtube_dl.compat))) - set(['unicode_literals'])
+            dir(youtube_dlc.compat))) - set(['unicode_literals'])
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):
index ebe820dfc1990e4df6758795345375375402900b..bcd3b40417b8e0f2b17b0de10873aa528a96f276 100644 (file)
 import json
 import socket
 
-import youtube_dl.YoutubeDL
-from youtube_dl.compat import (
+import youtube_dlc.YoutubeDL
+from youtube_dlc.compat import (
     compat_http_client,
     compat_urllib_error,
     compat_HTTPError,
 )
-from youtube_dl.utils import (
+from youtube_dlc.utils import (
     DownloadError,
     ExtractorError,
     format_bytes,
     UnavailableVideoError,
 )
-from youtube_dl.extractor import get_info_extractor
+from youtube_dlc.extractor import get_info_extractor
 
 RETRIES = 3
 
 
-class YoutubeDL(youtube_dl.YoutubeDL):
+class YoutubeDL(youtube_dlc.YoutubeDL):
     def __init__(self, *args, **kwargs):
         self.to_stderr = self.to_screen
         self.processed_info_dicts = []
@@ -92,7 +92,7 @@ def setUp(self):
 def generator(test_case, tname):
 
     def test_template(self):
-        ie = youtube_dl.extractor.get_info_extractor(test_case['name'])()
+        ie = youtube_dlc.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(
index 7504722810b4e706f6b1143c7a36208ee0478749..c8e28bd3a3c51136077a1aa8adc11ec43c73b309 100644 (file)
 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_dl import YoutubeDL
-from youtube_dl.compat import compat_http_server
-from youtube_dl.downloader.http import HttpFD
-from youtube_dl.utils import encodeFilename
+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
 import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
index 11661bb68148f4eb229b50c37f67dc744491c7df..b18e63d73f64e0c39066a39fe3c564c050389950 100644 (file)
@@ -10,7 +10,7 @@
 import subprocess
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.utils import encodeArgument
+from youtube_dlc.utils import encodeArgument
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 class TestExecution(unittest.TestCase):
     def test_import(self):
-        subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
+        subprocess.check_call([sys.executable, '-c', 'import youtube_dlc'], 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_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+            subprocess.check_call([sys.executable, '-m', 'youtube_dlc', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
-        subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        subprocess.check_call([sys.executable, 'youtube_dlc/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_cmdline_umlauts(self):
         p = subprocess.Popen(
-            [sys.executable, 'youtube_dl/__main__.py', encodeArgument('ä'), '--version'],
+            [sys.executable, 'youtube_dlc/__main__.py', encodeArgument('ä'), '--version'],
             cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
         _, stderr = p.communicate()
         self.assertFalse(stderr)
index 3ee0a5dda8df4446f915391e031f6d13da486150..55c3c6183d7671cbe619dbb9a641b33a97b4a4aa 100644 (file)
@@ -9,8 +9,8 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import http_server_port
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import compat_http_server, compat_urllib_request
+from youtube_dlc import YoutubeDL
+from youtube_dlc.compat import compat_http_server, compat_urllib_request
 import ssl
 import threading
 
index 789059dbea38026362caea2be08f9d36796a7b1d..303609baa43085a08fe282cab8e5bba6e3b5ee11 100644 (file)
@@ -9,7 +9,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL
-from youtube_dl.extractor import IqiyiIE
+from youtube_dlc.extractor import IqiyiIE
 
 
 class IqiyiIEWithCredentials(IqiyiIE):
index c24b8ca742acc308ca9c455378564bbac053765d..97fc8d5aa88626f569126dbdba2a21828743cfdc 100644 (file)
@@ -8,7 +8,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.jsinterp import JSInterpreter
+from youtube_dlc.jsinterp import JSInterpreter
 
 
 class TestJSInterpreter(unittest.TestCase):
index 7cf3a6a2e672e6300f26dcb8060bebca869f0310..566ba37a643b94b1156a38e15936748c9b2320b8 100644 (file)
@@ -7,7 +7,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (
     gen_extractors,
 )
 
index 3a25a6ba37ca2c7b409de640acb8fbf74dc03f0b..dce2533736525f5976469b53ac27b9a98ef38f5f 100644 (file)
@@ -8,7 +8,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.options import _hide_login_info
+from youtube_dlc.options import _hide_login_info
 
 
 class TestOptions(unittest.TestCase):
index 4209d1d9a0cefa96fc5ea9d26229f6ac44116996..6f538a3da0f823361f86e84f502e58f25540594e 100644 (file)
@@ -8,7 +8,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.postprocessor import MetadataFromTitlePP
+from youtube_dlc.postprocessor import MetadataFromTitlePP
 
 
 class TestMetadataFromTitle(unittest.TestCase):
index 1e68eb0daea04a466f07da4e790a1d25c88b5615..be52e2343e0fe28dd369f0cd4f35da0e4128f20b 100644 (file)
@@ -15,7 +15,7 @@
     FakeYDL,
     get_params,
 )
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_str,
     compat_urllib_request,
 )
index d9727c579d8ecd20cd9dc5b64dda412763ba5a7b..86e20cb4be444c4ab24924eb31e3fa7a266041fd 100644 (file)
@@ -10,7 +10,7 @@
 from test.helper import FakeYDL, md5
 
 
-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (
     YoutubeIE,
     DailymotionIE,
     TEDIE,
index 9f18055e629d3c21826ad8159bdf0ae55409bca2..1a8b353e8d29df62dc53afa8f7d6181d30d023d8 100644 (file)
@@ -14,7 +14,7 @@
 import re
 import subprocess
 
-from youtube_dl.swfinterp import SWFInterpreter
+from youtube_dlc.swfinterp import SWFInterpreter
 
 
 TEST_DIR = os.path.join(
index d9c71511db795a24d72b846ea40be574a7f4e549..1b144c43c42076062d949dcb9a55aa9ab4816524 100644 (file)
@@ -10,7 +10,7 @@
 
 
 import json
-from youtube_dl.update import rsa_verify
+from youtube_dlc.update import rsa_verify
 
 
 class TestUpdate(unittest.TestCase):
index 0896f41506aa6d6cdb45b1c601203d6e717946d6..5914d4fd62f0a6b75d98e8e7477775bf0c86fb38 100644 (file)
@@ -15,7 +15,7 @@
 import json
 import xml.etree.ElementTree
 
-from youtube_dl.utils import (
+from youtube_dlc.utils import (
     age_restricted,
     args_to_str,
     encode_base_n,
     cli_bool_option,
     parse_codecs,
 )
-from youtube_dl.compat import (
+from youtube_dlc.compat import (
     compat_chr,
     compat_etree_fromstring,
     compat_getenv,
@@ -240,12 +240,12 @@ def test_expand_path(self):
         def env(var):
             return '%{0}%'.format(var) if sys.platform == 'win32' else '${0}'.format(var)
 
-        compat_setenv('YOUTUBE_DL_EXPATH_PATH', 'expanded')
-        self.assertEqual(expand_path(env('YOUTUBE_DL_EXPATH_PATH')), 'expanded')
+        compat_setenv('youtube_dlc_EXPATH_PATH', 'expanded')
+        self.assertEqual(expand_path(env('youtube_dlc_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_DL_EXPATH_PATH')),
+            expand_path('~/%s' % env('youtube_dlc_EXPATH_PATH')),
             '%s/expanded' % compat_getenv('HOME'))
 
     def test_prepend_extension(self):
@@ -1388,8 +1388,8 @@ def test_caesar(self):
         self.assertEqual(caesar('ebg', 'acegik', -2), 'abc')
 
     def test_rot47(self):
-        self.assertEqual(rot47('youtube-dl'), r'J@FEF36\5=')
-        self.assertEqual(rot47('YOUTUBE-DL'), r'*~&%&qt\s{')
+        self.assertEqual(rot47('youtube-dlc'), r'J@FEF36\5=4')
+        self.assertEqual(rot47('YOUTUBE-DLC'), r'*~&%&qt\s{r')
 
     def test_urshift(self):
         self.assertEqual(urshift(3, 1), 1)
index c1465fe8c51d8bf3789606fbf6c61da0deabfa90..462f25e03f648d79df48f35fc4a7ddfdbc1f532d 100644 (file)
@@ -17,7 +17,7 @@ class TestVerboseOutput(unittest.TestCase):
     def test_private_info_arg(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',
                 '--username', 'johnsmith@gmail.com',
                 '--password', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -30,7 +30,7 @@ def test_private_info_arg(self):
     def test_private_info_shortarg(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',
                 '-u', 'johnsmith@gmail.com',
                 '-p', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -43,7 +43,7 @@ def test_private_info_shortarg(self):
     def test_private_info_eq(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',
                 '--username=johnsmith@gmail.com',
                 '--password=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -56,7 +56,7 @@ def test_private_info_eq(self):
     def test_private_info_shortarg_eq(self):
         outp = subprocess.Popen(
             [
-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',
                 '-u=johnsmith@gmail.com',
                 '-p=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
index 41abdfe3b99eaabf562ebabc222fc50fead77631..d98c96c15ffb00e3d495e6d5d78ae50701921d64 100644 (file)
 
 import xml.etree.ElementTree
 
-import youtube_dl.YoutubeDL
-import youtube_dl.extractor
+import youtube_dlc.YoutubeDL
+import youtube_dlc.extractor
 
 
-class YoutubeDL(youtube_dl.YoutubeDL):
+class YoutubeDL(youtube_dlc.YoutubeDL):
     def __init__(self, *args, **kwargs):
         super(YoutubeDL, self).__init__(*args, **kwargs)
         self.to_stderr = self.to_screen
@@ -45,7 +45,7 @@ def setUp(self):
 
     def test_info_json(self):
         expected = list(EXPECTED_ANNOTATIONS)  # Two annotations could have the same text.
-        ie = youtube_dl.extractor.YoutubeIE()
+        ie = youtube_dlc.extractor.YoutubeIE()
         ydl = YoutubeDL(params)
         ydl.add_info_extractor(ie)
         ydl.download([TEST_ID])
index e69c57377e617e2864a80e2e736bb72c87c4122e..4529d2e84d0e5f5f427f2078f0de782002c611b6 100644 (file)
@@ -9,7 +9,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import expect_value
-from youtube_dl.extractor import YoutubeIE
+from youtube_dlc.extractor import YoutubeIE
 
 
 class TestYoutubeChapters(unittest.TestCase):
index c4f0abbeaaacbe3b469320c13a205e8f738c443b..a693963ef9076e0a5bd5634b668e3fc7852acdd0 100644 (file)
@@ -10,7 +10,7 @@
 from test.helper import FakeYDL
 
 
-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (
     YoutubePlaylistIE,
     YoutubeIE,
 )
index 69df30edaa75efbeb51a1cad650c8e29b2596b66..a54b36198fd898de18fd01981317d6462ae8cc58 100644 (file)
@@ -13,8 +13,8 @@
 import string
 
 from test.helper import FakeYDL
-from youtube_dl.extractor import YoutubeIE
-from youtube_dl.compat import compat_str, compat_urlretrieve
+from youtube_dlc.extractor import YoutubeIE
+from youtube_dlc.compat import compat_str, compat_urlretrieve
 
 _TESTS = [
     (
diff --git a/tox.ini b/tox.ini
index 9c4e4a3d1eab285d8def7fce06e7d5ceb108952e..842091d65c1adc2cfdc26b46fc4f6bf6c4ba1445 100644 (file)
--- 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_dl --cover-html
+commands = nosetests --verbose {posargs:{[testenv]defaultargs}}  # --with-coverage --cover-package=youtube_dlc --cover-html
                                                # test.test_download:TestDownload.test_NowVideo
diff --git a/youtube-dl.plugin.zsh b/youtube-dl.plugin.zsh
deleted file mode 100644 (file)
index 17ab134..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# This allows the youtube-dl command to be installed in ZSH using antigen.
-# Antigen is a bundle manager. It allows you to enhance the functionality of
-# your zsh session by installing bundles and themes easily.
-
-# Antigen documentation:
-# http://antigen.sharats.me/
-# https://github.com/zsh-users/antigen
-
-# Install youtube-dl:
-# antigen bundle ytdl-org/youtube-dl
-# Bundles installed by antigen are available for use immediately.
-
-# Update youtube-dl (and all other antigen bundles):
-# antigen update
-
-# The antigen command will download the git repository to a folder and then
-# execute an enabling script (this file). The complete process for loading the
-# code is documented here:
-# https://github.com/zsh-users/antigen#notes-on-writing-plugins
-
-# This specific script just aliases youtube-dl to the python script that this
-# library provides. This requires updating the PYTHONPATH to ensure that the
-# full set of code can be located.
-alias youtube-dl="PYTHONPATH=$(dirname $0) $(dirname $0)/bin/youtube-dl"
diff --git a/youtube_dl/extractor/deezer.py b/youtube_dl/extractor/deezer.py
deleted file mode 100644 (file)
index a38b268..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-from __future__ import unicode_literals
-
-import json
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    orderedSet,
-)
-
-
-class DeezerPlaylistIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?deezer\.com/playlist/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'http://www.deezer.com/playlist/176747451',
-        'info_dict': {
-            'id': '176747451',
-            'title': 'Best!',
-            'uploader': 'Anonymous',
-            'thumbnail': r're:^https?://cdn-images\.deezer\.com/images/cover/.*\.jpg$',
-        },
-        'playlist_count': 30,
-        'skip': 'Only available in .de',
-    }
-
-    def _real_extract(self, url):
-        if 'test' not in self._downloader.params:
-            self._downloader.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!')
-
-        mobj = re.match(self._VALID_URL, url)
-        playlist_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, playlist_id)
-        geoblocking_msg = self._html_search_regex(
-            r'<p class="soon-txt">(.*?)</p>', webpage, 'geoblocking message',
-            default=None)
-        if geoblocking_msg is not None:
-            raise ExtractorError(
-                'Deezer said: %s' % geoblocking_msg, expected=True)
-
-        data_json = self._search_regex(
-            (r'__DZR_APP_STATE__\s*=\s*({.+?})\s*</script>',
-             r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n'),
-            webpage, 'data JSON')
-        data = json.loads(data_json)
-
-        playlist_title = data.get('DATA', {}).get('TITLE')
-        playlist_uploader = data.get('DATA', {}).get('PARENT_USERNAME')
-        playlist_thumbnail = self._search_regex(
-            r'<img id="naboo_playlist_image".*?src="([^"]+)"', webpage,
-            'playlist thumbnail')
-
-        preview_pattern = self._search_regex(
-            r"var SOUND_PREVIEW_GATEWAY\s*=\s*'([^']+)';", webpage,
-            'preview URL pattern', fatal=False)
-        entries = []
-        for s in data['SONGS']['data']:
-            puid = s['MD5_ORIGIN']
-            preview_video_url = preview_pattern.\
-                replace('{0}', puid[0]).\
-                replace('{1}', puid).\
-                replace('{2}', s['MEDIA_VERSION'])
-            formats = [{
-                'format_id': 'preview',
-                'url': preview_video_url,
-                'preference': -100,  # Only the first 30 seconds
-                'ext': 'mp3',
-            }]
-            self._sort_formats(formats)
-            artists = ', '.join(
-                orderedSet(a['ART_NAME'] for a in s['ARTISTS']))
-            entries.append({
-                'id': s['SNG_ID'],
-                'duration': int_or_none(s.get('DURATION')),
-                'title': '%s - %s' % (artists, s['SNG_TITLE']),
-                'uploader': s['ART_NAME'],
-                'uploader_id': s['ART_ID'],
-                'age_limit': 16 if s.get('EXPLICIT_LYRICS') == '1' else 0,
-                'formats': formats,
-            })
-
-        return {
-            '_type': 'playlist',
-            'id': playlist_id,
-            'title': playlist_title,
-            'uploader': playlist_uploader,
-            'thumbnail': playlist_thumbnail,
-            'entries': entries,
-        }
diff --git a/youtube_dl/extractor/dreisat.py b/youtube_dl/extractor/dreisat.py
deleted file mode 100644 (file)
index 848d387..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    unified_strdate,
-    xpath_text,
-    determine_ext,
-    float_or_none,
-    ExtractorError,
-)
-
-
-class DreiSatIE(InfoExtractor):
-    IE_NAME = '3sat'
-    _GEO_COUNTRIES = ['DE']
-    _VALID_URL = r'https?://(?:www\.)?3sat\.de/mediathek/(?:(?:index|mediathek)\.php)?\?(?:(?:mode|display)=[^&]+&)*obj=(?P<id>[0-9]+)'
-    _TESTS = [
-        {
-            'url': 'http://www.3sat.de/mediathek/index.php?mode=play&obj=45918',
-            'md5': 'be37228896d30a88f315b638900a026e',
-            'info_dict': {
-                'id': '45918',
-                'ext': 'mp4',
-                'title': 'Waidmannsheil',
-                'description': 'md5:cce00ca1d70e21425e72c86a98a56817',
-                'uploader': 'SCHWEIZWEIT',
-                'uploader_id': '100000210',
-                'upload_date': '20140913'
-            },
-            'params': {
-                'skip_download': True,  # m3u8 downloads
-            }
-        },
-        {
-            'url': 'http://www.3sat.de/mediathek/mediathek.php?mode=play&obj=51066',
-            'only_matching': True,
-        },
-    ]
-
-    def _parse_smil_formats(self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):
-        param_groups = {}
-        for param_group in smil.findall(self._xpath_ns('./head/paramGroup', namespace)):
-            group_id = param_group.get(self._xpath_ns(
-                'id', 'http://www.w3.org/XML/1998/namespace'))
-            params = {}
-            for param in param_group:
-                params[param.get('name')] = param.get('value')
-            param_groups[group_id] = params
-
-        formats = []
-        for video in smil.findall(self._xpath_ns('.//video', namespace)):
-            src = video.get('src')
-            if not src:
-                continue
-            bitrate = int_or_none(self._search_regex(r'_(\d+)k', src, 'bitrate', None)) or float_or_none(video.get('system-bitrate') or video.get('systemBitrate'), 1000)
-            group_id = video.get('paramGroup')
-            param_group = param_groups[group_id]
-            for proto in param_group['protocols'].split(','):
-                formats.append({
-                    'url': '%s://%s' % (proto, param_group['host']),
-                    'app': param_group['app'],
-                    'play_path': src,
-                    'ext': 'flv',
-                    'format_id': '%s-%d' % (proto, bitrate),
-                    'tbr': bitrate,
-                })
-        self._sort_formats(formats)
-        return formats
-
-    def extract_from_xml_url(self, video_id, xml_url):
-        doc = self._download_xml(
-            xml_url, video_id,
-            note='Downloading video info',
-            errnote='Failed to download video info')
-
-        status_code = xpath_text(doc, './status/statuscode')
-        if status_code and status_code != 'ok':
-            if status_code == 'notVisibleAnymore':
-                message = 'Video %s is not available' % video_id
-            else:
-                message = '%s returned error: %s' % (self.IE_NAME, status_code)
-            raise ExtractorError(message, expected=True)
-
-        title = xpath_text(doc, './/information/title', 'title', True)
-
-        urls = []
-        formats = []
-        for fnode in doc.findall('.//formitaeten/formitaet'):
-            video_url = xpath_text(fnode, 'url')
-            if not video_url or video_url in urls:
-                continue
-            urls.append(video_url)
-
-            is_available = 'http://www.metafilegenerator' not in video_url
-            geoloced = 'static_geoloced_online' in video_url
-            if not is_available or geoloced:
-                continue
-
-            format_id = fnode.attrib['basetype']
-            format_m = re.match(r'''(?x)
-                (?P<vcodec>[^_]+)_(?P<acodec>[^_]+)_(?P<container>[^_]+)_
-                (?P<proto>[^_]+)_(?P<index>[^_]+)_(?P<indexproto>[^_]+)
-            ''', format_id)
-
-            ext = determine_ext(video_url, None) or format_m.group('container')
-
-            if ext == 'meta':
-                continue
-            elif ext == 'smil':
-                formats.extend(self._extract_smil_formats(
-                    video_url, video_id, fatal=False))
-            elif ext == 'm3u8':
-                # the certificates are misconfigured (see
-                # https://github.com/ytdl-org/youtube-dl/issues/8665)
-                if video_url.startswith('https://'):
-                    continue
-                formats.extend(self._extract_m3u8_formats(
-                    video_url, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id=format_id, fatal=False))
-            elif ext == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    video_url, video_id, f4m_id=format_id, fatal=False))
-            else:
-                quality = xpath_text(fnode, './quality')
-                if quality:
-                    format_id += '-' + quality
-
-                abr = int_or_none(xpath_text(fnode, './audioBitrate'), 1000)
-                vbr = int_or_none(xpath_text(fnode, './videoBitrate'), 1000)
-
-                tbr = int_or_none(self._search_regex(
-                    r'_(\d+)k', video_url, 'bitrate', None))
-                if tbr and vbr and not abr:
-                    abr = tbr - vbr
-
-                formats.append({
-                    'format_id': format_id,
-                    'url': video_url,
-                    'ext': ext,
-                    'acodec': format_m.group('acodec'),
-                    'vcodec': format_m.group('vcodec'),
-                    'abr': abr,
-                    'vbr': vbr,
-                    'tbr': tbr,
-                    'width': int_or_none(xpath_text(fnode, './width')),
-                    'height': int_or_none(xpath_text(fnode, './height')),
-                    'filesize': int_or_none(xpath_text(fnode, './filesize')),
-                    'protocol': format_m.group('proto').lower(),
-                })
-
-        geolocation = xpath_text(doc, './/details/geolocation')
-        if not formats and geolocation and geolocation != 'none':
-            self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
-
-        self._sort_formats(formats)
-
-        thumbnails = []
-        for node in doc.findall('.//teaserimages/teaserimage'):
-            thumbnail_url = node.text
-            if not thumbnail_url:
-                continue
-            thumbnail = {
-                'url': thumbnail_url,
-            }
-            thumbnail_key = node.get('key')
-            if thumbnail_key:
-                m = re.match('^([0-9]+)x([0-9]+)$', thumbnail_key)
-                if m:
-                    thumbnail['width'] = int(m.group(1))
-                    thumbnail['height'] = int(m.group(2))
-            thumbnails.append(thumbnail)
-
-        upload_date = unified_strdate(xpath_text(doc, './/details/airtime'))
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': xpath_text(doc, './/information/detail'),
-            'duration': int_or_none(xpath_text(doc, './/details/lengthSec')),
-            'thumbnails': thumbnails,
-            'uploader': xpath_text(doc, './/details/originChannelTitle'),
-            'uploader_id': xpath_text(doc, './/details/originChannelId'),
-            'upload_date': upload_date,
-            'formats': formats,
-        }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        details_url = 'http://www.3sat.de/mediathek/xmlservice/web/beitragsDetails?id=%s' % video_id
-        return self.extract_from_xml_url(video_id, details_url)
diff --git a/youtube_dl/extractor/phoenix.py b/youtube_dl/extractor/phoenix.py
deleted file mode 100644 (file)
index e435c28..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-from __future__ import unicode_literals
-
-from .dreisat import DreiSatIE
-
-
-class PhoenixIE(DreiSatIE):
-    IE_NAME = 'phoenix.de'
-    _VALID_URL = r'''(?x)https?://(?:www\.)?phoenix\.de/content/
-        (?:
-            phoenix/die_sendungen/(?:[^/]+/)?
-        )?
-        (?P<id>[0-9]+)'''
-    _TESTS = [
-        {
-            'url': 'http://www.phoenix.de/content/884301',
-            'md5': 'ed249f045256150c92e72dbb70eadec6',
-            'info_dict': {
-                'id': '884301',
-                'ext': 'mp4',
-                'title': 'Michael Krons mit Hans-Werner Sinn',
-                'description': 'Im Dialog - Sa. 25.10.14, 00.00 - 00.35 Uhr',
-                'upload_date': '20141025',
-                'uploader': 'Im Dialog',
-            }
-        },
-        {
-            'url': 'http://www.phoenix.de/content/phoenix/die_sendungen/869815',
-            'only_matching': True,
-        },
-        {
-            'url': 'http://www.phoenix.de/content/phoenix/die_sendungen/diskussionen/928234',
-            'only_matching': True,
-        },
-    ]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        internal_id = self._search_regex(
-            r'<div class="phx_vod" id="phx_vod_([0-9]+)"',
-            webpage, 'internal video ID')
-
-        api_url = 'http://www.phoenix.de/php/mediaplayer/data/beitrags_details.php?ak=web&id=%s' % internal_id
-        return self.extract_from_xml_url(video_id, api_url)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from youtube_dl/YoutubeDL.py
rename to youtube_dlc/YoutubeDL.py
index 19370f6..f79d31d
@@ -228,7 +228,7 @@ class YoutubeDL(object):
                        playlist items.
     postprocessors:    A list of dictionaries, each with an entry
                        * key:  The name of the postprocessor. See
-                               youtube_dl/postprocessor/__init__.py for a list.
+                               youtube_dlc/postprocessor/__init__.py for a list.
                        as well as any further keyword arguments for the
                        postprocessor.
     progress_hooks:    A list of functions that get called on download
@@ -264,7 +264,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-dl servers for debugging.
+                       youtube-dlc servers for debugging.
     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
@@ -301,7 +301,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_dl/downloader/common.py):
+    the downloader (see youtube_dlc/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,
@@ -441,7 +441,7 @@ def warn_if_short_id(self, argv):
             if re.match(r'^-[0-9A-Za-z_-]{10}$', a)]
         if idxs:
             correct_argv = (
-                ['youtube-dl']
+                ['youtube-dlc']
                 + [a for i, a in enumerate(argv) if i not in idxs]
                 + ['--'] + [argv[i] for i in idxs]
             )
@@ -1805,6 +1805,14 @@ def ensure_dir_exists(path):
                     self.report_error('Cannot write annotations file: ' + annofn)
                     return
 
+        def dl(name, info):
+            fd = get_suitable_downloader(info, self.params)(self, self.params)
+            for ph in self._progress_hooks:
+                fd.add_progress_hook(ph)
+            if self.params.get('verbose'):
+                self.to_stdout('[debug] Invoking downloader on %r' % info.get('url'))
+            return fd.download(name, info)
+
         subtitles_are_requested = any([self.params.get('writesubtitles', False),
                                        self.params.get('writeautomaticsub')])
 
@@ -1812,14 +1820,12 @@ def ensure_dir_exists(path):
             # subtitles download errors are already managed as troubles in relevant IE
             # that way it will silently go on when used with unsupporting IE
             subtitles = info_dict['requested_subtitles']
-            ie = self.get_info_extractor(info_dict['extractor_key'])
             for sub_lang, sub_info in subtitles.items():
                 sub_format = sub_info['ext']
                 sub_filename = subtitles_filename(filename, sub_lang, sub_format, info_dict.get('ext'))
                 if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(sub_filename)):
                     self.to_screen('[info] Video subtitle %s.%s is already present' % (sub_lang, sub_format))
                 else:
-                    self.to_screen('[info] Writing video subtitles to: ' + sub_filename)
                     if sub_info.get('data') is not None:
                         try:
                             # Use newline='' to prevent conversion of newline characters
@@ -1831,11 +1837,11 @@ def ensure_dir_exists(path):
                             return
                     else:
                         try:
-                            sub_data = ie._request_webpage(
-                                sub_info['url'], info_dict['id'], note=False).read()
-                            with io.open(encodeFilename(sub_filename), 'wb') as subfile:
-                                subfile.write(sub_data)
-                        except (ExtractorError, IOError, OSError, ValueError) as err:
+                            dl(sub_filename, sub_info)
+                        except (ExtractorError, IOError, OSError, ValueError,
+                                compat_urllib_error.URLError,
+                                compat_http_client.HTTPException,
+                                socket.error) as err:
                             self.report_warning('Unable to download subtitle for "%s": %s' %
                                                 (sub_lang, error_to_compat_str(err)))
                             continue
@@ -1856,14 +1862,6 @@ def ensure_dir_exists(path):
 
         if not self.params.get('skip_download', False):
             try:
-                def dl(name, info):
-                    fd = get_suitable_downloader(info, self.params)(self, self.params)
-                    for ph in self._progress_hooks:
-                        fd.add_progress_hook(ph)
-                    if self.params.get('verbose'):
-                        self.to_stdout('[debug] Invoking downloader on %r' % info.get('url'))
-                    return fd.download(name, info)
-
                 if info_dict.get('requested_formats') is not None:
                     downloaded = []
                     success = True
@@ -2256,7 +2254,7 @@ def print_debug_header(self):
                 self.get_encoding()))
         write_string(encoding_str, encoding=None)
 
-        self._write_string('[debug] youtube-dl version ' + __version__ + '\n')
+        self._write_string('[debug] youtube-dlc version ' + __version__ + '\n')
         if _LAZY_LOADER:
             self._write_string('[debug] Lazy loading extractors enabled' + '\n')
         try:
@@ -2354,7 +2352,7 @@ def _setup_opener(self):
         file_handler = compat_urllib_request.FileHandler()
 
         def file_open(*args, **kwargs):
-            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dl for security reasons')
+            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dlc for security reasons')
         file_handler.file_open = file_open
 
         opener = compat_urllib_request.build_opener(
similarity index 99%
rename from youtube_dl/__init__.py
rename to youtube_dlc/__init__.py
index 9a659fc654d2a3af5d63e47363f8cdfdcdc0c333..a663417dab292caf7c6e4a72599a6419391a108c 100644 (file)
@@ -53,7 +53,7 @@ def _real_main(argv=None):
 
     workaround_optparse_bug9161()
 
-    setproctitle('youtube-dl')
+    setproctitle('youtube-dlc')
 
     parser, opts, args = parseOpts(argv)
 
@@ -455,7 +455,7 @@ def parse_retries(retries):
             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-dl --help to see a list of all options.')
+                'Type youtube-dlc --help to see a list of all options.')
 
         try:
             if opts.load_info_filename is not None:
old mode 100755 (executable)
new mode 100644 (file)
similarity index 73%
rename from youtube_dl/__main__.py
rename to youtube_dlc/__main__.py
index 138f5fb..0e76016
@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 # Execute with
-# $ python youtube_dl/__main__.py (2.6+)
-# $ python -m youtube_dl          (2.7+)
+# $ python youtube_dlc/__main__.py (2.6+)
+# $ python -m youtube_dlc          (2.7+)
 
 import sys
 
@@ -13,7 +13,7 @@
     path = os.path.realpath(os.path.abspath(__file__))
     sys.path.insert(0, os.path.dirname(os.path.dirname(path)))
 
-import youtube_dl
+import youtube_dlc
 
 if __name__ == '__main__':
-    youtube_dl.main()
+    youtube_dlc.main()
similarity index 100%
rename from youtube_dl/aes.py
rename to youtube_dlc/aes.py
similarity index 98%
rename from youtube_dl/cache.py
rename to youtube_dlc/cache.py
index 7bdade1bdb49a7406457688400830a91a98ef186..ada6aa1f28ba39f4e6f22df92e4327d81d7cd0f7 100644 (file)
@@ -23,7 +23,7 @@ def _get_root_dir(self):
         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-dl')
+            res = os.path.join(cache_root, 'youtube-dlc')
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
similarity index 99%
rename from youtube_dl/compat.py
rename to youtube_dlc/compat.py
index 0ee9bc76020377dc811c0d06736eba8082a53dbd..1cf7efed615af3a4ec5bcdfe084ff0bf197b8b3c 100644 (file)
@@ -2973,7 +2973,7 @@ def compat_b64decode(s, *args, **kwargs):
 
 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-dl one [2].
+    # names, see the original PyPy issue [1] and the youtube-dlc 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):
similarity index 93%
rename from youtube_dl/downloader/__init__.py
rename to youtube_dlc/downloader/__init__.py
index 2e485df9dac09e197af6183ded3570e57805fad2..4ae81f516e63958c30c798c917e8c5df44aa867f 100644 (file)
@@ -8,6 +8,7 @@
 from .dash import DashSegmentsFD
 from .rtsp import RtspFD
 from .ism import IsmFD
+from .youtube_live_chat import YoutubeLiveChatReplayFD
 from .external import (
     get_external_downloader,
     FFmpegFD,
@@ -26,6 +27,7 @@
     'f4m': F4mFD,
     'http_dash_segments': DashSegmentsFD,
     'ism': IsmFD,
+    'youtube_live_chat_replay': YoutubeLiveChatReplayFD,
 }
 
 
similarity index 99%
rename from youtube_dl/downloader/common.py
rename to youtube_dlc/downloader/common.py
index 1cdba89cd9b093c1cc45071d34e307028aac02ea..31c2864584b917d70cbbc903823a100d21a114dd 100644 (file)
@@ -243,7 +243,7 @@ def _report_progress_status(self, msg, is_last_line=False):
             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-dl ' + msg)
+        self.to_console_title('youtube-dlc ' + msg)
 
     def report_progress(self, s):
         if s['status'] == 'finished':
similarity index 98%
rename from youtube_dl/downloader/fragment.py
rename to youtube_dlc/downloader/fragment.py
index 02f35459e82ddb0e39dad3b7790f2db7a90d85fa..9339b3a62c4bd4d360bf719f0e1e3e16ebb0f840 100644 (file)
@@ -32,9 +32,9 @@ class FragmentFD(FileDownloader):
     keep_fragments:     Keep downloaded fragments on disk after downloading is
                         finished
 
-    For each incomplete fragment download youtube-dl keeps on disk a special
+    For each incomplete fragment download youtube-dlc 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-dl). This file is
+    be used for any incomplete download handled by youtube-dlc). 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/youtube_live_chat.py b/youtube_dlc/downloader/youtube_live_chat.py
new file mode 100644 (file)
index 0000000..4932dd9
--- /dev/null
@@ -0,0 +1,94 @@
+from __future__ import division, unicode_literals
+
+import re
+import json
+
+from .fragment import FragmentFD
+
+
+class YoutubeLiveChatReplayFD(FragmentFD):
+    """ Downloads YouTube live chat replays fragment by fragment """
+
+    FD_NAME = 'youtube_live_chat_replay'
+
+    def real_download(self, filename, info_dict):
+        video_id = info_dict['video_id']
+        self.to_screen('[%s] Downloading live chat' % self.FD_NAME)
+
+        test = self.params.get('test', False)
+
+        ctx = {
+            'filename': filename,
+            'live': True,
+            'total_frags': None,
+        }
+
+        def dl_fragment(url):
+            headers = info_dict.get('http_headers', {})
+            return self._download_fragment(ctx, url, info_dict, headers)
+
+        def parse_yt_initial_data(data):
+            window_patt = b'window\\["ytInitialData"\\]\\s*=\\s*(.*?)(?<=});'
+            var_patt = b'var\\s+ytInitialData\\s*=\\s*(.*?)(?<=});'
+            for patt in window_patt, var_patt:
+                try:
+                    raw_json = re.search(patt, data).group(1)
+                    return json.loads(raw_json)
+                except AttributeError:
+                    continue
+
+        self._prepare_and_start_frag_download(ctx)
+
+        success, raw_fragment = dl_fragment(
+            'https://www.youtube.com/watch?v={}'.format(video_id))
+        if not success:
+            return False
+        data = parse_yt_initial_data(raw_fragment)
+        continuation_id = data['contents']['twoColumnWatchNextResults']['conversationBar']['liveChatRenderer']['continuations'][0]['reloadContinuationData']['continuation']
+        # no data yet but required to call _append_fragment
+        self._append_fragment(ctx, b'')
+
+        first = True
+        offset = None
+        while continuation_id is not None:
+            data = None
+            if first:
+                url = 'https://www.youtube.com/live_chat_replay?continuation={}'.format(continuation_id)
+                success, raw_fragment = dl_fragment(url)
+                if not success:
+                    return False
+                data = parse_yt_initial_data(raw_fragment)
+            else:
+                url = ('https://www.youtube.com/live_chat_replay/get_live_chat_replay'
+                       + '?continuation={}'.format(continuation_id)
+                       + '&playerOffsetMs={}'.format(offset - 5000)
+                       + '&hidden=false'
+                       + '&pbj=1')
+                success, raw_fragment = dl_fragment(url)
+                if not success:
+                    return False
+                data = json.loads(raw_fragment)['response']
+
+            first = False
+            continuation_id = None
+
+            live_chat_continuation = data['continuationContents']['liveChatContinuation']
+            offset = None
+            processed_fragment = bytearray()
+            if 'actions' in live_chat_continuation:
+                for action in live_chat_continuation['actions']:
+                    if 'replayChatItemAction' in action:
+                        replay_chat_item_action = action['replayChatItemAction']
+                        offset = int(replay_chat_item_action['videoOffsetTimeMsec'])
+                    processed_fragment.extend(
+                        json.dumps(action, ensure_ascii=False).encode('utf-8') + b'\n')
+                continuation_id = live_chat_continuation['continuations'][0]['liveChatReplayContinuationData']['continuation']
+
+            self._append_fragment(ctx, processed_fragment)
+
+            if test or offset is None:
+                break
+
+        self._finish_frag_download(ctx)
+
+        return True
similarity index 99%
rename from youtube_dl/extractor/appletrailers.py
rename to youtube_dlc/extractor/appletrailers.py
index a9ef733e011237338d904f956c4324cc6dd7a72b..b5ed2b88b3e227216db12da1936b9d4c3466efa8 100644 (file)
@@ -199,7 +199,7 @@ def _clean_json(m):
                 'upload_date': upload_date,
                 'uploader_id': uploader_id,
                 'http_headers': {
-                    'User-Agent': 'QuickTime compatible (youtube-dl)',
+                    'User-Agent': 'QuickTime compatible (youtube-dlc)',
                 },
             })
 
similarity index 98%
rename from youtube_dl/extractor/bandcamp.py
rename to youtube_dlc/extractor/bandcamp.py
index f14b407dc82cf8f945f581ab059bd6218866eb57..b8a57e6a50b26ba61c1137b4c8c72d5fc603a8d6 100644 (file)
 class BandcampIE(InfoExtractor):
     _VALID_URL = r'https?://[^/]+\.bandcamp\.com/track/(?P<title>[^/?#&]+)'
     _TESTS = [{
-        'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
+        'url': 'http://youtube-dlc.bandcamp.com/track/youtube-dlc-test-song',
         'md5': 'c557841d5e50261777a6585648adf439',
         'info_dict': {
             'id': '1812978515',
             'ext': 'mp3',
-            'title': "youtube-dl  \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
+            'title': "youtube-dlc  \"'/\\\u00e4\u21ad - youtube-dlc test song \"'/\\\u00e4\u21ad",
             'duration': 9.8485,
         },
         '_skip': 'There is a limit of 200 free downloads / month for the test song'
similarity index 99%
rename from youtube_dl/extractor/bilibili.py
rename to youtube_dlc/extractor/bilibili.py
index 4dc597e160bcea4f0821719dc82e2908f20d1972..d39ee8ffeca763c882747d15e82d4813503ba26c 100644 (file)
@@ -139,7 +139,7 @@ def _real_extract(self, url):
                 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-dl with %s' % (
+                self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dlc 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',
similarity index 99%
rename from youtube_dl/extractor/common.py
rename to youtube_dlc/extractor/common.py
index a61753b17cd35835474c347c2b438e5f32949d73..c1ea5d84603f9e821e789648bac743a7c6d2c9b6 100644 (file)
@@ -269,7 +269,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-dl it
+    webpage_url:    The URL to the video webpage, if given to youtube-dlc 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
@@ -1500,7 +1500,7 @@ def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None,
         if not isinstance(manifest, compat_etree_Element) and not fatal:
             return []
 
-        # currently youtube-dl cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
+        # currently youtube-dlc 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]
similarity index 92%
rename from youtube_dl/extractor/commonmistakes.py
rename to youtube_dlc/extractor/commonmistakes.py
index 7e12499b1e83ab39026fb0448673dfdacddaf968..933b89eb3e5e649acb98764b7dcb3aaa3c78db16 100644 (file)
@@ -22,12 +22,12 @@ class CommonMistakesIE(InfoExtractor):
 
     def _real_extract(self, url):
         msg = (
-            'You\'ve asked youtube-dl to download the URL "%s". '
+            'You\'ve asked youtube-dlc 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-dl got.'
+            msg += ' Add -v to the command line to see what arguments and configuration youtube-dlc got.'
         raise ExtractorError(msg, expected=True)
 
 
diff --git a/youtube_dlc/extractor/deezer.py b/youtube_dlc/extractor/deezer.py
new file mode 100644 (file)
index 0000000..3031671
--- /dev/null
@@ -0,0 +1,147 @@
+from __future__ import unicode_literals
+
+import json
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    orderedSet,
+)
+
+
+class DeezerBaseInfoExtractor(InfoExtractor):
+    def get_data(self, url):
+        if not self._downloader.params.get('test'):
+            self._downloader.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!')
+
+        mobj = re.match(self._VALID_URL, url)
+        data_id = mobj.group('id')
+
+        webpage = self._download_webpage(url, data_id)
+        geoblocking_msg = self._html_search_regex(
+            r'<p class="soon-txt">(.*?)</p>', webpage, 'geoblocking message',
+            default=None)
+        if geoblocking_msg is not None:
+            raise ExtractorError(
+                'Deezer said: %s' % geoblocking_msg, expected=True)
+
+        data_json = self._search_regex(
+            (r'__DZR_APP_STATE__\s*=\s*({.+?})\s*</script>',
+             r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n'),
+            webpage, 'data JSON')
+        data = json.loads(data_json)
+        return data_id, webpage, data
+
+
+class DeezerPlaylistIE(DeezerBaseInfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?deezer\.com/(../)?playlist/(?P<id>[0-9]+)'
+    _TEST = {
+        'url': 'http://www.deezer.com/playlist/176747451',
+        'info_dict': {
+            'id': '176747451',
+            'title': 'Best!',
+            'uploader': 'anonymous',
+            'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
+        },
+        'playlist_count': 29,
+    }
+
+    def _real_extract(self, url):
+        playlist_id, webpage, data = self.get_data(url)
+
+        playlist_title = data.get('DATA', {}).get('TITLE')
+        playlist_uploader = data.get('DATA', {}).get('PARENT_USERNAME')
+        playlist_thumbnail = self._search_regex(
+            r'<img id="naboo_playlist_image".*?src="([^"]+)"', webpage,
+            'playlist thumbnail')
+
+        entries = []
+        for s in data.get('SONGS', {}).get('data'):
+            formats = [{
+                'format_id': 'preview',
+                'url': s.get('MEDIA', [{}])[0].get('HREF'),
+                'preference': -100,  # Only the first 30 seconds
+                'ext': 'mp3',
+            }]
+            self._sort_formats(formats)
+            artists = ', '.join(
+                orderedSet(a.get('ART_NAME') for a in s.get('ARTISTS')))
+            entries.append({
+                'id': s.get('SNG_ID'),
+                'duration': int_or_none(s.get('DURATION')),
+                'title': '%s - %s' % (artists, s.get('SNG_TITLE')),
+                'uploader': s.get('ART_NAME'),
+                'uploader_id': s.get('ART_ID'),
+                'age_limit': 16 if s.get('EXPLICIT_LYRICS') == '1' else 0,
+                'formats': formats,
+            })
+
+        return {
+            '_type': 'playlist',
+            'id': playlist_id,
+            'title': playlist_title,
+            'uploader': playlist_uploader,
+            'thumbnail': playlist_thumbnail,
+            'entries': entries,
+        }
+
+
+class DeezerAlbumIE(DeezerBaseInfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?deezer\.com/(../)?album/(?P<id>[0-9]+)'
+    _TEST = {
+        'url': 'https://www.deezer.com/fr/album/67505622',
+        'info_dict': {
+            'id': '67505622',
+            'title': 'Last Week',
+            'uploader': 'Home Brew',
+            'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
+        },
+        'playlist_count': 7,
+    }
+
+    def _real_extract(self, url):
+        album_id, webpage, data = self.get_data(url)
+
+        album_title = data.get('DATA', {}).get('ALB_TITLE')
+        album_uploader = data.get('DATA', {}).get('ART_NAME')
+        album_thumbnail = self._search_regex(
+            r'<img id="naboo_album_image".*?src="([^"]+)"', webpage,
+            'album thumbnail')
+
+        entries = []
+        for s in data.get('SONGS', {}).get('data'):
+            formats = [{
+                'format_id': 'preview',
+                'url': s.get('MEDIA', [{}])[0].get('HREF'),
+                'preference': -100,  # Only the first 30 seconds
+                'ext': 'mp3',
+            }]
+            self._sort_formats(formats)
+            artists = ', '.join(
+                orderedSet(a.get('ART_NAME') for a in s.get('ARTISTS')))
+            entries.append({
+                'id': s.get('SNG_ID'),
+                'duration': int_or_none(s.get('DURATION')),
+                'title': '%s - %s' % (artists, s.get('SNG_TITLE')),
+                'uploader': s.get('ART_NAME'),
+                'uploader_id': s.get('ART_ID'),
+                'age_limit': 16 if s.get('EXPLICIT_LYRICS') == '1' else 0,
+                'formats': formats,
+                'track': s.get('SNG_TITLE'),
+                'track_number': int_or_none(s.get('TRACK_NUMBER')),
+                'track_id': s.get('SNG_ID'),
+                'artist': album_uploader,
+                'album': album_title,
+                'album_artist': album_uploader,
+            })
+
+        return {
+            '_type': 'playlist',
+            'id': album_id,
+            'title': album_title,
+            'uploader': album_uploader,
+            'thumbnail': album_thumbnail,
+            'entries': entries,
+        }
diff --git a/youtube_dlc/extractor/doodstream.py b/youtube_dlc/extractor/doodstream.py
new file mode 100644 (file)
index 0000000..2c9ea68
--- /dev/null
@@ -0,0 +1,71 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import string
+import random
+import time
+
+from .common import InfoExtractor
+
+
+class DoodStreamIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?dood\.(?:to|watch)/[ed]/(?P<id>[a-z0-9]+)'
+    _TESTS = [{
+        'url': 'http://dood.to/e/5s1wmbdacezb',
+        'md5': '4568b83b31e13242b3f1ff96c55f0595',
+        'info_dict': {
+            'id': '5s1wmbdacezb',
+            'ext': 'mp4',
+            'title': 'Kat Wonders - Monthly May 2020',
+            'description': 'Kat Wonders - Monthly May 2020 | DoodStream.com',
+            'thumbnail': 'https://img.doodcdn.com/snaps/flyus84qgl2fsk4g.jpg',
+        }
+    }, {
+        'url': 'https://dood.to/d/jzrxn12t2s7n',
+        'md5': '3207e199426eca7c2aa23c2872e6728a',
+        'info_dict': {
+            'id': 'jzrxn12t2s7n',
+            'ext': 'mp4',
+            'title': 'Stacy Cruz Cute ALLWAYSWELL',
+            'description': 'Stacy Cruz Cute ALLWAYSWELL | DoodStream.com',
+            'thumbnail': 'https://img.doodcdn.com/snaps/8edqd5nppkac3x8u.jpg',
+        }
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        if '/d/' in url:
+            url = "https://dood.to" + self._html_search_regex(
+                r'<iframe src="(/e/[a-z0-9]+)"', webpage, 'embed')
+            video_id = self._match_id(url)
+            webpage = self._download_webpage(url, video_id)
+
+        title = self._html_search_meta(['og:title', 'twitter:title'],
+                                       webpage, default=None)
+        thumb = self._html_search_meta(['og:image', 'twitter:image'],
+                                       webpage, default=None)
+        token = self._html_search_regex(r'[?&]token=([a-z0-9]+)[&\']', webpage, 'token')
+        description = self._html_search_meta(
+            ['og:description', 'description', 'twitter:description'],
+            webpage, default=None)
+        auth_url = 'https://dood.to' + self._html_search_regex(
+            r'(/pass_md5.*?)\'', webpage, 'pass_md5')
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:53.0) Gecko/20100101 Firefox/66.0',
+            'referer': url
+        }
+
+        webpage = self._download_webpage(auth_url, video_id, headers=headers)
+        final_url = webpage + ''.join([random.choice(string.ascii_letters + string.digits) for _ in range(10)]) + "?token=" + token + "&expiry=" + str(int(time.time() * 1000))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'url': final_url,
+            'http_headers': headers,
+            'ext': 'mp4',
+            'description': description,
+            'thumbnail': thumb,
+        }
similarity index 90%
rename from youtube_dl/extractor/dropbox.py
rename to youtube_dlc/extractor/dropbox.py
index 14b6c00b0bd1c4d3a306b5513477e2bb6c4cd52d..9dc6614c582811a34198302929313b853045f707 100644 (file)
@@ -13,11 +13,11 @@ class DropboxIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P<id>[a-zA-Z0-9]{15})/.*'
     _TESTS = [
         {
-            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
+            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dlc%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
             'info_dict': {
                 'id': 'nelirfsxnmcfbfh',
                 'ext': 'mp4',
-                'title': 'youtube-dl test video \'ä"BaW_jenozKc'
+                'title': 'youtube-dlc test video \'ä"BaW_jenozKc'
             }
         }, {
             'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',
similarity index 85%
rename from youtube_dl/extractor/eighttracks.py
rename to youtube_dlc/extractor/eighttracks.py
index 9a44f89f3fe801047ef283e9b1fa410c8b88cb37..5ededd31da475ac997dc257f466bb3a0eff2ea2c 100644 (file)
@@ -18,12 +18,12 @@ class EightTracksIE(InfoExtractor):
     _VALID_URL = r'https?://8tracks\.com/(?P<user>[^/]+)/(?P<id>[^/#]+)(?:#.*)?$'
     _TEST = {
         'name': 'EightTracks',
-        'url': 'http://8tracks.com/ytdl/youtube-dl-test-tracks-a',
+        'url': 'http://8tracks.com/ytdl/youtube-dlc-test-tracks-a',
         'info_dict': {
             'id': '1336550',
-            'display_id': 'youtube-dl-test-tracks-a',
+            'display_id': 'youtube-dlc-test-tracks-a',
             'description': "test chars:  \"'/\\ä↭",
-            'title': "youtube-dl test tracks \"'/\\ä↭<>",
+            'title': "youtube-dlc test tracks \"'/\\ä↭<>",
         },
         'playlist': [
             {
@@ -31,7 +31,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885610',
                     'ext': 'm4a',
-                    'title': "youtue-dl project<>\"' - youtube-dl test track 1 \"'/\\\u00e4\u21ad",
+                    'title': "youtue-dl project<>\"' - youtube-dlc test track 1 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -40,7 +40,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885608',
                     'ext': 'm4a',
-                    'title': "youtube-dl project - youtube-dl test track 2 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project - youtube-dlc test track 2 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -49,7 +49,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885679',
                     'ext': 'm4a',
-                    'title': "youtube-dl project as well - youtube-dl test track 3 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project as well - youtube-dlc test track 3 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -58,7 +58,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885680',
                     'ext': 'm4a',
-                    'title': "youtube-dl project as well - youtube-dl test track 4 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project as well - youtube-dlc test track 4 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -67,7 +67,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885682',
                     'ext': 'm4a',
-                    'title': "PH - youtube-dl test track 5 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dlc test track 5 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -76,7 +76,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885683',
                     'ext': 'm4a',
-                    'title': "PH - youtube-dl test track 6 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dlc test track 6 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -85,7 +85,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885684',
                     'ext': 'm4a',
-                    'title': "phihag - youtube-dl test track 7 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dlc test track 7 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             },
@@ -94,7 +94,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885685',
                     'ext': 'm4a',
-                    'title': "phihag - youtube-dl test track 8 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dlc test track 8 \"'/\\\u00e4\u21ad",
                     'uploader_id': 'ytdl'
                 }
             }
similarity index 99%
rename from youtube_dl/extractor/extractors.py
rename to youtube_dlc/extractor/extractors.py
index 4b3092028f46fbfbb7ac8a64d43d10c1d1eff148..4e29c02302696757835162ab93059d523b285f9a 100644 (file)
 )
 from .dbtv import DBTVIE
 from .dctp import DctpTvIE
-from .deezer import DeezerPlaylistIE
+from .deezer import (
+    DeezerPlaylistIE,
+    DeezerAlbumIE,
+)
 from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE
     DouyuTVIE,
 )
 from .dplay import DPlayIE
-from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE
 from .drtv import (
 from .discoveryvr import DiscoveryVRIE
 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
+from .doodstream import DoodStreamIE
 from .dropbox import DropboxIE
 from .dw import (
     DWIE,
 )
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
+from .hrfensehen import HRFernsehenIE
 from .hrti import (
     HRTiIE,
     HRTiPlaylistIE,
     PluralsightCourseIE,
 )
 from .podomatic import PodomaticIE
-from .pokemon import PokemonIE
+from .pokemon import (
+    PokemonIE,
+    PokemonWatchIE,
+)
 from .polskieradio import (
     PolskieRadioIE,
     PolskieRadioCategoryIE,
     BellatorIE,
     ParamountNetworkIE,
 )
+from .storyfire import (
+    StoryFireIE,
+    StoryFireUserIE,
+    StoryFireSeriesIE,
+)
 from .stitcher import StitcherIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxIE
 from .tvnoe import TVNoeIE
 from .tvnow import (
     TVNowIE,
+    TVNowFilmIE,
     TVNowNewIE,
     TVNowSeasonIE,
     TVNowAnnualIE,
similarity index 98%
rename from youtube_dl/extractor/francetv.py
rename to youtube_dlc/extractor/francetv.py
index 81b468c7d1e030f7ba67fed2a7ef2562c8164c76..e340cddba8f5118ac0f5fa0fee43c088bd080498 100644 (file)
@@ -316,13 +316,14 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
     _VALID_URL = r'https?://(?:www|mobile|france3-regions)\.francetvinfo\.fr/(?:[^/]+/)*(?P<id>[^/?#&.]+)'
 
     _TESTS = [{
-        'url': 'http://www.francetvinfo.fr/replay-jt/france-3/soir-3/jt-grand-soir-3-lundi-26-aout-2013_393427.html',
+        'url': 'https://www.francetvinfo.fr/replay-jt/france-3/soir-3/jt-grand-soir-3-jeudi-22-aout-2019_3561461.html',
         'info_dict': {
-            'id': '84981923',
+            'id': 'd12458ee-5062-48fe-bfdd-a30d6a01b793',
             'ext': 'mp4',
             'title': 'Soir 3',
-            'upload_date': '20130826',
-            'timestamp': 1377548400,
+            'upload_date': '20190822',
+            'timestamp': 1566510900,
+            'description': 'md5:72d167097237701d6e8452ff03b83c00',
             'subtitles': {
                 'fr': 'mincount:2',
             },
@@ -374,7 +375,8 @@ def _real_extract(self, url):
         video_id = self._search_regex(
             (r'player\.load[^;]+src:\s*["\']([^"\']+)',
              r'id-video=([^@]+@[^"]+)',
-             r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"'),
+             r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"',
+             r'data-id="([^"]+)"'),
             webpage, 'video id')
 
         return self._make_url_result(video_id)
similarity index 99%
rename from youtube_dl/extractor/generic.py
rename to youtube_dlc/extractor/generic.py
index 355067a509fc197c10a2085bad058d4459729bc9..aba06b328e19fad48faee2d83eb42494af672f94 100644 (file)
@@ -1947,7 +1947,7 @@ class GenericIE(InfoExtractor):
         },
         {
             # vshare embed
-            'url': 'https://youtube-dl-demo.neocities.org/vshare.html',
+            'url': 'https://youtube-dlc-demo.neocities.org/vshare.html',
             'md5': '17b39f55b5497ae8b59f5fbce8e35886',
             'info_dict': {
                 'id': '0f64ce6',
@@ -2263,7 +2263,7 @@ def _real_extract(self, url):
                     if default_search == 'auto_warning':
                         if re.match(r'^(?:url|URL)$', url):
                             raise ExtractorError(
-                                'Invalid URL:  %r . Call youtube-dl like this:  youtube-dl -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
+                                'Invalid URL:  %r . Call youtube-dlc like this:  youtube-dlc -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
                                 expected=True)
                         else:
                             self._downloader.report_warning(
@@ -2273,7 +2273,7 @@ def _real_extract(self, url):
             if default_search in ('error', 'fixup_error'):
                 raise ExtractorError(
                     '%r is not a valid URL. '
-                    'Set --default-search "ytsearch" (or run  youtube-dl "ytsearch:%s" ) to search YouTube'
+                    'Set --default-search "ytsearch" (or run  youtube-dlc "ytsearch:%s" ) to search YouTube'
                     % (url, url), expected=True)
             else:
                 if ':' not in default_search:
@@ -2349,7 +2349,7 @@ def _real_extract(self, url):
             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-dl default Accept-Encoding
+            # test whether it's HTML or not). According to youtube-dlc 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.
@@ -3372,7 +3372,7 @@ def filter_video(urls):
 
         if not found:
             # twitter:player is a https URL to iframe player that may or may not
-            # be supported by youtube-dl thus this is checked the very last (see
+            # be supported by youtube-dlc 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/hrfensehen.py b/youtube_dlc/extractor/hrfensehen.py
new file mode 100644 (file)
index 0000000..805345e
--- /dev/null
@@ -0,0 +1,102 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import json
+import re
+
+from youtube_dlc.utils import int_or_none, unified_timestamp, unescapeHTML
+from .common import InfoExtractor
+
+
+class HRFernsehenIE(InfoExtractor):
+    IE_NAME = 'hrfernsehen'
+    _VALID_URL = r'^https?://www\.(?:hr-fernsehen|hessenschau)\.de/.*,video-(?P<id>[0-9]{6})\.html'
+
+    _TESTS = [{
+        'url': 'https://www.hessenschau.de/tv-sendung/hessenschau-vom-26082020,video-130546.html',
+        'md5': '5c4e0ba94677c516a2f65a84110fc536',
+        'info_dict': {
+            'id': '130546',
+            'ext': 'mp4',
+            'description': 'Sturmtief Kirsten fegt über Hessen / Die Corona-Pandemie – eine Chronologie / '
+                           'Sterbehilfe: Die Lage in Hessen / Miss Hessen leitet zwei eigene Unternehmen / '
+                           'Pop-Up Museum zeigt Schwarze Unterhaltung und Black Music',
+            'subtitles': {'de': [{
+                'url': 'https://hr-a.akamaihd.net/video/as/hessenschau/2020_08/hrLogo_200826200407_L385592_512x288-25p-500kbit.vtt'
+            }]},
+            'timestamp': 1598470200,
+            'upload_date': '20200826',
+            'thumbnails': [{
+                'url': 'https://www.hessenschau.de/tv-sendung/hs_ganz-1554~_t-1598465545029_v-16to9.jpg',
+                'id': '0'
+            }, {
+                'url': 'https://www.hessenschau.de/tv-sendung/hs_ganz-1554~_t-1598465545029_v-16to9__medium.jpg',
+                'id': '1'
+            }],
+            'title': 'hessenschau vom 26.08.2020'
+        }
+    }, {
+        'url': 'https://www.hr-fernsehen.de/sendungen-a-z/mex/sendungen/fair-und-gut---was-hinter-aldis-eigenem-guetesiegel-steckt,video-130544.html',
+        'only_matching': True
+    }]
+
+    _GEO_COUNTRIES = ['DE']
+
+    def extract_airdate(self, loader_data):
+        airdate_str = loader_data.get('mediaMetadata', {}).get('agf', {}).get('airdate')
+
+        if airdate_str is None:
+            return None
+
+        return unified_timestamp(airdate_str)
+
+    def extract_formats(self, loader_data):
+        stream_formats = []
+        for stream_obj in loader_data["videoResolutionLevels"]:
+            stream_format = {
+                'format_id': str(stream_obj['verticalResolution']) + "p",
+                'height': stream_obj['verticalResolution'],
+                'url': stream_obj['url'],
+            }
+
+            quality_information = re.search(r'([0-9]{3,4})x([0-9]{3,4})-([0-9]{2})p-([0-9]{3,4})kbit',
+                                            stream_obj['url'])
+            if quality_information:
+                stream_format['width'] = int_or_none(quality_information.group(1))
+                stream_format['height'] = int_or_none(quality_information.group(2))
+                stream_format['fps'] = int_or_none(quality_information.group(3))
+                stream_format['tbr'] = int_or_none(quality_information.group(4))
+
+            stream_formats.append(stream_format)
+
+        self._sort_formats(stream_formats)
+        return stream_formats
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        title = self._html_search_meta(
+            ['og:title', 'twitter:title', 'name'], webpage)
+        description = self._html_search_meta(
+            ['description'], webpage)
+
+        loader_str = unescapeHTML(self._search_regex(r"data-hr-mediaplayer-loader='([^']*)'", webpage, "ardloader"))
+        loader_data = json.loads(loader_str)
+
+        info = {
+            'id': video_id,
+            'title': title,
+            'description': description,
+            'formats': self.extract_formats(loader_data),
+            'timestamp': self.extract_airdate(loader_data)
+        }
+
+        if "subtitle" in loader_data:
+            info["subtitles"] = {"de": [{"url": loader_data["subtitle"]}]}
+
+        thumbnails = list(set([t for t in loader_data.get("previewImageUrl", {}).values()]))
+        if len(thumbnails) > 0:
+            info["thumbnails"] = [{"url": t} for t in thumbnails]
+
+        return info
similarity index 97%
rename from youtube_dl/extractor/imgur.py
rename to youtube_dlc/extractor/imgur.py
index a5ba03efae57e64cb0d05caaff8e9dd700aa6a0e..4dc7b0b5c0ede5df3e433890655377c22602eafa 100644 (file)
@@ -60,7 +60,7 @@ def _real_extract(self, url):
                 'width': width,
                 'height': height,
                 'http_headers': {
-                    'User-Agent': 'youtube-dl (like wget)',
+                    'User-Agent': 'youtube-dlc (like wget)',
                 },
             })
 
@@ -82,7 +82,7 @@ def _real_extract(self, url):
                 'url': self._proto_relative_url(gifd['gifUrl']),
                 'filesize': gifd.get('size'),
                 'http_headers': {
-                    'User-Agent': 'youtube-dl (like wget)',
+                    'User-Agent': 'youtube-dlc (like wget)',
                 },
             })
 
similarity index 99%
rename from youtube_dl/extractor/ivi.py
rename to youtube_dlc/extractor/ivi.py
index b5a740a01e1d360ca667869edef88f85e3559842..b9cb5a8e6bba0e7d6d4de35b2e69d98d56fda67a 100644 (file)
@@ -142,7 +142,7 @@ def _real_extract(self, url):
                     continue
                 elif bundled:
                     raise ExtractorError(
-                        'This feature does not work from bundled exe. Run youtube-dl from sources.',
+                        'This feature does not work from bundled exe. Run youtube-dlc from sources.',
                         expected=True)
                 elif not pycryptodomex_found:
                     raise ExtractorError(
similarity index 97%
rename from youtube_dl/extractor/joj.py
rename to youtube_dlc/extractor/joj.py
index 62b28e9809856abaca23c4690c4670cacc96965a..63761818350b764742a3f8057f11d0e8f350fb6e 100644 (file)
-# coding: utf-8\r
-from __future__ import unicode_literals\r
-\r
-import re\r
-\r
-from .common import InfoExtractor\r
-from ..compat import compat_str\r
-from ..utils import (\r
-    int_or_none,\r
-    js_to_json,\r
-    try_get,\r
-)\r
-\r
-\r
-class JojIE(InfoExtractor):\r
-    _VALID_URL = r'''(?x)\r
-                    (?:\r
-                        joj:|\r
-                        https?://media\.joj\.sk/embed/\r
-                    )\r
-                    (?P<id>[^/?#^]+)\r
-                '''\r
-    _TESTS = [{\r
-        'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932',\r
-        'info_dict': {\r
-            'id': 'a388ec4c-6019-4a4a-9312-b1bee194e932',\r
-            'ext': 'mp4',\r
-            'title': 'NOVÉ BÝVANIE',\r
-            'thumbnail': r're:^https?://.*\.jpg$',\r
-            'duration': 3118,\r
-        }\r
-    }, {\r
-        'url': 'https://media.joj.sk/embed/9i1cxv',\r
-        'only_matching': True,\r
-    }, {\r
-        'url': 'joj:a388ec4c-6019-4a4a-9312-b1bee194e932',\r
-        'only_matching': True,\r
-    }, {\r
-        'url': 'joj:9i1cxv',\r
-        'only_matching': True,\r
-    }]\r
-\r
-    @staticmethod\r
-    def _extract_urls(webpage):\r
-        return [\r
-            mobj.group('url')\r
-            for mobj in re.finditer(\r
-                r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//media\.joj\.sk/embed/(?:(?!\1).)+)\1',\r
-                webpage)]\r
-\r
-    def _real_extract(self, url):\r
-        video_id = self._match_id(url)\r
-\r
-        webpage = self._download_webpage(\r
-            'https://media.joj.sk/embed/%s' % video_id, video_id)\r
-\r
-        title = self._search_regex(\r
-            (r'videoTitle\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1',\r
-             r'<title>(?P<title>[^<]+)'), webpage, 'title',\r
-            default=None, group='title') or self._og_search_title(webpage)\r
-\r
-        bitrates = self._parse_json(\r
-            self._search_regex(\r
-                r'(?s)(?:src|bitrates)\s*=\s*({.+?});', webpage, 'bitrates',\r
-                default='{}'),\r
-            video_id, transform_source=js_to_json, fatal=False)\r
-\r
-        formats = []\r
-        for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []:\r
-            if isinstance(format_url, compat_str):\r
-                height = self._search_regex(\r
-                    r'(\d+)[pP]\.', format_url, 'height', default=None)\r
-                formats.append({\r
-                    'url': format_url,\r
-                    'format_id': '%sp' % height if height else None,\r
-                    'height': int(height),\r
-                })\r
-        if not formats:\r
-            playlist = self._download_xml(\r
-                'https://media.joj.sk/services/Video.php?clip=%s' % video_id,\r
-                video_id)\r
-            for file_el in playlist.findall('./files/file'):\r
-                path = file_el.get('path')\r
-                if not path:\r
-                    continue\r
-                format_id = file_el.get('id') or file_el.get('label')\r
-                formats.append({\r
-                    'url': 'http://n16.joj.sk/storage/%s' % path.replace(\r
-                        'dat/', '', 1),\r
-                    'format_id': format_id,\r
-                    'height': int_or_none(self._search_regex(\r
-                        r'(\d+)[pP]', format_id or path, 'height',\r
-                        default=None)),\r
-                })\r
-        self._sort_formats(formats)\r
-\r
-        thumbnail = self._og_search_thumbnail(webpage)\r
-\r
-        duration = int_or_none(self._search_regex(\r
-            r'videoDuration\s*:\s*(\d+)', webpage, 'duration', fatal=False))\r
-\r
-        return {\r
-            'id': video_id,\r
-            'title': title,\r
-            'thumbnail': thumbnail,\r
-            'duration': duration,\r
-            'formats': formats,\r
-        }\r
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..compat import compat_str
+from ..utils import (
+    int_or_none,
+    js_to_json,
+    try_get,
+)
+
+
+class JojIE(InfoExtractor):
+    _VALID_URL = r'''(?x)
+                    (?:
+                        joj:|
+                        https?://media\.joj\.sk/embed/
+                    )
+                    (?P<id>[^/?#^]+)
+                '''
+    _TESTS = [{
+        'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932',
+        'info_dict': {
+            'id': 'a388ec4c-6019-4a4a-9312-b1bee194e932',
+            'ext': 'mp4',
+            'title': 'NOVÉ BÝVANIE',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 3118,
+        }
+    }, {
+        'url': 'https://media.joj.sk/embed/9i1cxv',
+        'only_matching': True,
+    }, {
+        'url': 'joj:a388ec4c-6019-4a4a-9312-b1bee194e932',
+        'only_matching': True,
+    }, {
+        'url': 'joj:9i1cxv',
+        'only_matching': True,
+    }]
+
+    @staticmethod
+    def _extract_urls(webpage):
+        return [
+            mobj.group('url')
+            for mobj in re.finditer(
+                r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//media\.joj\.sk/embed/(?:(?!\1).)+)\1',
+                webpage)]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(
+            'https://media.joj.sk/embed/%s' % video_id, video_id)
+
+        title = self._search_regex(
+            (r'videoTitle\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1',
+             r'<title>(?P<title>[^<]+)'), webpage, 'title',
+            default=None, group='title') or self._og_search_title(webpage)
+
+        bitrates = self._parse_json(
+            self._search_regex(
+                r'(?s)(?:src|bitrates)\s*=\s*({.+?});', webpage, 'bitrates',
+                default='{}'),
+            video_id, transform_source=js_to_json, fatal=False)
+
+        formats = []
+        for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []:
+            if isinstance(format_url, compat_str):
+                height = self._search_regex(
+                    r'(\d+)[pP]\.', format_url, 'height', default=None)
+                formats.append({
+                    'url': format_url,
+                    'format_id': '%sp' % height if height else None,
+                    'height': int(height),
+                })
+        if not formats:
+            playlist = self._download_xml(
+                'https://media.joj.sk/services/Video.php?clip=%s' % video_id,
+                video_id)
+            for file_el in playlist.findall('./files/file'):
+                path = file_el.get('path')
+                if not path:
+                    continue
+                format_id = file_el.get('id') or file_el.get('label')
+                formats.append({
+                    'url': 'http://n16.joj.sk/storage/%s' % path.replace(
+                        'dat/', '', 1),
+                    'format_id': format_id,
+                    'height': int_or_none(self._search_regex(
+                        r'(\d+)[pP]', format_id or path, 'height',
+                        default=None)),
+                })
+        self._sort_formats(formats)
+
+        thumbnail = self._og_search_thumbnail(webpage)
+
+        duration = int_or_none(self._search_regex(
+            r'videoDuration\s*:\s*(\d+)', webpage, 'duration', fatal=False))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'thumbnail': thumbnail,
+            'duration': duration,
+            'formats': formats,
+        }
similarity index 98%
rename from youtube_dl/extractor/nowness.py
rename to youtube_dlc/extractor/nowness.py
index f26dafb8f03db4c937ace6607f2ddc795fb245de..c136bc8c0bbbdebae101aa1bfc5928435c4f45ca 100644 (file)
@@ -37,7 +37,7 @@ def _extract_url_result(self, post):
                     elif source == 'youtube':
                         return self.url_result(video_id, 'Youtube')
                     elif source == 'cinematique':
-                        # youtube-dl currently doesn't support cinematique
+                        # youtube-dlc currently doesn't support cinematique
                         # return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique')
                         pass
 
diff --git a/youtube_dlc/extractor/phoenix.py b/youtube_dlc/extractor/phoenix.py
new file mode 100644 (file)
index 0000000..8d52ad3
--- /dev/null
@@ -0,0 +1,52 @@
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+from ..utils import ExtractorError
+
+
+class PhoenixIE(InfoExtractor):
+    IE_NAME = 'phoenix.de'
+    _VALID_URL = r'''https?://(?:www\.)?phoenix.de/\D+(?P<id>\d+)\.html'''
+    _TESTS = [
+        {
+            'url': 'https://www.phoenix.de/sendungen/dokumentationen/unsere-welt-in-zukunft---stadt-a-1283620.html',
+            'md5': '5e765e838aa3531c745a4f5b249ee3e3',
+            'info_dict': {
+                'id': '0OB4HFc43Ns',
+                'ext': 'mp4',
+                'title': 'Unsere Welt in Zukunft - Stadt',
+                'description': 'md5:9bfb6fd498814538f953b2dcad7ce044',
+                'upload_date': '20190912',
+                'uploader': 'phoenix',
+                'uploader_id': 'phoenix',
+            }
+        },
+        {
+            'url': 'https://www.phoenix.de/drohnenangriffe-in-saudi-arabien-a-1286995.html?ref=aktuelles',
+            'only_matching': True,
+        },
+        # an older page: https://www.phoenix.de/sendungen/gespraeche/phoenix-persoenlich/im-dialog-a-177727.html
+        # seems to not have an embedded video, even though it's uploaded on youtube: https://www.youtube.com/watch?v=4GxnoUHvOkM
+    ]
+
+    def extract_from_json_api(self, video_id, api_url):
+        doc = self._download_json(
+            api_url, video_id,
+            note="Downloading webpage metadata",
+            errnote="Failed to load webpage metadata")
+
+        for a in doc["absaetze"]:
+            if a["typ"] == "video-youtube":
+                return {
+                    '_type': 'url_transparent',
+                    'id': a["id"],
+                    'title': doc["titel"],
+                    'url': "https://www.youtube.com/watch?v=%s" % a["id"],
+                    'ie_key': 'Youtube',
+                }
+        raise ExtractorError("No downloadable video found", expected=True)
+
+    def _real_extract(self, url):
+        page_id = self._match_id(url)
+        api_url = 'https://www.phoenix.de/response/id/%s' % page_id
+        return self.extract_from_json_api(page_id, api_url)
similarity index 53%
rename from youtube_dl/extractor/pokemon.py
rename to youtube_dlc/extractor/pokemon.py
index 80222d42831b8e58116449f96a615ea250b2985f..14ee1a72e17b3f6283c15cf3c8be8bece418e68b 100644 (file)
@@ -5,8 +5,11 @@
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     extract_attributes,
     int_or_none,
+    js_to_json,
+    merge_dicts,
 )
 
 
@@ -69,3 +72,67 @@ def _real_extract(self, url):
             'episode_number': int_or_none(video_data.get('data-video-episode')),
             'ie_key': 'LimelightMedia',
         }
+
+
+class PokemonWatchIE(InfoExtractor):
+    _VALID_URL = r'https?://watch\.pokemon\.com/[a-z]{2}-[a-z]{2}/player\.html\?id=(?P<id>[a-z0-9]{32})'
+    _API_URL = 'https://www.pokemon.com/api/pokemontv/v2/channels/{0:}'
+    _TESTS = [{
+        'url': 'https://watch.pokemon.com/en-us/player.html?id=8309a40969894a8e8d5bc1311e9c5667',
+        'md5': '62833938a31e61ab49ada92f524c42ff',
+        'info_dict': {
+            'id': '8309a40969894a8e8d5bc1311e9c5667',
+            'ext': 'mp4',
+            'title': 'Lillier and the Staff!',
+            'description': 'md5:338841b8c21b283d24bdc9b568849f04',
+        }
+    }, {
+        'url': 'https://watch.pokemon.com/de-de/player.html?id=b3c402e111a4459eb47e12160ab0ba07',
+        'only_matching': True
+    }]
+
+    def _extract_media(self, channel_array, video_id):
+        for channel in channel_array:
+            for media in channel.get('media'):
+                if media.get('id') == video_id:
+                    return media
+        return None
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        info = {
+            '_type': 'url',
+            'id': video_id,
+            'url': 'limelight:media:%s' % video_id,
+            'ie_key': 'LimelightMedia',
+        }
+
+        # API call can be avoided entirely if we are listing formats
+        if self._downloader.params.get('listformats', False):
+            return info
+
+        webpage = self._download_webpage(url, video_id)
+        build_vars = self._parse_json(self._search_regex(
+            r'(?s)buildVars\s*=\s*({.*?})', webpage, 'build vars'),
+            video_id, transform_source=js_to_json)
+        region = build_vars.get('region')
+        channel_array = self._download_json(self._API_URL.format(region), video_id)
+        video_data = self._extract_media(channel_array, video_id)
+
+        if video_data is None:
+            raise ExtractorError(
+                'Video %s does not exist' % video_id, expected=True)
+
+        info['_type'] = 'url_transparent'
+        images = video_data.get('images')
+
+        return merge_dicts(info, {
+            'title': video_data.get('title'),
+            'description': video_data.get('description'),
+            'thumbnail': images.get('medium') or images.get('small'),
+            'series': 'Pokémon',
+            'season_number': int_or_none(video_data.get('season')),
+            'episode': video_data.get('title'),
+            'episode_number': int_or_none(video_data.get('episode')),
+        })
similarity index 99%
rename from youtube_dl/extractor/sohu.py
rename to youtube_dlc/extractor/sohu.py
index a62ed84f1e34b75a721914d68a101ad2a0bb8983..76b3cc6b6b8ef639aa7185be60e68b3383e4c2fb 100644 (file)
@@ -77,7 +77,7 @@ class SohuIE(InfoExtractor):
         'info_dict': {
             'id': '78932792',
             'ext': 'mp4',
-            'title': 'youtube-dl testing video',
+            'title': 'youtube-dlc testing video',
         },
         'params': {
             'skip_download': True
similarity index 88%
rename from youtube_dl/extractor/soundcloud.py
rename to youtube_dlc/extractor/soundcloud.py
index d37c52543f1469652d69bea603e7d4f296d2bb50..0fe084f5cdbb3e44d9b1c81a2244d0bd970772f1 100644 (file)
@@ -3,6 +3,8 @@
 
 import itertools
 import re
+import json
+import random
 
 from .common import (
     InfoExtractor,
@@ -28,6 +30,7 @@
     update_url_query,
     url_or_none,
     urlhandle_detect_ext,
+    sanitized_Request,
 )
 
 
@@ -119,7 +122,7 @@ class SoundcloudIE(InfoExtractor):
         },
         # private link
         {
-            'url': 'https://soundcloud.com/jaimemf/youtube-dl-test-video-a-y-baw/s-8Pjrp',
+            'url': 'https://soundcloud.com/jaimemf/youtube-dlc-test-video-a-y-baw/s-8Pjrp',
             'md5': 'aa0dd32bfea9b0c5ef4f02aacd080604',
             'info_dict': {
                 'id': '123998367',
@@ -309,7 +312,81 @@ def _download_json(self, *args, **kwargs):
                 raise
 
     def _real_initialize(self):
-        self._CLIENT_ID = self._downloader.cache.load('soundcloud', 'client_id') or 'YUKXoArFcqrlQn9tfNHvvyfnDISj04zk'
+        self._CLIENT_ID = self._downloader.cache.load('soundcloud', 'client_id') or "T5R4kgWS2PRf6lzLyIravUMnKlbIxQag"  # 'EXLwg5lHTO2dslU5EePe3xkw0m1h86Cd' # 'YUKXoArFcqrlQn9tfNHvvyfnDISj04zk'
+        self._login()
+
+    _USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36"
+    _API_AUTH_QUERY_TEMPLATE = '?client_id=%s'
+    _API_AUTH_URL_PW = 'https://api-auth.soundcloud.com/web-auth/sign-in/password%s'
+    _access_token = None
+    _HEADERS = {}
+    _NETRC_MACHINE = 'soundcloud'
+
+    def _login(self):
+        username, password = self._get_login_info()
+        if username is None:
+            return
+
+        def genDevId():
+            def genNumBlock():
+                return ''.join([str(random.randrange(10)) for i in range(6)])
+            return '-'.join([genNumBlock() for i in range(4)])
+
+        payload = {
+            'client_id': self._CLIENT_ID,
+            'recaptcha_pubkey': 'null',
+            'recaptcha_response': 'null',
+            'credentials': {
+                'identifier': username,
+                'password': password
+            },
+            'signature': self.sign(username, password, self._CLIENT_ID),
+            'device_id': genDevId(),
+            'user_agent': self._USER_AGENT
+        }
+
+        query = self._API_AUTH_QUERY_TEMPLATE % self._CLIENT_ID
+        login = sanitized_Request(self._API_AUTH_URL_PW % query, json.dumps(payload).encode('utf-8'))
+        response = self._download_json(login, None)
+        self._access_token = response.get('session').get('access_token')
+        if not self._access_token:
+            self.report_warning('Unable to get access token, login may has failed')
+        else:
+            self._HEADERS = {'Authorization': 'OAuth ' + self._access_token}
+
+    # signature generation
+    def sign(self, user, pw, clid):
+        a = 33
+        i = 1
+        s = 440123
+        w = 117
+        u = 1800000
+        l = 1042
+        b = 37
+        k = 37
+        c = 5
+        n = "0763ed7314c69015fd4a0dc16bbf4b90"  # _KEY
+        y = "8"  # _REV
+        r = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36"  # _USER_AGENT
+        e = user  # _USERNAME
+        t = clid  # _CLIENT_ID
+
+        d = '-'.join([str(mInt) for mInt in [a, i, s, w, u, l, b, k]])
+        p = n + y + d + r + e + t + d + n
+        h = p
+
+        m = 8011470
+        f = 0
+
+        for f in range(f, len(h)):
+            m = (m >> 1) + ((1 & m) << 23)
+            m += ord(h[f])
+            m &= 16777215
+
+        # c is not even needed
+        out = str(y) + ':' + str(d) + ':' + format(m, 'x') + ':' + str(c)
+
+        return out
 
     @classmethod
     def _resolv_url(cls, url):
@@ -389,7 +466,7 @@ def add_format(f, protocol, is_preview=False):
             if not format_url:
                 continue
             stream = self._download_json(
-                format_url, track_id, query=query, fatal=False)
+                format_url, track_id, query=query, fatal=False, headers=self._HEADERS)
             if not isinstance(stream, dict):
                 continue
             stream_url = url_or_none(stream.get('url'))
@@ -487,7 +564,7 @@ def _real_extract(self, url):
             info_json_url = self._resolv_url(self._BASE_URL + resolve_title)
 
         info = self._download_json(
-            info_json_url, full_title, 'Downloading info JSON', query=query)
+            info_json_url, full_title, 'Downloading info JSON', query=query, headers=self._HEADERS)
 
         return self._extract_info_dict(info, full_title, token)
 
@@ -503,7 +580,7 @@ def _extract_set(self, playlist, token=None):
                     'ids': ','.join([compat_str(t['id']) for t in tracks]),
                     'playlistId': playlist_id,
                     'playlistSecretToken': token,
-                })
+                }, headers=self._HEADERS)
         entries = []
         for track in tracks:
             track_id = str_or_none(track.get('id'))
@@ -523,7 +600,7 @@ def _extract_set(self, playlist, token=None):
 
 
 class SoundcloudSetIE(SoundcloudPlaylistBaseIE):
-    _VALID_URL = r'https?://(?:(?:www|m)\.)?soundcloud\.com/(?P<uploader>[\w\d-]+)/sets/(?P<slug_title>[\w\d-]+)(?:/(?P<token>[^?/]+))?'
+    _VALID_URL = r'https?://(?:(?:www|m)\.)?soundcloud\.com/(?P<uploader>[\w\d-]+)/sets/(?P<slug_title>[:\w\d-]+)(?:/(?P<token>[^?/]+))?'
     IE_NAME = 'soundcloud:set'
     _TESTS = [{
         'url': 'https://soundcloud.com/the-concept-band/sets/the-royal-concept-ep',
@@ -536,6 +613,15 @@ class SoundcloudSetIE(SoundcloudPlaylistBaseIE):
     }, {
         'url': 'https://soundcloud.com/the-concept-band/sets/the-royal-concept-ep/token',
         'only_matching': True,
+    }, {
+        'url': 'https://soundcloud.com/discover/sets/weekly::flacmatic',
+        'only_matching': True,
+    }, {
+        'url': 'https://soundcloud.com/discover/sets/charts-top:all-music:de',
+        'only_matching': True,
+    }, {
+        'url': 'https://soundcloud.com/discover/sets/charts-top:hiphoprap:kr',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -547,7 +633,7 @@ def _real_extract(self, url):
             full_title += '/' + token
 
         info = self._download_json(self._resolv_url(
-            self._BASE_URL + full_title), full_title)
+            self._BASE_URL + full_title), full_title, headers=self._HEADERS)
 
         if 'errors' in info:
             msgs = (compat_str(err['error_message']) for err in info['errors'])
@@ -572,7 +658,7 @@ def _extract_playlist(self, base_url, playlist_id, playlist_title):
         for i in itertools.count():
             response = self._download_json(
                 next_href, playlist_id,
-                'Downloading track page %s' % (i + 1), query=query)
+                'Downloading track page %s' % (i + 1), query=query, headers=self._HEADERS)
 
             collection = response['collection']
 
@@ -694,7 +780,7 @@ def _real_extract(self, url):
 
         user = self._download_json(
             self._resolv_url(self._BASE_URL + uploader),
-            uploader, 'Downloading user info')
+            uploader, 'Downloading user info', headers=self._HEADERS)
 
         resource = mobj.group('rsrc') or 'all'
 
@@ -719,7 +805,7 @@ class SoundcloudTrackStationIE(SoundcloudPagedPlaylistBaseIE):
     def _real_extract(self, url):
         track_name = self._match_id(url)
 
-        track = self._download_json(self._resolv_url(url), track_name)
+        track = self._download_json(self._resolv_url(url), track_name, headers=self._HEADERS)
         track_id = self._search_regex(
             r'soundcloud:track-stations:(\d+)', track['id'], 'track id')
 
@@ -752,7 +838,7 @@ def _real_extract(self, url):
 
         data = self._download_json(
             self._API_V2_BASE + 'playlists/' + playlist_id,
-            playlist_id, 'Downloading playlist', query=query)
+            playlist_id, 'Downloading playlist', query=query, headers=self._HEADERS)
 
         return self._extract_set(data, token)
 
@@ -789,7 +875,7 @@ def _get_collection(self, endpoint, collection_id, **query):
         for i in itertools.count(1):
             response = self._download_json(
                 next_url, collection_id, 'Downloading page {0}'.format(i),
-                'Unable to download API page')
+                'Unable to download API page', headers=self._HEADERS)
 
             collection = response.get('collection', [])
             if not collection:
diff --git a/youtube_dlc/extractor/storyfire.py b/youtube_dlc/extractor/storyfire.py
new file mode 100644 (file)
index 0000000..67457cc
--- /dev/null
@@ -0,0 +1,255 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import itertools
+from .common import InfoExtractor
+
+
+class StoryFireIE(InfoExtractor):
+    _VALID_URL = r'(?:(?:https?://(?:www\.)?storyfire\.com/video-details)|(?:https://storyfire.app.link))/(?P<id>[^/\s]+)'
+    _TESTS = [{
+        'url': 'https://storyfire.com/video-details/5df1d132b6378700117f9181',
+        'md5': '560953bfca81a69003cfa5e53ac8a920',
+        'info_dict': {
+            'id': '5df1d132b6378700117f9181',
+            'ext': 'mp4',
+            'title': 'Buzzfeed Teaches You About Memes',
+            'uploader_id': 'ntZAJFECERSgqHSxzonV5K2E89s1',
+            'timestamp': 1576129028,
+            'description': 'Mocking Buzzfeed\'s meme lesson. Reuploaded from YouTube because of their new policies',
+            'uploader': 'whang!',
+            'upload_date': '20191212',
+        },
+        'params': {'format': 'bestvideo'}  # There are no merged formats in the playlist.
+    }, {
+        'url': 'https://storyfire.app.link/5GxAvWOQr8',  # Alternate URL format, with unrelated short ID
+        'md5': '7a2dc6d60c4889edfed459c620fe690d',
+        'info_dict': {
+            'id': '5f1e11ecd78a57b6c702001d',
+            'ext': 'm4a',
+            'title': 'Weird Nintendo Prototype Leaks',
+            'description': 'A stream taking a look at some weird Nintendo Prototypes with Luigi in Mario 64 and weird Yoshis',
+            'timestamp': 1595808576,
+            'upload_date': '20200727',
+            'uploader': 'whang!',
+            'uploader_id': 'ntZAJFECERSgqHSxzonV5K2E89s1',
+        },
+        'params': {'format': 'bestaudio'}  # Verifying audio extraction
+
+    }]
+
+    _aformats = {
+        'audio-medium-audio': {'acodec': 'aac', 'abr': 125, 'preference': -10},
+        'audio-high-audio': {'acodec': 'aac', 'abr': 254, 'preference': -1},
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        # Extracting the json blob is mandatory to proceed with extraction.
+        jsontext = self._html_search_regex(
+            r'<script id="__NEXT_DATA__" type="application/json">(.+?)</script>',
+            webpage, 'json_data')
+
+        json = self._parse_json(jsontext, video_id)
+
+        # The currentVideo field in the json is mandatory
+        # because it contains the only link to the m3u playlist
+        video = json['props']['initialState']['video']['currentVideo']
+        videourl = video['vimeoVideoURL']  # Video URL is mandatory
+
+        # Extract other fields from the json in an error tolerant fashion
+        # ID may be incorrect (on short URL format), correct it.
+        parsed_id = video.get('_id')
+        if parsed_id:
+            video_id = parsed_id
+
+        title = video.get('title')
+        description = video.get('description')
+
+        thumbnail = video.get('storyImage')
+        views = video.get('views')
+        likes = video.get('likesCount')
+        comments = video.get('commentsCount')
+        duration = video.get('videoDuration')
+        publishdate = video.get('publishDate')  # Apparently epoch time, day only
+
+        uploader = video.get('username')
+        uploader_id = video.get('hostID')
+        # Construct an uploader URL
+        uploader_url = None
+        if uploader_id:
+            uploader_url = "https://storyfire.com/user/%s/video" % uploader_id
+
+        # Collect root playlist to determine formats
+        formats = self._extract_m3u8_formats(
+            videourl, video_id, 'mp4', 'm3u8_native')
+
+        # Modify formats to fill in missing information about audio codecs
+        for format in formats:
+            aformat = self._aformats.get(format['format_id'])
+            if aformat:
+                format['acodec'] = aformat['acodec']
+                format['abr'] = aformat['abr']
+                format['preference'] = aformat['preference']
+                format['ext'] = 'm4a'
+
+        self._sort_formats(formats)
+
+        return {
+            'id': video_id,
+            'title': title,
+            'description': description,
+            'ext': "mp4",
+            'url': videourl,
+            'formats': formats,
+
+            'thumbnail': thumbnail,
+            'view_count': views,
+            'like_count': likes,
+            'comment_count': comments,
+            'duration': duration,
+            'timestamp': publishdate,
+
+            'uploader': uploader,
+            'uploader_id': uploader_id,
+            'uploader_url': uploader_url,
+
+        }
+
+
+class StoryFireUserIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?storyfire\.com/user/(?P<id>[^/\s]+)/video'
+    _TESTS = [{
+        'url': 'https://storyfire.com/user/ntZAJFECERSgqHSxzonV5K2E89s1/video',
+        'info_dict': {
+            'id': 'ntZAJFECERSgqHSxzonV5K2E89s1',
+            'title': 'whang!',
+        },
+        'playlist_mincount': 18
+    }, {
+        'url': 'https://storyfire.com/user/UQ986nFxmAWIgnkZQ0ftVhq4nOk2/video',
+        'info_dict': {
+            'id': 'UQ986nFxmAWIgnkZQ0ftVhq4nOk2',
+            'title': 'McJuggerNuggets',
+        },
+        'playlist_mincount': 143
+
+    }]
+
+    # Generator for fetching playlist items
+    def _enum_videos(self, baseurl, user_id, firstjson):
+        totalVideos = int(firstjson['videosCount'])
+        haveVideos = 0
+        json = firstjson
+
+        for page in itertools.count(1):
+            for video in json['videos']:
+                id = video['_id']
+                url = "https://storyfire.com/video-details/%s" % id
+                haveVideos += 1
+                yield {
+                    '_type': 'url',
+                    'id': id,
+                    'url': url,
+                    'ie_key': 'StoryFire',
+
+                    'title': video.get('title'),
+                    'description': video.get('description'),
+                    'view_count': video.get('views'),
+                    'comment_count': video.get('commentsCount'),
+                    'duration': video.get('videoDuration'),
+                    'timestamp': video.get('publishDate'),
+                }
+            # Are there more pages we could fetch?
+            if haveVideos < totalVideos:
+                pageurl = baseurl + ("%i" % haveVideos)
+                json = self._download_json(pageurl, user_id,
+                                           note='Downloading page %s' % page)
+
+                # Are there any videos in the new json?
+                videos = json.get('videos')
+                if not videos or len(videos) == 0:
+                    break  # no videos
+
+            else:
+                break  # We have fetched all the videos, stop
+
+    def _real_extract(self, url):
+        user_id = self._match_id(url)
+
+        baseurl = "https://storyfire.com/app/publicVideos/%s?skip=" % user_id
+
+        # Download first page to ensure it can be downloaded, and get user information if available.
+        firstpage = baseurl + "0"
+        firstjson = self._download_json(firstpage, user_id)
+
+        title = None
+        videos = firstjson.get('videos')
+        if videos and len(videos):
+            title = videos[1].get('username')
+
+        return {
+            '_type': 'playlist',
+            'entries': self._enum_videos(baseurl, user_id, firstjson),
+            'id': user_id,
+            'title': title,
+        }
+
+
+class StoryFireSeriesIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?storyfire\.com/write/series/stories/(?P<id>[^/\s]+)'
+    _TESTS = [{
+        'url': 'https://storyfire.com/write/series/stories/-Lq6MsuIHLODO6d2dDkr/',
+        'info_dict': {
+            'id': '-Lq6MsuIHLODO6d2dDkr',
+        },
+        'playlist_mincount': 13
+    }, {
+        'url': 'https://storyfire.com/write/series/stories/the_mortal_one/',
+        'info_dict': {
+            'id': 'the_mortal_one',
+        },
+        'playlist_count': 0  # This playlist has entries, but no videos.
+    }, {
+        'url': 'https://storyfire.com/write/series/stories/story_time',
+        'info_dict': {
+            'id': 'story_time',
+        },
+        'playlist_mincount': 10
+    }]
+
+    # Generator for returning playlist items
+    # This object is substantially different than the one in the user videos page above
+    def _enum_videos(self, jsonlist):
+        for video in jsonlist:
+            id = video['_id']
+            if video.get('hasVideo'):  # Boolean element
+                url = "https://storyfire.com/video-details/%s" % id
+                yield {
+                    '_type': 'url',
+                    'id': id,
+                    'url': url,
+                    'ie_key': 'StoryFire',
+
+                    'title': video.get('title'),
+                    'description': video.get('description'),
+                    'view_count': video.get('views'),
+                    'likes_count': video.get('likesCount'),
+                    'comment_count': video.get('commentsCount'),
+                    'duration': video.get('videoDuration'),
+                    'timestamp': video.get('publishDate'),
+                }
+
+    def _real_extract(self, url):
+        list_id = self._match_id(url)
+
+        listurl = "https://storyfire.com/app/seriesStories/%s/list" % list_id
+        json = self._download_json(listurl, list_id)
+
+        return {
+            '_type': 'playlist',
+            'entries': self._enum_videos(json),
+            'id': list_id
+        }
similarity index 93%
rename from youtube_dl/extractor/streamcloud.py
rename to youtube_dlc/extractor/streamcloud.py
index b97bb43741b0861ce3cf9e63f1be116687409854..32eb2b92d3a13a7edc4b728f05534afc98fdf054 100644 (file)
@@ -15,12 +15,12 @@ class StreamcloudIE(InfoExtractor):
     _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)(?:/(?P<fname>[^#?]*)\.html)?'
 
     _TESTS = [{
-        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html',
+        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dlc_test_video_____________-BaW_jenozKc.mp4.html',
         'md5': '6bea4c7fa5daaacc2a946b7146286686',
         'info_dict': {
             'id': 'skp9j99s4bpz',
             'ext': 'mp4',
-            'title': 'youtube-dl test video  \'/\\ ä ↭',
+            'title': 'youtube-dlc test video  \'/\\ ä ↭',
         },
         'skip': 'Only available from the EU'
     }, {
similarity index 76%
rename from youtube_dl/extractor/tvnow.py
rename to youtube_dlc/extractor/tvnow.py
index 9c8a8a0dc3944bdf616d7edfde0c4aaa1a9890ef..e2bb62ae85e74f9958d07b3cc86e110949130691 100644 (file)
@@ -7,10 +7,12 @@
 from ..compat import compat_str
 from ..utils import (
     ExtractorError,
+    get_element_by_id,
     int_or_none,
     parse_iso8601,
     parse_duration,
     str_or_none,
+    try_get,
     update_url_query,
     urljoin,
 )
@@ -204,6 +206,86 @@ def _real_extract(self, url):
             ie=TVNowIE.ie_key(), video_id=mobj.group('id'))
 
 
+class TVNowFilmIE(TVNowBaseIE):
+    _VALID_URL = r'''(?x)
+                    (?P<base_url>https?://
+                        (?:www\.)?tvnow\.(?:de|at|ch)/
+                        (?:filme))/
+                        (?P<title>[^/?$&]+)-(?P<id>\d+)
+                    '''
+    _TESTS = [{
+        'url': 'https://www.tvnow.de/filme/lord-of-war-haendler-des-todes-7959',
+        'info_dict': {
+            'id': '1426690',
+            'display_id': 'lord-of-war-haendler-des-todes',
+            'ext': 'mp4',
+            'title': 'Lord of War',
+            'description': 'md5:5eda15c0d5b8cb70dac724c8a0ff89a9',
+            'timestamp': 1550010000,
+            'upload_date': '20190212',
+            'duration': 7016,
+        },
+    }, {
+        'url': 'https://www.tvnow.de/filme/the-machinist-12157',
+        'info_dict': {
+            'id': '328160',
+            'display_id': 'the-machinist',
+            'ext': 'mp4',
+            'title': 'The Machinist',
+            'description': 'md5:9a0e363fdd74b3a9e1cdd9e21d0ecc28',
+            'timestamp': 1496469720,
+            'upload_date': '20170603',
+            'duration': 5836,
+        },
+    }, {
+        'url': 'https://www.tvnow.de/filme/horst-schlaemmer-isch-kandidiere-17777',
+        'only_matching': True,  # DRM protected
+    }]
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        display_id = mobj.group('title')
+
+        webpage = self._download_webpage(url, display_id, fatal=False)
+        if not webpage:
+            raise ExtractorError('Cannot download "%s"' % url, expected=True)
+
+        json_text = get_element_by_id('now-web-state', webpage)
+        if not json_text:
+            raise ExtractorError('Cannot read video data', expected=True)
+
+        json_data = self._parse_json(
+            json_text,
+            display_id,
+            transform_source=lambda x: x.replace('&q;', '"'),
+            fatal=False)
+        if not json_data:
+            raise ExtractorError('Cannot read video data', expected=True)
+
+        player_key = next(
+            (key for key in json_data.keys() if 'module/player' in key),
+            None)
+        page_key = next(
+            (key for key in json_data.keys() if 'page/filme' in key),
+            None)
+        movie_id = try_get(
+            json_data,
+            [
+                lambda x: x[player_key]['body']['id'],
+                lambda x: x[page_key]['body']['modules'][0]['id'],
+                lambda x: x[page_key]['body']['modules'][1]['id']],
+            int)
+        if not movie_id:
+            raise ExtractorError('Cannot extract movie ID', expected=True)
+
+        info = self._call_api(
+            'movies/%d' % movie_id,
+            display_id,
+            query={'fields': ','.join(self._VIDEO_FIELDS)})
+
+        return self._extract_video(info, display_id)
+
+
 class TVNowNewBaseIE(InfoExtractor):
     def _call_api(self, path, video_id, query={}):
         result = self._download_json(
@@ -345,6 +427,82 @@ def _real_extract(self, url):
         display_id, video_id = re.match(self._VALID_URL, url).groups()
         info = self._call_api('player/' + video_id, video_id)
         return self._extract_video(info, video_id, display_id)
+
+
+class TVNowFilmIE(TVNowIE):
+    _VALID_URL = r'''(?x)
+                    (?P<base_url>https?://
+                        (?:www\.)?tvnow\.(?:de|at|ch)/
+                        (?:filme))/
+                        (?P<title>[^/?$&]+)-(?P<id>\d+)
+                    '''
+    _TESTS = [{
+        'url': 'https://www.tvnow.de/filme/lord-of-war-haendler-des-todes-7959',
+        'info_dict': {
+            'id': '1426690',
+            'display_id': 'lord-of-war-haendler-des-todes',
+            'ext': 'mp4',
+            'title': 'Lord of War',
+            'description': 'md5:5eda15c0d5b8cb70dac724c8a0ff89a9',
+            'timestamp': 1550010000,
+            'upload_date': '20190212',
+            'duration': 7016,
+        },
+    }, {
+        'url': 'https://www.tvnow.de/filme/the-machinist-12157',
+        'info_dict': {
+            'id': '328160',
+            'display_id': 'the-machinist',
+            'ext': 'mp4',
+            'title': 'The Machinist',
+            'description': 'md5:9a0e363fdd74b3a9e1cdd9e21d0ecc28',
+            'timestamp': 1496469720,
+            'upload_date': '20170603',
+            'duration': 5836,
+        },
+    }, {
+        'url': 'https://www.tvnow.de/filme/horst-schlaemmer-isch-kandidiere-17777',
+        'only_matching': True,  # DRM protected
+    }]
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        display_id = mobj.group('title')
+
+        webpage = self._download_webpage(url, display_id, fatal=False)
+        if not webpage:
+            raise ExtractorError('Cannot download "%s"' % url, expected=True)
+
+        json_text = get_element_by_id('now-web-state', webpage)
+        if not json_text:
+            raise ExtractorError('Cannot read video data', expected=True)
+
+        json_data = self._parse_json(
+            json_text,
+            display_id,
+            transform_source=lambda x: x.replace('&q;', '"'),
+            fatal=False)
+        if not json_data:
+            raise ExtractorError('Cannot read video data', expected=True)
+
+        player_key = next(
+            (key for key in json_data.keys() if 'module/player' in key),
+            None)
+        page_key = next(
+            (key for key in json_data.keys() if 'page/filme' in key),
+            None)
+        movie_id = try_get(
+            json_data,
+            [
+                lambda x: x[player_key]['body']['id'],
+                lambda x: x[page_key]['body']['modules'][0]['id'],
+                lambda x: x[page_key]['body']['modules'][1]['id']],
+            int)
+        if not movie_id:
+            raise ExtractorError('Cannot extract movie ID', expected=True)
+
+        info = self._call_api('player/%d' % movie_id, display_id)
+        return self._extract_video(info, url, display_id)
 """
 
 
similarity index 94%
rename from youtube_dl/extractor/twitch.py
rename to youtube_dlc/extractor/twitch.py
index e211cd4c84cb4c713e937cf0e1eef83de7c40a93..35e4dda374bd7680adf34ed960bc4896d58ae1ce 100644 (file)
@@ -380,11 +380,13 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
     _PLAYLIST_PATH = 'kraken/channels/%s/videos/?offset=%d&limit=%d'
     _PAGE_LIMIT = 100
 
-    def _extract_playlist(self, channel_id):
+    def _extract_playlist(self, channel_name):
         info = self._call_api(
-            'kraken/channels/%s' % channel_id,
-            channel_id, 'Downloading channel info JSON')
-        channel_name = info.get('display_name') or info.get('name')
+            'kraken/users?login=%s' % channel_name,
+            channel_name, 'Downloading channel info JSON')
+        info = info['users'][0]
+        channel_id = info['_id']
+        channel_name = info.get('display_name') or info.get('name') or channel_name
         entries = []
         offset = 0
         limit = self._PAGE_LIMIT
@@ -444,7 +446,7 @@ class TwitchProfileIE(TwitchPlaylistBaseIE):
     _TESTS = [{
         'url': 'http://www.twitch.tv/vanillatv/profile',
         'info_dict': {
-            'id': 'vanillatv',
+            'id': '22744919',
             'title': 'VanillaTV',
         },
         'playlist_mincount': 412,
@@ -456,82 +458,86 @@ class TwitchProfileIE(TwitchPlaylistBaseIE):
 
 class TwitchVideosBaseIE(TwitchPlaylistBaseIE):
     _VALID_URL_VIDEOS_BASE = r'%s/(?P<id>[^/]+)/videos' % TwitchBaseIE._VALID_URL_BASE
+    _VALID_URL_VIDEOS_FILTERS = r'\?(?:.*?[&;])??filter=%s'
     _PLAYLIST_PATH = TwitchPlaylistBaseIE._PLAYLIST_PATH + '&broadcast_type='
 
 
 class TwitchAllVideosIE(TwitchVideosBaseIE):
     IE_NAME = 'twitch:videos:all'
-    _VALID_URL = r'%s/all' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
+    _VALID_URL = '%s/?(?:(?:%s)|$)' % (
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'all'
+    )
     _PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'archive,upload,highlight'
     _PLAYLIST_TYPE = 'all videos'
 
     _TESTS = [{
-        'url': 'https://www.twitch.tv/spamfish/videos/all',
+        'url': 'https://www.twitch.tv/spamfish/videos?filter=all&sort=time',
         'info_dict': {
-            'id': 'spamfish',
+            'id': '497952',
             'title': 'Spamfish',
         },
         'playlist_mincount': 869,
     }, {
-        'url': 'https://m.twitch.tv/spamfish/videos/all',
+        'url': 'https://m.twitch.tv/spamfish/videos/',
         'only_matching': True,
     }]
 
 
 class TwitchUploadsIE(TwitchVideosBaseIE):
     IE_NAME = 'twitch:videos:uploads'
-    _VALID_URL = r'%s/uploads' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
+    _VALID_URL = '%s/?(?:%s)' % (
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'uploads'
+    )
     _PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'upload'
     _PLAYLIST_TYPE = 'uploads'
 
     _TESTS = [{
-        'url': 'https://www.twitch.tv/spamfish/videos/uploads',
+        'url': 'https://www.twitch.tv/spamfish/videos?filter=uploads&sort=time',
         'info_dict': {
-            'id': 'spamfish',
+            'id': '497952',
             'title': 'Spamfish',
         },
         'playlist_mincount': 0,
-    }, {
-        'url': 'https://m.twitch.tv/spamfish/videos/uploads',
-        'only_matching': True,
     }]
 
 
 class TwitchPastBroadcastsIE(TwitchVideosBaseIE):
     IE_NAME = 'twitch:videos:past-broadcasts'
-    _VALID_URL = r'%s/past-broadcasts' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
+    _VALID_URL = '%s/?(?:%s)' % (
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'archives'
+    )
     _PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'archive'
     _PLAYLIST_TYPE = 'past broadcasts'
 
     _TESTS = [{
-        'url': 'https://www.twitch.tv/spamfish/videos/past-broadcasts',
+        'url': 'https://www.twitch.tv/spamfish/videos?filter=archives&sort=time',
         'info_dict': {
-            'id': 'spamfish',
+            'id': '497952',
             'title': 'Spamfish',
         },
         'playlist_mincount': 0,
-    }, {
-        'url': 'https://m.twitch.tv/spamfish/videos/past-broadcasts',
-        'only_matching': True,
     }]
 
 
 class TwitchHighlightsIE(TwitchVideosBaseIE):
     IE_NAME = 'twitch:videos:highlights'
-    _VALID_URL = r'%s/highlights' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
+    _VALID_URL = '%s/?(?:%s)' % (
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
+        TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'highlights'
+    )
     _PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'highlight'
     _PLAYLIST_TYPE = 'highlights'
 
     _TESTS = [{
-        'url': 'https://www.twitch.tv/spamfish/videos/highlights',
+        'url': 'https://www.twitch.tv/spamfish/videos?filter=highlights&sort=views',
         'info_dict': {
-            'id': 'spamfish',
+            'id': '497952',
             'title': 'Spamfish',
         },
         'playlist_mincount': 805,
-    }, {
-        'url': 'https://m.twitch.tv/spamfish/videos/highlights',
-        'only_matching': True,
     }]
 
 
similarity index 99%
rename from youtube_dl/extractor/udemy.py
rename to youtube_dlc/extractor/udemy.py
index 2a4faecefbc271f1f88dfe38d2fe284e0bbd9158..60e364d301feae058ae2eda4a7b46f7103ec3439 100644 (file)
@@ -143,7 +143,7 @@ def _download_webpage_handle(self, *args, **kwargs):
             raise ExtractorError(
                 'Udemy asks you to solve a CAPTCHA. Login with browser, '
                 'solve CAPTCHA, then export cookies and pass cookie file to '
-                'youtube-dl with --cookies.', expected=True)
+                'youtube-dlc with --cookies.', expected=True)
         return ret
 
     def _download_json(self, url_or_request, *args, **kwargs):
similarity index 58%
rename from youtube_dl/extractor/videa.py
rename to youtube_dlc/extractor/videa.py
index d0e34c81980c51b6cd464dfc1e1e34ff9b959c44..a03614cc10918301dbd3196de2123b0f22b2a8b8 100644 (file)
@@ -2,15 +2,24 @@
 from __future__ import unicode_literals
 
 import re
+import random
+import string
+import struct
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     int_or_none,
     mimetype2ext,
     parse_codecs,
     xpath_element,
     xpath_text,
 )
+from ..compat import (
+    compat_b64decode,
+    compat_ord,
+    compat_parse_qs,
+)
 
 
 class VideaIE(InfoExtractor):
@@ -60,15 +69,63 @@ def _extract_urls(webpage):
             r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//videa\.hu/player\?.*?\bv=.+?)\1',
             webpage)]
 
+    def rc4(self, ciphertext, key):
+        res = b''
+
+        keyLen = len(key)
+        S = list(range(256))
+
+        j = 0
+        for i in range(256):
+            j = (j + S[i] + ord(key[i % keyLen])) % 256
+            S[i], S[j] = S[j], S[i]
+
+        i = 0
+        j = 0
+        for m in range(len(ciphertext)):
+            i = (i + 1) % 256
+            j = (j + S[i]) % 256
+            S[i], S[j] = S[j], S[i]
+            k = S[(S[i] + S[j]) % 256]
+            res += struct.pack("B", k ^ compat_ord(ciphertext[m]))
+
+        return res
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id, fatal=True)
+        error = self._search_regex(r'<p class="error-text">([^<]+)</p>', webpage, 'error', default=None)
+        if error:
+            raise ExtractorError(error, expected=True)
+
+        video_src_params_raw = self._search_regex(r'<iframe[^>]+id="videa_player_iframe"[^>]+src="/player\?([^"]+)"', webpage, 'video_src_params')
+        video_src_params = compat_parse_qs(video_src_params_raw)
+        player_page = self._download_webpage("https://videa.hu/videojs_player?%s" % video_src_params_raw, video_id, fatal=True)
+        nonce = self._search_regex(r'_xt\s*=\s*"([^"]+)"', player_page, 'nonce')
+        random_seed = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(8))
+        static_secret = 'xHb0ZvME5q8CBcoQi6AngerDu3FGO9fkUlwPmLVY_RTzj2hJIS4NasXWKy1td7p'
+        l = nonce[:32]
+        s = nonce[32:]
+        result = ''
+        for i in range(0, 32):
+            result += s[i - (static_secret.index(l[i]) - 31)]
 
-        info = self._download_xml(
+        video_src_params['_s'] = random_seed
+        video_src_params['_t'] = result[:16]
+        encryption_key_stem = result[16:] + random_seed
+
+        [b64_info, handle] = self._download_webpage_handle(
             'http://videa.hu/videaplayer_get_xml.php', video_id,
-            query={'v': video_id})
+            query=video_src_params, fatal=True)
+
+        encrypted_info = compat_b64decode(b64_info)
+        key = encryption_key_stem + handle.info()['x-videa-xs']
+        info_str = self.rc4(encrypted_info, key).decode('utf8')
+        info = self._parse_xml(info_str, video_id)
 
         video = xpath_element(info, './/video', 'video', fatal=True)
         sources = xpath_element(info, './/video_sources', 'sources', fatal=True)
+        hash_values = xpath_element(info, './/hash_values', 'hash_values', fatal=True)
 
         title = xpath_text(video, './title', fatal=True)
 
@@ -77,6 +134,7 @@ def _real_extract(self, url):
             source_url = source.text
             if not source_url:
                 continue
+            source_url += '?md5=%s&expires=%s' % (hash_values.find('hash_value_%s' % source.get('name')).text, source.get('exp'))
             f = parse_codecs(source.get('codecs'))
             f.update({
                 'url': source_url,
similarity index 96%
rename from youtube_dl/extractor/vidzi.py
rename to youtube_dlc/extractor/vidzi.py
index 42ea4952c381b497b6f01abcb44212339563e0a3..4e79a0b84b8ca04ea537646aee4b593872351829 100644 (file)
@@ -20,7 +20,7 @@ class VidziIE(InfoExtractor):
         'info_dict': {
             'id': 'cghql9yq6emu',
             'ext': 'mp4',
-            'title': 'youtube-dl test video  1\\\\2\'3/4<5\\\\6ä7↭',
+            'title': 'youtube-dlc test video  1\\\\2\'3/4<5\\\\6ä7↭',
         },
         'params': {
             # m3u8 download
similarity index 98%
rename from youtube_dl/extractor/viki.py
rename to youtube_dlc/extractor/viki.py
index b0dcdc0e6baced889541e3307ac8314e73f99522..9e4171237ef44b1b3d749ff23c06ad3ef96f37ca 100644 (file)
@@ -56,14 +56,14 @@ def _prepare_call(self, path, timestamp=None, post_data=None):
 
     def _call_api(self, path, video_id, note, timestamp=None, post_data=None):
         resp = self._download_json(
-            self._prepare_call(path, timestamp, post_data), video_id, note)
+            self._prepare_call(path, timestamp, post_data), video_id, note, headers={'x-viki-app-ver': '2.2.5.1428709186'}, expected_status=[200, 400, 404])
 
         error = resp.get('error')
         if error:
             if error == 'invalid timestamp':
                 resp = self._download_json(
                     self._prepare_call(path, int(resp['current_timestamp']), post_data),
-                    video_id, '%s (retry)' % note)
+                    video_id, '%s (retry)' % note, headers={'x-viki-app-ver': '2.2.5.1428709186'}, expected_status=[200, 400, 404])
                 error = resp.get('error')
             if error:
                 self._raise_error(resp['error'])
similarity index 99%
rename from youtube_dl/extractor/vimeo.py
rename to youtube_dlc/extractor/vimeo.py
index 421795b94d9f6cf10fe3d5725503baa86383062c..9839657ca3d96fe3775c5bed4391d88e419225f9 100644 (file)
@@ -600,7 +600,7 @@ def _real_extract(self, url):
                 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-dl with the URL of the page '
+                        'URL. Please call youtube-dlc with the URL of the page '
                         'that embeds this video.',
                         expected=True)
             raise
similarity index 97%
rename from youtube_dl/extractor/wdr.py
rename to youtube_dlc/extractor/wdr.py
index cf6f7c7ed6ab5bce442a6cb2079baf687c324417..44d4a13cac006ac650c6a07b1a604729c25c5205 100644 (file)
@@ -45,9 +45,18 @@ def _real_extract(self, url):
         media_resource = metadata['mediaResource']
 
         formats = []
+        subtitles = {}
 
         # check if the metadata contains a direct URL to a file
         for kind, media_resource in media_resource.items():
+            if kind == 'captionsHash':
+                for ext, url in media_resource.items():
+                    subtitles.setdefault('de', []).append({
+                        'url': url,
+                        'ext': ext,
+                    })
+                continue
+
             if kind not in ('dflt', 'alt'):
                 continue
 
@@ -81,14 +90,6 @@ def _real_extract(self, url):
 
         self._sort_formats(formats)
 
-        subtitles = {}
-        caption_url = media_resource.get('captionURL')
-        if caption_url:
-            subtitles['de'] = [{
-                'url': caption_url,
-                'ext': 'ttml',
-            }]
-
         title = tracker_data['trackerClipTitle']
 
         return {
similarity index 99%
rename from youtube_dl/extractor/yandexmusic.py
rename to youtube_dlc/extractor/yandexmusic.py
index 08d35e04c968a497bc28f4c3207e8d63432bd8d4..4358bc83669ffab11e5dab39444ddce1acdab2cd 100644 (file)
@@ -27,12 +27,12 @@ def _handle_error(response):
     @staticmethod
     def _raise_captcha():
         raise ExtractorError(
-            'YandexMusic has considered youtube-dl requests automated and '
+            'YandexMusic has considered youtube-dlc 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-dl with --cookies',
+            'youtube-dlc with --cookies',
             expected=True)
 
     def _download_webpage_handle(self, *args, **kwargs):
similarity index 98%
rename from youtube_dl/extractor/youtube.py
rename to youtube_dlc/extractor/youtube.py
index bb382849f08e955a48ad47ff1bf930b8bca878c0..30a3e5c3c02dff7c28b166e3bafa2853ff2f3827 100644 (file)
@@ -1435,7 +1435,7 @@ def _decrypt_signature(self, s, video_id, player_url, age_gate=False):
             raise ExtractorError(
                 'Signature extraction failed: ' + tb, cause=e)
 
-    def _get_subtitles(self, video_id, webpage):
+    def _get_subtitles(self, video_id, webpage, has_live_chat_replay):
         try:
             subs_doc = self._download_xml(
                 'https://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id,
@@ -1462,6 +1462,14 @@ def _get_subtitles(self, video_id, webpage):
                     'ext': ext,
                 })
             sub_lang_list[lang] = sub_formats
+        if has_live_chat_replay:
+            sub_lang_list['live_chat'] = [
+                {
+                    'video_id': video_id,
+                    'ext': 'json',
+                    'protocol': 'youtube_live_chat_replay',
+                },
+            ]
         if not sub_lang_list:
             self._downloader.report_warning('video doesn\'t have subtitles')
             return {}
@@ -1485,6 +1493,15 @@ def _get_ytplayer_config(self, video_id, webpage):
             return self._parse_json(
                 uppercase_escape(config), video_id, fatal=False)
 
+    def _get_yt_initial_data(self, video_id, webpage):
+        config = self._search_regex(
+            (r'window\["ytInitialData"\]\s*=\s*(.*?)(?<=});',
+             r'var\s+ytInitialData\s*=\s*(.*?)(?<=});'),
+            webpage, 'ytInitialData', default=None)
+        if config:
+            return self._parse_json(
+                uppercase_escape(config), video_id, fatal=False)
+
     def _get_automatic_captions(self, video_id, webpage):
         """We need the webpage for getting the captions url, pass it as an
            argument to speed up the process."""
@@ -1668,21 +1685,15 @@ def extract_id(cls, url):
     def _extract_chapters_from_json(self, webpage, video_id, duration):
         if not webpage:
             return
-        player = self._parse_json(
+        initial_data = self._parse_json(
             self._search_regex(
-                r'RELATED_PLAYER_ARGS["\']\s*:\s*({.+})\s*,?\s*\n', webpage,
+                r'window\["ytInitialData"\] = (.+);\n', webpage,
                 'player args', default='{}'),
             video_id, fatal=False)
-        if not player or not isinstance(player, dict):
-            return
-        watch_next_response = player.get('watch_next_response')
-        if not isinstance(watch_next_response, compat_str):
-            return
-        response = self._parse_json(watch_next_response, video_id, fatal=False)
-        if not response or not isinstance(response, dict):
+        if not initial_data or not isinstance(initial_data, dict):
             return
         chapters_list = try_get(
-            response,
+            initial_data,
             lambda x: x['playerOverlays']
                        ['playerOverlayRenderer']
                        ['decoratedPlayerBarRenderer']
@@ -1832,7 +1843,7 @@ def extract_player_response(player_response, video_id):
         # Get video info
         video_info = {}
         embed_webpage = None
-        if re.search(r'player-age-gate-content">', video_webpage) is not None:
+        if self._html_search_meta('og:restrictions:age', video_webpage, default=None) == "18+":
             age_gate = True
             # We simulate the access to the video from www.youtube.com/v/{video_id}
             # this can be viewed without login into Youtube
@@ -1991,6 +2002,15 @@ def feed_entry(name):
         if is_live is None:
             is_live = bool_or_none(video_details.get('isLive'))
 
+        has_live_chat_replay = False
+        if not is_live:
+            yt_initial_data = self._get_yt_initial_data(video_id, video_webpage)
+            try:
+                yt_initial_data['contents']['twoColumnWatchNextResults']['conversationBar']['liveChatRenderer']['continuations'][0]['reloadContinuationData']['continuation']
+                has_live_chat_replay = True
+            except (KeyError, IndexError, TypeError):
+                pass
+
         # Check for "rental" videos
         if 'ypc_video_rental_bar_text' in video_info and 'author' not in video_info:
             raise ExtractorError('"rental" videos not supported. See https://github.com/ytdl-org/youtube-dl/issues/359 for more information.', expected=True)
@@ -2398,7 +2418,8 @@ def _extract_count(count_name):
             or try_get(video_info, lambda x: float_or_none(x['avg_rating'][0])))
 
         # subtitles
-        video_subtitles = self.extract_subtitles(video_id, video_webpage)
+        video_subtitles = self.extract_subtitles(
+            video_id, video_webpage, has_live_chat_replay)
         automatic_captions = self.extract_automatic_captions(video_id, video_webpage)
 
         video_duration = try_get(
similarity index 95%
rename from youtube_dl/extractor/zdf.py
rename to youtube_dlc/extractor/zdf.py
index 656864b2ed8a9982c1da934b01aff6bcb7126acf..7b5ad4a6e85398331fe4c7926cbc378f3b624f0f 100644 (file)
@@ -39,11 +39,23 @@ def _extract_player(self, webpage, video_id, fatal=True):
 
 
 class ZDFIE(ZDFBaseIE):
-    _VALID_URL = r'https?://www\.zdf\.de/(?:[^/]+/)*(?P<id>[^/?]+)\.html'
+    IE_NAME = "ZDF-3sat"
+    _VALID_URL = r'https?://www\.(zdf|3sat)\.de/(?:[^/]+/)*(?P<id>[^/?]+)\.html'
     _QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh')
     _GEO_COUNTRIES = ['DE']
 
     _TESTS = [{
+        'url': 'https://www.3sat.de/wissen/wissenschaftsdoku/luxusgut-lebensraum-100.html',
+        'info_dict': {
+            'id': 'luxusgut-lebensraum-100',
+            'ext': 'mp4',
+            'title': 'Luxusgut Lebensraum',
+            'description': 'md5:5c09b2f45ac3bc5233d1b50fc543d061',
+            'duration': 2601,
+            'timestamp': 1566497700,
+            'upload_date': '20190822',
+        }
+    }, {
         'url': 'https://www.zdf.de/dokumentation/terra-x/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100.html',
         'info_dict': {
             'id': 'die-magie-der-farben-von-koenigspurpur-und-jeansblau-100',
similarity index 96%
rename from youtube_dl/options.py
rename to youtube_dlc/options.py
index 6d5ac62b3bab68de226060c6bcd3cd9299f02825..2cc5eee742dcef08553b12082c10b0e9f23248fb 100644 (file)
@@ -57,33 +57,33 @@ def _readOptions(filename_bytes, default=[]):
     def _readUserConf():
         xdg_config_home = compat_getenv('XDG_CONFIG_HOME')
         if xdg_config_home:
-            userConfFile = os.path.join(xdg_config_home, 'youtube-dl', 'config')
+            userConfFile = os.path.join(xdg_config_home, 'youtube-dlc', 'config')
             if not os.path.isfile(userConfFile):
-                userConfFile = os.path.join(xdg_config_home, 'youtube-dl.conf')
+                userConfFile = os.path.join(xdg_config_home, 'youtube-dlc.conf')
         else:
-            userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dl', 'config')
+            userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dlc', 'config')
             if not os.path.isfile(userConfFile):
-                userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dl.conf')
+                userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dlc.conf')
         userConf = _readOptions(userConfFile, None)
 
         if userConf is None:
             appdata_dir = compat_getenv('appdata')
             if appdata_dir:
                 userConf = _readOptions(
-                    os.path.join(appdata_dir, 'youtube-dl', 'config'),
+                    os.path.join(appdata_dir, 'youtube-dlc', 'config'),
                     default=None)
                 if userConf is None:
                     userConf = _readOptions(
-                        os.path.join(appdata_dir, 'youtube-dl', 'config.txt'),
+                        os.path.join(appdata_dir, 'youtube-dlc', 'config.txt'),
                         default=None)
 
         if userConf is None:
             userConf = _readOptions(
-                os.path.join(compat_expanduser('~'), 'youtube-dl.conf'),
+                os.path.join(compat_expanduser('~'), 'youtube-dlc.conf'),
                 default=None)
         if userConf is None:
             userConf = _readOptions(
-                os.path.join(compat_expanduser('~'), 'youtube-dl.conf.txt'),
+                os.path.join(compat_expanduser('~'), 'youtube-dlc.conf.txt'),
                 default=None)
 
         if userConf is None:
@@ -168,14 +168,14 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     general.add_option(
         '--default-search',
         dest='default_search', metavar='PREFIX',
-        help='Use this prefix for unqualified URLs. For example "gvsearch2:" downloads two videos from google videos for youtube-dl "large apple". Use the value "auto" to let youtube-dl guess ("auto_warning" to emit a warning when guessing). "error" just throws an error. The default value "fixup_error" repairs broken URLs, but emits an error if this is not possible instead of searching.')
+        help='Use this prefix for unqualified URLs. For example "gvsearch2:" downloads two videos from google videos for youtube-dlc "large apple". Use the value "auto" to let youtube-dlc guess ("auto_warning" to emit a warning when guessing). "error" just throws an error. The default value "fixup_error" repairs broken URLs, but emits an error if this is not possible instead of searching.')
     general.add_option(
         '--ignore-config',
         action='store_true',
         help='Do not read configuration files. '
-        'When given in the global configuration file /etc/youtube-dl.conf: '
-        'Do not read the user configuration in ~/.config/youtube-dl/config '
-        '(%APPDATA%/youtube-dl/config.txt on Windows)')
+        'When given in the global configuration file /etc/youtube-dlc.conf: '
+        'Do not read the user configuration in ~/.config/youtube-dlc/config '
+        '(%APPDATA%/youtube-dlc/config.txt on Windows)')
     general.add_option(
         '--config-location',
         dest='config_location', metavar='PATH',
@@ -357,7 +357,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     authentication.add_option(
         '-p', '--password',
         dest='password', metavar='PASSWORD',
-        help='Account password. If this option is left out, youtube-dl will ask interactively.')
+        help='Account password. If this option is left out, youtube-dlc will ask interactively.')
     authentication.add_option(
         '-2', '--twofactor',
         dest='twofactor', metavar='TWOFACTOR',
@@ -383,7 +383,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     adobe_pass.add_option(
         '--ap-password',
         dest='ap_password', metavar='PASSWORD',
-        help='Multiple-system operator account password. If this option is left out, youtube-dl will ask interactively.')
+        help='Multiple-system operator account password. If this option is left out, youtube-dlc will ask interactively.')
     adobe_pass.add_option(
         '--ap-list-mso',
         action='store_true', dest='ap_list_mso', default=False,
@@ -670,11 +670,11 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     verbosity.add_option(
         '-C', '--call-home',
         dest='call_home', action='store_true', default=False,
-        help='Contact the youtube-dl server for debugging')
+        help='Contact the youtube-dlc server for debugging')
     verbosity.add_option(
         '--no-call-home',
         dest='call_home', action='store_false', default=False,
-        help='Do NOT contact the youtube-dl server for debugging')
+        help='Do NOT contact the youtube-dlc server for debugging')
 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
     filesystem.add_option(
@@ -720,7 +720,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     filesystem.add_option(
         '-c', '--continue',
         action='store_true', dest='continue_dl', default=True,
-        help='Force resume of partially downloaded files. By default, youtube-dl will resume downloads if possible.')
+        help='Force resume of partially downloaded files. By default, youtube-dlc will resume downloads if possible.')
     filesystem.add_option(
         '--no-continue',
         action='store_false', dest='continue_dl',
@@ -755,7 +755,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
         help='File to read cookies from and dump cookie jar in')
     filesystem.add_option(
         '--cache-dir', dest='cachedir', default=None, metavar='DIR',
-        help='Location in the filesystem where youtube-dl can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dl or ~/.cache/youtube-dl . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')
+        help='Location in the filesystem where youtube-dlc can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dlc or ~/.cache/youtube-dlc . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')
     filesystem.add_option(
         '--no-cache-dir', action='store_const', const=False, dest='cachedir',
         help='Disable filesystem caching')
@@ -892,14 +892,14 @@ def compat_conf(conf):
         if '--config-location' in command_line_conf:
             location = compat_expanduser(opts.config_location)
             if os.path.isdir(location):
-                location = os.path.join(location, 'youtube-dl.conf')
+                location = os.path.join(location, 'youtube-dlc.conf')
             if not os.path.exists(location):
                 parser.error('config-location %s does not exist.' % location)
             custom_conf = _readOptions(location)
         elif '--ignore-config' in command_line_conf:
             pass
         else:
-            system_conf = _readOptions('/etc/youtube-dl.conf')
+            system_conf = _readOptions('/etc/youtube-dlc.conf')
             if '--ignore-config' not in system_conf:
                 user_conf = _readUserConf()
 
similarity index 72%
rename from youtube_dl/postprocessor/embedthumbnail.py
rename to youtube_dlc/postprocessor/embedthumbnail.py
index 56be914b8f1b6e98802163ae1013392079d93fb3..e2002ab0b1ed84483c47b63ea74e4086fea7230a 100644 (file)
@@ -41,6 +41,28 @@ def run(self, info):
                 'Skipping embedding the thumbnail because the file is missing.')
             return [], info
 
+        # Check for mislabeled webp file
+        with open(encodeFilename(thumbnail_filename), "rb") as f:
+            b = f.read(16)
+        if b'\x57\x45\x42\x50' in b:  # Binary for WEBP
+            [thumbnail_filename_path, thumbnail_filename_extension] = os.path.splitext(thumbnail_filename)
+            if not thumbnail_filename_extension == ".webp":
+                webp_thumbnail_filename = thumbnail_filename_path + ".webp"
+                os.rename(encodeFilename(thumbnail_filename), encodeFilename(webp_thumbnail_filename))
+                thumbnail_filename = webp_thumbnail_filename
+
+        # If not a jpg or png thumbnail, convert it to jpg using ffmpeg
+        if not os.path.splitext(thumbnail_filename)[1].lower() in ['.jpg', '.png']:
+            jpg_thumbnail_filename = os.path.splitext(thumbnail_filename)[0] + ".jpg"
+            jpg_thumbnail_filename = os.path.join(os.path.dirname(jpg_thumbnail_filename), os.path.basename(jpg_thumbnail_filename).replace('%', '_'))  # ffmpeg interprets % as image sequence
+
+            self._downloader.to_screen('[ffmpeg] Converting thumbnail "%s" to JPEG' % thumbnail_filename)
+
+            self.run_ffmpeg(thumbnail_filename, jpg_thumbnail_filename, ['-bsf:v', 'mjpeg2jpeg'])
+
+            os.remove(encodeFilename(thumbnail_filename))
+            thumbnail_filename = jpg_thumbnail_filename
+
         if info['ext'] == 'mp3':
             options = [
                 '-c', 'copy', '-map', '0', '-map', '1',
similarity index 99%
rename from youtube_dl/postprocessor/ffmpeg.py
rename to youtube_dlc/postprocessor/ffmpeg.py
index 5f7298345b3f550c9a8d8b7ba2b602d2f084ed36..dbc736c50930670303783c047ce261067a57c744 100644 (file)
@@ -533,7 +533,7 @@ def can_merge(self):
         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-dl will download single file media. '
+                       'youtube-dlc will download single file media. '
                        'Update %s to version %s or newer to fix this.') % (
                            self.basename, self.basename, required_version)
             if self._downloader:
similarity index 100%
rename from youtube_dl/socks.py
rename to youtube_dlc/socks.py
similarity index 93%
rename from youtube_dl/update.py
rename to youtube_dlc/update.py
index 84c9646171e0b8f8d6a6397bff5339205cdadcd7..d95a07c0ca94b01b836bc7b62bfc5fc505f66873 100644 (file)
@@ -38,7 +38,7 @@ def update_self(to_screen, verbose, opener):
     UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
 
     if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'):
-        to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
+        to_screen('It looks like you installed youtube-dlc with a package manager, pip, setup.py or a tarball. Please use that to update.')
         return
 
     # Check if there is a new version
@@ -50,7 +50,7 @@ def update_self(to_screen, verbose, opener):
         to_screen('ERROR: can\'t find the current version. Please try again later.')
         return
     if newversion == __version__:
-        to_screen('youtube-dl is up-to-date (' + __version__ + ')')
+        to_screen('youtube-dlc is up-to-date (' + __version__ + ')')
         return
 
     # Download and check versions info
@@ -76,7 +76,7 @@ def update_self(to_screen, verbose, opener):
     def version_tuple(version_str):
         return tuple(map(int, version_str.split('.')))
     if version_tuple(__version__) >= version_tuple(version_id):
-        to_screen('youtube-dl is up to date (%s)' % __version__)
+        to_screen('youtube-dlc is up to date (%s)' % __version__)
         return
 
     to_screen('Updating to version ' + version_id + ' ...')
@@ -126,14 +126,14 @@ def version_tuple(version_str):
             return
 
         try:
-            bat = os.path.join(directory, 'youtube-dl-updater.bat')
+            bat = os.path.join(directory, 'youtube-dlc-updater.bat')
             with io.open(bat, 'w') as batfile:
                 batfile.write('''
 @echo off
 echo Waiting for file handle to be closed ...
 ping 127.0.0.1 -n 5 -w 1000 > NUL
 move /Y "%s.new" "%s" > NUL
-echo Updated youtube-dl to version %s.
+echo Updated youtube-dlc to version %s.
 start /b "" cmd /c del "%%~f0"&exit /b"
                 \n''' % (exe, exe, version_id))
 
@@ -171,7 +171,7 @@ def version_tuple(version_str):
             to_screen('ERROR: unable to overwrite current version')
             return
 
-    to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.')
+    to_screen('Updated youtube-dlc. Restart youtube-dlc to use the new version.')
 
 
 def get_notes(versions, fromVersion):
similarity index 99%
rename from youtube_dl/utils.py
rename to youtube_dlc/utils.py
index d1eca3760a66e89fbfc1673e70a2d526035776cf..7dafacac2a1c43fb43a081fdc277f2df08cf2707 100644 (file)
@@ -2317,12 +2317,12 @@ def make_HTTPS_handler(params, **kwargs):
 
 def bug_reports_message():
     if ytdl_is_updateable():
-        update_cmd = 'type  youtube-dl -U  to update'
+        update_cmd = 'type  youtube-dlc -U  to update'
     else:
         update_cmd = 'see  https://yt-dl.org/update  on how to update'
     msg = '; please report this issue on https://yt-dl.org/bug .'
     msg += ' Make sure you are using the latest version; %s.' % update_cmd
-    msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.'
+    msg += ' Be sure to call youtube-dlc with the --verbose flag and include its complete output.'
     return msg
 
 
@@ -2336,7 +2336,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-dl.
+        If expected is set, this is a normal error message and most likely not a bug in youtube-dlc.
         """
 
         if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
@@ -2745,7 +2745,7 @@ class YoutubeDLCookieJar(compat_cookiejar.MozillaCookieJar):
     _HTTPONLY_PREFIX = '#HttpOnly_'
     _ENTRY_LEN = 7
     _HEADER = '''# Netscape HTTP Cookie File
-# This file is generated by youtube-dl.  Do not edit.
+# This file is generated by youtube-dlc.  Do not edit.
 
 '''
     _CookieFileEntry = collections.namedtuple(
@@ -3732,7 +3732,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-dl is run in the background.
+        # SIGTTOU if youtube-dlc is run in the background.
         # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
         out, _ = subprocess.Popen(
             [encodeArgument(exe)] + args,
@@ -4144,7 +4144,7 @@ def is_outdated_version(version, limit, assume_new=True):
 
 
 def ytdl_is_updateable():
-    """ Returns if youtube-dl can be updated with -U """
+    """ Returns if youtube-dlc can be updated with -U """
     from zipimport import zipimporter
 
     return isinstance(globals().get('__loader__'), zipimporter) or hasattr(sys, 'frozen')
@@ -4173,6 +4173,7 @@ def mimetype2ext(mt):
         # Per RFC 3003, audio/mpeg can be .mp1, .mp2 or .mp3. Here use .mp3 as
         # it's the most popular one
         'audio/mpeg': 'mp3',
+        'audio/x-wav': 'wav',
     }.get(mt)
     if ext is not None:
         return ext
@@ -5352,7 +5353,7 @@ def proxy_open(self, req, proxy, type):
             return None  # No Proxy
         if compat_urlparse.urlparse(proxy).scheme.lower() in ('socks', 'socks4', 'socks4a', 'socks5'):
             req.add_header('Ytdl-socks-proxy', proxy)
-            # youtube-dl's http/https handlers do wrapping the socket with socks
+            # youtube-dlc's http/https handlers do wrapping the socket with socks
             return None
         return compat_urllib_request.ProxyHandler.proxy_open(
             self, req, proxy, type)
@@ -5625,7 +5626,7 @@ def write_xattr(path, key, value):
                 # TODO: fallback to CLI tools
                 raise XAttrUnavailableError(
                     'python-pyxattr is detected but is too old. '
-                    'youtube-dl requires %s or above while your version is %s. '
+                    'youtube-dlc requires %s or above while your version is %s. '
                     'Falling back to other xattr implementations' % (
                         pyxattr_required_version, xattr.__version__))
 
similarity index 58%
rename from youtube_dl/version.py
rename to youtube_dlc/version.py
index 17101fa47501d9bae1d6f223e35d7cb4dd3f8d5e..9cabf84e24f43dc35371430abe09b15137161c95 100644 (file)
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2020.07.28'
+__version__ = '2020.09.03.1'