From 77aa23a375d0f2bfb14baa953a70d3ad9ce256b3 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 10 Jul 2018 03:24:34 +0200 Subject: [PATCH] Make UiWebsocket admin_commands and async_commands class variables for easier extension --- src/Ui/UiWebsocket.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index 15372d1a..097d336f 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -20,7 +20,12 @@ from Content.ContentManager import VerifyError, SignError @PluginManager.acceptPlugins class UiWebsocket(object): - + admin_commands = set([ + "sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteAdd", + "channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce", + "certSet", "configSet", "permissionAdd", "permissionRemove" + ]) + async_commands = set(["fileGet", "fileList", "dirList", "fileNeed"]) def __init__(self, ws, site, server, user, request): self.ws = ws self.site = site @@ -34,12 +39,6 @@ class UiWebsocket(object): self.channels = [] # Channels joined to self.state = {"sending": False} # Shared state of websocket connection self.send_queue = [] # Messages to send to client - self.admin_commands = ( - "sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteAdd", - "channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce", - "certSet", "configSet", "permissionAdd", "permissionRemove" - ) - self.async_commands = ("fileGet", "fileList", "dirList", "fileNeed") # Start listener loop def start(self):