From ce89e83c4017618526f6bfab61bb05d4a2431a6f Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sat, 25 Jun 2016 06:40:27 +0300 Subject: network/youtube-dl: Updated for version 2016.06.23.1. Signed-off-by: Dimitris Zlatanidis --- network/youtube-dl/setup.patch | 47 +- network/youtube-dl/youtube-dl.1 | 1169 +++++++----------------------- network/youtube-dl/youtube-dl.SlackBuild | 2 +- network/youtube-dl/youtube-dl.info | 6 +- 4 files changed, 314 insertions(+), 910 deletions(-) diff --git a/network/youtube-dl/setup.patch b/network/youtube-dl/setup.patch index 3e1210c501..1ffdd77d59 100644 --- a/network/youtube-dl/setup.patch +++ b/network/youtube-dl/setup.patch @@ -1,11 +1,11 @@ ---- youtube-dl-2015.12.06/Makefile 2015-12-06 19:51:25.000000000 +0200 -+++ youtube-dl-2015.12.06/Makefile.orig 2015-12-08 03:44:10.554844147 +0200 -@@ -4,11 +4,11 @@ - 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 *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe +--- youtube-dl-2016.06.23.1/Makefile.orig 2016-06-23 05:42:56.000000000 +0300 ++++ youtube-dl-2016.06.23.1/Makefile 2016-06-24 06:06:24.990732349 +0300 +@@ -5,14 +5,22 @@ find . -name "*.pyc" -delete + find . -name "*.class" -delete -PREFIX ?= /usr/local -+PREFIX ?= ++PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin MANDIR ?= $(PREFIX)/man SHAREDIR ?= $(PREFIX)/share @@ -13,8 +13,20 @@ +PYTHON ?= /usr/bin/python # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local - ifeq ($(PREFIX),/usr) -@@ -50,7 +50,7 @@ +-SYSCONFDIR != if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi ++ifeq ($(PREFIX),/usr) ++ SYSCONFDIR=/etc ++else ++ ifeq ($(PREFIX),/usr/local) ++ SYSCONFDIR=/etc ++ else ++ SYSCONFDIR=$(PREFIX)/etc ++ endif ++endif + + install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish + install -d $(DESTDIR)$(BINDIR) +@@ -43,7 +51,7 @@ .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites @@ -23,7 +35,7 @@ youtube-dl: youtube_dl/*.py youtube_dl/*/*.py zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py -@@ -70,11 +70,11 @@ +@@ -66,11 +74,11 @@ $(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md README.txt: README.md @@ -31,15 +43,24 @@ + # 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 + $(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 + # pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1 rm -f youtube-dl.1.temp.md youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in ---- youtube-dl-2015.12.06/setup.py 2015-12-06 19:51:25.000000000 +0200 -+++ youtube-dl-2015.12.06/setup.py.orig 2015-12-08 03:47:01.705704467 +0200 -@@ -46,10 +46,8 @@ +@@ -90,7 +98,7 @@ + + lazy-extractors: youtube_dl/extractor/lazy_extractors.py + +-_EXTRACTOR_FILES != find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py' ++ _EXTRACTOR_FILES != 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) + $(PYTHON) devscripts/make_lazy_extractors.py $@ + +--- youtube-dl-2016.06.23.1/setup.py.orig 2016-06-24 06:06:54.071368791 +0300 ++++ youtube-dl-2016.06.23.1/setup.py 2016-06-24 06:07:18.516063191 +0300 +@@ -47,10 +47,10 @@ params = py2exe_params else: files_spec = [ @@ -49,6 +70,8 @@ - ('share/man/man1', ['youtube-dl.1']) + ('/etc/bash_completion.d', ['youtube-dl.bash-completion']), + ('/etc/fish/completions', ['youtube-dl.fish']), ++ ('/usr/doc/youtube_dl', ['README.txt']), ++ ('/usr/man/man1', ['youtube-dl.1']) ] root = os.path.dirname(os.path.abspath(__file__)) data_files = [] diff --git a/network/youtube-dl/youtube-dl.1 b/network/youtube-dl/youtube-dl.1 index 3f9e689522..a55d2ccb26 100644 --- a/network/youtube-dl/youtube-dl.1 +++ b/network/youtube-dl/youtube-dl.1 @@ -1,6 +1,3 @@ -.\" Automatically generated by Pandoc 1.15.1.1 -.\" -.hy .TH "YOUTUBE\-DL" "1" "" "" "" .SH NAME .PP @@ -18,823 +15,254 @@ It should work on your Unix box, on Windows or on Mac OS X. It is released to the public domain, which means you can modify it, redistribute it or use it however you like. .SH OPTIONS -.TP -.B \-h, \-\-help -Print this help text and exit -.RS -.RE -.TP -.B \-\-version -Print program version and exit -.RS -.RE -.TP -.B \-U, \-\-update -Update this program to latest version. -Make sure that you have sufficient permissions (run with sudo if needed) -.RS -.RE -.TP -.B \-i, \-\-ignore\-errors -Continue on download errors, for example to skip unavailable videos in a -playlist -.RS -.RE -.TP -.B \-\-abort\-on\-error -Abort downloading of further videos (in the playlist or the command -line) if an error occurs -.RS -.RE -.TP -.B \-\-dump\-user\-agent -Display the current browser identification -.RS -.RE -.TP -.B \-\-list\-extractors -List all supported extractors -.RS -.RE -.TP -.B \-\-extractor\-descriptions -Output descriptions of all supported extractors -.RS -.RE -.TP -.B \-\-force\-generic\-extractor -Force extraction to use the generic extractor -.RS -.RE -.TP -.B \-\-default\-search \f[I]PREFIX\f[] -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. -.RS -.RE -.TP -.B \-\-ignore\-config -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) -.RS -.RE -.TP -.B \-\-flat\-playlist -Do not extract the videos of a playlist, only list them. -.RS -.RE -.TP -.B \-\-no\-color -Do not emit color codes in output -.RS -.RE +.IP +.nf +\f[C] +\-h,\ \-\-help\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Print\ this\ help\ text\ and\ exit +\-\-version\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Print\ program\ version\ and\ exit +\-U,\ \-\-update\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Update\ this\ program\ to\ latest\ version.\ Make\ sure\ that\ you\ have\ sufficient\ permissions\ (run\ with\ sudo\ if\ needed) +\-i,\ \-\-ignore\-errors\ \ \ \ \ \ \ \ \ \ \ \ \ \ Continue\ on\ download\ errors,\ for\ example\ to\ skip\ unavailable\ videos\ in\ a\ playlist +\-\-abort\-on\-error\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Abort\ downloading\ of\ further\ videos\ (in\ the\ playlist\ or\ the\ command\ line)\ if\ an\ error\ occurs +\-\-dump\-user\-agent\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Display\ the\ current\ browser\ identification +\-\-list\-extractors\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ List\ all\ supported\ extractors +\-\-extractor\-descriptions\ \ \ \ \ \ \ \ \ Output\ descriptions\ of\ all\ supported\ extractors +\-\-force\-generic\-extractor\ \ \ \ \ \ \ \ Force\ extraction\ to\ use\ the\ generic\ extractor +\-\-default\-search\ PREFIX\ \ \ \ \ \ \ \ \ \ 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. +\-\-ignore\-config\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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) +\-\-flat\-playlist\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ extract\ the\ videos\ of\ a\ playlist,\ only\ list\ them. +\-\-no\-color\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ emit\ color\ codes\ in\ output +\f[] +.fi .SS Network Options: -.TP -.B \-\-proxy \f[I]URL\f[] -Use the specified HTTP/HTTPS proxy. -Pass in an empty string (\-\-proxy "") for direct connection -.RS -.RE -.TP -.B \-\-socket\-timeout \f[I]SECONDS\f[] -Time to wait before giving up, in seconds -.RS -.RE -.TP -.B \-\-source\-address \f[I]IP\f[] -Client\-side IP address to bind to (experimental) -.RS -.RE -.TP -.B \-4, \-\-force\-ipv4 -Make all connections via IPv4 (experimental) -.RS -.RE -.TP -.B \-6, \-\-force\-ipv6 -Make all connections via IPv6 (experimental) -.RS -.RE -.TP -.B \-\-cn\-verification\-proxy \f[I]URL\f[] -Use this proxy to verify the IP address for some Chinese sites. -The default proxy specified by \-\-proxy (or none, if the options is not -present) is used for the actual downloading. -(experimental) -.RS -.RE +.IP +.nf +\f[C] +\-\-proxy\ URL\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ the\ specified\ HTTP/HTTPS\ proxy.\ Pass\ in\ an\ empty\ string\ (\-\-proxy\ "")\ for\ direct\ connection +\-\-socket\-timeout\ SECONDS\ \ \ \ \ \ \ \ \ Time\ to\ wait\ before\ giving\ up,\ in\ seconds +\-\-source\-address\ IP\ \ \ \ \ \ \ \ \ \ \ \ \ \ Client\-side\ IP\ address\ to\ bind\ to\ (experimental) +\-4,\ \-\-force\-ipv4\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Make\ all\ connections\ via\ IPv4\ (experimental) +\-6,\ \-\-force\-ipv6\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Make\ all\ connections\ via\ IPv6\ (experimental) +\-\-cn\-verification\-proxy\ URL\ \ \ \ \ \ Use\ this\ proxy\ to\ verify\ the\ IP\ address\ for\ some\ Chinese\ sites.\ The\ default\ proxy\ specified\ by\ \-\-proxy\ (or\ none,\ if\ the\ options\ is +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ not\ present)\ is\ used\ for\ the\ actual\ downloading.\ (experimental) +\f[] +.fi .SS Video Selection: -.TP -.B \-\-playlist\-start \f[I]NUMBER\f[] -Playlist video to start at (default is 1) -.RS -.RE -.TP -.B \-\-playlist\-end \f[I]NUMBER\f[] -Playlist video to end at (default is last) -.RS -.RE -.TP -.B \-\-playlist\-items \f[I]ITEM_SPEC\f[] -Playlist video items to download. -Specify indices of the videos in the playlist separated by commas like: -"\-\-playlist\-items 1,2,5,8" if you want to download videos indexed 1, -2, 5, 8 in the playlist. -You can specify range: "\-\-playlist\-items 1\-3,7,10\-13", it will -download the videos at index 1, 2, 3, 7, 10, 11, 12 and 13. -.RS -.RE -.TP -.B \-\-match\-title \f[I]REGEX\f[] -Download only matching titles (regex or caseless sub\-string) -.RS -.RE -.TP -.B \-\-reject\-title \f[I]REGEX\f[] -Skip download for matching titles (regex or caseless sub\-string) -.RS -.RE -.TP -.B \-\-max\-downloads \f[I]NUMBER\f[] -Abort after downloading NUMBER files -.RS -.RE -.TP -.B \-\-min\-filesize \f[I]SIZE\f[] -Do not download any videos smaller than SIZE (e.g. -50k or 44.6m) -.RS -.RE -.TP -.B \-\-max\-filesize \f[I]SIZE\f[] -Do not download any videos larger than SIZE (e.g. -50k or 44.6m) -.RS -.RE -.TP -.B \-\-date \f[I]DATE\f[] -Download only videos uploaded in this date -.RS -.RE -.TP -.B \-\-datebefore \f[I]DATE\f[] -Download only videos uploaded on or before this date (i.e. -inclusive) -.RS -.RE -.TP -.B \-\-dateafter \f[I]DATE\f[] -Download only videos uploaded on or after this date (i.e. -inclusive) -.RS -.RE -.TP -.B \-\-min\-views \f[I]COUNT\f[] -Do not download any videos with less than COUNT views -.RS -.RE -.TP -.B \-\-max\-views \f[I]COUNT\f[] -Do not download any videos with more than COUNT views -.RS -.RE -.TP -.B \-\-match\-filter \f[I]FILTER\f[] -Generic video filter (experimental). -Specify any key (see help for \-o for a list of available keys) to match -if the key is present, !key to check if the key is not present,key > -NUMBER (like "comment_count > 12", also works with >=, <, <=, !=, =) to -compare against a number, and & to require multiple matches. -Values which are not known are excluded unless you put a question mark -(?) after the operator.For example, to only match videos that have been -liked more than 100 times and disliked less than 50 times (or the -dislike functionality is not available at the given service), but who -also have a description, use \-\-match\-filter "like_count > 100 & -dislike_count \ NUMBER\ (like\ "comment_count\ >\ 12",\ also\ works\ with\ >=,\ <,\ <=,\ !=,\ =)\ to\ compare\ against +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ a\ number,\ and\ &\ to\ require\ multiple\ matches.\ Values\ which\ are\ not\ known\ are\ excluded\ unless\ you\ put\ a\ question\ mark\ (?)\ after\ the +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ operator.For\ example,\ to\ only\ match\ videos\ that\ have\ been\ liked\ more\ than\ 100\ times\ and\ disliked\ less\ than\ 50\ times\ (or\ the\ dislike +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ functionality\ is\ not\ available\ at\ the\ given\ service),\ but\ who\ also\ have\ a\ description,\ use\ \ \-\-match\-filter\ "like_count\ >\ 100\ & +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ dislike_count\ \\youtube\-dl.conf\f[]. -For example, with the following configuration file youtube\-dl will -always extract the audio, not copy the mtime and use a proxy: +For example, with the following configration file youtube\-dl will +always extract the audio, not copy the mtime and use proxy: .IP .nf \f[C] @@ -844,7 +272,7 @@ always extract the audio, not copy the mtime and use a proxy: \f[] .fi .PP -You can use \f[C]\-\-ignore\-config\f[] if you want to disable the +You can use \f[C]\-\-ignore\-config\f[] if you want to disable configuration file for a particular youtube\-dl run. .SS Authentication with \f[C]\&.netrc\f[] file .PP @@ -852,11 +280,11 @@ You may also want to configure automatic credentials storage for extractors that support authentication (by providing login and password with \f[C]\-\-username\f[] and \f[C]\-\-password\f[]) 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 +execution and prevent tracking plain text passwords in shell command history. -You can achieve this using a \f[C]\&.netrc\f[] +You can achieve this using \f[C]\&.netrc\f[] file (http://stackoverflow.com/tags/.netrc/info) on per extractor basis. -For that you will need to create a\f[C]\&.netrc\f[] file in your +For that you will need to create \f[C]\&.netrc\f[] file in your \f[C]$HOME\f[] and restrict permissions to read/write by you only: .IP .nf @@ -884,11 +312,11 @@ machine\ twitch\ login\ my_twitch_account_name\ password\ my_twitch_password \f[] .fi .PP -To activate authentication with the \f[C]\&.netrc\f[] file you should -pass \f[C]\-\-netrc\f[] to youtube\-dl or place it in the configuration +To activate authentication with \f[C]\&.netrc\f[] file you should pass +\f[C]\-\-netrc\f[] to youtube\-dl or place it in configuration file (#configuration). .PP -On Windows you may also need to setup the \f[C]%HOME%\f[] environment +On Windows you may also need to setup \f[C]%HOME%\f[] environment variable manually. .SH OUTPUT TEMPLATE .PP @@ -900,7 +328,7 @@ single file, like in However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format \f[C]%(NAME)s\f[]. -To clarify, that is a percent symbol followed by a name in parentheses, +To clarify, that is a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are: .IP \[bu] 2 @@ -957,7 +385,7 @@ youtube\-dl_test_video_.mp4\ \ \ \ \ \ \ \ \ \ #\ A\ simple\ file\ name .SH FORMAT SELECTION .PP By default youtube\-dl tries to download the best quality, but sometimes -you may want to download in a different format. +you may want to download other format. The simplest case is requesting a specific format, for example \f[C]\-f\ 22\f[]. You can get the list of available formats using @@ -996,8 +424,8 @@ Since the end of April 2015 and version 2015.04.26 youtube\-dl uses If ffmpeg or avconv are installed this results in downloading \f[C]bestvideo\f[] and \f[C]bestaudio\f[] separately and muxing them together into a single file giving the best overall quality available. -Otherwise it falls back to \f[C]best\f[] and results in downloading the -best available quality served as a single file. +Otherwise it falls back to \f[C]best\f[] and results in downloading best +available quality served as a single file. \f[C]best\f[] is also needed for videos that don\[aq]t come from YouTube because they don\[aq]t provide the audio and video in two different files. @@ -1014,15 +442,15 @@ delivery immediately to your player and not to wait until .PP 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 +you want to download best available quality media served as a single file, you should explicitly specify your choice with \f[C]\-f\ best\f[]. You may want to add it to the configuration file (#configuration) in order not to type it every time you run youtube\-dl. .SH VIDEO SELECTION .PP Videos can be filtered by their upload date using the options -\f[C]\-\-date\f[], \f[C]\-\-datebefore\f[] or \f[C]\-\-dateafter\f[]. -They accept dates in two formats: +\f[C]\-\-date\f[], \f[C]\-\-datebefore\f[] or \f[C]\-\-dateafter\f[], +they accept dates in two formats: .IP \[bu] 2 Absolute dates: Dates in the format \f[C]YYYYMMDD\f[]. .IP \[bu] 2 @@ -1039,7 +467,7 @@ $\ 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 +$\ #\ will\ only\ download\ the\ videos\ uploaded\ in\ the\ 200x\ decade $\ youtube\-dl\ \-\-dateafter\ 20000101\ \-\-datebefore\ 20091231 \f[] .fi @@ -1062,7 +490,7 @@ As a rule of thumb, youtube\-dl releases at least once a month, and often weekly or even daily. Simply go to http://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. +distributions serves a really outdated version. You can (and should) complain to your distribution in their bugtracker or support forum. .PP @@ -1116,7 +544,7 @@ Therefore, it is unnecessary and sometimes harmful to copy long option strings from webpages. In particular, the only option out of \f[C]\-citw\f[] that is regularly useful is \f[C]\-i\f[]. -.SS Can you please put the \f[C]\-b\f[] option back? +.SS Can you please put the \-b option back? .PP Most people asking this question are not aware that youtube\-dl now defaults to downloading the highest available quality as reported by @@ -1135,26 +563,12 @@ We\[aq]re considering to provide a way to let you solve the CAPTCHA (https://github.com/rg3/youtube-dl/issues/154), but at the moment, your best course of action is pointing a webbrowser to the youtube URL, solving the CAPTCHA, and restart youtube\-dl. -.SS Do I need any other programs? -.PP -youtube\-dl works fine on its own on most sites. -However, if you want to convert video/audio, you\[aq]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. -.PP -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 (http://mplayerhq.hu/) or mpv (https://mpv.io/) to be installed. .SS I have downloaded a video but how can I play it? .PP Once the video is fully downloaded, use any video player, such as vlc (http://www.videolan.org) or mplayer (http://www.mplayerhq.hu/). -.SS I extracted a video URL with \f[C]\-g\f[], but it does not play on -another machine / in my webbrowser. +.SS I extracted a video URL with \-g, but it does not play on another +machine / in my webbrowser. .PP It depends a lot on the service. In many cases, requests for the video (to download/play it) must come @@ -1172,8 +586,7 @@ exception rather than the rule. .PP Please bear in mind that some URL protocols are \f[B]not\f[] supported by browsers out of the box, including RTMP. -If you are using \f[C]\-g\f[], your own downloader must support these as -well. +If you are using \-g, your own downloader must support these as well. .PP 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 @@ -1197,7 +610,7 @@ output \f[C][1]\ 2839\f[] or .PP That\[aq]s actually the output from your shell. Since ampersand is one of the special shell characters it\[aq]s -interpreted by the shell preventing you from passing the whole URL to +interpreted by 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 @@ -1280,7 +693,7 @@ Use the \f[C]\-o\f[] to specify an output template (#output-template), for example \f[C]\-o\ "/home/user/videos/%(title)s\-%(id)s.%(ext)s"\f[]. If you want this for all of your downloads, put the option into your configuration file (#configuration). -.SS How do I download a video starting with a \f[C]\-\f[]? +.SS How do I download a video starting with a \f[C]\-\f[] ? .PP Either prepend \f[C]http://www.youtube.com/watch?v=\f[] or separate the ID from the options with \f[C]\-\-\f[]: @@ -1295,24 +708,19 @@ youtube\-dl\ "http://www.youtube.com/watch?v=\-wNyEUrxzFU" .PP Use the \f[C]\-\-cookies\f[] option, for example \f[C]\-\-cookies\ /path/to/cookies/file.txt\f[]. -Note that the cookies file must be in Mozilla/Netscape format and the -first line of the cookies file must be either -\f[C]#\ HTTP\ Cookie\ File\f[] or +Note that cookies file must be in Mozilla/Netscape format and the first +line of cookies file must be either \f[C]#\ HTTP\ Cookie\ File\f[] or \f[C]#\ Netscape\ HTTP\ Cookie\ File\f[]. 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 +format (https://en.wikipedia.org/wiki/Newline) in cookies file and +convert newlines if necessary to correspond your OS, namely \f[C]CRLF\f[] (\f[C]\\r\\n\f[]) for Windows, \f[C]LF\f[] (\f[C]\\n\f[]) for Linux and \f[C]CR\f[] (\f[C]\\r\f[]) for Mac OS. \f[C]HTTP\ Error\ 400:\ Bad\ Request\f[] when using \f[C]\-\-cookies\f[] is a good sign of invalid newline format. .PP -Passing cookies to youtube\-dl is a good way to workaround login when a +Passing cookies to youtube\-dl is a good way to workaround login when 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). .SS Can you add support for this anime video site, or site which shows current movies for free? .PP @@ -1480,13 +888,12 @@ class\ YourExtractorIE(InfoExtractor): \ \ \ \ \ \ \ \ webpage\ =\ self._download_webpage(url,\ video_id) \ \ \ \ \ \ \ \ #\ TODO\ more\ code\ goes\ here,\ for\ example\ ... -\ \ \ \ \ \ \ \ title\ =\ self._html_search_regex(r\[aq]

(.+?)

\[aq],\ webpage,\ \[aq]title\[aq]) +\ \ \ \ \ \ \ \ title\ =\ self._html_search_regex(r\[aq]

(.*?)

\[aq],\ webpage,\ \[aq]title\[aq]) \ \ \ \ \ \ \ \ return\ { \ \ \ \ \ \ \ \ \ \ \ \ \[aq]id\[aq]:\ video_id, \ \ \ \ \ \ \ \ \ \ \ \ \[aq]title\[aq]:\ title, \ \ \ \ \ \ \ \ \ \ \ \ \[aq]description\[aq]:\ self._og_search_description(webpage), -\ \ \ \ \ \ \ \ \ \ \ \ \[aq]uploader\[aq]:\ self._search_regex(r\[aq]]+id="uploader"[^>]*>([^<]+)<\[aq],\ webpage,\ \[aq]uploader\[aq],\ fatal=False), \ \ \ \ \ \ \ \ \ \ \ \ #\ TODO\ more\ properties\ (see\ youtube_dl/extractor/common.py) \ \ \ \ \ \ \ \ } \f[] @@ -1502,7 +909,8 @@ This \f[I]should fail\f[] at first, but you can continually re\-run it until you\[aq]re done. If you decide to add more than one test, then rename \f[C]_TEST\f[] to \f[C]_TESTS\f[] and make it into a list of dictionaries. -The tests will then be named \f[C]TestDownload.test_YourExtractor\f[], +The tests will be then be named +\f[C]TestDownload.test_YourExtractor\f[], \f[C]TestDownload.test_YourExtractor_1\f[], \f[C]TestDownload.test_YourExtractor_2\f[], etc. .IP " 7." 4 @@ -1559,7 +967,7 @@ with\ youtube_dl.YoutubeDL(ydl_opts)\ as\ ydl: .PP Most likely, you\[aq]ll want to use various options. For a list of what can be done, have a look at -\f[C]youtube_dl/YoutubeDL.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/YoutubeDL.py#L121-L269). +youtube_dl/YoutubeDL.py (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/YoutubeDL.py#L117-L265). For a start, if you want to intercept youtube\-dl\[aq]s output, set a \f[C]logger\f[] object. .PP @@ -1606,41 +1014,16 @@ with\ youtube_dl.YoutubeDL(ydl_opts)\ as\ ydl: .SH BUGS .PP Bugs and suggestions should be reported at: -. + . Unless you were prompted so 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 (http://webchat.freenode.net/?randomnick=1&channels=youtube-dl)). +For discussions, join us in the irc channel #youtube\-dl on freenode. .PP \f[B]Please include the full output of youtube\-dl when run with -\f[C]\-v\f[]\f[], i.e. -add \f[C]\-v\f[] flag to your command line, copy the \f[B]whole\f[] -output and post it in the issue body wrapped in ``` for better -formatting. -It should look similar to this: -.IP -.nf -\f[C] -$\ youtube\-dl\ \-v\ http://www.youtube.com/watch?v=BaW_jenozKcj -[debug]\ System\ config:\ [] -[debug]\ User\ config:\ [] -[debug]\ Command\-line\ args:\ [u\[aq]\-v\[aq],\ u\[aq]http://www.youtube.com/watch?v=BaW_jenozKcj\[aq]] -[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:\ {} -\&... -\f[] -.fi -.PP -\f[B]Do not post screenshots of verbose log only plain text is -acceptable.\f[] +\f[C]\-v\f[]\f[]. .PP -The output (including the first lines) contains important debugging +The output (including the first lines) contain important debugging information. Issues without the full output are often not reproducible and therefore do not get solved in short order, if ever. @@ -1670,18 +1053,17 @@ 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\[aq]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 +As a commiter 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. .PP For bug reports, this means that your report should contain the -\f[I]complete\f[] output of youtube\-dl when called with the -\f[C]\-v\f[] flag. +\f[I]complete\f[] 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. .PP If your server has multiple IPs or you suspect censorship, adding -\f[C]\-\-call\-home\f[] may be a good idea to get more diagnostics. +\-\-call\-home may be a good idea to get more diagnostics. If the error is \f[C]ERROR:\ Unable\ to\ extract\ ...\f[] and you cannot reproduce it from multiple countries, add \f[C]\-\-dump\-pages\f[] (warning: this will yield a rather large output, redirect it to the file @@ -1691,14 +1073,14 @@ command\-line) or upload the \f[C]\&.dump\f[] files you get when you add .PP \f[B]Site support requests must contain an example URL\f[]. An example URL is a URL you might want to download, like -\f[C]http://www.youtube.com/watch?v=BaW_jenozKc\f[]. +http://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. -\f[C]http://www.youtube.com/\f[]) is \f[I]not\f[] an example URL. +http://www.youtube.com/ ) is \f[I]not\f[] an example URL. .SS Are you using the latest version? .PP -Before reporting any issue, type \f[C]youtube\-dl\ \-U\f[]. +Before reporting any issue, type youtube\-dl \-U. This should report that you\[aq]re up\-to\-date. About 20% of the reports we receive are already fixed, but people are using outdated versions. @@ -1707,9 +1089,8 @@ This goes for feature requests as well. .PP Make sure that someone has not already opened the issue you\[aq]re trying to open. -Search at the top of the window or browse the GitHub -Issues (https://github.com/rg3/youtube-dl/search?type=Issues) of this -repository. +Search at the top of the window or at +https://github.com/rg3/youtube\-dl/search?type=Issues . 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: ...". @@ -1786,6 +1167,6 @@ bug. .PP youtube\-dl is released into the public domain by the copyright holders. .PP -This README file was originally written by Daniel -Bolton (https://github.com/dbbolton) and is likewise released into the -public domain. +This README file was originally written by Daniel Bolton +() and is likewise released into the public +domain. diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild index 617a8d883c..ffa2e8c8e3 100644 --- a/network/youtube-dl/youtube-dl.SlackBuild +++ b/network/youtube-dl/youtube-dl.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=youtube-dl -VERSION=${VERSION:-2016.01.09} +VERSION=${VERSION:-2016.06.23.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info index 972b1f83a9..60ad01cf10 100644 --- a/network/youtube-dl/youtube-dl.info +++ b/network/youtube-dl/youtube-dl.info @@ -1,8 +1,8 @@ PRGNAM="youtube-dl" -VERSION="2016.01.09" +VERSION="2016.06.23.1" HOMEPAGE="https://rg3.github.io/youtube-dl" -DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2016.01.09.tar.gz" -MD5SUM="928d15adbffc01b6653617a009009603" +DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2016.06.23.1.tar.gz" +MD5SUM="a6053c605cca6f01a9e517925d111bfa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3-65-gdbad