From 30cd5db7d9d050af4f1b27b5efdd4b515e58b9f5 Mon Sep 17 00:00:00 2001 From: Joey Payne Date: Mon, 26 Sep 2016 09:39:04 -0600 Subject: [PATCH] Fix #161: Add new page to search for nw.js versions --- command_line.py | 5 +++-- files/settings.cfg | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/command_line.py b/command_line.py index 15d2ab0..3dd7312 100644 --- a/command_line.py +++ b/command_line.py @@ -282,7 +282,8 @@ def get_versions(self): current_branch = self.get_default_nwjs_branch() - for url in self.settings['version_info']['urls']: + for urlTuple in self.settings['version_info']['urls']: + url, regex = urlTuple url = url.format(current_branch) response = request.urlopen(url) html = response.read().decode('utf-8') @@ -291,7 +292,7 @@ def get_versions(self): old_versions = set(nw_version.values) old_versions = old_versions.union(union_versions) - new_versions = set(re.findall('(\S+) / \d{2}-\d{2}-\d{4}', html)) + new_versions = set(re.findall(regex, html)) union_versions = old_versions.union(new_versions) diff --git a/files/settings.cfg b/files/settings.cfg index 2f4bcc5..0574624 100644 --- a/files/settings.cfg +++ b/files/settings.cfg @@ -319,5 +319,5 @@ linux_64_dir_prefix = 'nwjs-v{}-linux-x64' 'force_download']""" [version_info] - urls="""['https://raw.githubusercontent.com/nwjs/nw.js/{}/CHANGELOG.md']""" + urls="""[('https://raw.githubusercontent.com/nwjs/nw.js/{}/CHANGELOG.md', '(\S+) / \d{2}-\d{2}-\d{4}'), ('http://nwjs.io/blog/', 'NW.js v(\S+) ')]""" github_api_url="https://api.github.com/repos/nwjs/nw.js"