X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=nullclient-ecore.py;h=72cc6554d707abcf033a66659e74da4ba33de21b;hp=9e2c369f9fccf5e15077e94221955b2e17e918ee;hb=2bfa6c6897898733546439b42a20da25f3f8a62f;hpb=47eee11c8d110ae4ceb59358a8021d923f285925
diff --git a/nullclient-ecore.py b/nullclient-ecore.py
index 9e2c369..72cc655 100644
--- a/nullclient-ecore.py
+++ b/nullclient-ecore.py
@@ -9,28 +9,19 @@ conn_cbs = {}
conv_cbs = {}
notify_cbs = {}
request_cbs = {}
-signal_cbs = {}
def account_callback(name):
print "---- account callback example: %s" % name
-acc_cbs["notify_added"] = account_callback
-acc_cbs["status_changed"] = account_callback
-acc_cbs["request_add"] = account_callback
-acc_cbs["request_authorize"] = account_callback
-acc_cbs["close_account_request"] = account_callback
-
-cbs["account"] = acc_cbs
-
def blist_callback(name):
print "---- blist callback example: %s" % name
-blist_cbs["new_list"] = blist_callback
-blist_cbs["new_node"] = blist_callback
-blist_cbs["show"] = blist_callback
+#blist_cbs["new_list"] = blist_callback
+#blist_cbs["new_node"] = blist_callback
+#blist_cbs["show"] = blist_callback
#blist_cbs["update"] = blist_callback
-blist_cbs["remove"] = blist_callback
-blist_cbs["destroy"] = blist_callback
+#blist_cbs["remove"] = blist_callback
+#blist_cbs["destroy"] = blist_callback
blist_cbs["set_visible"] = blist_callback
blist_cbs["request_add_buddy"] = blist_callback
blist_cbs["request_add_chat"] = blist_callback
@@ -58,11 +49,11 @@ cbs["connection"] = conn_cbs
def conv_callback(name):
print "---- conversation callback example: %s" % name
-conv_cbs["create_conversation"] = conv_callback
-conv_cbs["destroy_conversation"] = conv_callback
+#conv_cbs["create_conversation"] = conv_callback
+#conv_cbs["destroy_conversation"] = conv_callback
conv_cbs["write_chat"] = conv_callback
-conv_cbs["write_im"] = conv_callback
conv_cbs["write_conv"] = conv_callback
+#conv_cbs["write_im"] = conv_callback
conv_cbs["chat_add_users"] = conv_callback
conv_cbs["chat_rename_user"] = conv_callback
conv_cbs["chat_remove_users"] = conv_callback
@@ -104,21 +95,15 @@ request_cbs["request_folder"] = request_callback
cbs["request"] = request_cbs
-def buddy_signed_off_cb(name):
- print "---- sign off from buddy %s" % name
-
-def receiving_im_msg_cb(sender, name, message):
- print "---- receiving IM message from %s: %s" % (name, message)
- return False
-
-signal_cbs["buddy_signed_off"] = buddy_signed_off_cb
-signal_cbs["receiving_im_msg"] = receiving_im_msg_cb
-
-
class MainWindow:
def __init__(self, quit_cb):
+ global conv_cbs
+ global signal_cbs
self.bt_cbs = {}
+ self.new_acc_bt_cbs = {}
+ self.send_cbs = {}
self.quit_cb = quit_cb
+ conv_cbs["write_im"] = self._write_im_cb
def init_window(self):
# Main vbox
@@ -126,17 +111,28 @@ class MainWindow:
hbox_cmd = etk.HBox(homogeneous=False)
self.cmd_entry = etk.Entry()
- lcmd = etk.Label(text="Type your message: ")
- hbox_cmd.append(lcmd, etk.HBox.START, etk.HBox.START, 0)
+ self.lcmd = etk.Label(text="Type your message: ")
+ hbox_cmd.append(self.lcmd, etk.HBox.START, etk.HBox.START, 0)
hbox_cmd.append(self.cmd_entry, etk.HBox.START, etk.HBox.EXPAND_FILL, 0)
+ vbox_accs = etk.VBox()
+ self.accslistmodel = etk.ListModel()
+ self.accslist = etk.List(model=self.accslistmodel,\
+ columns=[(10, etk.TextRenderer(slot=0),\
+ False)], selectable=True,\
+ animated_changes=True)
+ vbox_accs.append(self.accslist, etk.VBox.START, etk.VBox.EXPAND_FILL, 0)
+
hbox_buttons = etk.HBox(homogeneous=False)
send_bt = etk.Button(label="Send")
send_bt.on_clicked(self._send_bt_cb)
conn_bt = etk.Button(label="Connect")
- conn_bt.on_clicked(self._conn_bt_cb)
+ conn_bt.on_clicked(self.login_window)
+ new_account_bt = etk.Button(label="New Account")
+ new_account_bt.on_clicked(self._new_account)
hbox_buttons.append(send_bt, etk.HBox.START, etk.HBox.NONE, 0)
hbox_buttons.append(conn_bt, etk.HBox.START, etk.HBox.NONE, 0)
+ hbox_buttons.append(new_account_bt, etk.HBox.START, etk.HBox.NONE, 0)
hbox_panel = etk.HBox()
@@ -149,10 +145,13 @@ class MainWindow:
vbox_txt_area = etk.VBox()
self.txt_area = etk.Label()
+ self.txt_area.text = "
"
+
vbox_txt_area.append(self.txt_area, etk.VBox.START, etk.VBox.EXPAND_FILL, 0)
hbox_panel.append(vbox_txt_area, etk.HBox.START, etk.HBox.EXPAND_FILL, 0)
hbox_panel.append(vbox_buddies, etk.HBox.END, etk.HBox.EXPAND_FILL, 0)
+ hbox_panel.append(vbox_accs, etk.HBox.END, etk.HBox.EXPAND_FILL, 0)
self.lstatus = etk.Label(text="Connection status")
@@ -166,6 +165,17 @@ class MainWindow:
self.set_global_callbacks()
self._window.show_all()
+ def login_window(self, pointer):
+ self.login_password = etk.Entry()
+ confirm_login_bt = etk.Button(label="Ok")
+ confirm_login_bt.on_clicked(self._conn_bt_cb)
+ vbox_login = etk.VBox()
+ vbox_login.append(self.login_password, etk.VBox.START, etk.VBox.FILL, 0)
+ vbox_login.append(confirm_login_bt, etk.VBox.END, etk.VBox.NONE, 0)
+ self.login_win = etk.Window(title="Password", size_request=(190, 80),
+ child=vbox_login)
+ self.login_win.show_all()
+
def set_global_callbacks(self):
global cbs
cbs["connection"]["connect_progress"] = self._purple_conn_status_cb
@@ -174,12 +184,32 @@ class MainWindow:
def _conn_bt_cb(self, pointer):
if self.bt_cbs.has_key("on_clicked"):
- self.bt_cbs["on_clicked"]()
+ self.bt_cbs["on_clicked"](self.login_password.text)
+ self.login_win.destroy()
def _send_bt_cb(self, pointer):
bname = self.blist.selected_rows[0][0]
- if bname:
- print "ITEM: %s" % bname
+ msg = self.cmd_entry.text
+ if bname and msg != "":
+ if self.send_cbs.has_key("on_clicked"):
+ self.send_cbs["on_clicked"](bname, msg)
+ else:
+ print "Buddy not selected!"
+ self.cmd_entry.text = ""
+
+ def selected_accs(self):
+ try:
+ acc = self.accslist.selected_rows[0][0]
+ if acc:
+ return acc
+ else:
+ return None
+ except:
+ return None
+
+ def _new_account(self, pointer):
+ if self.new_acc_bt_cbs.has_key("on_clicked"):
+ self.new_acc_bt_cbs["on_clicked"]()
def _purple_conn_status_cb(self, txt, step, step_count):
self.lstatus.text = txt
@@ -191,7 +221,14 @@ class MainWindow:
if [b] not in self.blistmodel.elements:
self.blistmodel.append([b])
- def _purple_disconnected_status_cb(self, pointer):
+ def remove_buddy(self, bname):
+ self.blistmodel.remove([bname])
+
+ def new_account(self, a):
+ if [a] not in self.accslistmodel.elements:
+ self.accslistmodel.append([a])
+
+ def _purple_disconnected_status_cb(self):
self.lstatus.text = "Disconnected"
def set_panel_text(self, txt):
@@ -201,64 +238,112 @@ class MainWindow:
if callable(cb):
self.bt_cbs["on_clicked"] = cb
+ def add_account_cb(self, cb):
+ if callable(cb):
+ self.new_acc_bt_cbs["on_clicked"] = cb
+
+ def add_send_cb(self, cb):
+ if callable(cb):
+ self.send_cbs["on_clicked"] = cb
+
def add_quit_cb(self, cb):
if callable(cb):
self.quit_cb = cb
+ def _write_im_cb(self, name, who, message):
+ if who:
+ w = who.split("/")[0]
+ self.txt_area.text += w + ": " + str(message) + "
"
+ else:
+ self.txt_area.text += str(name) + ": " + str(message) + "
"
+ self._window.show_all()
+
class NullClientPurple:
def __init__(self):
self.p = purple.Purple(debug_enabled=False)
self.window = MainWindow(self.quit)
- self.buddies = []
- self.account = None
- self.protocol = None
- self.username = "carmanplugintest@gmail.com"
- self.password = "abc123def"
+ self.buddies = {} #all buddies
+ self.conversations = {}
+ self.protocol_id = "prpl-jabber"
+ self.accs = None
global cbs
- cbs["blist"]["update"] = self._purple_blist_new_cb
+ cbs["blist"]["update"] = self._purple_update_blist_cb
+
+ self.p.add_account_cb("notify_added", account_callback)
+ self.p.add_account_cb("status_changed", account_callback)
+ self.p.add_account_cb("request_add", account_callback)
+ self.p.add_account_cb("request_authorize", account_callback)
+ self.p.add_account_cb("close_account_request", account_callback)
+
self.p.purple_init(cbs)
#Initializing UI
self.window.add_bt_conn_cb(self.connect)
+ self.window.add_send_cb(self.send_msg)
+ self.window.add_account_cb(self.add_account)
self.window.init_window()
- def _purple_blist_new_cb(self, pointer):
- """ FIXME: Hack! to fill blist on UI """
- buddies = self.account.get_buddies_online()
- for i in buddies:
- if i not in self.buddies:
- self.buddies.append(i)
- self.window.new_buddy(i)
-
- def set_protocol(self, protocol):
- for p in self.p.get_protocols():
- if p.get_name() == protocol:
- self.protocol = p
- return
-
- def connect(self):
- self.set_protocol("XMPP")
- self.account = purple.Account(self.username, self.protocol.get_id())
- self.account.set_password(self.password)
-
- self.account.proxy.set_type(purple.ProxyInfoType().HTTP)
- self.account.proxy.set_host("172.18.216.211")
- self.account.proxy.set_port(8080)
-
- self.account.get_protocol_options()
-
- self.account.set_enabled("carman-purple-python", True)
- self.p.connect()
- self.p.attach_signals(signal_cbs)
+ def _purple_update_blist_cb(self, type, name=None, alias=None, totalsize=None,\
+ currentsize=None, online=None):
+ if type == 2:
+ if not self.buddies.has_key(name):
+ b = purple.Buddy()
+ b.new_buddy(self.account, name, alias)
+ self.buddies[name] = b
+ elif self.buddies[name].online:
+ self.window.new_buddy(name)
+
+ def _purple_signal_sign_off_cb(self, name, bname):
+ if self.buddies.has_key(bname):
+ self.buddies[bname] = None
+ self.buddies.pop(bname)
+ print "[DEBUG]: Buddy removed!"
+ self.window.remove_buddy(bname)
+
+ def _purple_create_conv_cb(self, name, type):
+ bname = name.split("/")[0]
+ if bname in self.buddies and not self.conversations.has_key(name):
+ conv = purple.Conversation()
+ conv.initialize(self.account, "IM", bname)
+ self.conversations[bname] = conv
+
+ def connect(self, password):
+ username_acc = self.window.selected_accs()
+ if username_acc:
+ self.account = self.p.account_verify(username_acc)
+ self.account.get_protocol_options()
+ self.account.set_enabled("carman-purple-python", True)
+ self.account.password = password
+ self.p.connect()
+ self.p.signal_connect("buddy-signed-off", self._purple_signal_sign_off_cb)
+
+ def add_account(self):
+ username = "carmanplugintest@gmail.com"
+ host = "172.18.216.211"
+ port = 8080
+ self.p.account_add(username, self.protocol_id, host, port)
+ self.accs = self.p.accounts
+ for acc in self.accs.keys():
+ self.window.new_account(acc)
+
+ def send_msg(self, name, msg):
+ if not self.conversations.has_key(name):
+ conv = purple.Conversation()
+ conv.initialize(self.account, "IM", name)
+ self.conversations[name] = conv
+ self.conversations[name].write(msg)
def quit(self, o):
- print "quitting"
- self.p = None
+ print "[DEBUG]: quitting"
+ for i in self.conversations:
+ self.conversations[i].destroy()
+ self.conversations[i] = None
+ self.conversations = None
+ self.p.destroy()
ecore.main_loop_quit()
if __name__ == '__main__':
-
nullpurple = NullClientPurple()
- ecore.main_loop_begin()
\ No newline at end of file
+ ecore.main_loop_begin()