Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a couple of Windows exe update bugs

Browse Source
This commit is contained in:
Filippo Valsorda 2012-05-27 23:03:45 +02:00
parent 668d975039
commit f36cd07685
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
youtube-dl
View File

Binary file not shown.

BIN
youtube-dl.exe
View File

Binary file not shown.

14
youtube_dl/__init__.py
View File

@ -60,13 +60,17 @@ def updateSelf(downloader, filename):
urlv.close() urlv.close()
if hasattr(sys, "frozen"): #py2exe if hasattr(sys, "frozen"): #py2exe
directory = os.path.dirname(filename)
exe = os.path.abspath(filename) exe = os.path.abspath(filename)
directory = os.path.dirname(exe)
if not os.access(directory, os.W_OK): if not os.access(directory, os.W_OK):
sys.exit('ERROR: no write permissions on %s' % directory) sys.exit('ERROR: no write permissions on %s' % directory)
try: try:
urllib.urlretrieve(UPDATE_URL_EXE, exe + '.new') urlh = urllib2.urlopen(UPDATE_URL_EXE)
newcontent = urlh.read()
urlh.close()
with open(exe + '.new', 'wb') as outf:
outf.write(newcontent)
except (IOError, OSError), err: except (IOError, OSError), err:
sys.exit('ERROR: unable to download latest version') sys.exit('ERROR: unable to download latest version')
@ -75,6 +79,7 @@ def updateSelf(downloader, filename):
b = open(bat, 'w') b = open(bat, 'w')
print >> b, """ print >> b, """
echo Updating youtube-dl...
ping 127.0.0.1 -n 5 -w 1000 > NUL ping 127.0.0.1 -n 5 -w 1000 > NUL
move /Y "%s.new" "%s" move /Y "%s.new" "%s"
del "%s" del "%s"
@ -95,11 +100,8 @@ del "%s"
sys.exit('ERROR: unable to download latest version') sys.exit('ERROR: unable to download latest version')
try: try:
outf = open(filename, 'wb') with open(filename, 'wb') as outf:
try:
outf.write(newcontent) outf.write(newcontent)
finally:
outf.close()
except (IOError, OSError), err: except (IOError, OSError), err:
sys.exit('ERROR: unable to overwrite current version') sys.exit('ERROR: unable to overwrite current version')