Release 2011.11.23

Fix duplicated downloads from YouTube user page where watch URLs are not. Thanks to anatoly techtonik.

LATEST_VERSION

@@ -1 +1 @@
-2011.09.17
+2011.11.23

Makefile

@@ -1,12 +1,12 @@
 default: update
 
-update: update-readme update-latest
+update: compile update-readme update-latest
 
 update-latest:
-	./youtube-dl --version > LATEST_VERSION
+	./youtube-dl.dev --version > LATEST_VERSION
 
 update-readme:
-	@options=$$(COLUMNS=80 ./youtube-dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/### \1/') && \
+	@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) && \
 		echo "$${header}" > README.md && \
@@ -15,6 +15,7 @@ update-readme:
 		echo -e '\n## FAQ' >> README.md && \
 		echo "$${footer}" >> README.md
 
+compile:
+	cp youtube_dl/__init__.py youtube-dl
 
-
+.PHONY: default compile update update-latest update-readme
-.PHONY: default update update-latest update-readme

README.md

@@ -33,13 +33,17 @@ which means you can modify it, redistribute it or use it however you like.
     -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
+    -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, and %%
+                             for a literal percent
     -a, --batch-file FILE    file containing URLs to download ('-' 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 dump cookie jar to
+    --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
@@ -64,6 +68,7 @@ which means you can modify it, redistribute it or use it however you like.
     -f, --format FORMAT      video format code
     --all-formats            download all available video formats
     --max-quality FORMAT     highest quality format to download
+    -F, --list-formats       list all available formats (currently youtube only)
 
 ### Authentication Options:
     -u, --username USERNAME  account username
@@ -73,7 +78,7 @@ which means you can modify it, redistribute it or use it however you like.
 ### Post-processing Options:
     --extract-audio          convert video files to audio-only files (requires
                              ffmpeg and ffprobe)
-    --audio-format FORMAT    "best", "aac" or "mp3"; best by default
+    --audio-format FORMAT    "best", "aac", "vorbis" or "mp3"; best by default
     --audio-quality QUALITY  ffmpeg 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

test/test_div.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+# Various small unit tests
+
+import os,sys
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
+import youtube_dl
+
+def test_simplify_title():
+	assert youtube_dl._simplify_title(u'abc') == u'abc'
+	assert youtube_dl._simplify_title(u'abc_d-e') == u'abc_d-e'
+
+	assert youtube_dl._simplify_title(u'123') == u'123'
+
+	assert u'/' not in youtube_dl._simplify_title(u'abc/de')
+	assert u'abc' in youtube_dl._simplify_title(u'abc/de')
+	assert u'de' in youtube_dl._simplify_title(u'abc/de')
+	assert u'/' not in youtube_dl._simplify_title(u'abc/de///')
+
+	assert u'\\' not in youtube_dl._simplify_title(u'abc\\de')
+	assert u'abc' in youtube_dl._simplify_title(u'abc\\de')
+	assert u'de' in youtube_dl._simplify_title(u'abc\\de')
+
+	assert youtube_dl._simplify_title(u'ä') == u'ä'
+	assert youtube_dl._simplify_title(u'кириллица') == u'кириллица'
+
+	# Strip underlines
+	assert youtube_dl._simplify_title(u'\'a_') == u'a'

youtube-dl.dev

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import youtube_dl
+
+youtube_dl.main()