robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed name, added __repr__ to handler, added sanity checks when searching programs, removed parameters from stop

Browse source
This commit is contained in:
PhilipTrauner 2016-03-31 22:39:36 +02:00
parent 70f64e570b
commit 8c65539216
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Server/Server.py
View file

@ -28,21 +28,23 @@ class Info(Routing.ServerRoute):
class WallabyControl(Routing.ServerRoute): class WallabyControl(Routing.ServerRoute):
def __init__(self): def __init__(self):
self.actions_with_params = {"stop" : self.stop, "run" : self.run_program} self.actions_with_params = {"run" : self.run_program}
self.actions_without_params = {"restart" : self.restart, "disconnect" : self.disconnect, self.actions_without_params = {"restart" : self.restart, "disconnect" : self.disconnect,
"reboot" : self.reboot, "shutdown" : self.shutdown} "reboot" : self.reboot, "shutdown" : self.shutdown, "stop" : self.stop_programs}
self.programs = [] self.programs = []
def run(self, data, handler): def run(self, data, handler):
self.programs = []
for program in os.listdir(handler.routes[WALLABY_SYNC_ROUTE].folder): for program in os.listdir(handler.routes[WALLABY_SYNC_ROUTE].folder):
if "botball_user_program" in os.listdir(handler.routes[WALLABY_SYNC_ROUTE].folder + program) if os.path.isdir(handler.routes[WALLABY_SYNC_ROUTE].folder + program):
self.programs.append(program) if "botball_user_program" in os.listdir(handler.routes[WALLABY_SYNC_ROUTE].folder + program):
self.programs.append(program)
if data == "list_wallaby_controllers": if data == "list_wallaby_controllers":
wallabies = {} wallaby_controllers = {}
for wallaby_handler in handler.broadcast.channels[Handler.Channels.WALLABY]: for wallaby_handler in handler.broadcast.channels[Handler.Channels.WALLABY]:
wallabies["%s:%d" % (wallaby_handler.sock.address, wallaby_handler.sock.port)] = wallaby_handler.name wallaby_controllers["%s:%d" % (wallaby_handler.sock.address, wallaby_handler.sock.port)] = wallaby_handler.name
handler.sock.send(wallabies, "wallaby_control") handler.sock.send({"wallaby_controllers" : wallaby_controllers}, "wallaby_control")
elif data == "list_programs": elif data == "list_programs":
handler.sock.send({"programs" : self.programs}) handler.sock.send({"programs" : self.programs})
elif type(data) is dict: elif type(data) is dict:
@ -62,7 +64,7 @@ class WallabyControl(Routing.ServerRoute):
def restart(self, wallaby_handler): def restart(self, wallaby_handler):
wallaby_handler.sock.send("restart") wallaby_handler.sock.send("restart", "wallaby_control")
def disconnect(self, wallaby_handler): def disconnect(self, wallaby_handler):
@ -70,19 +72,19 @@ class WallabyControl(Routing.ServerRoute):
def reboot(self, wallaby_handler): def reboot(self, wallaby_handler):
wallaby_handler.sock.send("reboot") wallaby_handler.sock.send("reboot", "wallaby_control")
def shutdown(self, wallaby_handler): def shutdown(self, wallaby_handler):
wallaby_handler.sock.send("shutdown") wallaby_handler.sock.send("shutdown", "wallaby_control")
def run_program(self, wallaby_handler, program): def run_program(self, wallaby_handler, program):
wallaby_handler.sock.send({"run" : program}) wallaby_handler.sock.send({"run" : program}, "wallaby_control")
def stop(self, wallaby_handler, program): def stop_programs(self, wallaby_handler):
pass wallaby_handler.sock.send("stop", "wallaby_control")
class Compile(Routing.ServerRoute): class Compile(Routing.ServerRoute):
@ -133,7 +135,7 @@ class GetInfo(Routing.ServerRoute):
handler.channel = Handler.Channels.WALLABY handler.channel = Handler.Channels.WALLABY
handler.broadcast.add(handler, handler.channel) handler.broadcast.add(handler, handler.channel)
if "name" in data: if "name" in data:
handler.sock.name = data["name"] handler.name = data["name"]
Logging.info("'%s:%d' has identified as a %s client." % (handler.info[0], handler.info[1], Logging.info("'%s:%d' has identified as a %s client." % (handler.info[0], handler.info[1],
"Sublime Text" if handler.channel == Handler.Channels.SUBLIME else "Sublime Text" if handler.channel == Handler.Channels.SUBLIME else
"Wallaby" if handler.channel == Handler.Channels.WALLABY else "Wallaby" if handler.channel == Handler.Channels.WALLABY else
@ -172,6 +174,9 @@ class Handler(Server.Handler):
self.routes[route].stop(self) self.routes[route].stop(self)
Logging.info("'%s:%d' disconnected." % (self.sock.address, self.sock.port)) Logging.info("'%s:%d' disconnected." % (self.sock.address, self.sock.port))
def __repr__(self):
return "%s: %s:%d" % (self.name, self.sock.address, self.sock.port)
def folder_validator(folder): def folder_validator(folder):
if not os.path.isdir(folder): if not os.path.isdir(folder):