Ticket #317: gtkui_torrentview_update_sidebar.patch

deluge/ui/gtkui/torrentview.py

@@ -195 +195 @@
         for torrent_id in state:
             self.add_row(torrent_id)
         
-        self.update_filter()    
         self.update()
         
     def stop(self):
@@ -209 +208 @@
         
     def set_filter(self, field, condition):
         """Sets filters for the torrentview.."""
-        if self.filter != (None, None):
-            self.filter = (None, None)
-            self.update_filter()
-        
         self.filter = (field, condition)
-        self.update_filter()
         self.update()
     
     def send_status_request(self, columns=None):
@@ -251 +245 @@
         # Create list of torrent_ids in need of status updates
         torrent_ids = []
         for row in self.liststore:
-            # Only add this torrent_id if it's not filtered
-            if row[self.columns["filter"].column_indices[0]] == True:
-                torrent_ids.append(row[self.columns["torrent_id"].column_indices[0]])
+            # Add this torrent_id even if it is currently filtered, because
+            # the event that triggered this update may have made this torrent
+            # unfiltered
+            torrent_ids.append(row[self.columns["torrent_id"].column_indices[0]])
 
         if torrent_ids == []:
             return
@@ -265 +260 @@
     
     def update_filter(self):
         # Update the filter view
+        filter_column = self.columns["filter"].column_indices[0]
+        field, condition = self.filter
         for row in self.liststore:
-            filter_column = self.columns["filter"].column_indices[0]
             # Create a function to create a new liststore with only the
             # desired rows based on the filter.
-            field, condition = self.filter
             if field == None and condition == None:
                 row[filter_column] = True
                 continue
@@ -342 +337 @@
         
         if self.status != {}:
             self.update_view()
-        
+            # The status of a torrent may have changed. Update the filter
+            self.update_filter()
+
     def add_row(self, torrent_id):
         """Adds a new torrent row to the treeview"""
         # Insert a new row to the liststore
@@ -353 +350 @@
                     self.columns["torrent_id"].column_indices[0], 
                     torrent_id)
         self.update()
-        self.update_filter()
         
     def remove_row(self, torrent_id):
         """Removes a row with torrent_id"""
@@ -362 +358 @@
                 self.liststore.remove(row.iter)
                 # Force an update of the torrentview
                 self.update()
-                self.update_filter()
                 break
             
     def get_selected_torrent(self):