From 5a59fd6392ec644e01a1c44511724fd8b0ba9da3 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Wed, 28 Nov 2012 00:01:06 +0100
Subject: new .travis.yml with notifications and 3.3

---
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03947b1eb..c8b6e5112 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: python
-#specify the python version
 python:
   - "2.6"
   - "2.7"
-#command to install the setup
-install:
-# command to run tests
+  - "3.3"
 script: nosetests test --nocapture
+notifications:
+  email:
+    - filippo.valsorda@gmail.com
+  irc:
+    channels:
+      - "irc.freenode.org#youtube-dl"
+    skip_join: true
-- 
cgit v1.2.3


From 2d2fa229eceac1009c894e7a9eb5d956e833c904 Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Wed, 28 Nov 2012 11:16:34 +0100
Subject: making the metacafe test pass

---
 test/test_download.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_download.py b/test/test_download.py
index b3fd7d992..cd9fc158b 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -27,7 +27,7 @@ class DownloadTest(unittest.TestCase):
 
     METACAFE_SIZE = 5754305
     METACAFE_URL = "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/"
-    METACAFE_FILE = "_aUehQsCQtM.flv"
+    METACAFE_FILE = "aUehQsCQtM.flv"
 
     BLIP_MD5 = "93c24d2f4e0782af13b8a7606ea97ba7"
     BLIP_URL = "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352"
-- 
cgit v1.2.3


From 79ae0a06d55666f408cde3104f97f6261e4f9f50 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Wed, 28 Nov 2012 11:46:56 +0100
Subject: comment out 3.3 testing until Travis implements it

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c8b6e5112..c6c758fd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "3.3"
+#  - "3.3"
 script: nosetests test --nocapture
 notifications:
   email:
-- 
cgit v1.2.3


From df5cff3751ea5b1a3cfaaea1e1c25937950335df Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Wed, 28 Nov 2012 11:54:20 +0100
Subject: make tests skip on not _WORKING

---
 test/test_download.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/test_download.py b/test/test_download.py
index cd9fc158b..66bc1488f 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -66,6 +66,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(YoutubeIE())
+        if not YoutubeIE._WORKING: return
         fd.download([DownloadTest.YOUTUBE_URL])
         self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE))
         self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE)
@@ -74,6 +75,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(DailymotionIE())
+        if not DailymotionIE._WORKING: return
         fd.download([DownloadTest.DAILYMOTION_URL])
         self.assertTrue(os.path.exists(DownloadTest.DAILYMOTION_FILE))
         md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE)
@@ -84,7 +86,9 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(MetacafeIE())
+        if not MetacafeIE._WORKING: return
         fd.add_info_extractor(YoutubeIE())
+        if not YoutubeIE._WORKING: return
         fd.download([DownloadTest.METACAFE_URL])
         self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE))
         self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE)
@@ -93,6 +97,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(BlipTVIE())
+        if not BlipTVIE._WORKING: return
         fd.download([DownloadTest.BLIP_URL])
         self.assertTrue(os.path.exists(DownloadTest.BLIP_FILE))
         md5_down_file = md5_for_file(DownloadTest.BLIP_FILE)
@@ -102,6 +107,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(XVideosIE())
+        if not XVideosIE._WORKING: return
         fd.download([DownloadTest.XVIDEO_URL])
         self.assertTrue(os.path.exists(DownloadTest.XVIDEO_FILE))
         md5_down_file = md5_for_file(DownloadTest.XVIDEO_FILE)
@@ -133,6 +139,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(SoundcloudIE())
+        if not SoundcloudIE._WORKING: return
         fd.download([DownloadTest.SOUNDCLOUD_URL])
         self.assertTrue(os.path.exists(DownloadTest.SOUNDCLOUD_FILE))
         md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE)
@@ -142,6 +149,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(StanfordOpenClassroomIE())
+        if not StanfordOpenClassroomIE._WORKING: return
         fd.download([DownloadTest.STANDFORD_URL])
         self.assertTrue(os.path.exists(DownloadTest.STANDFORD_FILE))
         md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE)
@@ -151,6 +159,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(CollegeHumorIE())
+        if not CollegeHumorIE._WORKING: return
         fd.download([DownloadTest.COLLEGEHUMOR_URL])
         self.assertTrue(os.path.exists(DownloadTest.COLLEGEHUMOR_FILE))
         md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE)
@@ -160,6 +169,7 @@ class DownloadTest(unittest.TestCase):
         with open(DownloadTest.PARAMETERS_FILE) as f:
             fd = FileDownloader(json.load(f))
         fd.add_info_extractor(XNXXIE())
+        if not XNXXIE._WORKING: return
         fd.download([DownloadTest.XNXX_URL])
         self.assertTrue(os.path.exists(DownloadTest.XNXX_FILE))
         md5_down_file = md5_for_file(DownloadTest.XNXX_FILE)
-- 
cgit v1.2.3


From c64de2c980f7819b95c09ce4fef79cdd6f48dd14 Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Wed, 28 Nov 2012 18:21:53 +0100
Subject: correction on the test

---
 test/test_download.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test_download.py b/test/test_download.py
index 66bc1488f..1a1b09db1 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -29,11 +29,11 @@ class DownloadTest(unittest.TestCase):
     METACAFE_URL = "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/"
     METACAFE_FILE = "aUehQsCQtM.flv"
 
-    BLIP_MD5 = "93c24d2f4e0782af13b8a7606ea97ba7"
+    BLIP_MD5 = "4962f94441605832eb1008eb820ef47a"
     BLIP_URL = "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352"
     BLIP_FILE = "5779306.m4v"
 
-    XVIDEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf"
+    XVIDEO_MD5 = "aecab2ea59b7996110a7e409f0c55da3"
     XVIDEO_URL = "http://www.xvideos.com/video939581/funny_porns_by_s_-1"
     XVIDEO_FILE = "939581.flv"
 
@@ -45,11 +45,11 @@ class DownloadTest(unittest.TestCase):
     VIMEO2_URL = "http://player.vimeo.com/video/47019590"
     VIMEO2_FILE = ""
 
-    SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed"
+    SOUNDCLOUD_MD5 = "c1b9b9ea8bfd620b96b2628664576e1c"
     SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy"
     SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3"
 
-    STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4"
+    STANDFORD_MD5 = "8aac7873a07dcfaed66b1559ab128514"
     STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100"
     STANDFORD_FILE = "PracticalUnix_intro-environment.mp4"
 
@@ -57,7 +57,7 @@ class DownloadTest(unittest.TestCase):
     COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody"
     COLLEGEHUMOR_FILE = ""
 
-    XNXX_MD5 = "5f0469c8d1dfd1bc38c8e6deb5e0a21d"
+    XNXX_MD5 = "c5c67df477eb0d9b058200351448ba4c"
     XNXX_URL = "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_"
     XNXX_FILE = "1135332.flv"
 
@@ -205,4 +205,4 @@ def md5_for_file(filename, block_size=2**20):
             if not data:
                 break
             md5.update(data)
-            return md5.hexdigest()
+        return md5.hexdigest()
-- 
cgit v1.2.3


From 4efe62a0167a0e82e8aaf25b00294dd281b555c9 Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Wed, 28 Nov 2012 18:24:16 +0100
Subject: moving to setup.py

---
 build_exe.py | 48 ------------------------------------------------
 setup.py     | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 48 deletions(-)
 delete mode 100644 build_exe.py
 create mode 100644 setup.py

diff --git a/build_exe.py b/build_exe.py
deleted file mode 100644
index 9fa8186cb..000000000
--- a/build_exe.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from distutils.core import setup
-import py2exe
-import sys, os
-
-"""This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
-
-# If run without args, build executables
-if len(sys.argv) == 1:
-    sys.argv.append("py2exe")
-
-# os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh
-sys.path.append('./youtube_dl')
-
-options = {
-    "bundle_files": 1,
-    "compressed": 1,
-    "optimize": 2,
-    "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe']
-}
-
-console = [{
-    "script":"./youtube_dl/__main__.py",
-    "dest_base": "youtube-dl",
-}]
-
-init_file = open('./youtube_dl/__init__.py')
-for line in init_file.readlines():
-    if line.startswith('__version__'):
-        version = line[11:].strip(" ='\n")
-        break
-else:
-    version = ''
-
-setup(name='youtube-dl',
-      version=version,
-      description='Small command-line program to download videos from YouTube.com and other video sites',
-      url='https://github.com/rg3/youtube-dl',
-      packages=['youtube_dl'],
-      
-      console = console,
-      options = {"py2exe": options},
-      zipfile = None,
-)
-
-import shutil
-shutil.rmtree("build")
-
diff --git a/setup.py b/setup.py
new file mode 100644
index 000000000..3eccf50d8
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,52 @@
+from distutils.core import setup
+import sys
+try:
+    import py2exe
+except ImportError:
+    sys.stderr.write("Cannot import py2exe")
+import os
+
+"""This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
+
+# If run without args, build executables
+if len(sys.argv) == 1:
+    sys.argv.append("py2exe")
+
+# os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh
+sys.path.append('./youtube_dl')
+
+options = {
+    "bundle_files": 1,
+    "compressed": 1,
+    "optimize": 2,
+    "dist_dir": '.',
+    "dll_excludes": ['w9xpopen.exe']
+}
+
+console = [{
+    "script":"./youtube_dl/__main__.py",
+    "dest_base": "youtube-dl",
+}]
+
+init_file = open('./youtube_dl/__init__.py')
+for line in init_file.readlines():
+    if line.startswith('__version__'):
+        version = line[11:].strip(" ='\n")
+        break
+else:
+    version = ''
+
+setup(name='youtube-dl',
+      version=version,
+      description='Small command-line program to download videos from YouTube.com and other video sites',
+      url='https://github.com/rg3/youtube-dl',
+      packages=['youtube_dl'],
+
+      console = console,
+      options = {"py2exe": options},
+      zipfile = None,
+)
+
+import shutil
+shutil.rmtree("build")
+
-- 
cgit v1.2.3


From 190e8e27d8446aaf6cdb992cf1255267bed48d74 Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Wed, 28 Nov 2012 18:33:58 +0100
Subject: removing the zip option, this can be done with python setup.py bdist
 --format=zip

---
 Makefile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Makefile b/Makefile
index c4937a512..b5c0d4266 100644
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,6 @@ test:
 .PHONY: all clean install test README.md youtube-dl.bash-completion
 # TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them
 
-youtube-dl: youtube_dl/*.py
-	zip --quiet youtube-dl __main__.py youtube_dl/*.py
-	echo '#!/usr/bin/env python' > youtube-dl
-	cat youtube-dl.zip >> youtube-dl
-	rm youtube-dl.zip
-	chmod a+x youtube-dl
 
 youtube-dl.exe: youtube_dl/*.py
 	bash devscripts/wine-py2exe.sh build_exe.py
-- 
cgit v1.2.3


From 87bec4c7155d390c3f6e716c87616ce8cdf1450a Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Wed, 28 Nov 2012 18:49:56 +0100
Subject: getting version from git or failing

---
 setup.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 3eccf50d8..d90856b9d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,15 +5,22 @@ try:
 except ImportError:
     sys.stderr.write("Cannot import py2exe")
 import os
+import subprocess
 
-"""This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
+"""The p2exe option will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package.
+    python setup.py py2exe
+   You can also build a zip executable with
+    python setup.py bdist --format=zip
+
+
+"""
 
 # If run without args, build executables
 if len(sys.argv) == 1:
     sys.argv.append("py2exe")
 
 # os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh
-sys.path.append('./youtube_dl')
+#sys.path.append('./youtube_dl')
 
 options = {
     "bundle_files": 1,
@@ -29,11 +36,10 @@ console = [{
 }]
 
 init_file = open('./youtube_dl/__init__.py')
-for line in init_file.readlines():
-    if line.startswith('__version__'):
-        version = line[11:].strip(" ='\n")
-        break
-else:
+
+try:
+    version = subprocess.checkoutput(["git", "describe", "--abbrev=0", "--tags"])
+except:
     version = ''
 
 setup(name='youtube-dl',
-- 
cgit v1.2.3


From 10f100ac8a211d707ec4ffab685c90f38cfe8a7a Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Wed, 28 Nov 2012 19:38:37 +0100
Subject: cleaning binaries

---
 LATEST_VERSION |   1 -
 youtube-dl.1   | 306 ---------------------------------------------------------
 youtube-dl.exe | Bin 3989886 -> 0 bytes
 3 files changed, 307 deletions(-)
 delete mode 100644 LATEST_VERSION
 delete mode 100644 youtube-dl.1
 delete mode 100644 youtube-dl.exe

diff --git a/LATEST_VERSION b/LATEST_VERSION
deleted file mode 100644
index d645a4c7a..000000000
--- a/LATEST_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2012.11.29
diff --git a/youtube-dl.1 b/youtube-dl.1
deleted file mode 100644
index 4508622d2..000000000
--- a/youtube-dl.1
+++ /dev/null
@@ -1,306 +0,0 @@
-.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)
---buffer-size\ SIZE\ \ \ \ \ \ \ size\ of\ download\ buffer\ (e.g.\ 1024\ or\ 16k)\ (default
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ is\ 1024)
---no-resize-buffer\ \ \ \ \ \ \ do\ not\ automatically\ adjust\ the\ buffer\ size.\ By
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ default,\ the\ buffer\ size\ is\ automatically\ resized
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ from\ an\ initial\ value\ of\ SIZE.
---dump-user-agent\ \ \ \ \ \ \ \ display\ the\ current\ browser\ identification
---user-agent\ UA\ \ \ \ \ \ \ \ \ \ specify\ a\ custom\ user\ agent
---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
---id\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ use\ video\ ID\ in\ file\ name
--l,\ --literal\ \ \ \ \ \ \ \ \ \ \ \ [deprecated]\ alias\ of\ --title
--A,\ --auto-number\ \ \ \ \ \ \ \ number\ downloaded\ files\ starting\ from\ 00000
--o,\ --output\ TEMPLATE\ \ \ \ output\ filename\ template.\ Use\ %(title)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),
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ %(extractor)s\ for\ the\ provider\ (youtube,\ metacafe,
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ etc),\ %(id)s\ for\ the\ video\ id\ and\ %%\ for\ a\ literal
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ percent.\ Use\ -\ to\ output\ to\ stdout.
---restrict-filenames\ \ \ \ \ Restrict\ filenames\ to\ only\ ASCII\ characters,\ and
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ avoid\ "&"\ and\ spaces\ in\ filenames
--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]
--x,\ --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\ quality\ specification,\ insert\ a
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ value\ between\ 0\ (better)\ and\ 9\ (worse)\ for\ VBR\ or\ a
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specific\ bitrate\ like\ 128K\ (default\ 5)
--k,\ --keep-video\ \ \ \ \ \ \ \ \ keeps\ the\ video\ file\ on\ disk\ after\ the\ post-
-\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ processing;\ the\ video\ is\ erased\ by\ default
-\f[]
-.fi
-.SH CONFIGURATION
-.PP
-You can configure youtube-dl by placing default arguments (such as
-\f[C]--extract-audio\ --no-mtime\f[] to always extract the audio and not
-copy the mtime) into \f[C]/etc/youtube-dl.conf\f[] and/or
-\f[C]~/.local/config/youtube-dl.conf\f[].
-.SH OUTPUT TEMPLATE
-.PP
-The \f[C]-o\f[] option allows users to indicate a template for the
-output file names.
-The basic usage is not to set any template arguments when downloading a
-single file, like in
-\f[C]youtube-dl\ -o\ funny_video.flv\ "http://some/video"\f[].
-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 parenthesis,
-followed by a lowercase S.
-Allowed names are:
-.IP \[bu] 2
-\f[C]id\f[]: The sequence will be replaced by the video identifier.
-.IP \[bu] 2
-\f[C]url\f[]: The sequence will be replaced by the video URL.
-.IP \[bu] 2
-\f[C]uploader\f[]: The sequence will be replaced by the nickname of the
-person who uploaded the video.
-.IP \[bu] 2
-\f[C]upload_date\f[]: The sequence will be replaced by the upload date
-in YYYYMMDD format.
-.IP \[bu] 2
-\f[C]title\f[]: The sequence will be replaced by the video title.
-.IP \[bu] 2
-\f[C]ext\f[]: The sequence will be replaced by the appropriate extension
-(like flv or mp4).
-.IP \[bu] 2
-\f[C]epoch\f[]: The sequence will be replaced by the Unix epoch when
-creating the file.
-.IP \[bu] 2
-\f[C]autonumber\f[]: The sequence will be replaced by a five-digit
-number that will be increased with each download, starting at zero.
-.PP
-The current default template is \f[C]%(id)s.%(ext)s\f[], but that will
-be switchted to \f[C]%(title)s-%(id)s.%(ext)s\f[] (which can be
-requested with \f[C]-t\f[] at the moment).
-.PP
-In some cases, you don\[aq]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 \f[C]--restrict-filenames\f[] flag to get a
-shorter title:
-.IP
-.nf
-\f[C]
-$\ youtube-dl\ --get-filename\ -o\ "%(title)s.%(ext)s"\ BaW_jenozKc
-youtube-dl\ test\ video\ \[aq]\[aq]_ä↭𝕐.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
-\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[].
-.SS ERROR: unable to download video
-.PP
-youtube requires an additional signature since September 2012 which is
-not supported by old versions of youtube-dl.
-You can update youtube-dl with \f[C]sudo\ youtube-dl\ --update\f[].
-.SS SyntaxError: Non-ASCII character
-.PP
-The error
-.IP
-.nf
-\f[C]
-File\ "youtube-dl",\ line\ 2
-SyntaxError:\ Non-ASCII\ character\ \[aq]\\x93\[aq]\ ...
-\f[]
-.fi
-.PP
-means you\[aq]re using an outdated version of Python.
-Please update to Python 2.6 or 2.7.
-.PP
-To run youtube-dl under Python 2.5, you\[aq]ll have to manually check it
-out like this:
-.IP
-.nf
-\f[C]
-git\ clone\ git://github.com/rg3/youtube-dl.git
-cd\ youtube-dl
-python\ -m\ youtube_dl\ --help
-\f[]
-.fi
-.PP
-Please note that Python 2.5 is not supported anymore.
-.SS What is this binary file? Where has the code gone?
-.PP
-Since June 2012 (#342) youtube-dl is packed as an executable zipfile,
-simply unzip it (might need renaming to \f[C]youtube-dl.zip\f[] 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
-\f[C]__main__.py\f[] file.
-To recompile the executable, run \f[C]make\ youtube-dl\f[].
-.SS The exe throws a \f[I]Runtime error from Visual C++\f[]
-.PP
-To run the exe you need to install first the Microsoft Visual C++ 2008
-Redistributable
-Package (http://www.microsoft.com/en-us/download/details.aspx?id=29).
-.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
-(<https://github.com/dbbolton>) and is likewise released into the public
-domain.
-.SH BUGS
-.PP
-Bugs and suggestions should be reported at:
-<https://github.com/rg3/youtube-dl/issues>
-.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.exe b/youtube-dl.exe
deleted file mode 100644
index 2ee57c593..000000000
Binary files a/youtube-dl.exe and /dev/null differ
-- 
cgit v1.2.3


From caaa47d37215f498c033afb42972c135be8138d4 Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Thu, 29 Nov 2012 14:12:06 +0100
Subject: adding the script hook

---
 bin/youtube-dl |   6 ++++++
 setup.py       |  29 ++++++++++++++++++-----------
 youtube-dl     | Bin 46327 -> 91 bytes
 3 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100755 bin/youtube-dl

diff --git a/bin/youtube-dl b/bin/youtube-dl
new file mode 100755
index 000000000..fc3cc8ad8
--- /dev/null
+++ b/bin/youtube-dl
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import youtube_dl
+
+if __name__ == '__main__':
+    youtube_dl.main()
diff --git a/setup.py b/setup.py
index d90856b9d..ec63bedde 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,9 @@
-from distutils.core import setup
+from distutils.core import setup, Command
 import sys
 try:
     import py2exe
 except ImportError:
     sys.stderr.write("Cannot import py2exe")
-import os
 import subprocess
 
 """The p2exe option will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package.
@@ -12,12 +11,16 @@ import subprocess
    You can also build a zip executable with
     python setup.py bdist --format=zip
 
+   The test suite can be run with
+    python setup.py test
 
+
+    The actual version is defined by the last git tag
 """
 
 # If run without args, build executables
-if len(sys.argv) == 1:
-    sys.argv.append("py2exe")
+#if len(sys.argv) == 1:
+#    sys.argv.append("py2exe")
 
 # os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh
 #sys.path.append('./youtube_dl')
@@ -38,21 +41,25 @@ console = [{
 init_file = open('./youtube_dl/__init__.py')
 
 try:
+    #return the last tag name
     version = subprocess.checkoutput(["git", "describe", "--abbrev=0", "--tags"])
 except:
     version = ''
 
 setup(name='youtube-dl',
       version=version,
-      description='Small command-line program to download videos from YouTube.com and other video sites',
+      long_description='Small command-line program to download videos from YouTube.com and other video sites',
       url='https://github.com/rg3/youtube-dl',
       packages=['youtube_dl'],
-
-      console = console,
-      options = {"py2exe": options},
-      zipfile = None,
+      #test suite
+      test_suite='nose.collector',
+      test_requires=['nosetest'],
+      console=console,
+      options={"py2exe": options},
+      scripts=['bin/youtube-dl'],
+      zipfile=None,
 )
 
-import shutil
-shutil.rmtree("build")
+#import shutil
+#shutil.rmtree("build")
 
diff --git a/youtube-dl b/youtube-dl
index ca4e467ff..fc3cc8ad8 100755
Binary files a/youtube-dl and b/youtube-dl differ
-- 
cgit v1.2.3


From cc51a7d4e030646a5d7075934f11036ad52a3f1f Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Thu, 29 Nov 2012 16:51:55 +0100
Subject: New repo skeleton, getting ready for PyPi

---
 .gitignore                    |  8 +++++
 MANIFEST.in                   |  3 ++
 Makefile                      | 19 ++++++------
 setup.py                      | 68 +++++++++++++++----------------------------
 youtube-dl                    |  6 ----
 youtube-dl.bash-completion    | 14 ---------
 youtube-dl.bash-completion.in | 14 +++++++++
 youtube_dl/__init__.py        |  2 +-
 youtube_dl/version.py         |  2 ++
 9 files changed, 60 insertions(+), 76 deletions(-)
 create mode 100644 MANIFEST.in
 delete mode 100755 youtube-dl
 delete mode 100644 youtube-dl.bash-completion
 create mode 100644 youtube-dl.bash-completion.in
 create mode 100644 youtube_dl/version.py

diff --git a/.gitignore b/.gitignore
index b2163f118..9619a7dfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,11 @@
 wine-py2exe/
 py2exe.log
 *.kate-swp
+build/
+dist/
+MANIFEST
+README.txt
+youtube-dl.1
+youtube-dl.bash-completion
+youtube-dl
+youtube-dl.exe
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..81f8e05cd
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+include README.md
+include test/*.py
+include test/*.json
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2eb226fdb..470717a92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-all: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
+all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
 # TODO: re-add youtube-dl.exe, and make sure it's 1. safe and 2. doesn't need sudo
 
 clean:
-	rm -f youtube-dl youtube-dl.exe youtube-dl.1 LATEST_VERSION
+	rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
 
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
@@ -20,8 +20,7 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
 test:
 	nosetests2 --nocapture test
 
-.PHONY: all clean install test README.md youtube-dl.bash-completion
-# TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them
+.PHONY: all clean install test
 
 youtube-dl: youtube_dl/*.py
 	zip --quiet youtube-dl youtube_dl/*.py
@@ -46,13 +45,13 @@ README.md: youtube_dl/*.py
 		echo '# CONFIGURATION' >> README.md && \
 		echo "$${footer}" >> README.md
 
+README.txt: README.md
+	pandoc -f markdown -t plain README.md -o README.txt
+
 youtube-dl.1: README.md
-	pandoc -s -w man README.md -o youtube-dl.1
+	pandoc -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md
+youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
 	@options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
-		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \
+		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion.in` && \
 		echo "$${content}" > youtube-dl.bash-completion
-
-LATEST_VERSION: youtube_dl/__init__.py
-	python -m youtube_dl --version > LATEST_VERSION
diff --git a/setup.py b/setup.py
index ec63bedde..5dfbbc72d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,31 +1,13 @@
-from distutils.core import setup, Command
+from distutils.core import setup
+import pkg_resources
 import sys
+
 try:
     import py2exe
 except ImportError:
-    sys.stderr.write("Cannot import py2exe")
-import subprocess
-
-"""The p2exe option will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package.
-    python setup.py py2exe
-   You can also build a zip executable with
-    python setup.py bdist --format=zip
-
-   The test suite can be run with
-    python setup.py test
-
-
-    The actual version is defined by the last git tag
-"""
+    print >> sys.stderr, "Cannot import py2exe"
 
-# If run without args, build executables
-#if len(sys.argv) == 1:
-#    sys.argv.append("py2exe")
-
-# os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh
-#sys.path.append('./youtube_dl')
-
-options = {
+py2exe_options = {
     "bundle_files": 1,
     "compressed": 1,
     "optimize": 2,
@@ -33,33 +15,29 @@ options = {
     "dll_excludes": ['w9xpopen.exe']
 }
 
-console = [{
+py2exe_console = [{
     "script":"./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 
-init_file = open('./youtube_dl/__init__.py')
+execfile('youtube_dl/version.py')
 
-try:
-    #return the last tag name
-    version = subprocess.checkoutput(["git", "describe", "--abbrev=0", "--tags"])
-except:
-    version = ''
+setup(
+    name = 'youtube_dl',
+    version = __version__,
+    description = 'Small command-line program to download videos from YouTube.com and other video sites',
+    url = 'https://github.com/rg3/youtube-dl',
+    author = 'Ricardo Garcia',
+    maintainer = 'Philipp Hagemeister',
+    maintainer_email = 'phihag@phihag.de',
+    packages = ['youtube_dl'],
 
-setup(name='youtube-dl',
-      version=version,
-      long_description='Small command-line program to download videos from YouTube.com and other video sites',
-      url='https://github.com/rg3/youtube-dl',
-      packages=['youtube_dl'],
-      #test suite
-      test_suite='nose.collector',
-      test_requires=['nosetest'],
-      console=console,
-      options={"py2exe": options},
-      scripts=['bin/youtube-dl'],
-      zipfile=None,
-)
+    test_suite = 'nose.collector',
+    test_requires = ['nosetest'],
 
-#import shutil
-#shutil.rmtree("build")
+    console = py2exe_console,
+    options = { "py2exe": py2exe_options },
 
+    scripts = ['bin/youtube-dl'],
+    zipfile = None,
+)
diff --git a/youtube-dl b/youtube-dl
deleted file mode 100755
index fc3cc8ad8..000000000
--- a/youtube-dl
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import youtube_dl
-
-if __name__ == '__main__':
-    youtube_dl.main()
diff --git a/youtube-dl.bash-completion b/youtube-dl.bash-completion
deleted file mode 100644
index 3a2f62efb..000000000
--- a/youtube-dl.bash-completion
+++ /dev/null
@@ -1,14 +0,0 @@
-__youtube-dl()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    opts="--all-formats --audio-format --audio-quality --auto-number --batch-file --buffer-size --console-title --continue --cookies --dump-user-agent --extract-audio --format --get-description --get-filename --get-format --get-thumbnail --get-title --get-url --help --id --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 --no-resize-buffer --output --password --playlist-end --playlist-start --prefer-free-formats --quiet --rate-limit --reject-title --restrict-filenames --retries --simulate --skip-download --srt-lang --title --update --user-agent --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
diff --git a/youtube-dl.bash-completion.in b/youtube-dl.bash-completion.in
new file mode 100644
index 000000000..c5d0e3f78
--- /dev/null
+++ b/youtube-dl.bash-completion.in
@@ -0,0 +1,14 @@
+__youtube-dl()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    opts=""
+
+    if [[ ${cur} == * ]] ; then
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+}
+
+complete -F __youtube-dl youtube-dl
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 37d6f8cfd..3bb573c16 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -23,7 +23,6 @@ __authors__  = (
     )
 
 __license__ = 'Public Domain'
-__version__ = '2012.11.29'
 
 UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
 UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION'
@@ -41,6 +40,7 @@ import sys
 import warnings
 
 from .utils import *
+from .version import __version__
 from .FileDownloader import *
 from .InfoExtractors import *
 from .PostProcessor import *
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
new file mode 100644
index 000000000..f30283a62
--- /dev/null
+++ b/youtube_dl/version.py
@@ -0,0 +1,2 @@
+
+__version__ = '2012.11.29'
-- 
cgit v1.2.3


From 2f1765c4eaeeee58c1711aaf5757c1fb731c7f9b Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Thu, 29 Nov 2012 19:21:19 +0100
Subject: setup.py Python3 fix, PyPi classifiers

---
 setup.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 5dfbbc72d..ba051f7de 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import print_function
 from distutils.core import setup
 import pkg_resources
 import sys
@@ -5,7 +9,7 @@ import sys
 try:
     import py2exe
 except ImportError:
-    print >> sys.stderr, "Cannot import py2exe"
+    print("Cannot import py2exe", file=sys.stderr)
 
 py2exe_options = {
     "bundle_files": 1,
@@ -20,7 +24,7 @@ py2exe_console = [{
     "dest_base": "youtube-dl",
 }]
 
-execfile('youtube_dl/version.py')
+exec(compile(open('youtube_dl/version.py').read(), 'youtube_dl/version.py', 'exec'))
 
 setup(
     name = 'youtube_dl',
@@ -40,4 +44,15 @@ setup(
 
     scripts = ['bin/youtube-dl'],
     zipfile = None,
+
+    classifiers = [
+        "Topic :: Multimedia :: Video",
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "License :: Public Domain",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3"
+    ]
 )
-- 
cgit v1.2.3


From a5741a3f5e8f2f92951d3d32f0a1badb3028c32f Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Fri, 7 Dec 2012 11:39:08 +0100
Subject: pip installs fine!

---
 Makefile |  8 ++------
 setup.py | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 470717a92..e126a9fa1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
-# TODO: re-add youtube-dl.exe, and make sure it's 1. safe and 2. doesn't need sudo
 
 clean:
 	rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
@@ -30,9 +29,6 @@ youtube-dl: youtube_dl/*.py
 	rm youtube-dl.zip
 	chmod a+x youtube-dl
 
-youtube-dl.exe: youtube_dl/*.py
-	bash devscripts/wine-py2exe.sh build_exe.py
-
 README.md: youtube_dl/*.py
 	@options=$$(COLUMNS=80 python -m youtube_dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
 		header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \
@@ -46,10 +42,10 @@ README.md: youtube_dl/*.py
 		echo "$${footer}" >> README.md
 
 README.txt: README.md
-	pandoc -f markdown -t plain README.md -o README.txt
+	pandoc -s -f markdown -t plain README.md -o README.txt
 
 youtube-dl.1: README.md
-	pandoc -f markdown -t man README.md -o youtube-dl.1
+	pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
 youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
 	@options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
diff --git a/setup.py b/setup.py
index ba051f7de..45ccf432e 100644
--- a/setup.py
+++ b/setup.py
@@ -6,11 +6,6 @@ from distutils.core import setup
 import pkg_resources
 import sys
 
-try:
-    import py2exe
-except ImportError:
-    print("Cannot import py2exe", file=sys.stderr)
-
 py2exe_options = {
     "bundle_files": 1,
     "compressed": 1,
@@ -20,30 +15,46 @@ py2exe_options = {
 }
 
 py2exe_console = [{
-    "script":"./youtube_dl/__main__.py",
+    "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 
+try:
+    import py2exe
+    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
+    py2exe_params = {
+        'console': py2exe_console,
+        'options': { "py2exe": py2exe_options },
+        'zipfile': None
+    }
+except ImportError:
+    if 'py2exe' in sys.argv:
+        print("Cannot import py2exe", file=sys.stderr)
+        exit(1)
+    py2exe_params = {}
+
+# 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'))
 
 setup(
     name = 'youtube_dl',
     version = __version__,
-    description = 'Small command-line program to download videos from YouTube.com and other video sites',
+    description = 'YouTube video downloader',
+    long_description = 'Small command-line program to download videos from YouTube.com and other video sites.',
     url = 'https://github.com/rg3/youtube-dl',
     author = 'Ricardo Garcia',
     maintainer = 'Philipp Hagemeister',
     maintainer_email = 'phihag@phihag.de',
     packages = ['youtube_dl'],
 
-    test_suite = 'nose.collector',
-    test_requires = ['nosetest'],
-
-    console = py2exe_console,
-    options = { "py2exe": py2exe_options },
+    # Provokes warning on most systems (why?!)
+    #test_suite = 'nose.collector',
+    #test_requires = ['nosetest'],
 
     scripts = ['bin/youtube-dl'],
-    zipfile = None,
+    data_files = [('etc/bash_completion.d', ['youtube-dl.bash-completion']), # Installing system-wide would require sudo...
+                  ('share/doc/youtube_dl', ['README.txt']),
+                  ('share/man/man1/', ['youtube-dl.1']) ],
 
     classifiers = [
         "Topic :: Multimedia :: Video",
@@ -54,5 +65,7 @@ setup(
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3"
-    ]
+    ],
+
+    **py2exe_params
 )
-- 
cgit v1.2.3


From fec89790b19d804eecb7318e5da64dbb1445c7f0 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Fri, 7 Dec 2012 12:04:52 +0100
Subject: and now, also py2exe compiles fine :) (on Windows)

---
 setup.py               | 41 ++++++++++++++++++++++-------------------
 youtube_dl/__main__.py |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/setup.py b/setup.py
index 45ccf432e..6d019dcbb 100644
--- a/setup.py
+++ b/setup.py
@@ -6,6 +6,14 @@ from distutils.core import setup
 import pkg_resources
 import sys
 
+try:
+    import py2exe
+    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
+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,
@@ -13,25 +21,25 @@ py2exe_options = {
     "dist_dir": '.',
     "dll_excludes": ['w9xpopen.exe']
 }
-
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
+py2exe_params = {
+    'console': py2exe_console,
+    'options': { "py2exe": py2exe_options },
+    'zipfile': None
+}
 
-try:
-    import py2exe
-    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
-    py2exe_params = {
-        'console': py2exe_console,
-        'options': { "py2exe": py2exe_options },
-        'zipfile': None
+if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+    params = py2exe_params
+else:
+    params = {
+        'scripts': ['bin/youtube-dl'],
+        'data_files': [('etc/bash_completion.d', ['youtube-dl.bash-completion']), # Installing system-wide would require sudo...
+                       ('share/doc/youtube_dl', ['README.txt']),
+                       ('share/man/man1/', ['youtube-dl.1'])]
     }
-except ImportError:
-    if 'py2exe' in sys.argv:
-        print("Cannot import py2exe", file=sys.stderr)
-        exit(1)
-    py2exe_params = {}
 
 # 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'))
@@ -51,11 +59,6 @@ setup(
     #test_suite = 'nose.collector',
     #test_requires = ['nosetest'],
 
-    scripts = ['bin/youtube-dl'],
-    data_files = [('etc/bash_completion.d', ['youtube-dl.bash-completion']), # Installing system-wide would require sudo...
-                  ('share/doc/youtube_dl', ['README.txt']),
-                  ('share/man/man1/', ['youtube-dl.1']) ],
-
     classifiers = [
         "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
@@ -67,5 +70,5 @@ setup(
         "Programming Language :: Python :: 3.3"
     ],
 
-    **py2exe_params
+    **params
 )
diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index 0910e9d15..7f8410f2a 100755
--- a/youtube_dl/__main__.py
+++ b/youtube_dl/__main__.py
@@ -6,7 +6,7 @@
 
 import sys
 
-if __package__ is None:
+if __package__ is None and not hasattr(sys, "frozen"):
     import os.path
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-- 
cgit v1.2.3


From 4bb028f48ecfcde1f4d2feafbc71fc8e346a7b99 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Fri, 7 Dec 2012 14:45:16 +0100
Subject: devscripts/make_readme.py in place of all that sedding, that has
 porting problems

---
 Makefile                  | 13 ++-----------
 devscripts/make_readme.py | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 devscripts/make_readme.py

diff --git a/Makefile b/Makefile
index e126a9fa1..dbb315dc7 100644
--- a/Makefile
+++ b/Makefile
@@ -30,19 +30,10 @@ youtube-dl: youtube_dl/*.py
 	chmod a+x youtube-dl
 
 README.md: youtube_dl/*.py
-	@options=$$(COLUMNS=80 python -m 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,/.*# CONFIGURATION/ d' README.md) && \
-		echo "$${header}" > README.md && \
-		echo >> README.md && \
-		echo '# OPTIONS' >> README.md && \
-		echo "$${options}" >> README.md&& \
-		echo >> README.md && \
-		echo '# CONFIGURATION' >> README.md && \
-		echo "$${footer}" >> README.md
+	COLUMNS=80 python -m youtube_dl --help | python devscripts/make_readme.py
 
 README.txt: README.md
-	pandoc -s -f markdown -t plain README.md -o README.txt
+	pandoc -f markdown -t plain README.md -o README.txt
 
 youtube-dl.1: README.md
 	pandoc -s -f markdown -t man README.md -o youtube-dl.1
diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py
new file mode 100644
index 000000000..57ff0456e
--- /dev/null
+++ b/devscripts/make_readme.py
@@ -0,0 +1,21 @@
+import sys
+import re
+
+helptext = sys.stdin.read()
+
+f = open('README.md')
+oldreadme = f.read()
+f.close()
+
+header = oldreadme[:oldreadme.index('# OPTIONS')]
+footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
+
+options = helptext[helptext.index('  General Options:')+19:]
+options = re.sub(r'^  (\w.+)$', r'## \1', options, flags=re.M)
+options = '# OPTIONS\n' + options + '\n'
+
+f = open('README.md', 'w')
+f.write(header)
+f.write(options)
+f.write(footer)
+f.close()
\ No newline at end of file
-- 
cgit v1.2.3


From 23109d6a9c7d8f2569a9adba517e90767e201bf4 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Fri, 7 Dec 2012 14:46:14 +0100
Subject: youtube-dl.tar.gz make target

---
 .gitignore | 1 +
 Makefile   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9619a7dfd..996489d8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ youtube-dl.1
 youtube-dl.bash-completion
 youtube-dl
 youtube-dl.exe
+youtube-dl.tar.gz
diff --git a/Makefile b/Makefile
index dbb315dc7..e152b00ac 100644
--- a/Makefile
+++ b/Makefile
@@ -42,3 +42,9 @@ youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
 	@options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
 		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion.in` && \
 		echo "$${content}" > youtube-dl.bash-completion
+
+youtube-dl.tar.gz: all
+	tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
+		--exclude="*.pyc" --exclude="*.pyo" --exclude="*~" --exclude="youtube-dl.exe" \
+		--exclude="wine-py2exe/" --exclude="py2exe.log" --exclude="*.kate-swp" \
+		--exclude="build/" --exclude="dist/" --exclude="MANIFEST" --exclude=".git/" .
-- 
cgit v1.2.3


From bdff345529dee85e2c2bc9f142b1df17e4ee266b Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Fri, 7 Dec 2012 21:38:45 +0100
Subject: adding a proper bash-completion generation

---
 devscripts/bash_completion.py       | 22 ++++++++++++++++++++++
 devscripts/bash_completion.template | 14 ++++++++++++++
 youtube-dl.bash-completion.in       | 14 --------------
 3 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 devscripts/bash_completion.py
 create mode 100644 devscripts/bash_completion.template
 delete mode 100644 youtube-dl.bash-completion.in

diff --git a/devscripts/bash_completion.py b/devscripts/bash_completion.py
new file mode 100644
index 000000000..1cbfa8bec
--- /dev/null
+++ b/devscripts/bash_completion.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python2
+import youtube_dl
+
+BASH_COMPLETION_FILE = "youtube-dl.bash_completion"
+BASH_COMPLETION_TEMPLATE = "devscripts/bash_completion.template"
+
+def build_completion(opt_parser):
+    opts_flag = []
+    for group in opt_parser.option_groups:
+        for option in group.option_list:
+            #for every long flag
+            opts_flag.append(option.get_opt_string())
+    with open(BASH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
+    with open(BASH_COMPLETION_FILE, "w") as f:
+        #just using the special char
+        print opts_flag
+        filled_template = template.replace("{{flags}}", " ".join(opts_flag))
+        f.write(filled_template)
+
+parser = youtube_dl.parseOpts()[0]
+build_completion(parser)
diff --git a/devscripts/bash_completion.template b/devscripts/bash_completion.template
new file mode 100644
index 000000000..3b99a9614
--- /dev/null
+++ b/devscripts/bash_completion.template
@@ -0,0 +1,14 @@
+__youtube-dl()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    opts="{{flags}}"
+
+    if [[ ${cur} == * ]] ; then
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+}
+
+complete -F __youtube-dl youtube-dl
diff --git a/youtube-dl.bash-completion.in b/youtube-dl.bash-completion.in
deleted file mode 100644
index c5d0e3f78..000000000
--- a/youtube-dl.bash-completion.in
+++ /dev/null
@@ -1,14 +0,0 @@
-__youtube-dl()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    opts=""
-
-    if [[ ${cur} == * ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-}
-
-complete -F __youtube-dl youtube-dl
-- 
cgit v1.2.3


From 682407f2d5048cf034faf75b3e3611db31850f91 Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Fri, 7 Dec 2012 21:40:06 +0100
Subject: little correction on the readme

---
 devscripts/make_readme.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py
index 57ff0456e..7f2ea319c 100644
--- a/devscripts/make_readme.py
+++ b/devscripts/make_readme.py
@@ -1,11 +1,11 @@
 import sys
 import re
 
+README_FILE = 'README.md'
 helptext = sys.stdin.read()
 
-f = open('README.md')
-oldreadme = f.read()
-f.close()
+with open(README_FILE) as f:
+    oldreadme = f.read()
 
 header = oldreadme[:oldreadme.index('# OPTIONS')]
 footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
@@ -14,8 +14,7 @@ options = helptext[helptext.index('  General Options:')+19:]
 options = re.sub(r'^  (\w.+)$', r'## \1', options, flags=re.M)
 options = '# OPTIONS\n' + options + '\n'
 
-f = open('README.md', 'w')
-f.write(header)
-f.write(options)
-f.write(footer)
-f.close()
\ No newline at end of file
+with open(README_FILE, 'w') as f:
+    f.write(header)
+    f.write(options)
+    f.write(footer)
-- 
cgit v1.2.3


From a9d2f7e8945abfb792b76ba551f568d3580c30a6 Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Fri, 7 Dec 2012 21:59:59 +0100
Subject: making the script compatible with python3

---
 Makefile                      | 8 +++-----
 devscripts/bash_completion.py | 8 ++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e152b00ac..119c1eeaa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
+all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion
 
 clean:
 	rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
@@ -38,10 +38,8 @@ README.txt: README.md
 youtube-dl.1: README.md
 	pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
-	@options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
-		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion.in` && \
-		echo "$${content}" > youtube-dl.bash-completion
+youtube-dl.bash-completion: README.md devscripts/bash_completion.template
+	python devscripts/bash_completion.py
 
 youtube-dl.tar.gz: all
 	tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
diff --git a/devscripts/bash_completion.py b/devscripts/bash_completion.py
index 1cbfa8bec..704034f22 100644
--- a/devscripts/bash_completion.py
+++ b/devscripts/bash_completion.py
@@ -1,4 +1,9 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
+import os
+from os.path import dirname as dirn
+import sys
+
+sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
 
 BASH_COMPLETION_FILE = "youtube-dl.bash_completion"
@@ -14,7 +19,6 @@ def build_completion(opt_parser):
         template = f.read()
     with open(BASH_COMPLETION_FILE, "w") as f:
         #just using the special char
-        print opts_flag
         filled_template = template.replace("{{flags}}", " ".join(opts_flag))
         f.write(filled_template)
 
-- 
cgit v1.2.3


From 4c1d273e88a88f7a7b9e09bb2bbadb161d25b615 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sat, 8 Dec 2012 00:37:26 +0100
Subject: it's curious but bash-completion is with - and not _

---
 Makefile                            |  4 ++--
 devscripts/bash-completion.py       | 26 ++++++++++++++++++++++++++
 devscripts/bash-completion.template | 14 ++++++++++++++
 devscripts/bash_completion.py       | 26 --------------------------
 devscripts/bash_completion.template | 14 --------------
 5 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 devscripts/bash-completion.py
 create mode 100644 devscripts/bash-completion.template
 delete mode 100644 devscripts/bash_completion.py
 delete mode 100644 devscripts/bash_completion.template

diff --git a/Makefile b/Makefile
index 119c1eeaa..c97d6ffb0 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,8 @@ README.txt: README.md
 youtube-dl.1: README.md
 	pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md devscripts/bash_completion.template
-	python devscripts/bash_completion.py
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.template
+	python devscripts/bash-completion.py
 
 youtube-dl.tar.gz: all
 	tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py
new file mode 100644
index 000000000..880db7886
--- /dev/null
+++ b/devscripts/bash-completion.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+import os
+from os.path import dirname as dirn
+import sys
+
+sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
+import youtube_dl
+
+BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
+BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.template"
+
+def build_completion(opt_parser):
+    opts_flag = []
+    for group in opt_parser.option_groups:
+        for option in group.option_list:
+            #for every long flag
+            opts_flag.append(option.get_opt_string())
+    with open(BASH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
+    with open(BASH_COMPLETION_FILE, "w") as f:
+        #just using the special char
+        filled_template = template.replace("{{flags}}", " ".join(opts_flag))
+        f.write(filled_template)
+
+parser = youtube_dl.parseOpts()[0]
+build_completion(parser)
diff --git a/devscripts/bash-completion.template b/devscripts/bash-completion.template
new file mode 100644
index 000000000..3b99a9614
--- /dev/null
+++ b/devscripts/bash-completion.template
@@ -0,0 +1,14 @@
+__youtube-dl()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    opts="{{flags}}"
+
+    if [[ ${cur} == * ]] ; then
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+}
+
+complete -F __youtube-dl youtube-dl
diff --git a/devscripts/bash_completion.py b/devscripts/bash_completion.py
deleted file mode 100644
index 704034f22..000000000
--- a/devscripts/bash_completion.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-import os
-from os.path import dirname as dirn
-import sys
-
-sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dl
-
-BASH_COMPLETION_FILE = "youtube-dl.bash_completion"
-BASH_COMPLETION_TEMPLATE = "devscripts/bash_completion.template"
-
-def build_completion(opt_parser):
-    opts_flag = []
-    for group in opt_parser.option_groups:
-        for option in group.option_list:
-            #for every long flag
-            opts_flag.append(option.get_opt_string())
-    with open(BASH_COMPLETION_TEMPLATE) as f:
-        template = f.read()
-    with open(BASH_COMPLETION_FILE, "w") as f:
-        #just using the special char
-        filled_template = template.replace("{{flags}}", " ".join(opts_flag))
-        f.write(filled_template)
-
-parser = youtube_dl.parseOpts()[0]
-build_completion(parser)
diff --git a/devscripts/bash_completion.template b/devscripts/bash_completion.template
deleted file mode 100644
index 3b99a9614..000000000
--- a/devscripts/bash_completion.template
+++ /dev/null
@@ -1,14 +0,0 @@
-__youtube-dl()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    opts="{{flags}}"
-
-    if [[ ${cur} == * ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-}
-
-complete -F __youtube-dl youtube-dl
-- 
cgit v1.2.3


From 5a304a7637c033dea00ff46d6980075b63d17f24 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sat, 8 Dec 2012 00:48:07 +0100
Subject: new updating scheme, based on GH downloads; also, check if not
 updateable (pip installed)

---
 youtube_dl/__init__.py | 66 +++++++++++++++++++++++++++++++++++---------------
 youtube_dl/__main__.py |  1 +
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 3bb573c16..f953f1fb9 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -24,11 +24,6 @@ __authors__  = (
 
 __license__ = 'Public Domain'
 
-UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
-UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION'
-UPDATE_URL_EXE = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl.exe'
-
-
 import getpass
 import optparse
 import os
@@ -46,29 +41,40 @@ from .InfoExtractors import *
 from .PostProcessor import *
 
 def updateSelf(downloader, filename):
-    ''' Update the program file with the latest version from the repository '''
-    # Note: downloader only used for options
+    """Update the program file with the latest version from the repository"""
 
-    if not os.access(filename, os.W_OK):
-        sys.exit('ERROR: no write permissions on %s' % filename)
+    # TODO: at least, check https certificates
 
-    downloader.to_screen(u'Updating to latest version...')
+    from zipimport import zipimporter
 
-    urlv = compat_urllib_request.urlopen(UPDATE_URL_VERSION)
-    newversion = urlv.read().strip()
-    if newversion == __version__:
-        downloader.to_screen(u'youtube-dl is up-to-date (' + __version__ + ')')
-        return
-    urlv.close()
+    API_URL = "https://api.github.com/repos/rg3/youtube-dl/downloads"
+    BIN_URL = "https://github.com/downloads/rg3/youtube-dl/youtube-dl"
+    EXE_URL = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.exe"
+
+    if hasattr(sys, "frozen"): # PY2EXE
+        if not os.access(filename, os.W_OK):
+            sys.exit('ERROR: no write permissions on %s' % filename)
+
+        downloader.to_screen(u'Updating to latest version...')
+
+        urla = compat_urllib_request.urlopen(API_URL)
+        download = filter(lambda x: x["name"] == "youtube-dl.exe", json.loads(urla.read()))
+        if not download:
+            downloader.to_screen(u'ERROR: can\'t find the current version. Please try again later.')
+            return
+        newversion = download[0]["description"].strip()
+        if newversion == __version__:
+            downloader.to_screen(u'youtube-dl is up-to-date (' + __version__ + ')')
+            return
+        urla.close()
 
-    if hasattr(sys, "frozen"): #py2exe
         exe = os.path.abspath(filename)
         directory = os.path.dirname(exe)
         if not os.access(directory, os.W_OK):
             sys.exit('ERROR: no write permissions on %s' % directory)
 
         try:
-            urlh = compat_urllib_request.urlopen(UPDATE_URL_EXE)
+            urlh = compat_urllib_request.urlopen(EXE_URL)
             newcontent = urlh.read()
             urlh.close()
             with open(exe + '.new', 'wb') as outf:
@@ -91,9 +97,25 @@ del "%s"
         except (IOError, OSError) as err:
             sys.exit('ERROR: unable to overwrite current version')
 
-    else:
+    elif isinstance(globals().get('__loader__'), zipimporter): # UNIX ZIP
+        if not os.access(filename, os.W_OK):
+            sys.exit('ERROR: no write permissions on %s' % filename)
+
+        downloader.to_screen(u'Updating to latest version...')
+
+        urla = compat_urllib_request.urlopen(API_URL)
+        download = [x for x in json.loads(urla.read().decode('utf8')) if x["name"] == "youtube-dl"]
+        if not download:
+            downloader.to_screen(u'ERROR: can\'t find the current version. Please try again later.')
+            return
+        newversion = download[0]["description"].strip()
+        if newversion == __version__:
+            downloader.to_screen(u'youtube-dl is up-to-date (' + __version__ + ')')
+            return
+        urla.close()
+
         try:
-            urlh = compat_urllib_request.urlopen(UPDATE_URL)
+            urlh = compat_urllib_request.urlopen(BIN_URL)
             newcontent = urlh.read()
             urlh.close()
         except (IOError, OSError) as err:
@@ -105,6 +127,10 @@ del "%s"
         except (IOError, OSError) as err:
             sys.exit('ERROR: unable to overwrite current version')
 
+    else:
+        downloader.to_screen(u'It looks like you installed youtube-dl with pip or setup.py. Please use that to update.')
+        return
+
     downloader.to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.')
 
 def parseOpts():
diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index 7f8410f2a..7022ea4be 100755
--- a/youtube_dl/__main__.py
+++ b/youtube_dl/__main__.py
@@ -7,6 +7,7 @@
 import sys
 
 if __package__ is None and not hasattr(sys, "frozen"):
+    # direct call of __main__.py
     import os.path
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-- 
cgit v1.2.3


From c7287a3cafba65b700b64633d76aa016f5cbc95d Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sat, 8 Dec 2012 01:28:44 +0100
Subject: ATTENTION DO NOT USE THESE: new binaries in the Downloads section
 placed fake binaries that update themselves where old versions updating will
 search for the new version

---
 LATEST_VERSION                                 |   1 +
 devscripts/transition_helper.py                |  40 ++++++++++++++++++++
 devscripts/transition_helper_exe/setup.py      |  12 ++++++
 devscripts/transition_helper_exe/youtube-dl.py |  49 +++++++++++++++++++++++++
 youtube-dl                                     |  40 ++++++++++++++++++++
 youtube-dl.exe                                 | Bin 0 -> 3790446 bytes
 6 files changed, 142 insertions(+)
 create mode 100644 LATEST_VERSION
 create mode 100644 devscripts/transition_helper.py
 create mode 100644 devscripts/transition_helper_exe/setup.py
 create mode 100644 devscripts/transition_helper_exe/youtube-dl.py
 create mode 100755 youtube-dl
 create mode 100644 youtube-dl.exe

diff --git a/LATEST_VERSION b/LATEST_VERSION
new file mode 100644
index 000000000..275de03d9
--- /dev/null
+++ b/LATEST_VERSION
@@ -0,0 +1 @@
+9999.99.99
\ No newline at end of file
diff --git a/devscripts/transition_helper.py b/devscripts/transition_helper.py
new file mode 100644
index 000000000..d5ca2d4ba
--- /dev/null
+++ b/devscripts/transition_helper.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+
+import sys, os
+
+try:
+    import urllib.request as compat_urllib_request
+except ImportError: # Python 2
+    import urllib2 as compat_urllib_request
+
+sys.stderr.write(u'Hi! We changed distribution method and now youtube-dl needs to update itself one more time.\n')
+sys.stderr.write(u'This will only happen once. Simply press enter to go on. Sorry for the trouble!\n')
+sys.stderr.write(u'The new location of the binaries is https://github.com/rg3/youtube-dl/downloads, not the git repository.\n\n')
+
+try:
+	raw_input()
+except NameError: # Python 3
+	input()
+
+filename = sys.argv[0]
+
+API_URL = "https://api.github.com/repos/rg3/youtube-dl/downloads"
+BIN_URL = "https://github.com/downloads/rg3/youtube-dl/youtube-dl"
+
+if not os.access(filename, os.W_OK):
+    sys.exit('ERROR: no write permissions on %s' % filename)
+
+try:
+    urlh = compat_urllib_request.urlopen(BIN_URL)
+    newcontent = urlh.read()
+    urlh.close()
+except (IOError, OSError) as err:
+    sys.exit('ERROR: unable to download latest version')
+
+try:
+    with open(filename, 'wb') as outf:
+        outf.write(newcontent)
+except (IOError, OSError) as err:
+    sys.exit('ERROR: unable to overwrite current version')
+
+sys.stderr.write(u'Done! Now you can run youtube-dl.\n')
diff --git a/devscripts/transition_helper_exe/setup.py b/devscripts/transition_helper_exe/setup.py
new file mode 100644
index 000000000..aaf5c2983
--- /dev/null
+++ b/devscripts/transition_helper_exe/setup.py
@@ -0,0 +1,12 @@
+from distutils.core import setup
+import py2exe
+
+py2exe_options = {
+    "bundle_files": 1,
+    "compressed": 1,
+    "optimize": 2,
+    "dist_dir": '.',
+    "dll_excludes": ['w9xpopen.exe']
+}
+
+setup(console=['youtube-dl.py'], options={ "py2exe": py2exe_options }, zipfile=None)
\ No newline at end of file
diff --git a/devscripts/transition_helper_exe/youtube-dl.py b/devscripts/transition_helper_exe/youtube-dl.py
new file mode 100644
index 000000000..409f980bc
--- /dev/null
+++ b/devscripts/transition_helper_exe/youtube-dl.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+import sys, os
+import urllib2
+
+sys.stderr.write(u'Hi! We changed distribution method and now youtube-dl needs to update itself one more time.\n')
+sys.stderr.write(u'This will only happen once. Simply press enter to go on. Sorry for the trouble!\n')
+sys.stderr.write(u'The new location of the binaries is https://github.com/rg3/youtube-dl/downloads, not the git repository.\n\n')
+
+raw_input()
+
+filename = sys.argv[0]
+
+API_URL = "https://api.github.com/repos/rg3/youtube-dl/downloads"
+EXE_URL = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.exe"
+
+if not os.access(filename, os.W_OK):
+    sys.exit('ERROR: no write permissions on %s' % filename)
+
+exe = os.path.abspath(filename)
+directory = os.path.dirname(exe)
+if not os.access(directory, os.W_OK):
+    sys.exit('ERROR: no write permissions on %s' % directory)
+
+try:
+    urlh = urllib2.urlopen(EXE_URL)
+    newcontent = urlh.read()
+    urlh.close()
+    with open(exe + '.new', 'wb') as outf:
+        outf.write(newcontent)
+except (IOError, OSError) as err:
+    sys.exit('ERROR: unable to download latest version')
+
+try:
+    bat = os.path.join(directory, 'youtube-dl-updater.bat')
+    b = open(bat, 'w')
+    b.write("""
+echo Updating youtube-dl...
+ping 127.0.0.1 -n 5 -w 1000 > NUL
+move /Y "%s.new" "%s"
+del "%s"
+    \n""" %(exe, exe, bat))
+    b.close()
+
+    os.startfile(bat)
+except (IOError, OSError) as err:
+    sys.exit('ERROR: unable to overwrite current version')
+
+sys.stderr.write(u'Done! Now you can run youtube-dl.\n')
diff --git a/youtube-dl b/youtube-dl
new file mode 100755
index 000000000..d5ca2d4ba
--- /dev/null
+++ b/youtube-dl
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+
+import sys, os
+
+try:
+    import urllib.request as compat_urllib_request
+except ImportError: # Python 2
+    import urllib2 as compat_urllib_request
+
+sys.stderr.write(u'Hi! We changed distribution method and now youtube-dl needs to update itself one more time.\n')
+sys.stderr.write(u'This will only happen once. Simply press enter to go on. Sorry for the trouble!\n')
+sys.stderr.write(u'The new location of the binaries is https://github.com/rg3/youtube-dl/downloads, not the git repository.\n\n')
+
+try:
+	raw_input()
+except NameError: # Python 3
+	input()
+
+filename = sys.argv[0]
+
+API_URL = "https://api.github.com/repos/rg3/youtube-dl/downloads"
+BIN_URL = "https://github.com/downloads/rg3/youtube-dl/youtube-dl"
+
+if not os.access(filename, os.W_OK):
+    sys.exit('ERROR: no write permissions on %s' % filename)
+
+try:
+    urlh = compat_urllib_request.urlopen(BIN_URL)
+    newcontent = urlh.read()
+    urlh.close()
+except (IOError, OSError) as err:
+    sys.exit('ERROR: unable to download latest version')
+
+try:
+    with open(filename, 'wb') as outf:
+        outf.write(newcontent)
+except (IOError, OSError) as err:
+    sys.exit('ERROR: unable to overwrite current version')
+
+sys.stderr.write(u'Done! Now you can run youtube-dl.\n')
diff --git a/youtube-dl.exe b/youtube-dl.exe
new file mode 100644
index 000000000..a11878986
Binary files /dev/null and b/youtube-dl.exe differ
-- 
cgit v1.2.3