X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=nullclient.py;h=112ea10537b8b172b7b4e440f84eae6f72be2229;hp=2b7dd70131371ffc1cf9fb161f30f96cb85c37ed;hb=fa83e5e05e62fa5c6707312d375b97195143e6b7;hpb=3317112f6f04d1fdc7b338b947f18e811c9b9e7e

diff --git a/nullclient.py b/nullclient.py
index 2b7dd70..112ea10 100644
--- a/nullclient.py
+++ b/nullclient.py
@@ -2,49 +2,99 @@ import purple
 import ecore
 import getpass
 import sys
+from xml.dom import minidom
 
-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
+        self.clientmodel = ClientModel()
+        new_acc = {}
+        acc_info = {}
+        new_acc['username'] = self.getuser()
+        new_acc['protocol'] = 'prpl-jabber'
 
-    def execute(self):
-        self.p.purple_init()
+        acc = self.clientmodel.add_account(new_acc)
 
-    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
+        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)
 
-    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)
+        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)
 
-    def get_buddies(self, account):
-        buddies = account.get_buddies_online(account)
-        print buddies
+        self.clientmodel.account_connect(acc)
 
-def getuser():
-    sys.stdout.write("GTalk account: ")
-    username = sys.stdin.readline()
-    return username[:-1]
+    def getuser(self):
+        sys.stdout.write("GTalk account: ")
+        username = sys.stdin.readline()
+        return username[:-1]
 
-def getpassword():
-    return getpass.getpass()
+    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(30, client.get_buddies, client.account)
     ecore.main_loop_begin()