Browse Source

[update] Look for .exe extension on Windows (Fixes #745)

Philipp Hagemeister 12 years ago
parent
commit
46353f6783
2 changed files with 9 additions and 3 deletions
  1. 1 1
      youtube_dl/__init__.py
  2. 8 2
      youtube_dl/update.py

+ 1 - 1
youtube_dl/__init__.py

@@ -658,7 +658,7 @@ def _real_main(argv=None):
 
 
     # Update version
     # Update version
     if opts.update_self:
     if opts.update_self:
-        update_self(ydl.to_screen, opts.verbose, sys.argv[0])
+        update_self(ydl.to_screen, opts.verbose)
 
 
     # Maybe do nothing
     # Maybe do nothing
     if len(all_urls) < 1:
     if len(all_urls) < 1:

+ 8 - 2
youtube_dl/update.py

@@ -1,6 +1,7 @@
 import json
 import json
 import traceback
 import traceback
 import hashlib
 import hashlib
+import sys
 from zipimport import zipimporter
 from zipimport import zipimporter
 
 
 from .utils import *
 from .utils import *
@@ -34,7 +35,7 @@ def rsa_verify(message, signature, key):
     if signature != sha256(message).digest(): return False
     if signature != sha256(message).digest(): return False
     return True
     return True
 
 
-def update_self(to_screen, verbose, filename):
+def update_self(to_screen, verbose):
     """Update the program file with the latest version from the repository"""
     """Update the program file with the latest version from the repository"""
 
 
     UPDATE_URL = "http://rg3.github.io/youtube-dl/update/"
     UPDATE_URL = "http://rg3.github.io/youtube-dl/update/"
@@ -42,7 +43,6 @@ def update_self(to_screen, verbose, filename):
     JSON_URL = UPDATE_URL + 'versions.json'
     JSON_URL = UPDATE_URL + 'versions.json'
     UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
     UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
 
 
-
     if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, "frozen"):
     if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, "frozen"):
         to_screen(u'It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
         to_screen(u'It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
         return
         return
@@ -80,6 +80,12 @@ def update_self(to_screen, verbose, filename):
 
 
     print_notes(to_screen, versions_info['versions'])
     print_notes(to_screen, versions_info['versions'])
 
 
+    filename = sys.argv[0]
+    # Py2EXE: Filename could be different
+    if hasattr(sys, "frozen") and not os.path.isfile(filename):
+        if os.path.isfile(filename + u'.exe'):
+            filename += u'.exe'
+
     if not os.access(filename, os.W_OK):
     if not os.access(filename, os.W_OK):
         to_screen(u'ERROR: no write permissions on %s' % filename)
         to_screen(u'ERROR: no write permissions on %s' % filename)
         return
         return