X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=nullclient-ecore.py;h=4691910e5b158626af696c47fca9bc7d3f68e3d3;hp=d2df7ff75fab11b39f10b1c20821fe53c758dbc4;hb=c7d5e9f4dc0cb8af06129380ad0eb3ae48b7b21b;hpb=b18104778893417ea6ce29ceffe33adb526c86f6
diff --git a/nullclient-ecore.py b/nullclient-ecore.py
index d2df7ff..4691910 100644
--- a/nullclient-ecore.py
+++ b/nullclient-ecore.py
@@ -1,116 +1,16 @@
+#!/usr/bin/env python
+
import etk
import ecore
import purple
-
-cbs = {}
-acc_cbs = {}
-blist_cbs = {}
-conn_cbs = {}
-conv_cbs = {}
-notify_cbs = {}
-request_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["update"] = 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
-blist_cbs["request_add_group"] = blist_callback
-
-cbs["blist"] = blist_cbs
-
-def conn_callback(name):
- print "---- connection callback example: %s" % name
-
-def conn_progress_cb(data):
- return "Connection in progress..."
-
-#conn_cbs["connect_progress"] = conn_progress_cb
-#conn_cbs["connected"] = conn_callback
-#conn_cbs["disconnected"] = conn_callback
-conn_cbs["notice"] = conn_callback
-conn_cbs["report_disconnect"] = conn_callback
-conn_cbs["network_connected"] = conn_callback
-conn_cbs["network_disconnected"] = conn_callback
-conn_cbs["report_disconnect_reason"] = conn_callback
-
-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["write_chat"] = 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
-conv_cbs["chat_update_user"] = conv_callback
-conv_cbs["present"] = conv_callback
-conv_cbs["has_focus"] = conv_callback
-conv_cbs["custom_smiley_add"] = conv_callback
-conv_cbs["custom_smiley_write"] = conv_callback
-conv_cbs["custom_smiley_close"] = conv_callback
-conv_cbs["send_confirm"] = conv_callback
-
-cbs["conversation"] = conv_cbs
-
-def notify_callback(name):
- print "---- notify callback example: %s" % name
-
-notify_cbs["notify_message"] = notify_callback
-notify_cbs["notify_email"] = notify_callback
-notify_cbs["notify_emails"] = notify_callback
-notify_cbs["notify_formatted"] = notify_callback
-notify_cbs["notify_searchresults"] = notify_callback
-notify_cbs["notify_searchresults_new_rows"] = notify_callback
-notify_cbs["notify_userinfo"] = notify_callback
-notify_cbs["notify_uri"] = notify_callback
-notify_cbs["close_notify"] = notify_callback
-
-cbs["notify"] = notify_cbs
-
-def request_callback(name):
- print "---- request callback example: %s" % name
-
-request_cbs["request_input"] = request_callback
-request_cbs["request_choice"] = request_callback
-request_cbs["request_action"] = request_callback
-request_cbs["request_fields"] = request_callback
-request_cbs["request_file"] = request_callback
-request_cbs["close_request"] = request_callback
-request_cbs["request_folder"] = request_callback
-
-cbs["request"] = request_cbs
+#from xml.dom import minidom
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
@@ -122,13 +22,24 @@ class MainWindow:
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()
@@ -147,6 +58,7 @@ class MainWindow:
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")
@@ -157,18 +69,23 @@ class MainWindow:
self._window = etk.Window(title="NullClient-Etk", size_request=(600, 600), child=vbox)
self._window.on_destroyed(self.quit_cb)
- self.set_global_callbacks()
self._window.show_all()
- def set_global_callbacks(self):
- global cbs
- cbs["connection"]["connect_progress"] = self._purple_conn_status_cb
- cbs["connection"]["disconnected"] = self._purple_disconnected_status_cb
- cbs["connection"]["connected"] = self._purple_connected_cb
+ 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 _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]
@@ -180,11 +97,20 @@ class MainWindow:
print "Buddy not selected!"
self.cmd_entry.text = ""
- def _purple_conn_status_cb(self, txt, step, step_count):
- self.lstatus.text = txt
+ 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_connected_cb(self):
- self.lstatus.text = "Connected"
def new_buddy(self, b):
if [b] not in self.blistmodel.elements:
@@ -193,8 +119,9 @@ class MainWindow:
def remove_buddy(self, bname):
self.blistmodel.remove([bname])
- def _purple_disconnected_status_cb(self):
- self.lstatus.text = "Disconnected"
+ def new_account(self, a):
+ if [a] not in self.accslistmodel.elements:
+ self.accslistmodel.append([a])
def set_panel_text(self, txt):
self.txt_area = txt
@@ -203,6 +130,10 @@ 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
@@ -211,72 +142,111 @@ class MainWindow:
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()
+ def show(self):
+ if self._window:
+ self._window.show_all()
-
-class NullClientPurple:
+class NullClientPurple(object):
def __init__(self):
- self.p = purple.Purple(debug_enabled=False)
+ self.purple = purple.Purple(debug_enabled=False)
self.window = MainWindow(self.quit)
self.buddies = {} #all buddies
self.conversations = {}
- self.account = None
self.protocol_id = "prpl-jabber"
- self.username = "carmanplugintest@gmail.com"
- self.password = "abc123def"
+ self.account = None
+
+ self.purple.add_callback("blist", "update", self.__purple_update_blist_cb)
+ self.purple.add_callback("connection", "connect-progress", self.__purple_conn_progress_cb)
+ self.purple.add_callback("connection", "connected", self.__purple_connected_cb)
+ self.purple.add_callback("connection", "disconnected", self.__purple_disconnected_cb)
+ self.purple.add_callback("conversation", "write-im", self.__purple_write_im_cb)
- global cbs
- cbs["blist"]["update"] = self._purple_update_blist_cb
- self.p.purple_init(cbs)
+ self.purple.purple_init()
#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_update_blist_cb(self, type, name=None, alias=None, totalsize=None,\
- currentsize=None, online=None):
- if type == 2:
+ def __purple_update_blist_cb(self, type, name=None, alias=None, \
+ totalsize=None, currentsize=None, \
+ online=None):
+ if self.account and name != None and 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 is True:
+ 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):
- self.account = purple.Account(self.username, self.protocol_id)
- self.account.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.signal_connect("buddy-signed-off", self._purple_signal_sign_off_cb)
+ def __purple_conn_progress_cb(self, text, step, step_count):
+ if self.window:
+ self.window.lstatus.text = text
+
+ def __purple_connected_cb(self, *data):
+ if self.window:
+ self.window.lstatus.text = "Connected"
+
+ def __purple_disconnected_cb(self, *data):
+ if self.window:
+ self.window.lstatus.text = "Disconnected"
+
+ def __purple_write_im_cb(self, username, name, alias, message):
+ if self.window:
+ if alias:
+ self.window.txt_area.text += alias + ": " + message + "
"
+ else:
+ self.window.txt_area.text += name + ": " + message + "
"
+ self.window.show()
+
+ def __purple_signal_signed_on_cb(self, username, protocol_id):
+ print "[DEBUG] Signed on: %s %s" % (username, protocol_id)
+
+ def __purple_signal_signed_off_cb(self, username, protocol_id):
+ print "[DEBUG] Signed off: %s %s" % (username, protocol_id)
+
+ def __purple_signal_buddy_signed_on_cb(self, name, alias):
+ print "[DEBUG]: Buddy signed on: %s %s" % (name, alias)
+
+ def __purple_signal_buddy_signed_off_cb(self, name, alias):
+ if self.buddies.has_key(name):
+ self.buddies[name] = None
+ self.buddies.pop(name)
+ print "[DEBUG]: Buddy signed off: %s %s" % (name, alias)
+ self.window.remove_buddy(name)
+
+ """
+ def __purple_signal_jabber_receiving_xmlnode_cb(self, message):
+ xml = minidom.parse(message)
+ for msg in xml.getElementsByTagName("message"):
+ who = msg.getAttribute("from")
+ for geoloc in msg.getElementsByTagNameNS("http://jabber.org/protocol/geoloc", "geoloc"):
+ lat = geoloc.getElementsByTagName("lat")[0].childNodes[0].nodeValue
+ lon = geoloc.getElementsByTagName("lon")[0].childNodes[0].nodeValue
+ print "who: %s lat: %s lon: %s" % (who, lat, lon)
+ """
+
+ def add_account(self):
+ username = "carmanplugintest@gmail.com"
+ host = "172.18.216.211"
+ port = 8080
+ self.purple.account_add(username, self.protocol_id, host, port)
+ for account in self.purple.accounts.keys():
+ self.window.new_account(account)
+
+ def connect(self, password):
+ username_acc = self.window.selected_accs()
+ if username_acc:
+ self.account = self.purple.account_verify(username_acc)
+ self.account.get_protocol_options()
+ self.account.set_enabled("carman-purple-python", True)
+ self.account.password = password
+ self.purple.signal_connect("signed-on", self.__purple_signal_signed_on_cb)
+ self.purple.signal_connect("signed-off", self.__purple_signal_signed_off_cb)
+ self.purple.signal_connect("buddy-signed-on", self.__purple_signal_buddy_signed_on_cb)
+ self.purple.signal_connect("buddy-signed-off", self.__purple_signal_buddy_signed_off_cb)
+ #self.purple.signal_connect("jabber-receiving-xmlnode", self.__purple_signal_jabber_receiving_xmlnode_cb)
def send_msg(self, name, msg):
if not self.conversations.has_key(name):
@@ -291,10 +261,9 @@ class NullClientPurple:
self.conversations[i].destroy()
self.conversations[i] = None
self.conversations = None
- self.p.destroy()
+ self.purple.destroy()
ecore.main_loop_quit()
if __name__ == '__main__':
-
nullpurple = NullClientPurple()
ecore.main_loop_begin()