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

Added additional disconnect error handling and found a bug in sublime text (yea)

Browse source
This commit is contained in:
PhilipTrauner 2016-03-31 22:42:26 +02:00
parent 5a24c17bc1
commit b3128a2c8c
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Sublime/fl0w/fl0w.py
View file

@ -31,7 +31,8 @@ CHANNEL = "s"
def plugin_unloaded(): def plugin_unloaded():
for window in windows: for window in windows:
if hasattr(window, "fl0w"): if hasattr(window, "fl0w"):
window.fl0w.invoke_disconnect() if window.fl0w.connected:
window.fl0w.invoke_disconnect()
@ -129,7 +130,6 @@ class Fl0w:
# Establish connection to the server # Establish connection to the server
self.sock = ESock(socket.create_connection((connect_details[0], int(connect_details[1]))), disconnect_callback=self.invoke_disconnect, debug=False) self.sock = ESock(socket.create_connection((connect_details[0], int(connect_details[1]))), disconnect_callback=self.invoke_disconnect, debug=False)
sublime.status_message("Connected to %s:%s." % (connect_details[0], connect_details[1])) sublime.status_message("Connected to %s:%s." % (connect_details[0], connect_details[1]))
self.connected = True
# Initialize all routes # Initialize all routes
error_report = Fl0w.ErrorReport() error_report = Fl0w.ErrorReport()
info = Fl0w.Info() info = Fl0w.Info()
@ -141,6 +141,7 @@ class Fl0w:
"info" : info, "wallaby_control" : wallaby_control, "get_info" : get_info, "info" : info, "wallaby_control" : wallaby_control, "get_info" : get_info,
"s_sync" : self.s_sync, "compile" : compile}, self)) "s_sync" : self.s_sync, "compile" : compile}, self))
self.s_sync.start() self.s_sync.start()
self.connected = True
# Saving last server address # Saving last server address
sublime.load_settings("fl0w.sublime-setting").set("server_address", connect_details_raw) sublime.load_settings("fl0w.sublime-setting").set("server_address", connect_details_raw)
sublime.save_settings("fl0w.sublime-setting") sublime.save_settings("fl0w.sublime-setting")
@ -159,23 +160,23 @@ class Fl0w:
def invoke_disconnect(self): def invoke_disconnect(self):
if self.connected: if self.connected:
sublime.message_dialog("Connection closed ('%s')" % ", ".join(self.folder)) self.connected = False
if hasattr(self, "s_sync"): sublime.message_dialog("Connection closed ('%s')" % self.folder)
self.s_sync.observer.stop() self.s_sync.observer.stop()
self.connected = False self.sock.close()
self.sock.close()
def invoke_wallaby_control(self): def invoke_wallaby_control(self):
self.sock.send("list", "wallaby_control") self.sock.send("list_wallaby_controllers", "wallaby_control")
class WallabyControl(Routing.ClientRoute): class WallabyControl(Routing.ClientRoute):
def run(self, data, handler): def run(self, data, handler):
wallaby_menu = Menu() wallaby_menu = Menu()
entry_count = 0 entry_count = 0
for wallaby in data: for wallaby in data["wallaby_controllers"]:
wallaby_menu.add(Entry(wallaby, str(data[wallaby]), action=handler.wallaby_control_submenu, kwargs={"wallaby" : wallaby})) wallaby_menu.add(Entry(wallaby, str(data["wallaby_controllers"][wallaby]), action=handler.wallaby_control_submenu, kwargs={"wallaby" : wallaby}))
entry_count += 1 entry_count += 1
if entry_count != 0: if entry_count != 0:
wallaby_menu.invoke(handler.window, back=handler.main_menu) wallaby_menu.invoke(handler.window, back=handler.main_menu)
@ -185,10 +186,9 @@ class Fl0w:
def wallaby_control_submenu(self, wallaby): def wallaby_control_submenu(self, wallaby):
menu = Menu(subtitles=False) menu = Menu(subtitles=False)
for action in ("Run", "Stop"): menu.add(Entry("Run"))
menu.add(Entry(action, action=self.sock.send, kwargs={"data" : {wallaby : action.lower()}, "route" : "wallaby_control"})) for action in ("Stop", "Restart", "Shutdown", "Reboot", "Disconnect"):
for action in ("Restart", "Shutdown", "Reboot", "Disconnect"): menu.add(Entry(action, action=self.sock.send, kwargs={"data" : {wallaby : [action.lower()]}, "route" : "wallaby_control"}))
menu.add(Entry(action, action=self.sock.send, kwargs={"data" : {wallaby : action.lower()}, "route" : "wallaby_control"}))
menu.invoke(self.window) menu.invoke(self.window)
@ -208,6 +208,7 @@ class Fl0w:
class Fl0wCommand(sublime_plugin.WindowCommand): class Fl0wCommand(sublime_plugin.WindowCommand):
def run(self): def run(self):
print(windows)
valid_window_setup = True valid_window_setup = True
folder_count = len(self.window.folders()) folder_count = len(self.window.folders())
if folder_count > 1: if folder_count > 1:
@ -238,6 +239,7 @@ class Fl0wCommand(sublime_plugin.WindowCommand):
else: else:
sublime.error_message("fl0w can't be opened in your current directory (.no-fl0w file exists)") sublime.error_message("fl0w can't be opened in your current directory (.no-fl0w file exists)")
else: else:
print(self.window.fl0w.connected)
if not self.window.fl0w.connected: if not self.window.fl0w.connected:
self.window.fl0w.start_menu.invoke(self.window) self.window.fl0w.start_menu.invoke(self.window)
else: else:
@ -248,11 +250,6 @@ class Fl0wCommand(sublime_plugin.WindowCommand):
if self.window.fl0w.connected: if self.window.fl0w.connected:
self.window.fl0w.invoke_disconnect() self.window.fl0w.invoke_disconnect()
def description(self):
print("description accessed")
if hasattr(self.windows, "fl0w"):
return "Connected."
return None
windows = [] windows = []