r408 - /debtorrent/trunk/DebTorrent/BT1/track.py

[camrdale-guest at users.alioth.debian.org]

Author: camrdale-guest
Date: Mon Dec 15 06:26:48 2008
New Revision: 408

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=408
Log:
Remove old tracker entries that have no peers or stats.

Modified:
    debtorrent/trunk/DebTorrent/BT1/track.py

Modified: debtorrent/trunk/DebTorrent/BT1/track.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/track.py?rev=408&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/track.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/track.py Mon Dec 15 06:26:48 2008
@@ -1607,13 +1607,14 @@
                 if t < self.prevtime:
                     self.delete_peer(x,myid)
         self.prevtime = clock()
-        if (self.keep_dead != 1):
-            for key, value in self.downloads.items():
-                if len(value) == 0 and (
-                        self.allowed is None or not self.allowed.has_key(key) ):
-                    del self.times[key]
-                    del self.downloads[key]
-                    del self.seedcount[key]
+        for key, value in self.downloads.items():
+            if len(value) == 0 and (
+                    self.allowed is None or not self.allowed.has_key(key) ) and (
+                    self.keep_dead != 1 or (self.stats.get(key, {}).get('uploaded', 0) <= 0 and
+                                            self.stats.get(key, {}).get('downloaded', 0) <= 0)):
+                del self.times[key]
+                del self.downloads[key]
+                del self.seedcount[key]
         self.rawserver.add_task(self.expire_downloaders, self.timeout_downloaders_interval)