Fetch remotes before checking for updates

This commit is contained in:
Ruud
2011-10-22 22:01:31 +02:00
parent 2061fe7279
commit dda68e9a35
3 changed files with 15 additions and 7 deletions
+6 -5
View File
@@ -38,7 +38,6 @@ config = [{
'name': 'launch_browser', 'name': 'launch_browser',
'default': 1, 'default': 1,
'type': 'bool', 'type': 'bool',
'label': 'Launch Browser',
'description': 'Launch the browser when I start.', 'description': 'Launch the browser when I start.',
}, },
], ],
@@ -53,26 +52,28 @@ config = [{
'name': 'api_key', 'name': 'api_key',
'default': uuid4().hex, 'default': uuid4().hex,
'readonly': 1, 'readonly': 1,
'label': 'Api Key',
'description': "This is top-secret! Don't share this!", 'description': "This is top-secret! Don't share this!",
}, },
{ {
'name': 'debug', 'name': 'debug',
'default': 0, 'default': 0,
'type': 'bool', 'type': 'bool',
'label': 'Debug',
'description': 'Enable debugging.', 'description': 'Enable debugging.',
}, },
{
'name': 'development',
'default': 0,
'type': 'bool',
'description': 'Disables some checks/downloads for faster reloading.',
},
{ {
'name': 'data_dir', 'name': 'data_dir',
'label': 'Data dir',
'type': 'directory', 'type': 'directory',
'description': 'Where cache/logs/etc are stored. Keep empty for <strong>./_data</strong>.', 'description': 'Where cache/logs/etc are stored. Keep empty for <strong>./_data</strong>.',
}, },
{ {
'name': 'url_base', 'name': 'url_base',
'default': '', 'default': '',
'label': 'Url Base',
'description': 'When using mod_proxy use this to append the url with this.', 'description': 'When using mod_proxy use this to append the url with this.',
}, },
{ {
+8 -1
View File
@@ -63,6 +63,10 @@ class Updater(Plugin):
if self.update_version or self.isDisabled(): if self.update_version or self.isDisabled():
return return
log.info('Checking for new version on github for %s' % self.repo_name)
if not Env.setting('development'):
self.repo.fetch()
current_branch = self.repo.getCurrentBranch().name current_branch = self.repo.getCurrentBranch().name
for branch in self.repo.getRemoteByName('origin').getBranches(): for branch in self.repo.getRemoteByName('origin').getBranches():
@@ -77,7 +81,10 @@ class Updater(Plugin):
if self.conf('automatic') and not self.update_failed: if self.conf('automatic') and not self.update_failed:
self.doUpdate() self.doUpdate()
else: else:
self.update_version = remote.hash self.update_version = {
'hash': remote.hash[:8],
'date': remote.getDate(),
}
if self.conf('notification'): if self.conf('notification'):
fireEvent('updater.available', message = 'A new update is available', data = self.getVersion()) fireEvent('updater.available', message = 'A new update is available', data = self.getVersion())
@@ -48,7 +48,7 @@ var UpdaterBase = new Class({
'text': 'A new version is available' 'text': 'A new version is available'
}), }),
new Element('a', { new Element('a', {
'href': 'https://github.com/'+data.repo_name+'/compare/'+data.version.substr(0, 7)+'...'+data.update_version.substr(0, 7), 'href': 'https://github.com/'+data.repo_name+'/compare/'+data.version.hash+'...'+data.update_version.hash,
'text': 'see what has changed', 'text': 'see what has changed',
'target': '_blank' 'target': '_blank'
}), }),