X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fupdate.py;h=ccab6f27f2a7c2faa7e2f1c047678ff763f62b22;hb=d80a064eff4fe2416f9db36b07f1e2ca641f1334;hp=f6e3e5c69d72170c02c7f279a27ecb637c8ac557;hpb=d5ed35b664628f40945959e5c07bfbf4c0bd134a;p=youtube-dl diff --git a/youtube_dl/update.py b/youtube_dl/update.py index f6e3e5c69..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 @@ -77,10 +77,8 @@ def update_self(to_screen, verbose, filename): to_screen(u'Updating to version ' + versions_info['latest'] + '...') version = versions_info['versions'][versions_info['latest']] - if version.get('notes'): - to_screen(u'PLEASE NOTE:') - for note in version['notes']: - to_screen(note) + + 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) @@ -158,3 +156,17 @@ del "%s" 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()): + 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: + to_screen(note)