r121 - in /debtorrent/trunk/DebTorrent/BT1: Downloader.py FileSelector.py

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

Author: camrdale-guest
Date: Thu Jun 21 05:25:47 2007
New Revision: 121

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=121
Log:
Change the downloader to only drop connections to seeds when the download is fully complete.

Modified:
    debtorrent/trunk/DebTorrent/BT1/Downloader.py
    debtorrent/trunk/DebTorrent/BT1/FileSelector.py

Modified: debtorrent/trunk/DebTorrent/BT1/Downloader.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/Downloader.py?rev=121&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/Downloader.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/Downloader.py Thu Jun 21 05:25:47 2007
@@ -458,7 +458,7 @@
             self.downloader.picker.got_have(index)
             if self.have.complete():
                 self.downloader.picker.became_seed()
-                if self.downloader.storage.am_I_complete():
+                if not self.downloader.storage.get_amount_left():
                     self.downloader.add_disconnected_seed(self.connection.get_readable_id())
                     self.connection.close()
             elif self.downloader.endgamemode:
@@ -493,7 +493,7 @@
         
         """
         
-        if self.downloader.storage.am_I_complete() and have.complete():
+        if not self.downloader.storage.get_amount_left() and have.complete():
             if self.downloader.super_seeding:
                 self.connection.send_bitfield(have.tostring()) # be nice, show you're a seed too
             self.connection.close()
@@ -908,7 +908,7 @@
             self.endgamemode = False
         if self.endgame_queued_pieces and not self.endgamemode:
             self.requeue_piece_download()
-        if self.storage.am_I_complete():
+        if not self.storage.get_amount_left():
             assert not self.all_requests
             assert not self.endgamemode
             for d in [i for i in self.downloads if i.have.complete()]:

Modified: debtorrent/trunk/DebTorrent/BT1/FileSelector.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/FileSelector.py?rev=121&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/FileSelector.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/FileSelector.py Thu Jun 21 05:25:47 2007
@@ -200,7 +200,6 @@
         
 
     def _initialize_piece_priority(self, new_priority):
-        was_complete = self.storagewrapper.am_I_complete()
         new_piece_priority = self._get_piece_priority_list(new_priority)
         pieces = range(self.numpieces)
         shuffle(pieces)