Fixed wrong assertion when sender name is NULL.
[python-purple] / purple.pyx
index 10dcd62..1a82c68 100644 (file)
@@ -35,8 +35,9 @@ cdef conversation.PurpleConversationUiOps c_conv_ui_ops
 cdef core.PurpleCoreUiOps c_core_ui_ops
 cdef eventloop.PurpleEventLoopUiOps c_eventloop_ui_ops
 #cdef ft.PurpleXferUiOps c_ft_ui_ops
-#cdef notify.PurpleNotifyUiOps c_notify_ui_ops
-#cdef request.PurpleRequestUiOps c_request_ui_ops
+cdef notify.PurpleNotifyUiOps c_notify_ui_ops
+#cdef privacy.PurplePrivacyUiOps c_privacy_ui_ops
+cdef request.PurpleRequestUiOps c_request_ui_ops
 #cdef roomlist.PurpleRoomlistUiOps c_rlist_ui_ops
 
 cdef glib.GHashTable *c_ui_info
@@ -47,6 +48,14 @@ include "account_cbs.pxd"
 include "blist_cbs.pxd"
 include "connection_cbs.pxd"
 include "conversation_cbs.pxd"
+#include "xfer_cbs.pxd"
+include "notify_cbs.pxd"
+#include "privacy_cbs.pxd"
+include "request_cbs.pxd"
+#include "roomlist_cbs.pxd"
+include "signal_cbs.pxd"
+
+include "util.pxd"
 
 cdef class Purple:
     """ Purple class.
@@ -56,7 +65,10 @@ cdef class Purple:
     @parm default_path: Full path for libpurple user files.
     """
 
+    cdef object __accounts
+
     def __init__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__):
+        self.__accounts = {}
         if app_name is not __APP_NAME__:
             __APP_NAME__ = app_name
 
@@ -68,9 +80,9 @@ cdef class Purple:
         plugin.c_purple_plugins_add_search_path(default_path)
 
         # adds glib iteration inside ecore main loop
-        ecore.idler_add(self.__glib_iteration_when_idle)
+        ecore.timer_add(0.001, self.__glib_iteration_when_idle)
 
-    def __del__(self):
+    def destroy(self):
         core.c_purple_core_quit()
 
     cdef void __core_ui_ops_ui_prefs_init(self):
@@ -89,8 +101,9 @@ cdef class Purple:
         connection.c_purple_connections_set_ui_ops(&c_conn_ui_ops)
         blist.c_purple_blist_set_ui_ops(&c_blist_ui_ops)
         conversation.c_purple_conversations_set_ui_ops(&c_conv_ui_ops)
-        #notify.c_purple_notify_set_ui_ops(&c_notify_ui_ops)
-        #request.c_purple_request_set_ui_ops(&c_request_ui_ops)
+        notify.c_purple_notify_set_ui_ops(&c_notify_ui_ops)
+        #privacy.c_purple_privacy_set_ui_ops(&c_privacy_ui_ops)
+        request.c_purple_request_set_ui_ops(&c_request_ui_ops)
         #ft.c_purple_xfers_set_ui_ops(&c_ft_ui_ops)
         #roomlist.c_purple_roomlist_set_ui_ops(&c_rlist_ui_ops)
 
@@ -104,9 +117,10 @@ cdef class Purple:
         blist.c_purple_blist_set_ui_ops(NULL)
         conversation.c_purple_conversations_set_ui_ops(NULL)
         notify.c_purple_notify_set_ui_ops(NULL)
+        #privacy.c_purple_privacy_set_ui_ops(NULL)
         request.c_purple_request_set_ui_ops(NULL)
-        ft.c_purple_xfers_set_ui_ops(NULL)
-        roomlist.c_purple_roomlist_set_ui_ops(NULL)
+        #ft.c_purple_xfers_set_ui_ops(NULL)
+        #roomlist.c_purple_roomlist_set_ui_ops(NULL)
 
         if c_ui_info:
             glib.g_hash_table_destroy(c_ui_info)
@@ -125,20 +139,9 @@ cdef class Purple:
         glib.g_main_context_iteration(NULL, False)
         return True
 
-    def purple_init(self, callbacks_dict=None):
+    def purple_init(self):
         """ Initializes libpurple """
 
-        if callbacks_dict is not None:
-            global account_cbs
-            global blist_cbs
-            global connection_cbs
-            global conversation_cbs
-
-            account_cbs = callbacks_dict["account"]
-            blist_cbs = callbacks_dict["blist"]
-            connection_cbs = callbacks_dict["connection"]
-            conversation_cbs = callbacks_dict["conversation"]
-
         c_account_ui_ops.notify_added = notify_added
         c_account_ui_ops.status_changed = status_changed
         c_account_ui_ops.request_add = request_add
@@ -181,6 +184,24 @@ cdef class Purple:
         c_conv_ui_ops.custom_smiley_close = custom_smiley_close
         c_conv_ui_ops.send_confirm = send_confirm
 
+        c_notify_ui_ops.notify_message = notify_message
+        c_notify_ui_ops.notify_email = notify_email
+        c_notify_ui_ops.notify_emails = notify_emails
+        c_notify_ui_ops.notify_formatted = notify_formatted
+        c_notify_ui_ops.notify_searchresults = notify_searchresults
+        c_notify_ui_ops.notify_searchresults_new_rows = notify_searchresults_new_rows
+        c_notify_ui_ops.notify_userinfo = notify_userinfo
+        c_notify_ui_ops.notify_uri = notify_uri
+        c_notify_ui_ops.close_notify = close_notify
+
+        c_request_ui_ops.request_input = request_input
+        c_request_ui_ops.request_choice = request_choice
+        c_request_ui_ops.request_action = request_action
+        c_request_ui_ops.request_fields = request_fields
+        c_request_ui_ops.request_file = request_file
+        c_request_ui_ops.close_request = close_request
+        c_request_ui_ops.request_folder = request_folder
+
         c_core_ui_ops.ui_prefs_init = <void (*)()> self.__core_ui_ops_ui_prefs_init
         c_core_ui_ops.debug_ui_init = <void (*)()> self.__core_ui_ops_debug_init
         c_core_ui_ops.ui_init = <void (*)()> self.__core_ui_ops_ui_init
@@ -192,7 +213,7 @@ cdef class Purple:
         c_eventloop_ui_ops.input_add = glib_input_add
         c_eventloop_ui_ops.input_remove = glib.g_source_remove
         c_eventloop_ui_ops.input_get_error = NULL
-        c_eventloop_ui_ops.timeout_add_seconds = glib.g_timeout_add_seconds
+        c_eventloop_ui_ops.timeout_add_seconds = NULL
 
         core.c_purple_core_set_ui_ops(&c_core_ui_ops)
         eventloop.c_purple_eventloop_set_ui_ops(&c_eventloop_ui_ops)
@@ -216,26 +237,119 @@ cdef class Purple:
         # load pounces
         pounce.c_purple_pounces_load()
 
+        # initialize accounts
+        self.load_accounts()
+
         return ret
 
-    def get_protocols(self):
+    def add_callback(self, type, name, func):
+        """ Adds a callback 'func' with given name 'name' inside type 'type'.
+        Example: add_callback("account", "notify-added", notify_added_cb)
+        """
+        global account_cbs
+        global blist_cbs
+        global connection_cbs
+        global conversation_cbs
+        global notify_cbs
+        global request_cbs
+
+        { "account": account_cbs,
+          "blist": blist_cbs,
+          "connection": connection_cbs,
+          "conversation": conversation_cbs,
+          "notify": notify_cbs,
+          "request": request_cbs }[type][name] = func
+
+    def signal_connect(self, name=None, cb=None):
+        cdef int handle
+        cdef plugin.PurplePlugin *jabber
+
+        if name is None:
+            return
+
+        jabber = prpl.c_purple_find_prpl("prpl-jabber")
+        if jabber == NULL:
+            return
+
+        global signal_cbs
+        signal_cbs[name] = cb
+
+        if name == "signed-on":
+            signals.c_purple_signal_connect(
+                    connection.c_purple_connections_get_handle(),
+                    "signed-on", &handle,
+                    <signals.PurpleCallback> signal_signed_on_cb, NULL)
+        elif name == "signed-off":
+            signals.c_purple_signal_connect(
+                    connection.c_purple_connections_get_handle(),
+                    "signed-off", &handle,
+                    <signals.PurpleCallback> signal_signed_off_cb, NULL)
+        elif name == "connection-error":
+            signals.c_purple_signal_connect(
+                    connection.c_purple_connections_get_handle(),
+                    "connection-error", &handle,
+                    <signals.PurpleCallback> signal_connection_error_cb, NULL)
+        elif name == "buddy-signed-on":
+            signals.c_purple_signal_connect(
+                    blist.c_purple_blist_get_handle(),
+                    "buddy-signed-on", &handle,
+                    <signals.PurpleCallback> signal_buddy_signed_on_cb, NULL)
+        elif name == "buddy-signed-off":
+            signals.c_purple_signal_connect(
+                    blist.c_purple_blist_get_handle(),
+                    "buddy-signed-off", &handle,
+                    <signals.PurpleCallback> signal_buddy_signed_off_cb, NULL)
+        elif name == "receiving-im-msg":
+            signals.c_purple_signal_connect(
+                    conversation.c_purple_conversations_get_handle(),
+                    "receiving-im-msg", &handle,
+                    <signals.PurpleCallback> signal_receiving_im_msg_cb, NULL)
+        elif name == "jabber-receiving-xmlnode":
+            signals.c_purple_signal_connect(
+                    jabber, "jabber-receiving-xmlnode", &handle,
+                    <signals.PurpleCallback> jabber_receiving_xmlnode_cb, NULL)
+
+    def __get_accounts(self):
+        return self.__accounts
+    accounts = property(__get_accounts)
+
+    def new_account(self, username, protocol_id):
+        acc = Account(username, protocol_id)
+        return acc
+
+    def load_accounts(self):
         cdef glib.GList *iter
-        cdef plugin.PurplePlugin *__plugin
-        protocols = []
-        iter = plugin.c_purple_plugins_get_protocols()
+        cdef account.PurpleAccount *acc
+        iter = account.c_purple_accounts_get_all()
         while iter:
-            __plugin = <plugin.PurplePlugin*> iter.data
-            if __plugin.info and __plugin.info.name:
-                protocols += [(__plugin.info.id, __plugin.info.name)]
+            acc = <account.PurpleAccount *> iter.data
+            if <account.PurpleAccount *>acc:
+                username = account.c_purple_account_get_username(acc)
+                protocol_id = account.c_purple_account_get_protocol_id(acc)
+                self.account_add(username.split("/")[0], protocol_id, "172.18.216.211", 8080)
             iter = iter.next
-        return protocols
-
-    def connect(self):
-        conn = Connection()
-        conn.connect()
 
+    def account_add(self, username, protocol_id, host, port):
+        if not self.account_verify(username):
+            acc = purple.Account(username, protocol_id)
+            self.__accounts[username] = acc
+            if not account.c_purple_accounts_find(username, protocol_id):
+                acc.proxy.set_type(purple.ProxyInfoType().HTTP)
+                acc.proxy.set_host(host)
+                acc.proxy.set_port(port)
+                acc.save_into_xml()
+
+    def account_verify(self, acc_username):
+        if self.__accounts:
+            for username in self.__accounts.keys():
+                if acc_username == username:
+                    return self.__accounts[username]
+        else:
+            return None
+
+include "plugin.pyx"
 include "proxy.pyx"
 include "account.pyx"
 include "buddy.pyx"
-include "connection.pyx"
+#include "connection.pyx"
 include "conversation.pyx"