diff options
| -rw-r--r-- | ircactivity.py | 42 | ||||
| -rw-r--r-- | purk/core.py | 8 | ||||
| -rw-r--r-- | purk/events.py | 7 | ||||
| -rw-r--r-- | purk/irc.py | 3 |
4 files changed, 37 insertions, 23 deletions
diff --git a/ircactivity.py b/ircactivity.py index 90c8510..bcb5eda 100644 --- a/ircactivity.py +++ b/ircactivity.py @@ -33,14 +33,18 @@ class IRCActivity(activity.Activity): print "=== nickname ===" self.metadata['nickname'] = self.client.core.window.network.me + print self.metadata['nickname'] print "=== ======== ===" print "=== channels ===" - self.metadata['channels'] = self.client.core.channels + if len(self.client.core.channels) > 0: + self.metadata['channels'] = self.client.core.channels + print self.metadata['channels'] print "=== ======== ===" print "=== server ===" self.metadata['server'] = self.client.core.window.network.server + print self.metadata['server'] print "=== ====== ===" print "DEBUG: done with write_file" @@ -58,10 +62,24 @@ class IRCActivity(activity.Activity): self.is_visible = False - self.client = purk.Client() - self.client.join_server('us.freenode.net') - self.client.add_channel('#sugar') - #self.client.add_channel('#lmms') + self.client = purk.Client(self) + + if self.metadata.has_key("server"): + print "DEBUG: setting server from journal" + self.client.join_server(self.metadata["server"]) + print "DONE: setting server from journal" + else: + print "DEBUG: setting server from default" + self.client.join_server("irc.freenode.net") + print "DONE: setting server from default" + + if self.metadata.has_key("channels"): + print self.metadata["channels"] + #for channel in self.metadata["channels"]: + # self.client.add_channel(channel) + else: + self.client.add_channel('#sugar') + self.client.show() widget = self.client.get_widget() @@ -76,20 +94,6 @@ class IRCActivity(activity.Activity): print "DEBUG: running nickname command" self.client.run_command("/nick hellobv") - - print "DEBUG: adding channels" - try: - for channel in self.metadata['channels']: - self.client.add_channel(channel) - except: - print "ERROR: cannot add channels" - - print "DEBUG: setting server" - - try: - self.client.run_command("/server " + self.metadata['server']) - except: - print "ERROR: cannot set server" def __visibility_notify_event_cb(self, window, event): self.is_visible = event.state != gtk.gdk.VISIBILITY_FULLY_OBSCURED diff --git a/purk/core.py b/purk/core.py index 57af19a..4c1216b 100644 --- a/purk/core.py +++ b/purk/core.py @@ -45,12 +45,13 @@ class Trigger(object): return self._mods class Core(object): - def __init__(self): + def __init__(self,client): self.window = None self.trigger = Trigger() self.events = self.trigger.events self.manager = widgets.UrkUITabs(self) self.channels = [] + self.client = client mods = self.trigger.get_modules() @@ -76,8 +77,9 @@ class Core(object): return class Client(object): - def __init__(self): - self.core = Core() + def __init__(self,activity): + self.activity = activity + self.core = Core(self) self.widget = self.core.manager self.widget.show_all() diff --git a/purk/events.py b/purk/events.py index 4142003..1eec7c3 100644 --- a/purk/events.py +++ b/purk/events.py @@ -194,11 +194,16 @@ def run(text, window, network): event_name = "Command" + c_data.name.capitalize() if event_name in all_events: + print "WOO" result = trigger(event_name, c_data) + print result if result: - c_data.window.write("* /%s: %s" % (c_data.name, result[0])) + print "woo more?" + #c_data.window.write("* /%s: %s" % (c_data.name, result[0])) + c_data.window.write("* /%s %s" % (c_data.name, result[0])) else: + print "NO WOO" trigger("Command", c_data) if not c_data.done: diff --git a/purk/irc.py b/purk/irc.py index edd8a4b..7006b1c 100644 --- a/purk/irc.py +++ b/purk/irc.py @@ -89,6 +89,9 @@ class Network(object): self.name = name or server self.nicks = nicks or default_nicks() + + if core.client.activity.metadata.has_key("nickname"): + self.nicks[0] = core.client.activity.metadata["nickname"] self.me = self.nicks[0] self.username = username or "urk" |