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

Added support for sublime-settings

Browse source
This commit is contained in:
PhilipTrauner 2016-02-20 08:22:35 +01:00
parent 19bb54ad60
commit b68c284531
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Sublime/fl0w/fl0w.py
View file

@ -27,6 +27,7 @@ def plugin_unloaded():
observer.stop() observer.stop()
try: try:
fl0w.sock.close() fl0w.sock.close()
fl0w.connected = False
except: except:
pass pass
print("Observer stopped!") print("Observer stopped!")
@ -99,7 +100,9 @@ class Fl0w:
# Input invokers # Input invokers
def invoke_connect(self): def invoke_connect(self):
Input("Address:Port", initial_text="", on_done=self.connect).invoke(self.window) address = sublime.load_settings("fl0w.sublime-setting").get("server_address")
address = "" if type(address) is not str else address
Input("Address:Port", initial_text=address, on_done=self.connect).invoke(self.window)
def invoke_about(self): def invoke_about(self):
if sublime.ok_cancel_dialog("fl0w by @robot0nfire", "robot0nfire.com"): if sublime.ok_cancel_dialog("fl0w by @robot0nfire", "robot0nfire.com"):
@ -135,6 +138,7 @@ class Fl0w:
debug_menu.add(Entry("Off", action=self.set_debug, kwargs={"debug" : False})) debug_menu.add(Entry("Off", action=self.set_debug, kwargs={"debug" : False}))
debug_menu.invoke(self.window, back=self.main_menu) debug_menu.invoke(self.window, back=self.main_menu)
def set_debug(self, debug): def set_debug(self, debug):
print("Debug now %s" % debug) print("Debug now %s" % debug)
self.sock.debug = debug self.sock.debug = debug
@ -159,6 +163,7 @@ class Fl0w:
def connect(self, connect_details): def connect(self, connect_details):
connect_details_raw = connect_details
connect_details = connect_details.split(":") connect_details = connect_details.split(":")
if len(connect_details) == 2: if len(connect_details) == 2:
try: try:
@ -166,6 +171,8 @@ class Fl0w:
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 self.connected = True
_thread.start_new_thread(sock_handler, (self.sock, {"error_report": Fl0w.ErrorReport(), "info" : Fl0w.Info(), "wallaby_control" : Fl0w.WallabyControl()}, self)) _thread.start_new_thread(sock_handler, (self.sock, {"error_report": Fl0w.ErrorReport(), "info" : Fl0w.Info(), "wallaby_control" : Fl0w.WallabyControl()}, self))
sublime.load_settings("fl0w.sublime-setting").set("server_address", connect_details_raw)
sublime.save_settings("fl0w.sublime-setting")
self.main_menu.invoke(self.window) self.main_menu.invoke(self.window)
except OSError as e: except OSError as e:
sublime.error_message("Error during connection creation:\n %s" % str(e)) sublime.error_message("Error during connection creation:\n %s" % str(e))