From ba187397139c96a210ca4c9b02ff9cf417ddb2fe Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 13 May 2015 17:08:08 +0300 Subject: network/youtube-dl: Updated for version 2015.05.10. Signed-off-by: Dimitris Zlatanidis --- network/youtube-dl/youtube-dl.1 | 112 +++++++++++++++++++++++++------ network/youtube-dl/youtube-dl.SlackBuild | 2 +- network/youtube-dl/youtube-dl.info | 6 +- 3 files changed, 97 insertions(+), 23 deletions(-) diff --git a/network/youtube-dl/youtube-dl.1 b/network/youtube-dl/youtube-dl.1 index e0fd74fc26..e09ef883d6 100644 --- a/network/youtube-dl/youtube-dl.1 +++ b/network/youtube-dl/youtube-dl.1 @@ -121,7 +121,7 @@ redistribute it or use it however you like. \-\-no\-mtime\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ use\ the\ Last\-modified\ header\ to\ set\ the\ file\ modification\ time \-\-write\-description\ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ video\ description\ to\ a\ .description\ file \-\-write\-info\-json\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ video\ metadata\ to\ a\ .info.json\ file -\-\-write\-annotations\ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ video\ annotations\ to\ a\ .annotation\ file +\-\-write\-annotations\ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ video\ annotations\ to\ a\ .annotations.xml\ file \-\-load\-info\ FILE\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ JSON\ file\ containing\ the\ video\ information\ (created\ with\ the\ "\-\-write\-info\-json"\ 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\ permanently.\ By\ default\ $XDG_CACHE_HOME/youtube\-dl @@ -189,19 +189,9 @@ redistribute it or use it however you like. .IP .nf \f[C] -\-f,\ \-\-format\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ \ \ Video\ format\ code,\ specify\ the\ order\ of\ preference\ using\ slashes,\ as\ in\ \-f\ 22/17/18\ .\ \ Instead\ of\ format\ codes,\ you\ can\ select\ by -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ extension\ for\ the\ extensions\ aac,\ m4a,\ mp3,\ mp4,\ ogg,\ wav,\ webm.\ You\ can\ also\ use\ the\ special\ names\ "best",\ "bestvideo",\ "bestaudio", -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "worst".\ \ You\ can\ filter\ the\ video\ results\ by\ putting\ a\ condition\ in\ brackets,\ as\ in\ \-f\ "best[height=720]"\ (or\ \-f\ "[filesize>10M]"). -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ This\ works\ for\ filesize,\ height,\ width,\ tbr,\ abr,\ vbr,\ asr,\ and\ fps\ and\ the\ comparisons\ <,\ <=,\ >,\ >=,\ =,\ !=\ and\ for\ ext,\ acodec, -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ vcodec,\ container,\ and\ protocol\ and\ the\ comparisons\ =,\ !=\ .\ 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.\ By\ default,\ youtube\-dl\ will\ pick\ the\ best\ quality. -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Use\ commas\ to\ download\ multiple\ audio\ formats,\ such\ as\ \-f\ \ 136/137/mp4/bestvideo,140/m4a/bestaudio.\ You\ can\ merge\ the\ video\ and\ audio -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ of\ two\ formats\ into\ a\ single\ file\ using\ \-f\ +\ (requires\ ffmpeg\ or\ avconv),\ for\ example\ \-f -\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bestvideo+bestaudio. +\-f,\ \-\-format\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ \ \ Video\ format\ code,\ see\ the\ "FORMAT\ SELECTION"\ for\ all\ the\ info \-\-all\-formats\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Download\ all\ available\ video\ formats \-\-prefer\-free\-formats\ \ \ \ \ \ \ \ \ \ \ \ Prefer\ free\ video\ formats\ unless\ a\ specific\ one\ is\ requested -\-\-max\-quality\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ \ Highest\ quality\ format\ to\ download \-F,\ \-\-list\-formats\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ List\ all\ available\ formats \-\-youtube\-skip\-dash\-manifest\ \ \ \ \ Do\ not\ download\ the\ DASH\ manifest\ on\ YouTube\ videos \-\-merge\-output\-format\ FORMAT\ \ \ \ \ If\ a\ merge\ is\ required\ (e.g.\ bestvideo+bestaudio),\ output\ to\ given\ container\ format.\ One\ of\ mkv,\ mp4,\ ogg,\ webm,\ flv.Ignored\ if\ no @@ -242,7 +232,7 @@ redistribute it or use it however you like. \-\-recode\-video\ FORMAT\ \ \ \ \ \ \ \ \ \ \ \ Encode\ the\ video\ to\ another\ format\ if\ necessary\ (currently\ supported:\ mp4|flv|ogg|webm|mkv) \-k,\ \-\-keep\-video\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Keep\ the\ video\ file\ on\ disk\ after\ the\ post\-processing;\ the\ video\ is\ erased\ by\ default \-\-no\-post\-overwrites\ \ \ \ \ \ \ \ \ \ \ \ \ Do\ not\ overwrite\ post\-processed\ files;\ the\ post\-processed\ files\ are\ overwritten\ by\ default -\-\-embed\-subs\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Embed\ subtitles\ in\ the\ video\ (only\ for\ mp4\ videos) +\-\-embed\-subs\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Embed\ subtitles\ in\ the\ video\ (only\ for\ mkv\ and\ mp4\ videos) \-\-embed\-thumbnail\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Embed\ thumbnail\ in\ the\ audio\ as\ cover\ art \-\-add\-metadata\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Write\ metadata\ to\ the\ video\ file \-\-metadata\-from\-title\ FORMAT\ \ \ \ \ Parse\ additional\ metadata\ like\ song\ title\ /\ artist\ from\ the\ video\ title.\ The\ format\ syntax\ is\ the\ same\ as\ \-\-output,\ the\ parsed @@ -325,6 +315,67 @@ $\ youtube\-dl\ \-\-get\-filename\ \-o\ "%(title)s.%(ext)s"\ BaW_jenozKc\ \-\-re youtube\-dl_test_video_.mp4\ \ \ \ \ \ \ \ \ \ #\ A\ simple\ file\ name \f[] .fi +.SH FORMAT SELECTION +.PP +By default youtube\-dl tries to download the best quality, but sometimes +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 +\f[C]\-\-list\-formats\f[], you can also use a file extension (currently +it supports aac, m4a, mp3, mp4, ogg, wav, webm) or the special names +\f[C]best\f[], \f[C]bestvideo\f[], \f[C]bestaudio\f[] and +\f[C]worst\f[]. +.PP +If you want to download multiple videos and they don\[aq]t have the same +formats available, you can specify the order of preference using +slashes, as in \f[C]\-f\ 22/17/18\f[]. +You can also filter the video results by putting a condition in +brackets, as in \f[C]\-f\ "best[height=720]"\f[] (or +\f[C]\-f\ "[filesize>10M]"\f[]). +This works for filesize, height, width, tbr, abr, vbr, asr, and fps and +the comparisons <, <=, >, >=, =, != and for ext, acodec, vcodec, +container, and protocol and the comparisons =, != . +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[C]\-f\ "[height\ <=?\ 720][tbr>500]"\f[] selects up to 720p videos +(or videos where the height is not known) with a bitrate of at least 500 +KBit/s. +Use commas to download multiple formats, such as +\f[C]\-f\ 136/137/mp4/bestvideo,140/m4a/bestaudio\f[]. +You can merge the video and audio of two formats into a single file +using \f[C]\-f\ +\f[] (requires ffmpeg or +avconv), for example \f[C]\-f\ bestvideo+bestaudio\f[]. +.PP +Since the end of April 2015 and version 2015.04.26 youtube\-dl uses +\f[C]\-f\ bestvideo+bestaudio/best\f[] as default format selection (see +#5447, #5456). +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 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. +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[C]\-f\ bestvideo[height<=?1080]+bestaudio/best\f[] to +your configuration file. +Note that if you use youtube\-dl to stream to \f[C]stdout\f[] (and most +likely to pipe it to your media player then), i.e. +you explicitly specify output template as \f[C]\-o\ \-\f[], youtube\-dl +still uses \f[C]\-f\ best\f[] format selection in order to start content +delivery immediately to your player and not to wait until +\f[C]bestvideo\f[] and \f[C]bestaudio\f[] are downloaded and muxed. +.PP +If you want to preserve the old format selection behavior (prior to +youtube\-dl 2015.04.26), i.e. +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 @@ -414,18 +465,15 @@ guys (mailto:ubuntu-motu@lists.ubuntu.com?subject=outdated%20version%20of%20yout \- all they have to do is update the package to a somewhat recent version. See above for a way to update. -.SS Do I always have to pass in \f[C]\-\-max\-quality\ FORMAT\f[], or -\f[C]\-citw\f[]? +.SS Do I always have to pass \f[C]\-citw\f[]? .PP 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, \f[C]\-\-max\-quality\f[] \f[I]limits\f[] the video -quality (so if you want the best quality, do NOT pass it in), and the -only option out of \f[C]\-citw\f[] that is regularly useful is -\f[C]\-i\f[]. +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 \-b option back? .PP Most people asking this question are not aware that youtube\-dl now @@ -486,6 +534,32 @@ See above (#how-do-i-update-youtube-dl) for how to update youtube\-dl. 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. +.SS Video URL contains an ampersand and I\[aq]m getting some strange +output \f[C][1]\ 2839\f[] or +\f[C]\[aq]v\[aq]\ is\ not\ recognized\ as\ an\ internal\ or\ external\ command\f[] +.PP +That\[aq]s actually the output from your shell. +Since ampersand is one of the special shell characters it\[aq]s +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 +escape them with a backslash (which approach will work depends on your +shell). +.PP +For example if your URL is +https://www.youtube.com/watch?t=4&v=BaW_jenozKc you should end up with +following command: +.PP +\f[C]youtube\-dl\ \[aq]https://www.youtube.com/watch?t=4&v=BaW_jenozKc\[aq]\f[] +.PP +or +.PP +\f[C]youtube\-dl\ https://www.youtube.com/watch?t=4\\&v=BaW_jenozKc\f[] +.PP +For Windows you have to use the double quotes: +.PP +\f[C]youtube\-dl\ "https://www.youtube.com/watch?t=4&v=BaW_jenozKc"\f[] .SS ExtractorError: Could not find JS function u\[aq]OF\[aq] .PP In February 2015, the new YouTube player contained a character sequence diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild index 2f89d5a988..f81686c9cb 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:-2015.05.03} +VERSION=${VERSION:-2015.05.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info index 215a7c5b25..aacaa65874 100644 --- a/network/youtube-dl/youtube-dl.info +++ b/network/youtube-dl/youtube-dl.info @@ -1,8 +1,8 @@ PRGNAM="youtube-dl" -VERSION="2015.05.03" +VERSION="2015.05.10" HOMEPAGE="https://rg3.github.io/youtube-dl" -DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2015.05.03.tar.gz" -MD5SUM="cf6e85417d6e86eeab8e5860c1b77d97" +DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2015.05.10.tar.gz" +MD5SUM="ce289c1dc08a48ab7eadd4d4fbee5b3b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3