X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fupdate.py;h=ccab6f27f2a7c2faa7e2f1c047678ff763f62b22;hb=20c3893f0ea7c341ed015a15cec951ab4f7c8748;hp=b446dd94c9741b3f20524d1908771e1ecfa62bef;hpb=5cb3c0b31989b3c98447aa454d68abacb616cd06;p=youtube-dl diff --git a/youtube_dl/update.py b/youtube_dl/update.py index b446dd94c..ccab6f27f 100644 --- a/youtube_dl/update.py +++ b/youtube_dl/update.py @@ -37,14 +37,14 @@ def rsa_verify(message, signature, key): def update_self(to_screen, verbose, filename): """Update the program file with the latest version from the repository""" - UPDATE_URL = "http://rg3.github.com/youtube-dl/update/" + UPDATE_URL = "http://rg3.github.io/youtube-dl/update/" VERSION_URL = UPDATE_URL + 'LATEST_VERSION' JSON_URL = UPDATE_URL + 'versions.json' UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, "frozen"): - to_screen(u'It looks like you installed youtube-dl with 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 # Check if there is a new version @@ -78,7 +78,7 @@ def update_self(to_screen, verbose, filename): to_screen(u'Updating to version ' + versions_info['latest'] + '...') version = versions_info['versions'][versions_info['latest']] - print_notes(versions_info['versions']) + print_notes(to_screen, versions_info['versions']) if not os.access(filename, os.W_OK): to_screen(u'ERROR: no write permissions on %s' % filename) @@ -157,11 +157,15 @@ del "%s" to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.') -def print_notes(versions, fromVersion=__version__): +def get_notes(versions, fromVersion): notes = [] 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: to_screen(u'PLEASE NOTE:') for note in notes: