oxjs might be replaced get replaced right now, only use js

This commit is contained in:
j 2016-01-13 12:17:13 +05:30
commit 47fe90329c
3 changed files with 57 additions and 89 deletions

View file

@ -242,6 +242,10 @@ actions.register(restart, cache=False)
class Update(Thread):
_status = {
'reload': False,
'status': 'Updating Open Media Library...'
}
def __init__(self):
Thread.__init__(self)
@ -250,10 +254,11 @@ class Update(Thread):
def status(self, status, reload=False):
from websocket import trigger_event
trigger_event('updatestatus', {
self._status = {
'reload': reload,
'status': status,
})
}
trigger_event('updatestatus', self._status)
def install(self):
while update_available():
@ -272,7 +277,7 @@ class Update(Thread):
db_version = settings.server.get('db_version', 0)
if db_version < settings.DB_VERSION:
self.status('Migrating database...')
time.sleep(1)
time.sleep(30)
settings.server['db_version'] = settings.DB_VERSION
def run(self):

View file

@ -34,10 +34,13 @@ class Handler(WebSocketHandler):
self.close()
if self not in state.websockets:
state.websockets.append(self)
trigger_event('status', {
'id': settings.USER_ID,
'online': state.online
})
if state.update:
trigger_event('updatestatus', state.tasks._status)
else:
trigger_event('status', {
'id': settings.USER_ID,
'online': state.online
})
if state.nodes:
for node in state.nodes._nodes.values():
node.trigger_status()