Changeset 4019

Timestamp:

10/15/08 23:57:03 (3 months ago)

Author:

andar

Message:

Fix IP filter

Files:

• branches/1.0.0_RC/ChangeLog (modified) (1 diff)
• branches/1.0.0_RC/deluge/core/core.py (modified) (2 diffs)
• trunk/deluge/core/core.py (modified) (3 diffs)

branches/1.0.0_RC/ChangeLog

@@ -6 +6 @@
   * Fix issue where fastresume files would be rejected when using FAT32.  This
     would cause the torrent to be rechecked on every startup.
+  * Fix ip filtering
 
 Deluge 1.0.2 (10 October 2008)

branches/1.0.0_RC/deluge/core/core.py

@@ -224 +224 @@
         self.session.set_settings(self.settings)
         
+        # Create an ip filter
+        self.ip_filter = lt.ip_filter()
+        # This keeps track of the timer to set the ip filter.. We do this a few
+        # seconds aftering adding a rule so that 'batch' adding of rules isn't slow.
+        self._set_ip_filter_timer = None
+
         # Load metadata extension
         self.session.add_extension(lt.create_metadata_plugin)
@@ -615 +621 @@
     def export_block_ip_range(self, range):
         """Block an ip range"""
-        try:
-            self.ip_filter.add_rule(range[0], range[1], 1)
-        except AttributeError:
-            self.export_reset_ip_filter()
-            self.ip_filter.add_rule(range[0], range[1], 1)
-    
+        self.ip_filter.add_rule(range[0], range[1], 1)
+        
+        # Start a 2 second timer (and remove the previous one if it exists)
+        if self._set_ip_filter_timer:
+            gobject.source_remove(self._set_ip_filter_timer)
+        self._set_ip_filter_timer = gobject.timeout_add(2000, self.session.set_ip_filter, self.ip_filter)
+
     def export_reset_ip_filter(self):
         """Clears the ip filter"""

trunk/deluge/core/core.py

@@ -184 +184 @@
         self.session.set_settings(self.settings)
 
+        # Create an ip filter
+        self.ip_filter = lt.ip_filter()
+        # This keeps track of the timer to set the ip filter.. We do this a few
+        # seconds aftering adding a rule so that 'batch' adding of rules isn't slow.
+        self._set_ip_filter_timer = None
+       
         # Load metadata extension
         self.session.add_extension(lt.create_metadata_plugin)
@@ -634 +640 @@
     def export_block_ip_range(self, range):
         """Block an ip range"""
-        try:
-            self.ip_filter.add_rule(range[0], range[1], 1)
-        except AttributeError:
-            self.export_reset_ip_filter()
-            self.ip_filter.add_rule(range[0], range[1], 1)
-
+        self.ip_filter.add_rule(range[0], range[1], 1)
+        
+        # Start a 2 second timer (and remove the previous one if it exists)
+        if self._set_ip_filter_timer:
+            gobject.source_remove(self._set_ip_filter_timer)
+        self._set_ip_filter_timer = gobject.timeout_add(2000, self.session.set_ip_filter, self.ip_filter)
+        
     def export_reset_ip_filter(self):
         """Clears the ip filter"""
@@ -707 +714 @@
         list of (index, filename) pairs."""
         self.torrents[torrent_id].rename_files(filenames)
+    
+    def export_rename_folder(self, torrent_id, folder, new_folder):
+        """Renames the 'folder' to 'new_folder' in 'torrent_id'."""
+        self.torrents[torrent_id].rename_folder(folder, new_folder)
 
     ## Queueing functions ##