From 2fbe881935994b3f390fdbf6dc6f8fc4e4fc0b17 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Mon, 4 Jan 2016 17:32:40 +0530
Subject: [PATCH] check for new version in getVersion

---
 oml/update.py          | 21 +++++++++++++++------
 static/js/appDialog.js |  6 +++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/oml/update.py b/oml/update.py
index ea9a6db..8e934f2 100644
--- a/oml/update.py
+++ b/oml/update.py
@@ -75,12 +75,19 @@ def current_version(module):
         version = ''
     return version
 
-def download():
-    if not os.path.exists(os.path.join(settings.config_path, 'release.json')):
-        return True
+def get_latest_release():
     release_data = get(settings.server.get('release_url'))
     release = json.loads(release_data.decode('utf-8'))
     if verify(release):
+        with open(os.path.join(settings.updates_path, 'release.json'), 'wb') as fd:
+            fd.write(release_data)
+        return release
+
+def download():
+    if not os.path.exists(os.path.join(settings.config_path, 'release.json')):
+        return True
+    release = get_latest_release()
+    if release:
         ox.makedirs(settings.updates_path)
         os.chdir(os.path.dirname(settings.base_dir))
         current_files = {'release.json'}
@@ -90,14 +97,13 @@ def download():
                 base_url = settings.server.get('release_url').rsplit('/', 1)[0]
                 url = '/'.join([base_url, release['modules'][module]['name']])
                 if not os.path.exists(module_tar):
-                    print('downloading', os.path.basename(module_tar))
+                    logger.debug('download', os.path.basename(module_tar))
                     get(url, module_tar)
                     if ox.sha1sum(module_tar) != release['modules'][module]['sha1']:
+                        logger.debug('invalid checksum', os.path.basename(module_tar))
                         os.unlink(module_tar)
                         return False
                 current_files.add(os.path.basename(module_tar))
-        with open(os.path.join(settings.updates_path, 'release.json'), 'wb') as fd:
-            fd.write(release_data)
         for f in set(next(os.walk(settings.updates_path))[2])-current_files:
             os.unlink(os.path.join(settings.updates_path, f))
         return True
@@ -189,6 +195,7 @@ def getVersion(data):
         '''
         response['update'] = False
     else:
+        get_latest_release()
         if not os.path.exists(os.path.join(settings.updates_path, 'release.json')):
             return response
         if not os.path.exists(os.path.join(settings.config_path, 'release.json')):
@@ -207,6 +214,8 @@ def restart(data):
     '''
         restart (and upgrade if upgrades are available)
     '''
+    if data.get('update'):
+        download()
     subprocess.Popen([os.path.join(settings.base_dir, 'ctl'), 'restart'], close_fds=True)
     return {}
 actions.register(restart, cache=False)
diff --git a/static/js/appDialog.js b/static/js/appDialog.js
index 040a4cd..115b910 100644
--- a/static/js/appDialog.js
+++ b/static/js/appDialog.js
@@ -56,7 +56,7 @@ oml.ui.appDialog = function() {
                                             disabled: true,
                                             title: 'Installing...'
                                         });
-                                        oml.api.restart(function(response) {
+                                        oml.api.restart({update: true},function(response) {
                                             if (response.status.code == 200) {
                                                 setTimeout(reload, 500);
                                             }
@@ -66,9 +66,9 @@ oml.ui.appDialog = function() {
                             }
                         } else {
                             if (response.data.current == 'git') {
-                                $update.html(Ox._('No updates available'));
+                                $update.html(Ox._('You\'re up to date'));
                             } else {
-                                $update.html(Ox._('You are running Version {0}. No updates available', [response.data.current]));
+                                $update.html(Ox._('You are running Version {0}. You\'re up to date.', [response.data.current]));
                             }
                         }
                     });