Changeset 9727

Timestamp:

05/31/08 21:41:42 (6 months ago)

Author:

jim++

Message:

Use idle_add for history_win._fill_completion_dict (LOT faster)

Files:

• trunk/src/history_window.py (modified) (8 diffs)

trunk/src/history_window.py

@@ -118 +118 @@
                 self.accounts_seen_online = [] # Update dict when new accounts connect
                 self.jids_to_search = []
-                self._fill_completion_dict()
+
+                # This will load history too
+                gobject.idle_add(self._fill_completion_dict().next)
 
                 if jid:
@@ -124 +126 @@
 
                 xml.signal_autoconnect(self)
-                self._load_history(jid, account)
                 self.window.show_all()
 
         def _fill_completion_dict(self):
-                '''Fill completion_dict for key auto completion. 
+                '''Fill completion_dict for key auto completion. Then load history for 
+                current jid (by calling another function).
 
                 Key will be either jid or full_completion_name  
@@ -134 +136 @@
                 
                 {key : (jid, account, nick_name, full_completion_name}
+                this is a generator and does pseudo-threading via idle_add()
                 '''
                 liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry)
@@ -151 +154 @@
                 contact_img = gajim.interface.jabber_state_images['16']['online']
                 muc_active_pix = muc_active_img.get_pixbuf()
-                contact_pix = contact_img.get_pixbuf()                  
+                contact_pix = contact_img.get_pixbuf()
+                
                 keys = self.completion_dict.keys()
+                # Move the actual jid at first so we load history faster
+                actual_jid = self.jid_entry.get_text().decode('utf-8')
+                keys.remove(actual_jid)
+                keys.insert(0, actual_jid)
                 # Map jid to info tuple
                 # Warning : This for is time critical with big DB 
@@ -181 +189 @@
                         else:
                                 pix = contact_pix
-                        
+
                         liststore.append((pix, completed))
                         self.completion_dict[key] = (info_jid, info_acc, info_name,
@@ -187 +195 @@
                         self.completion_dict[completed] = (info_jid, info_acc,
                                 info_name, info_completion)
+                        if key == actual_jid:
+                                self._load_history(info_jid, info_acc)
+                        yield True
                 keys.sort()
+                yield False
         
         def _get_account_for_jid(self, jid):
@@ -481 +493 @@
                                 local_time = time.localtime(tim)
                                 date = time.strftime('%x', local_time)
-                                #  jid (to which log is assigned to), name, date, message, time (full unix time)
+                                #  jid (to which log is assigned to), name, date, message, 
+                                # time (full unix time)
                                 model.append((jid, contact_name, date, message, tim))
 
@@ -574 +587 @@
         def open_history(self, jid, account):
                 '''Load chat history of the specified jid'''
+                self.jid_entry.set_text(jid)
                 if account and account not in self.accounts_seen_online:
                         # Update dict to not only show bare jid
-                        self._fill_completion_dict
-                self.jid_entry.set_text(jid)
-                self._load_history(jid, account)
+                        gobject.idle_add(self._fill_completion_dict().next)
+                else:
+                        # Only in that case because it's called by self._fill_completion_dict()
+                        # otherwise 
+                        self._load_history(jid, account)
                 self.results_window.set_property('visible', False)