From 6eb3fa9cf94f3a254b5ac972dee668a2ce3647c9 Mon Sep 17 00:00:00 2001 From: Joey Payne Date: Sat, 14 Nov 2015 15:26:38 -0700 Subject: [PATCH] Added both links to changelog to get both of best worlds. --- command_line.py | 21 +++++++++++++++------ files/settings.cfg | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/command_line.py b/command_line.py index 0994eea..f3a6ceb 100644 --- a/command_line.py +++ b/command_line.py @@ -391,19 +391,28 @@ class CommandBase(object): def get_versions(self): if self.logger is not None: self.logger.info('Getting versions...') - response = urllib2.urlopen(self.settings['version_info']['url']) - html = response.read() - nw_version = self.get_setting('nw_version') + union_versions = set() - old_versions = set(nw_version.values) - new_versions = set(re.findall('(\S+) / \S+', html)) + for url in self.settings['version_info']['urls']: + response = urllib2.urlopen(url) + html = response.read() - union_versions = list(old_versions.union(new_versions)) + nw_version = self.get_setting('nw_version') + + old_versions = set(nw_version.values) + old_versions = old_versions.union(union_versions) + new_versions = set(re.findall('(\S+) / \S+', html)) + + union_versions = old_versions.union(new_versions) versions = sorted(union_versions, key=Version, reverse=True) + if len(versions) > 19: + #Cut off old versions + versions = versions[:-19] + nw_version.values = versions f = None try: diff --git a/files/settings.cfg b/files/settings.cfg index dfc588f..ef1695d 100644 --- a/files/settings.cfg +++ b/files/settings.cfg @@ -367,4 +367,4 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' 'force_download']""" [version_info] - url='https://raw.githubusercontent.com/nwjs/nw.js/nw13/CHANGELOG.md' + urls="""['https://raw.githubusercontent.com/nwjs/nw.js/nw13/CHANGELOG.md', 'https://raw.githubusercontent.com/nwjs/nw.js/master/CHANGELOG.md']"""