Remove stable from help wording (There will be only one main branch for now)

[youtube-dl.git] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 218782e..c919c40 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -9,10 +9,14 @@ __author__  = (
        'Witold Baryluk',
        'Paweł Paprota',
        'Gergely Imreh',
+       'Rogério Brito',
+       'Philipp Hagemeister',
        )
 
 __license__ = 'Public Domain'
-__version__ = '2011.08.24-phihag'
+__version__ = '2011.08.28-phihag'
+
+UPDATE_URL = 'https://raw.github.com/phihag/youtube-dl/master/youtube-dl'
 
 import cookielib
 import datetime
@@ -1039,7 +1043,7 @@ class YoutubeIE(InfoExtractor):
        _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
        _NETRC_MACHINE = 'youtube'
        # Listed in order of quality
-       _available_formats = ['38', '37', '22', '45', '35', '34', '43', '18', '6', '5', '17', '13']
+       _available_formats = ['38', '37', '45', '22', '43', '35', '34', '18', '6', '5', '17', '13']
        _video_extensions = {
                '13': '3gp',
                '17': 'mp4',
@@ -3070,24 +3074,27 @@ def updateSelf(downloader, filename):
        if not os.access(filename, os.W_OK):
                sys.exit('ERROR: no write permissions on %s' % filename)
 
-       downloader.to_screen('Updating to latest stable version...')
+       downloader.to_screen('Updating to latest version...')
 
        try:
-               latest_url = 'http://github.com/rg3/youtube-dl/raw/master/LATEST_VERSION'
-               latest_version = urllib.urlopen(latest_url).read().strip()
-               prog_url = 'http://github.com/rg3/youtube-dl/raw/%s/youtube-dl' % latest_version
-               newcontent = urllib.urlopen(prog_url).read()
+               try:
+                       urlh = urllib.urlopen(UPDATE_URL)
+                       newcontent = urlh.read()
+               finally:
+                       urlh.close()
        except (IOError, OSError), err:
                sys.exit('ERROR: unable to download latest version')
 
        try:
-               stream = open(filename, 'wb')
-               stream.write(newcontent)
-               stream.close()
+               outf = open(filename, 'wb')
+               try:
+                       outf.write(newcontent)
+               finally:
+                       outf.close()
        except (IOError, OSError), err:
                sys.exit('ERROR: unable to overwrite current version')
 
-       downloader.to_screen('Updated to version %s' % latest_version)
+       downloader.to_screen('Updated youtube-dl. Restart to use the new version.')
 
 def parseOpts():
        # Deferred imports
@@ -3152,7 +3159,7 @@ def parseOpts():
        general.add_option('-v', '--version',
                        action='version', help='print program version and exit')
        general.add_option('-U', '--update',
-                       action='store_true', dest='update_self', help='update this program to latest stable version')
+                       action='store_true', dest='update_self', help='update this program to latest version')
        general.add_option('-i', '--ignore-errors',
                        action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
        general.add_option('-r', '--rate-limit',