X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=7240de2620309b7260ade83fc3aaa29c78c61d1f;hp=80b0b0e846c4525bcba049e9352baf46d31e572b;hb=e46b731142ce1fc0bad91a0391c1358c5e2d6405;hpb=004e280b67aef2279b3c2c06fbeb330adf611677

diff --git a/account.pyx b/account.pyx
index 80b0b0e..7240de2 100644
--- a/account.pyx
+++ b/account.pyx
@@ -19,115 +19,519 @@
 
 cimport purple
 
-cdef extern from *:
-    ctypedef char const_char "const char"
-
 cdef class Account:
-    """ Account class """
-    cdef account.PurpleAccount *__account
-    cdef plugin.PurplePlugin *c_plugin
-    cdef prpl.PurplePluginProtocolInfo *c_prpl_info
-    cdef plugin.PurplePluginInfo *c_plugin_info
-    cdef savedstatuses.PurpleSavedStatus *__sstatus
-    cdef ProxyInfo __proxy
-
-    def __init__(self, char *username, char *protocol_id):
-        cdef proxy.PurpleProxyInfo *c_proxyinfo
-        self.__account = account.c_purple_account_new(username, protocol_id)
-        self.c_plugin = plugin.c_purple_plugins_find_with_id(protocol_id)
-        self.c_prpl_info = plugin.c_PURPLE_PLUGIN_PROTOCOL_INFO(self.c_plugin)
-
-        c_proxyinfo = account.c_purple_account_get_proxy_info(self.__account)
-        if c_proxyinfo == NULL:
-            c_proxyinfo = proxy.c_purple_proxy_info_new()
-            proxy.c_purple_proxy_info_set_type(c_proxyinfo, proxy.PURPLE_PROXY_NONE)
-        account.c_purple_account_set_proxy_info(self.__account, c_proxyinfo)
-        self.__proxy = ProxyInfo()
-        self.__proxy.c_proxyinfo = c_proxyinfo
+    """
+    Account class
+    @param username
+    @param protocol Protocol class instance
+    @param core Purple class instance
+    """
 
+    cdef object __username
+    cdef object __protocol
+    cdef object __core
+    cdef object __exists
 
-    def set_password(self, password):
-        account.c_purple_account_set_password(self.__account, password)
+    def __init__(self, username, protocol, core):
+        self.__username = username
+        self.__protocol = protocol
+        self.__core = core
 
-    def set_enabled(self, ui, value):
-        account.c_purple_account_set_enabled(self.__account, ui, value)
+        if protocol.exists and self._get_structure() != NULL:
+            self.__exists = True
+        else:
+            self.__exists = False
 
-    def get_acc_username(self):
-        if self.__account:
-            return account.c_purple_account_get_username(self.__account)
+    cdef account.PurpleAccount *_get_structure(self):
+        return account.purple_accounts_find(self.__username, \
+                self.__protocol.id)
 
-    def get_password(self):
-        if self.__account:
-            return account.c_purple_account_get_password(self.__account)
+    def __is_connected(self):
+        if self.__exists:
+            return account.purple_account_is_connected(self._get_structure())
+        else:
+            return None
+    is_connected = property(__is_connected)
 
-    def set_status(self):
-        self.__sstatus = savedstatuses.c_purple_savedstatus_new(NULL, status.PURPLE_STATUS_AVAILABLE)
-        savedstatuses.c_purple_savedstatus_activate(self.__sstatus)
+    def __is_connecting(self):
+        if self.__exists:
+            return account.purple_account_is_connecting(self._get_structure())
+        else:
+            return None
+    is_connecting = property(__is_connecting)
 
-    def get_proxy(self):
-        return self.__proxy
+    def __is_disconnected(self):
+        if self.__exists:
+            return account.purple_account_is_disconnected( \
+                    self._get_structure())
+        else:
+            return None
+    is_disconnected = property(__is_disconnected)
 
-    proxy = property(get_proxy)
+    def __get_core(self):
+        return self.__core
+    core = property(__get_core)
 
-    def get_buddies_online(self):
-        cdef glib.GSList *iter
-        cdef blist.PurpleBuddy *buddy
-        buddies = []
-        iter = blist.c_purple_find_buddies(self.__account, NULL)
-        while iter:
-            buddy = <blist.PurpleBuddy *> iter.data
-            if <blist.PurpleBuddy *>buddy and \
-                account.c_purple_account_is_connected(blist.c_purple_buddy_get_account(buddy)) and \
-                status.c_purple_presence_is_online(blist.c_purple_buddy_get_presence(buddy)):
-                buddies += [buddy.name]
-            iter = iter.next
-        return buddies
+    def __get_exists(self):
+        return self.__exists
+    exists = property(__get_exists)
+
+    def __get_username(self):
+        cdef char *username = NULL
+        if self.__exists:
+            username = <char *> account.purple_account_get_username( \
+                    self._get_structure())
+            if username:
+                return username
+            else:
+                return None
+        else:
+            return self.__username
+    username = property(__get_username)
+
+    def __get_protocol(self):
+        return self.__protocol
+    protocol = property(__get_protocol)
 
-    def get_protocol_options(self):
-        ''' FIXME: It is just a hack, to set the XMPP's options. '''
+    def _get_protocol_options(self):
+        """
+        @return Dictionary {'setting': value, ...} 
+        """
         cdef glib.GList *iter
-        cdef account.PurpleAccountOption *option
+        cdef account.PurpleAccount *c_account
+        cdef plugin.PurplePlugin *c_plugin
+        cdef prpl.PurplePluginProtocolInfo *prpl_info
+        cdef accountopt.PurpleAccountOption *option
         cdef prefs.PurplePrefType type
-        cdef const_char *label_name
-        cdef const_char *str_value
-        cdef const_char *setting
+        cdef char *label_name
+        cdef char *str_value
+        cdef char *setting
         cdef int int_value
         cdef glib.gboolean bool_value
-        iter = self.c_prpl_info.protocol_options
+
+        c_account = self._get_structure()
+
+        if c_account == NULL:
+            return None
+
+        po = {}
+
+        c_plugin = plugin.purple_plugins_find_with_id(self.__protocol.id)
+        prpl_info = plugin.PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
+        iter = prpl_info.protocol_options
+
         while iter:
-            option = <account.PurpleAccountOption *> iter.data
-            type = account.c_purple_account_option_get_type(option)
-            label_name = account.c_purple_account_option_get_text(option)
-            setting = account.c_purple_account_option_get_setting(option)
+
+            option = <accountopt.PurpleAccountOption *> iter.data
+            type = accountopt.purple_account_option_get_type(option)
+            label_name = <char *> accountopt.purple_account_option_get_text(option)
+            setting = <char *> accountopt.purple_account_option_get_setting(option)
+
+            sett = str(<char *> setting)
+
             if type == prefs.PURPLE_PREF_STRING:
-                str_value = account.c_purple_account_option_get_default_string(option)
+
+                str_value = <char *> accountopt.purple_account_option_get_default_string(option)
 
                 # Google Talk default domain hackery!
                 if str_value == NULL and str(<char *> label_name) == "Connect server":
                     str_value = "talk.google.com"
+                str_value = <char *> account.purple_account_get_string(c_account, setting, str_value)
 
-                if self.__account != NULL:
-                    str_value = account.c_purple_account_get_string(self.__account, setting, str_value)
-                    account.c_purple_account_set_string(self.__account, setting, str_value );
+                val = str(<char *> str_value)
 
             elif type == prefs.PURPLE_PREF_INT:
-                int_value = account.c_purple_account_option_get_default_int(option)
-                if self.__account != NULL:
-                   int_value = account.c_purple_account_get_int(self.__account, setting, int_value)
-                   if str(<char *> setting) == "port":
-                        account.c_purple_account_set_int(self.__account, setting, 443);
+
+                int_value = accountopt.purple_account_option_get_default_int(option)
+                int_value = account.purple_account_get_int(c_account, setting, int_value)
+
+                val = int(int_value)
 
             elif type == prefs.PURPLE_PREF_BOOLEAN:
-                bool_value = account.c_purple_account_option_get_default_bool(option)
-                if self.__account != NULL:
-                    bool_value = account.c_purple_account_get_bool(self.__account, setting, bool_value)
-                    if str(<char *> setting) == "old_ssl":
-                        account.c_purple_account_set_bool(self.__account, setting, True);
+
+                bool_value = accountopt.purple_account_option_get_default_bool(option)
+                bool_value = account.purple_account_get_bool(c_account, setting, bool_value)
+
+                val = bool(bool_value)
 
             elif type == prefs.PURPLE_PREF_STRING_LIST:
-                str_value = account.c_purple_account_option_get_default_list_value(option)
-                if self.__account != NULL:
-                    str_value = account.c_purple_account_get_string(self.__account, setting, str_value)
+
+                str_value = <char *> accountopt.purple_account_option_get_default_list_value(option)
+                str_value = <char *> account.purple_account_get_string(c_account, setting, str_value)
+
+                val = str(<char *> str_value)
 
             iter = iter.next
 
+            po[sett] = val
+
+        return po
+    protocol_options = property(_get_protocol_options)
+
+    def __get_password(self):
+        cdef char *password = NULL
+        if self.__exists:
+            password = <char *> account.purple_account_get_password( \
+                    self._get_structure())
+            if password:
+                return password
+            else:
+                return None
+        else:
+            return None
+    password = property(__get_password)
+
+    def __get_alias(self):
+        cdef char *alias = NULL
+        if self.__exists:
+            alias = <char *> account.purple_account_get_alias(self._get_structure())
+            if alias:
+                return alias
+            else:
+                return None
+        else:
+            return None
+    alias = property(__get_alias)
+
+    def __get_user_info(self):
+        cdef char *user_info = NULL
+        if self.__exists:
+            user_info = <char *> account.purple_account_get_user_info(self._get_structure())
+            if user_info:
+                return user_info
+            else:
+                return None
+        else:
+            return None
+    user_info = property(__get_user_info)
+
+    def __get_remember_password(self):
+        if self.__exists:
+            return account.purple_account_get_remember_password( \
+                    self._get_structure())
+        else:
+            return None
+    remember_password = property(__get_remember_password)
+
+    def __get_enabled(self):
+        if self.__exists:
+            return account.purple_account_get_enabled(self._get_structure(), \
+                    self.__core.ui_name)
+        else:
+            return None
+    enabled = property(__get_enabled)
+
+    def set_username(self, username):
+        """
+        Sets the account's username.
+
+        @param username The username
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_username(self._get_structure(), \
+                    username)
+            return True
+        else:
+            return False
+
+    def set_protocol(self, protocol):
+        """
+        Sets the account's protocol.
+
+        @param protocol A Protocol class instance
+        @return True if successful, False if account doesn't exists
+        """
+        if protocol.exists and self.__exists:
+            account.purple_account_set_protocol_id(self._get_structure(), \
+                        protocol.id)
+            self.__protocol = protocol
+            return True
+        else:
+            return False
+
+    def set_protocol_options(self, po):
+        """
+        @param po Dictionary {'setting': value, ...} options to be updated
+        @return True to success or False to failure
+        """
+        cdef glib.GList *iter
+        cdef account.PurpleAccount *c_account
+        cdef plugin.PurplePlugin *c_plugin
+        cdef prpl.PurplePluginProtocolInfo *prpl_info
+        cdef accountopt.PurpleAccountOption *option
+        cdef prefs.PurplePrefType type
+        cdef char *str_value
+        cdef char *setting
+        cdef int int_value
+        cdef glib.gboolean bool_value
+
+        c_account = self._get_structure()
+
+        if c_account == NULL:
+            return False
+
+        c_plugin = plugin.purple_plugins_find_with_id(self.__protocol.id)
+        prpl_info = plugin.PURPLE_PLUGIN_PROTOCOL_INFO(c_plugin)
+        iter = prpl_info.protocol_options
+
+        while iter:
+
+            option = <accountopt.PurpleAccountOption *> iter.data
+            type = accountopt.purple_account_option_get_type(option)
+            setting = <char *> accountopt.purple_account_option_get_setting(option)
+
+            sett = str(<char *> setting)
+
+            if not po.has_key(sett):
+                iter = iter.next
+                continue
+
+            if type == prefs.PURPLE_PREF_STRING:
+
+                str_value = <char *> po[sett]
+                account.purple_account_set_string(c_account, setting, str_value)
+
+            elif type == prefs.PURPLE_PREF_INT:
+
+                int_value = int(po[sett])
+                account.purple_account_set_int(c_account, setting, int_value)
+
+            elif type == prefs.PURPLE_PREF_BOOLEAN:
+
+                bool_value = bool(po[sett])
+                account.purple_account_set_bool(c_account, setting, bool_value)
+
+            elif type == prefs.PURPLE_PREF_STRING_LIST:
+
+                str_value = <char *> po[sett]
+                account.purple_account_set_string(c_account, setting, str_value)
+
+            iter = iter.next
+
+        return True
+
+    def set_password(self, password):
+        """
+        Sets the account's password.
+
+        @param password The password
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_password(self._get_structure(), \
+                    password)
+            return True
+        else:
+            return False
+
+    def set_alias(self, alias):
+        """
+        Sets the account's alias
+
+        @param alias The alias
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_alias(self._get_structure(), \
+                    alias)
+            return True
+        else:
+            return False
+
+    def set_user_info(self, user_info):
+        """
+        Sets the account's user information
+
+        @param user_info The user information
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_user_info(self._get_structure(), \
+                    user_info)
+            return True
+        else:
+            return False
+
+    def set_remember_password(self, remember_password):
+        """
+        Sets whether or not this account should save its password.
+
+        @param remember_password True if should remember the password,
+                                 or False otherwise
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_remember_password( \
+                self._get_structure(), remember_password)
+            return True
+        else:
+            return False
+
+    def set_enabled(self, value):
+        """
+        Sets wheter or not this account is enabled.
+
+        @param value True if it is enabled, or False otherwise
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_set_enabled(self._get_structure(), \
+                    self.__core.ui_name, bool(value))
+            return True
+        else:
+            return False
+
+    def new(self):
+        """
+        Creates a new account.
+
+        @return True if successful, False if account already exists
+        """
+        if self.__exists:
+            return False
+        else:
+            account.purple_accounts_add(account.purple_account_new( \
+                    self.__username, self.__protocol.id))
+
+            self.__exists = True
+            return True
+
+    def remove(self):
+        """
+        Removes an existing account.
+
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_accounts_delete(self._get_structure())
+            self__exists = False
+            return True
+        else:
+            return False
+
+    def connect(self):
+        """
+        Connects to an account.
+
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_connect(self._get_structure())
+            return True
+        else:
+            return False
+
+    def disconnect(self):
+        """
+        Disconnects from an account.
+
+        @return True if successful, False if account doesn't exists
+        """
+        if self.__exists:
+            account.purple_account_disconnect(self._get_structure())
+            return True
+        else:
+            return False
+
+    def add_buddy(self, name, alias=None, group=None):
+        """
+        Adds a buddy to account's buddy list.
+
+        @param name  Buddy name
+        @param alias Buddy alias (optional)
+        @return True if successfull, False otherwise
+        """
+        cdef blist.PurpleBuddy *c_buddy = NULL
+        cdef blist.PurpleGroup *c_group = NULL
+        cdef char *c_alias = NULL
+
+        if alias:
+            c_alias = alias
+        else:
+            c_alias = NULL
+
+        if self.__exists and \
+                account.purple_account_is_connected(self._get_structure()):
+            if blist.purple_find_buddy(self._get_structure(), name):
+                return False
+
+            if group:
+                c_group = blist.purple_find_group(group)
+                if c_group == NULL:
+                    c_group = blist.purple_group_new(group)
+
+            c_buddy = blist.purple_buddy_new(self._get_structure(), \
+                    name, c_alias)
+            if c_buddy == NULL:
+                return False
+
+            blist.purple_blist_add_buddy(c_buddy, NULL, c_group, NULL)
+            account.purple_account_add_buddy(self._get_structure(), c_buddy)
+            return True
+
+        else:
+            return None
+
+    def remove_buddy(self, name):
+        """
+        Removes a buddy from account's buddy list.
+
+        @param name Buddy name
+        @return True if successful, False otherwise
+        """
+        cdef blist.PurpleBuddy *c_buddy = NULL
+        cdef blist.PurpleGroup *c_group = NULL
+
+        if self.__exists and \
+                account.purple_account_is_connected(self._get_structure()):
+            c_buddy = blist.purple_find_buddy(self._get_structure(), name)
+            if c_buddy == NULL:
+                return False
+
+            c_group = blist.purple_buddy_get_group(c_buddy)
+
+            account.purple_account_remove_buddy(self._get_structure(), \
+                    c_buddy, c_group)
+            blist.purple_blist_remove_buddy(c_buddy)
+            return True
+        else:
+            return None
+
+    def get_buddies_online(self):
+        cdef glib.GSList *iter = NULL
+        cdef blist.PurpleBuddy *c_buddy = NULL
+        cdef char *c_alias = NULL
+
+        if self.__exists and \
+                account.purple_account_is_connected(self._get_structure()):
+            iter = blist.purple_find_buddies(self._get_structure(), NULL)
+
+            buddies_list = []
+            while iter:
+                c_alias = NULL
+                c_buddy = <blist.PurpleBuddy *> iter.data
+                if <blist.PurpleBuddy *> c_buddy and \
+                        status.purple_presence_is_online( \
+                                blist.purple_buddy_get_presence(c_buddy)):
+                    name = <char *> blist.purple_buddy_get_name(c_buddy)
+
+                    new_buddy = Buddy(name, self)
+
+                    c_alias = <char *> blist.purple_buddy_get_alias_only(c_buddy)
+                    if c_alias:
+                        new_buddy.set_alias(c_alias)
+
+                    buddies_list.append(new_buddy)
+                iter = iter.next
+            return buddies_list
+        else:
+            return None
+
+    def request_add_buddy(self, buddy_username, buddy_alias):
+        if buddy_alias:
+            blist.purple_blist_request_add_buddy(self._get_structure(), \
+                    buddy_username, NULL, buddy_alias)
+        else:
+            blist.purple_blist_request_add_buddy(self._get_structure(), \
+                    buddy_username, NULL, NULL)