Changeset 3760

Timestamp:

08/26/08 22:38:22 (3 months ago)

Author:

andar

Message:

Tracker errors now change the tracker status

Files:

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

branches/1.0.0_RC/ChangeLog

@@ -2 +2 @@
- Core:
-  * Attempt to automatically upgrade a 0.5.x state file to new format
+  * Tracker errors now change the tracker status
- 
- Plugins:

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

@@ -146 +146 @@
-        self.alerts.register_handler("tracker_warning_alert",
-            self.on_alert_tracker_warning)
+        self.alerts.register_handler("tracker_error_alert",
+            self.on_alert_tracker_error)
-        self.alerts.register_handler("storage_moved_alert",
-            self.on_alert_storage_moved)
@@ -710 +712 @@
-        except KeyError:
-            log.debug("torrent_id doesn't exist.")
+
+    def on_alert_tracker_error(self, alert):
+        log.debug("on_alert_tracker_error")
+        torrent = self.torrents[str(alert.handle.info_hash())]
+        
+        tracker_status = "%s: %s" % (_("Error"), str(alert.message()))
+        try:
+            torrent.set_tracker_status(tracker_status)
+        except KeyError:
+            log.debug("torrent_id doesn't exist.")
-            
-    def on_alert_storage_moved(self, alert):

trunk/deluge/core/torrentmanager.py

@@ -146 +146 @@
-        self.alerts.register_handler("tracker_warning_alert",
-            self.on_alert_tracker_warning)
+        self.alerts.register_handler("tracker_error_alert",
+            self.on_alert_tracker_error)
-        self.alerts.register_handler("storage_moved_alert",
-            self.on_alert_storage_moved)
@@ -693 +695 @@
-        except KeyError:
-            log.debug("torrent_id doesn't exist.")
+
+    def on_alert_tracker_error(self, alert):
+        log.debug("on_alert_tracker_error")
+        torrent = self.torrents[str(alert.handle.info_hash())]
+        
+        tracker_status = "%s: %s" % (_("Error"), str(alert.message()))
+        try:
+            torrent.set_tracker_status(tracker_status)
+        except KeyError:
+            log.debug("torrent_id doesn't exist.")
-            
-    def on_alert_storage_moved(self, alert):