X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fupdate.py;h=448ad229c055f7f635a65f4e0d6cfe76b5da43ec;hb=2514d2635e0c8ff0fb72d00a093a849001df2bdd;hp=0689a4891200bf2a03024b96ec2ecda5d857efb1;hpb=c0de39e6d42d8de6a77768b2a96570fd8df8ad36;p=youtube-dl diff --git a/youtube_dl/update.py b/youtube_dl/update.py index 0689a4891..448ad229c 100644 --- a/youtube_dl/update.py +++ b/youtube_dl/update.py @@ -2,20 +2,28 @@ import io import json import traceback import hashlib +import os import subprocess import sys from zipimport import zipimporter -from .utils import * +from .utils import ( + compat_str, + compat_urllib_request, +) from .version import __version__ + def rsa_verify(message, signature, key): from struct import pack from hashlib import sha256 from sys import version_info + def b(x): - if version_info[0] == 2: return x - else: return x.encode('latin1') + if version_info[0] == 2: + return x + else: + return x.encode('latin1') assert(type(message) == type(b(''))) block_size = 0 n = key[0] @@ -28,15 +36,20 @@ def rsa_verify(message, signature, key): raw_bytes.insert(0, pack("B", signature & 0xFF)) signature >>= 8 signature = (block_size - len(raw_bytes)) * b('\x00') + b('').join(raw_bytes) - if signature[0:2] != b('\x00\x01'): return False + if signature[0:2] != b('\x00\x01'): + return False signature = signature[2:] - if not b('\x00') in signature: return False - signature = signature[signature.index(b('\x00'))+1:] - if not signature.startswith(b('\x30\x31\x30\x0D\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20')): return False + if not b('\x00') in signature: + return False + signature = signature[signature.index(b('\x00')) + 1:] + if not signature.startswith(b('\x30\x31\x30\x0D\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20')): + return False signature = signature[19:] - if signature != sha256(message).digest(): return False + if signature != sha256(message).digest(): + return False return True + def update_self(to_screen, verbose): """Update the program file with the latest version from the repository""" @@ -53,7 +66,8 @@ def update_self(to_screen, verbose): try: newversion = compat_urllib_request.urlopen(VERSION_URL).read().decode('utf-8').strip() except: - if verbose: to_screen(compat_str(traceback.format_exc())) + if verbose: + to_screen(compat_str(traceback.format_exc())) to_screen(u'ERROR: can\'t find the current version. Please try again later.') return if newversion == __version__: @@ -65,7 +79,8 @@ def update_self(to_screen, verbose): versions_info = compat_urllib_request.urlopen(JSON_URL).read().decode('utf-8') versions_info = json.loads(versions_info) except: - if verbose: to_screen(compat_str(traceback.format_exc())) + if verbose: + to_screen(compat_str(traceback.format_exc())) to_screen(u'ERROR: can\'t obtain versions info. Please try again later.') return if not 'signature' in versions_info: @@ -78,7 +93,14 @@ def update_self(to_screen, verbose): return version_id = versions_info['latest'] - to_screen(u'Updating to version ' + version_id + '...') + + def version_tuple(version_str): + return tuple(map(int, version_str.split('.'))) + if version_tuple(__version__) >= version_tuple(version_id): + to_screen(u'youtube-dl is up to date (%s)' % __version__) + return + + to_screen(u'Updating to version ' + version_id + ' ...') version = versions_info['versions'][version_id] print_notes(to_screen, versions_info['versions']) @@ -105,8 +127,9 @@ def update_self(to_screen, verbose): urlh = compat_urllib_request.urlopen(version['exe'][0]) newcontent = urlh.read() urlh.close() - except (IOError, OSError) as err: - if verbose: to_screen(compat_str(traceback.format_exc())) + except (IOError, OSError): + if verbose: + to_screen(compat_str(traceback.format_exc())) to_screen(u'ERROR: unable to download latest version') return @@ -118,8 +141,9 @@ def update_self(to_screen, verbose): try: with open(exe + '.new', 'wb') as outf: outf.write(newcontent) - except (IOError, OSError) as err: - if verbose: to_screen(compat_str(traceback.format_exc())) + except (IOError, OSError): + if verbose: + to_screen(compat_str(traceback.format_exc())) to_screen(u'ERROR: unable to write the new version') return @@ -137,8 +161,9 @@ start /b "" cmd /c del "%%~f0"&exit /b" subprocess.Popen([bat]) # Continues to run in the background return # Do not show premature success messages - except (IOError, OSError) as err: - if verbose: to_screen(compat_str(traceback.format_exc())) + except (IOError, OSError): + if verbose: + to_screen(compat_str(traceback.format_exc())) to_screen(u'ERROR: unable to overwrite current version') return @@ -148,8 +173,9 @@ start /b "" cmd /c del "%%~f0"&exit /b" urlh = compat_urllib_request.urlopen(version['bin'][0]) newcontent = urlh.read() urlh.close() - except (IOError, OSError) as err: - if verbose: to_screen(compat_str(traceback.format_exc())) + except (IOError, OSError): + if verbose: + to_screen(compat_str(traceback.format_exc())) to_screen(u'ERROR: unable to download latest version') return @@ -161,20 +187,23 @@ start /b "" cmd /c del "%%~f0"&exit /b" try: with open(filename, 'wb') as outf: outf.write(newcontent) - except (IOError, OSError) as err: - if verbose: to_screen(compat_str(traceback.format_exc())) + except (IOError, OSError): + if verbose: + to_screen(compat_str(traceback.format_exc())) to_screen(u'ERROR: unable to overwrite current version') return to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.') + def get_notes(versions, fromVersion): notes = [] - for v,vdata in sorted(versions.items()): + for v, vdata in sorted(versions.items()): if v > fromVersion: notes.extend(vdata.get('notes', [])) return notes + def print_notes(to_screen, versions, fromVersion=__version__): notes = get_notes(versions, fromVersion) if notes: