Fixed protocol append typo on purple.pyx.
[python-purple] / account.pyx
index a6d2412..8973bfe 100644 (file)
 
 cimport purple
 
-from protocol import Protocol
-
 cdef class Account:
     """
     Account class
-    @param core
     @param username
-    @param protocol_id
+    @param protocol Protocol class instance
+    @param core Purple class instance
     """
 
-    def __init__(self, core, username, protocol_id):
-        self.__core = core
+    cdef object __username
+    cdef object __protocol
+    cdef object __core
+    cdef object __exists
+
+    def __init__(self, username, protocol, core):
         self.__username = username
-        self.__protocol = Protocol(self, protocol_id)
+        self.__protocol = protocol
+        self.__core = core
 
-        if self._get_structure() == NULL:
-            self.__exists = False
-        else:
+        if protocol.exists and self._get_structure() != NULL:
             self.__exists = True
+        else:
+            self.__exists = False
 
     cdef account.PurpleAccount *_get_structure(self):
-        return account.purple_accounts_find(self.username, \
-                self.protocol_id)
+        return account.purple_accounts_find(self.__username, \
+                self.__protocol.id)
 
     def __is_connected(self):
         if self.__exists:
@@ -86,18 +89,84 @@ cdef class Account:
             return self.__username
     username = property(__get_username)
 
-    def __get_protocol_id(self):
-        cdef char *protocol_id = NULL
-        if self.__exists:
-            protocol_id = <char *> account.purple_account_get_protocol_id( \
-                    self._get_structure())
-            if protocol_id:
-                return protocol_id
-            else:
-                return None
-        else:
-            return self.protocol_id
-    protocol_id = property(__get_protocol_id)
+    def __get_protocol(self):
+        return self.__protocol
+    protocol = property(__get_protocol)
+
+    def _get_protocol_options(self):
+        """
+        @return Dictionary {'setting': value, ...} 
+        """
+        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 *label_name
+        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 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 = <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 = <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)
+
+                val = str(<char *> str_value)
+
+            elif type == prefs.PURPLE_PREF_INT:
+
+                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 = 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 = <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
@@ -147,7 +216,7 @@ cdef class Account:
     def __get_enabled(self):
         if self.__exists:
             return account.purple_account_get_enabled(self._get_structure(), \
-                    self.core.ui_name)
+                    self.__core.ui_name)
         else:
             return None
     enabled = property(__get_enabled)
@@ -166,19 +235,78 @@ cdef class Account:
         else:
             return False
 
-    def set_protocol_id(self, protocol_id):
+    def set_protocol(self, protocol):
         """
-        Sets the account's protocol ID.
+        Sets the account's protocol.
 
-        @param protocol_id The protocol ID
+        @param protocol A Protocol class instance
         @return True if successful, False if account doesn't exists
         """
-        if self.__exists:
-            self.__protocol._set_protocol_id(protocol_id)
+        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 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.
@@ -245,7 +373,7 @@ cdef class Account:
         """
         if self.__exists:
             account.purple_account_set_enabled(self._get_structure(), \
-                    self.core.ui_name, bool(value))
+                    self.__core.ui_name, bool(value))
             return True
         else:
             return False
@@ -259,7 +387,7 @@ cdef class Account:
         if self.__exists:
             return False
         else:
-            account.purple_account_new(self.username, self.protocol_id)
+            account.purple_account_new(self.__username, self.__protocol.id)
             self.__exists = True
             return True
 
@@ -286,3 +414,4 @@ cdef class Account:
             return True
         else:
             return False
+