From ef0c08cdfe05295f7dc5b164f187e2359970cde1 Mon Sep 17 00:00:00 2001 From: joehillen Date: Sun, 22 Jul 2012 13:36:22 -0700 Subject: [PATCH 1/7] Added install target to Makefile. --- Makefile | 5 ++++- youtube-dl | Bin 40554 -> 40604 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e2da02e96..0de669c12 100644 --- a/Makefile +++ b/Makefile @@ -23,4 +23,7 @@ compile: cat youtube-dl.zip >> youtube-dl rm youtube-dl.zip -.PHONY: default compile update update-latest update-readme +install: youtube-dl + install -m 755 --owner root --group root youtube-dl /usr/local/bin/ + +.PHONY: default compile update update-latest update-readme install diff --git a/youtube-dl b/youtube-dl index b3e0cd4221b302881fc5ad75746dd5fc9ad0c7fd..0a59de83b7ee43b69175850e6ed2714b38c7937c 100755 GIT binary patch delta 3919 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 delta 3861 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 Date: Wed, 1 Aug 2012 11:53:17 +0200 Subject: [PATCH 2/7] auto-generating manpage from README.md (closes #151); redesigned Makefile --- Makefile | 31 ++++---- README.md | 31 ++++---- youtube-dl.1 | 192 +++++++++++++++++++++++++++++++++++++++++++++++++ youtube-dl.dev | 6 -- youtube-dl.exe | Bin 3989787 -> 3989787 bytes 5 files changed, 227 insertions(+), 33 deletions(-) create mode 100644 youtube-dl.1 delete mode 100755 youtube-dl.dev diff --git a/Makefile b/Makefile index 0de669c12..c31850a55 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,34 @@ -default: update - -update: compile update-readme update-latest +all: compile exe readme man-page update-latest update-latest: - ./youtube-dl.dev --version > LATEST_VERSION + ./youtube-dl --version > LATEST_VERSION -update-readme: - @options=$$(COLUMNS=80 ./youtube-dl.dev --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/### \1/') && \ - header=$$(sed -e '/.*## OPTIONS/,$$ d' README.md) && \ - footer=$$(sed -e '1,/.*## FAQ/ d' README.md) && \ +readme: + @options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \ + header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \ + footer=$$(sed -e '1,/.*# FAQ/ d' README.md) && \ echo "$${header}" > README.md && \ echo >> README.md && \ - echo '## OPTIONS' >> README.md && \ + echo '# OPTIONS' >> README.md && \ echo "$${options}" >> README.md&& \ echo >> README.md && \ - echo '## FAQ' >> README.md && \ + echo '# FAQ' >> README.md && \ echo "$${footer}" >> README.md +man-page: + pandoc -s -w man README.md -o youtube-dl.1 + compile: zip --quiet --junk-paths youtube-dl youtube_dl/*.py echo '#!/usr/bin/env python' > youtube-dl cat youtube-dl.zip >> youtube-dl rm youtube-dl.zip -install: youtube-dl - install -m 755 --owner root --group root youtube-dl /usr/local/bin/ +exe: + bash devscripts/wine-py2exe.sh build_exe.py -.PHONY: default compile update update-latest update-readme install +install: + install -m 755 --owner root --group root youtube-dl /usr/local/bin/ + install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 + +.PHONY: all update-latest readme man-page compile exe install \ No newline at end of file diff --git a/README.md b/README.md index f04b96128..05f437db9 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,19 @@ -# youtube-dl +% youtube-dl(1) -## USAGE -youtube-dl [options] url [url...] +# NAME +youtube-dl -## DESCRIPTION +# SYNOPSIS +**youtube-dl** [OPTIONS] URL [URL...] + +# DESCRIPTION **youtube-dl** is a small command-line program to download videos from YouTube.com and a few more sites. It requires the Python interpreter, version 2.x (x being at least 6), and it is not platform specific. It should work in your Unix box, in Windows or in Mac OS X. It is released to the public domain, which means you can modify it, redistribute it or use it however you like. -## OPTIONS +# OPTIONS -h, --help print this help text and exit --version print program version and exit -U, --update update this program to latest version @@ -21,7 +24,7 @@ which means you can modify it, redistribute it or use it however you like. --list-extractors List all supported extractors and the URLs they would handle -### Video Selection: +## Video Selection: --playlist-start NUMBER playlist video to start at (default is 1) --playlist-end NUMBER playlist video to end at (default is last) --match-title REGEX download only matching titles (regex or caseless @@ -30,7 +33,7 @@ which means you can modify it, redistribute it or use it however you like. caseless sub-string) --max-downloads NUMBER Abort after downloading NUMBER files -### Filesystem Options: +## Filesystem Options: -t, --title use title in file name -l, --literal use literal title in file name -A, --auto-number number downloaded files starting from 00000 @@ -53,7 +56,7 @@ which means you can modify it, redistribute it or use it however you like. --write-description write video description to a .description file --write-info-json write video metadata to a .info.json file -### Verbosity / Simulation Options: +## Verbosity / Simulation Options: -q, --quiet activates quiet mode -s, --simulate do not download the video and do not write anything to disk @@ -68,7 +71,7 @@ which means you can modify it, redistribute it or use it however you like. --console-title display progress in console titlebar -v, --verbose print various debugging information -### Video Format Options: +## Video Format Options: -f, --format FORMAT video format code --all-formats download all available video formats --prefer-free-formats prefer free video formats unless a specific one is @@ -80,12 +83,12 @@ which means you can modify it, redistribute it or use it however you like. --srt-lang LANG language of the closed captions to download (optional) use IETF language tags like 'en' -### Authentication Options: +## Authentication Options: -u, --username USERNAME account username -p, --password PASSWORD account password -n, --netrc use .netrc authentication data -### Post-processing Options: +## Post-processing Options: --extract-audio convert video files to audio-only files (requires ffmpeg or avconv and ffprobe or avprobe) --audio-format FORMAT "best", "aac", "vorbis", "mp3", "m4a", or "wav"; @@ -95,7 +98,7 @@ which means you can modify it, redistribute it or use it however you like. -k, --keep-video keeps the video file on disk after the post- processing; the video is erased by default -## FAQ +# FAQ ### Can you please put the -b option back? @@ -117,13 +120,13 @@ The URLs youtube-dl outputs require the downloader to have the correct cookies. youtube has switched to a new video info format in July 2011 which is not supported by old versions of youtube-dl. You can update youtube-dl with `sudo youtube-dl --update`. -## COPYRIGHT +# COPYRIGHT youtube-dl is released into the public domain by the copyright holders. This README file was originally written by Daniel Bolton () and is likewise released into the public domain. -## BUGS +# BUGS Bugs and suggestions should be reported at: diff --git a/youtube-dl.1 b/youtube-dl.1 new file mode 100644 index 000000000..09bb843f4 --- /dev/null +++ b/youtube-dl.1 @@ -0,0 +1,192 @@ +.TH youtube-dl 1 "" +.SH NAME +.PP +youtube-dl +.SH SYNOPSIS +.PP +\f[B]youtube-dl\f[] [OPTIONS] URL [URL...] +.SH DESCRIPTION +.PP +\f[B]youtube-dl\f[] is a small command-line program to download videos +from YouTube.com and a few more sites. +It requires the Python interpreter, version 2.x (x being at least 6), +and it is not platform specific. +It should work in your Unix box, in Windows or in 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 +.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 +-i,\ --ignore-errors\ \ \ \ \ \ continue\ on\ download\ errors +-r,\ --rate-limit\ LIMIT\ \ \ download\ rate\ limit\ (e.g.\ 50k\ or\ 44.6m) +-R,\ --retries\ RETRIES\ \ \ \ number\ of\ retries\ (default\ is\ 10) +--dump-user-agent\ \ \ \ \ \ \ \ display\ the\ current\ browser\ identification +--list-extractors\ \ \ \ \ \ \ \ List\ all\ supported\ extractors\ and\ the\ URLs\ they +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ would\ handle +\f[] +.fi +.SS Video Selection: +.IP +.nf +\f[C] +--playlist-start\ NUMBER\ \ playlist\ video\ to\ start\ at\ (default\ is\ 1) +--playlist-end\ NUMBER\ \ \ \ playlist\ video\ to\ end\ at\ (default\ is\ last) +--match-title\ REGEX\ \ \ \ \ \ download\ only\ matching\ titles\ (regex\ or\ caseless +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sub-string) +--reject-title\ REGEX\ \ \ \ \ skip\ download\ for\ matching\ titles\ (regex\ or +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ caseless\ sub-string) +--max-downloads\ NUMBER\ \ \ Abort\ after\ downloading\ NUMBER\ files +\f[] +.fi +.SS Filesystem Options: +.IP +.nf +\f[C] +-t,\ --title\ \ \ \ \ \ \ \ \ \ \ \ \ \ use\ title\ in\ file\ name +-l,\ --literal\ \ \ \ \ \ \ \ \ \ \ \ use\ literal\ title\ in\ file\ name +-A,\ --auto-number\ \ \ \ \ \ \ \ number\ downloaded\ files\ starting\ from\ 00000 +-o,\ --output\ TEMPLATE\ \ \ \ output\ filename\ template.\ Use\ %(stitle)s\ to\ get\ the +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ title,\ %(uploader)s\ for\ the\ uploader\ name, +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(autonumber)s\ to\ get\ an\ automatically\ incremented +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ number,\ %(ext)s\ for\ the\ filename\ extension, +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(upload_date)s\ for\ the\ upload\ date\ (YYYYMMDD),\ and +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %%\ for\ a\ literal\ percent.\ Use\ -\ to\ output\ to +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ stdout. +-a,\ --batch-file\ FILE\ \ \ \ file\ containing\ URLs\ to\ download\ (\[aq]-\[aq]\ for\ stdin) +-w,\ --no-overwrites\ \ \ \ \ \ do\ not\ overwrite\ files +-c,\ --continue\ \ \ \ \ \ \ \ \ \ \ resume\ partially\ downloaded\ files +--no-continue\ \ \ \ \ \ \ \ \ \ \ \ do\ not\ resume\ partially\ downloaded\ files\ (restart +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ from\ beginning) +--cookies\ FILE\ \ \ \ \ \ \ \ \ \ \ file\ to\ read\ cookies\ from\ and\ dump\ cookie\ jar\ in +--no-part\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ do\ not\ use\ .part\ files +--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 +\f[] +.fi +.SS Verbosity / Simulation Options: +.IP +.nf +\f[C] +-q,\ --quiet\ \ \ \ \ \ \ \ \ \ \ \ \ \ activates\ quiet\ mode +-s,\ --simulate\ \ \ \ \ \ \ \ \ \ \ do\ not\ download\ the\ video\ and\ do\ not\ write\ anything +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ to\ disk +--skip-download\ \ \ \ \ \ \ \ \ \ do\ not\ download\ the\ video +-g,\ --get-url\ \ \ \ \ \ \ \ \ \ \ \ simulate,\ quiet\ but\ print\ URL +-e,\ --get-title\ \ \ \ \ \ \ \ \ \ simulate,\ quiet\ but\ print\ title +--get-thumbnail\ \ \ \ \ \ \ \ \ \ simulate,\ quiet\ but\ print\ thumbnail\ URL +--get-description\ \ \ \ \ \ \ \ simulate,\ quiet\ but\ print\ video\ description +--get-filename\ \ \ \ \ \ \ \ \ \ \ simulate,\ quiet\ but\ print\ output\ filename +--get-format\ \ \ \ \ \ \ \ \ \ \ \ \ simulate,\ quiet\ but\ print\ output\ format +--no-progress\ \ \ \ \ \ \ \ \ \ \ \ do\ not\ print\ progress\ bar +--console-title\ \ \ \ \ \ \ \ \ \ display\ progress\ in\ console\ titlebar +-v,\ --verbose\ \ \ \ \ \ \ \ \ \ \ \ print\ various\ debugging\ information +\f[] +.fi +.SS Video Format Options: +.IP +.nf +\f[C] +-f,\ --format\ FORMAT\ \ \ \ \ \ video\ format\ code +--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\ (currently\ youtube\ only) +--write-srt\ \ \ \ \ \ \ \ \ \ \ \ \ \ write\ video\ closed\ captions\ to\ a\ .srt\ file +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ (currently\ youtube\ only) +--srt-lang\ LANG\ \ \ \ \ \ \ \ \ \ language\ of\ the\ closed\ captions\ to\ download +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ (optional)\ use\ IETF\ language\ tags\ like\ \[aq]en\[aq] +\f[] +.fi +.SS Authentication Options: +.IP +.nf +\f[C] +-u,\ --username\ USERNAME\ \ account\ username +-p,\ --password\ PASSWORD\ \ account\ password +-n,\ --netrc\ \ \ \ \ \ \ \ \ \ \ \ \ \ use\ .netrc\ authentication\ data +\f[] +.fi +.SS Post-processing Options: +.IP +.nf +\f[C] +--extract-audio\ \ \ \ \ \ \ \ \ \ convert\ video\ files\ to\ audio-only\ files\ (requires +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ ffmpeg\ or\ avconv\ and\ ffprobe\ or\ avprobe) +--audio-format\ FORMAT\ \ \ \ "best",\ "aac",\ "vorbis",\ "mp3",\ "m4a",\ or\ "wav"; +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ best\ by\ default +--audio-quality\ QUALITY\ \ ffmpeg/avconv\ audio\ bitrate\ specification,\ 128k\ by +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ default +-k,\ --keep-video\ \ \ \ \ \ \ \ \ keeps\ the\ video\ file\ on\ disk\ after\ the\ post- +\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ processing;\ the\ video\ is\ erased\ by\ default +\f[] +.fi +.SH FAQ +.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 +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\[aq]\[aq]re interested +in. +In that case, simply request it with the -f option and youtube-dl will +try to download it. +.SS I get HTTP error 402 when trying to download a video. What\[aq]s +this? +.PP +Apparently YouTube requires you to pass a CAPTCHA test if you download +too much. +We\[aq]\[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 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 The links provided by youtube-dl -g are not working anymore +.PP +The URLs youtube-dl outputs require the downloader to have the correct +cookies. +Use the \f[C]--cookies\f[] 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 +\f[C]--dump-user-agent\f[] to see the one in use by youtube-dl. +.SS ERROR: no fmt_url_map or conn information found in video info +.PP +youtube has switched to a new video info format in July 2011 which is +not supported by old versions of youtube-dl. +You can update youtube-dl with \f[C]sudo\ youtube-dl\ --update\f[]. +.SH COPYRIGHT +.PP +youtube-dl is released into the public domain by the copyright holders. +.PP +This README file was originally written by Daniel Bolton +() and is likewise released into the public +domain. +.SH BUGS +.PP +Bugs and suggestions should be reported at: + +.PP +Please include: +.IP \[bu] 2 +Your exact command line, like +\f[C]youtube-dl\ -t\ "http://www.youtube.com/watch?v=uHlDtZ6Oc3s&feature=channel_video_title"\f[]. +A common mistake is not to escape the \f[C]&\f[]. +Putting URLs in quotes should solve this problem. +.IP \[bu] 2 +The output of \f[C]youtube-dl\ --version\f[] +.IP \[bu] 2 +The output of \f[C]python\ --version\f[] +.IP \[bu] 2 +The name and version of your Operating System ("Ubuntu 11.04 x64" or +"Windows 7 x64" is usually enough). diff --git a/youtube-dl.dev b/youtube-dl.dev deleted file mode 100755 index 473b7f42d..000000000 --- a/youtube-dl.dev +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -import youtube_dl - -youtube_dl.main() diff --git a/youtube-dl.exe b/youtube-dl.exe index 2aa052ccf569ae513f627910c18e55675effe844..b3016aeb678171271710d313df1f739e3187b8c7 100755 GIT binary patch delta 5829 zcmX|_cU%kzR~ z6$KO(78OJgL}`K`pcF+#qlqy-3mOyiE_2VBKkn!A{haeV<(_+IWW^HRHf4qSx(~zecB(^c7-sKQyZAFKKBZpb#&Af1y2P8I zbA$Sk7sK`^>Nx_#&vlwI&<2NUUUy>FKH-`(P~w+QHL1|Uo++CBdM4<%NfQT~uidGM z9?7hu8#FDjAyc#F7i(tiep@pQtgG*7l3VGdS6azDLluW1o@JDE*CJQNJ;(n z3b)kGsiU3t{4bKcrRt@;k7Z{C$HOt?HFCS{+&cVc!hRi_Ni)B3lET|K56hxEN|OF< z+%?cUzu+dg$@{VlXTom?zY6f+XuiLj-1?P8S%&vITKBcIPvQe0LC>%FG{Ewu{7BYS zpA+?&TWIaea&1q^J)2H_zz_UxP*&~chXeW~@`ZrSnfxpkKPr96ffzc4Va}}g85j9O zY(6*KAC^W_&qXKZ2`uJCJNb6(nUHKN4K1hLm0aZ)!aWko`R#y}m3$1~^lE-TpmnW+ z@pb$bu)cp&!MsL(H&`dMD9Ik);WvXd`X1j8?sEDA{w3V|l;8M`ATU4W^PJ=sgU*@? zC5t2Rw|Ktc7lZr9w|pF+;T^w^VOA+g1mi+mf_`@gatN%a9f<_^u?soOE?20h$D(bL zSw#zYxsy0{S1ZTG)}+yiMM;NzNq0-VC&633*Oy#`v!CQoDgg~Dk_p(#lOn)W133%$ zg_)cI^ba99fVT#cbil1cNHnY6+iQKVt+e)A=^HcgwP;3=ee4*E%3|t2q>k>+(gHK- zW@(EcpF(u_Ma;4z)NfXnOh z4XFpggKx=Q!186}I$**of^UM6>q!|{JvWj@z~@^@T&J!bPiBzk!n$0;NU;Q8EmIDV+mLWb0?C3#Unh}?VErVO zd<`FqODD->7xwZD%q7)uwc7JZE`(VMi5J|msuHrxM!s4tvtON(x>k^0(wY*%$+D}I zECIP|1xWxreT^IgoPM3uLhaCcauKY5-y|miGnW&J`i`icmP;?lPLM{nlcUV;80OxZGVwU%K+_x_IdbV3@Bi1Ug^ruj?Jo z1V2yJ%_a=(H|Y*QvXni#|3NqV<8_ar^DSArWY}8YTpizqg+-O=-oQ*JSL(()G3)7i zU1A8sNpAXP7(-4KanILeMzMGNZ;2rvA$j~cJzYf|-I;yV#T%4^Ba%S4& z7xm}5GyJMip9)s*2l{g`-r6Vn>AjdB)Yb3;He~iSB*7eR`WxDyv%+A5i#5|$_cMG8 zrxFoi7z=q1j58$rGrX(;W`f8r#!;||Bi_aw=w_zY7z3Ml6>K!Zx$>b#`sm81{V>c} zr)F3%%@_qesumclJ2UI+?~JXE44c0P)TBZ%L48IE=w@l&*nvg;@-ng&pkouvBnZ zU_YHD>v*K_cp*%F0ZMD*g%C#P;)TA9p2Z6T7#S1L`=vth2^f1PK^Vexszi*Knke*R zw%A0WKckvNVK5`FBq5a1xFo^MXk(HP%qU->cExK*M(?a-?B!rG#?~lamlVt#k%DzM zqzFMQ^Vt-PeV!r=Vz%HTIF0Bd*mL?3%zRg|^*AaFWD$`^F?QckjJb`0|!JciyT#pZV$vrIWIgtHFfkE8DPam*5shC7c+6NWNfLK>b- zTN>8j(uEPsJ3k$}%1Fn|&lMVwfw3zyFg7;>tG!cb=n1r~SExuKhm+`yP-u%nH&4Nz}=xK_TDMXq%)^oI*_s`JF*s zltPCTx}#7)7V2gwl&H{sg*4fy`$C~33jLyx)*=j&zxW-$s;5iOEP|ILS_GAB)6aM` z18l|A#`g9bjbLQV5k|m(Sw;vOkBn zV3a~J=kTUgoWtAVdR`bNx94s1P1Kjt;q$cRdFQci+)tB1;7a<9lx=e>>Fi}XUWu{y z74o|#^kLqy*XUCw>wdaMpD39s73y4twoz4>WkVHqdZ7yYdsRhGOO72-O~14MEEzXmh+sKvVftwry4 zg)S@ft`;)~-M~rCzJU>kZ(zRq8#qayI`sah4m%L*@U#l*V3K?5v4OC9lr5;o5-IhV zq@^A=)V%?1;~LPmy#YsXMIoD;n0e4mY%lsI>M|7XBgNbM7JVq>QO&%C2c2*WujxI- z7TAcknF=K};-Nlh#1U{!nC0^(?D;?wUX8jY?8UtqhdZJfZL6D6XKBW3^|G11Ead)# V7NiX=_{fyBz$0UEy)C%e{2wlheCYrH delta 5829 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 QBU9WAkBr6Trr>J*4?*|G?f?J) From ce7b2a40d04de1eadd5b81910ad374fee8db268d Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 1 Aug 2012 17:26:50 +0200 Subject: [PATCH 3/7] added automatically generated bash-completion; closes #191 --- Makefile | 10 ++++++++-- youtube-dl.bash-completion | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 youtube-dl.bash-completion diff --git a/Makefile b/Makefile index c31850a55..da9103cd2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: compile exe readme man-page update-latest +all: compile exe readme man-page bash-completion update-latest update-latest: ./youtube-dl --version > LATEST_VERSION @@ -18,6 +18,11 @@ readme: man-page: pandoc -s -w man README.md -o youtube-dl.1 +bash-completion: + @options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \ + content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \ + echo "$${content}" > youtube-dl.bash-completion + compile: zip --quiet --junk-paths youtube-dl youtube_dl/*.py echo '#!/usr/bin/env python' > youtube-dl @@ -30,5 +35,6 @@ exe: install: install -m 755 --owner root --group root youtube-dl /usr/local/bin/ install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 + install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl -.PHONY: all update-latest readme man-page compile exe install \ No newline at end of file +.PHONY: all update-latest readme man-page bash-completion compile exe install \ No newline at end of file diff --git a/youtube-dl.bash-completion b/youtube-dl.bash-completion new file mode 100644 index 000000000..8704d0fd3 --- /dev/null +++ b/youtube-dl.bash-completion @@ -0,0 +1,14 @@ +__youtube-dl() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + opts="--all-formats --audio-format --audio-quality --auto-number --batch-file --console-title --continue --cookies --dump-user-agent --extract-audio --format --get-description --get-filename --get-format --get-thumbnail --get-title --get-url --help --ignore-errors --keep-video --list-extractors --list-formats --literal --match-title --max-downloads --max-quality --netrc --no-continue --no-mtime --no-overwrites --no-part --no-progress --output --password --playlist-end --playlist-start --prefer-free-formats --quiet --rate-limit --reject-title --retries --simulate --skip-download --srt-lang --title --update --username --verbose --version --write-description --write-info-json --write-srt" + + if [[ ${cur} == * ]] ; then + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + fi +} + +complete -F __youtube-dl youtube-dl From 7a7c093ab011ea94de52d90500cb90c7a39ea0a2 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 1 Aug 2012 18:40:27 +0200 Subject: [PATCH 4/7] added one-step realese script 'make release version=nn' - closes #158 --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index da9103cd2..ea1efe075 100644 --- a/Makefile +++ b/Makefile @@ -37,4 +37,14 @@ install: install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl -.PHONY: all update-latest readme man-page bash-completion compile exe install \ No newline at end of file +release: + @if [ -z "$$version" ]; then echo 'ERROR: specify version number like this: make release version=1994.09.06'; exit 1; fi + @if [ ! -z "`git tag | grep "$$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi + @if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi + @sed -i "s/__version__ = '.*'/__version__ = '$$version'/" youtube_dl/__init__.py + make all + git add -A + git commit -m "release $$version" + git tag -m "Release $$version" "$$version" + +.PHONY: all update-latest readme man-page bash-completion compile exe install release From dce1088450becaa95e7fcaea2c70e8965b142a69 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Fri, 3 Aug 2012 20:10:54 +0200 Subject: [PATCH 5/7] A more "make-esque" Makefile with file targets and dependencies --- Makefile | 70 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index ea1efe075..26c85b578 100644 --- a/Makefile +++ b/Makefile @@ -1,38 +1,6 @@ -all: compile exe readme man-page bash-completion update-latest +all: youtube-dl youtube-dl.exe README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION -update-latest: - ./youtube-dl --version > LATEST_VERSION - -readme: - @options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \ - header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \ - footer=$$(sed -e '1,/.*# FAQ/ d' README.md) && \ - echo "$${header}" > README.md && \ - echo >> README.md && \ - echo '# OPTIONS' >> README.md && \ - echo "$${options}" >> README.md&& \ - echo >> README.md && \ - echo '# FAQ' >> README.md && \ - echo "$${footer}" >> README.md - -man-page: - pandoc -s -w man README.md -o youtube-dl.1 - -bash-completion: - @options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \ - content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \ - echo "$${content}" > youtube-dl.bash-completion - -compile: - zip --quiet --junk-paths youtube-dl youtube_dl/*.py - echo '#!/usr/bin/env python' > youtube-dl - cat youtube-dl.zip >> youtube-dl - rm youtube-dl.zip - -exe: - bash devscripts/wine-py2exe.sh build_exe.py - -install: +install: youtube-dl youtube-dl.1 youtube-dl.bash-completion install -m 755 --owner root --group root youtube-dl /usr/local/bin/ install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl @@ -47,4 +15,36 @@ release: git commit -m "release $$version" git tag -m "Release $$version" "$$version" -.PHONY: all update-latest readme man-page bash-completion compile exe install release +.PHONY: all install release + +youtube-dl: youtube_dl/*.py + zip --quiet --junk-paths youtube-dl youtube_dl/*.py + echo '#!/usr/bin/env python' > youtube-dl + cat youtube-dl.zip >> youtube-dl + rm youtube-dl.zip + +youtube-dl.exe: youtube_dl/*.py + bash devscripts/wine-py2exe.sh build_exe.py + +README.md: youtube-dl + @options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \ + header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \ + footer=$$(sed -e '1,/.*# FAQ/ d' README.md) && \ + echo "$${header}" > README.md && \ + echo >> README.md && \ + echo '# OPTIONS' >> README.md && \ + echo "$${options}" >> README.md&& \ + echo >> README.md && \ + echo '# FAQ' >> README.md && \ + echo "$${footer}" >> README.md + +youtube-dl.1: README.md + pandoc -s -w man README.md -o youtube-dl.1 + +youtube-dl.bash-completion: README.md + @options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \ + content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \ + echo "$${content}" > youtube-dl.bash-completion + +LATEST_VERSION: youtube-dl + ./youtube-dl --version > LATEST_VERSION From 225dceb0468a0608e9805479b927f6fb8cb94067 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 25 Sep 2012 23:56:01 +0200 Subject: [PATCH 6/7] moved make release to devscripts/release.sh --- Makefile | 12 +----------- devscripts/posix-locale.sh | 0 devscripts/release.sh | 11 +++++++++++ devscripts/wine-py2exe.sh | 0 4 files changed, 12 insertions(+), 11 deletions(-) mode change 100644 => 100755 devscripts/posix-locale.sh create mode 100755 devscripts/release.sh mode change 100644 => 100755 devscripts/wine-py2exe.sh diff --git a/Makefile b/Makefile index 26c85b578..c167d01c4 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,7 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl -release: - @if [ -z "$$version" ]; then echo 'ERROR: specify version number like this: make release version=1994.09.06'; exit 1; fi - @if [ ! -z "`git tag | grep "$$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi - @if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi - @sed -i "s/__version__ = '.*'/__version__ = '$$version'/" youtube_dl/__init__.py - make all - git add -A - git commit -m "release $$version" - git tag -m "Release $$version" "$$version" - -.PHONY: all install release +.PHONY: all install youtube-dl: youtube_dl/*.py zip --quiet --junk-paths youtube-dl youtube_dl/*.py diff --git a/devscripts/posix-locale.sh b/devscripts/posix-locale.sh old mode 100644 new mode 100755 diff --git a/devscripts/release.sh b/devscripts/release.sh new file mode 100755 index 000000000..75f8ec8eb --- /dev/null +++ b/devscripts/release.sh @@ -0,0 +1,11 @@ +#! /bin/bash + +if [ -z "$1" ]; then echo "ERROR: specify version number like this: $0 1994.09.06"; exit 1; fi +version="$1" +if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi +if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi +sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/__init__.py +make all +git add -A +git commit -m "release $version" +git tag -m "Release $version" "$version" \ No newline at end of file diff --git a/devscripts/wine-py2exe.sh b/devscripts/wine-py2exe.sh old mode 100644 new mode 100755 From 0e841bdc54c68076d82c29d541683eb844d19794 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 26 Sep 2012 00:10:39 +0200 Subject: [PATCH 7/7] add PREFIX option to make install --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c167d01c4..21b346905 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ all: youtube-dl youtube-dl.exe README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION +PREFIX=/usr/local install: youtube-dl youtube-dl.1 youtube-dl.bash-completion - install -m 755 --owner root --group root youtube-dl /usr/local/bin/ - install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 + install -m 755 --owner root --group root youtube-dl $(PREFIX)/bin/ + install -m 644 --owner root --group root youtube-dl.1 $(PREFIX)/man/man1 install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl .PHONY: all install