X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=nullclient.py;h=112ea10537b8b172b7b4e440f84eae6f72be2229;hp=4953a1f87e1e6f241cba3874abddfd0b57a9b561;hb=d498550db3bfd489d8319e7342cc10b76cf24ac9;hpb=c91fe1b6caf0ae1339fba5435b70d27fcffbe5fa diff --git a/nullclient.py b/nullclient.py index 4953a1f..112ea10 100644 --- a/nullclient.py +++ b/nullclient.py @@ -2,117 +2,99 @@ import purple import ecore import getpass import sys +from xml.dom import minidom -cbs = {} -acc_cbs = {} -blist_cbs = {} -conn_cbs = {} -conv_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 - -conn_cbs["connect_progress"] = conn_callback -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_im"] = conv_callback -conv_cbs["write_conv"] = 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 - -class NullClient: + +class ClientModel: + def __init__(self): + self.purple = purple.Purple(debug_enabled=True) + self.purple.purple_init() + self.account = purple.Account() + + def add_account(self, acc): + ''' @param acc: {'username': "foo@gmail.com", 'protocol': "XMPP"} ''' + + new_acc = self.account.new(acc['username'], acc['protocol']) + + return new_acc + + def get_protocols(self): + return self.account.protocol.get_all() + + def get_protocol_options(self, protocol_id): + return self.account.protocol.get_options(protocol_id) + + def set_account_info(self, acc, info): + ''' @param info: {protocol: 'prpl-jabber', alias: '', password: ' ', server: 'new server', port: '' } || + {server: 'new server'} ''' + + if info.has_key('protocol'): + self.account.set_protocol_id(acc, info['protocol']) + if info.has_key('alias'): + self.account.set_alias(acc, info['alias']) + if info.has_key('password'): + self.account.set_password(acc, info['password']) + + self.account.protocol.set_options(acc, info) + + def get_account_info(self, acc): + info = {} + po = self.account.protocol.get_options(acc[1], acc[0]) + info['protocol'] = self.account.get_protocol_id(acc) + info['alias'] = self.account.get_alias(acc) + info['password'] = self.account.get_password(acc) + info['connect_server'] = po['connect_server'][1] + info['port'] = po['port'][1] + + return info + + def set_account_proxy(self, acc, info): + self.account.proxy.set_info(acc, info) + + def account_connect(self, acc): + self.account.set_enabled(acc, "carman-purple-python", True) + # self.account.connect(acc) + self.purple.connect() + + def account_disconnect(self, acc): + self.account.disconnect(acc) + + +class ClientCtrl: def __init__(self): - self.p = purple.Purple() - self.account = None - - def execute(self): - global cbs - self.p.purple_init(cbs) - - def set_protocol(self, protocol): - for i in self.p.get_protocols(): - if i[1] == protocol: - print "-- NULLCLIENT --: Choosing %s as protocol" % protocol - self.protocol = i[0] - print "-- NULLCLIENT --: Protocol successfully chosen: %s" % i[0] - return - - def new_account(self, username, protocol, password): - self.account = purple.Account(username, protocol) - self.account.set_password(password) - self.account.set_enabled("carman-purple-python", True) - def get_buddies(self): - buddies = self.account.get_buddies_online() - print buddies - -def getuser(): - sys.stdout.write("GTalk account: ") - username = sys.stdin.readline() - return username[:-1] - -def getpassword(): - return getpass.getpass() + self.clientmodel = ClientModel() + new_acc = {} + acc_info = {} + new_acc['username'] = self.getuser() + new_acc['protocol'] = 'prpl-jabber' + + acc = self.clientmodel.add_account(new_acc) + + acc_info = self.clientmodel.get_account_info(acc) + acc_info['password'] = self.getpassword() + acc_info['connect_server'] = 'talk.google.com' + acc_info['port'] = 443 + acc_info['old_ssl'] = True + self.clientmodel.set_account_info(acc, acc_info) + + acc_proxy = {} + acc_proxy['type'] = 'HTTP' + acc_proxy['host'] = '172.18.216.211' + acc_proxy['port'] = 8080 + self.clientmodel.set_account_proxy(acc, acc_proxy) + + self.clientmodel.account_connect(acc) + + def getuser(self): + sys.stdout.write("GTalk account: ") + username = sys.stdin.readline() + return username[:-1] + + def getpassword(self): + return getpass.getpass() if __name__ == '__main__': - client = NullClient() - client.execute() - client.set_protocol("XMPP") - username = getuser() - password = getpassword() - client.new_account(username, client.protocol, password) + ctrl = ClientCtrl() - client.p.connect() - ecore.timer_add(20, client.get_buddies) ecore.main_loop_begin()