[Debtorrent-commits] r73 - in /debtorrent/branches/http-listen/DebTorrent: BT1/Storage.py RateLimiter.py piecebuffer.py

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

Author: camrdale-guest
Date: Wed May 30 21:17:44 2007
New Revision: 73

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=73
Log:
Completed changing of default to all files disabled.
Some modifications to DEBUG messages.

Modified:
    debtorrent/branches/http-listen/DebTorrent/BT1/Storage.py
    debtorrent/branches/http-listen/DebTorrent/RateLimiter.py
    debtorrent/branches/http-listen/DebTorrent/piecebuffer.py

Modified: debtorrent/branches/http-listen/DebTorrent/BT1/Storage.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/branches/http-listen/DebTorrent/BT1/Storage.py?rev=73&op=diff
==============================================================================
--- debtorrent/branches/http-listen/DebTorrent/BT1/Storage.py (original)
+++ debtorrent/branches/http-listen/DebTorrent/BT1/Storage.py Wed May 30 21:17:44 2007
@@ -148,7 +148,7 @@
         @param config: the configuration information
         @type disabled_files: C{list} of C{boolean}
         @param disabled_files: list of true for the files that are disabled
-            (optional, default is no files disabled)
+            (optional, default is all files disabled)
         @raise IOError: unknown
         @raise ValueError: unknown
         
@@ -197,7 +197,7 @@
             else:
                 range = (total, total + length, 0, file)
                 self.file_ranges.append(range)
-                self.working_ranges.append([range])
+                self.working_ranges.append([])
                 numfiles += 1
                 total += length
                 start_piece = cur_piece
@@ -527,8 +527,8 @@
             self.ranges.extend(l)
         self.begins = [i[0] for i in self.ranges]
         if DEBUG:
-            print str(self.ranges)
-            print str(self.begins)
+            print 'file ranges:', str(self.ranges)
+            print 'file begins:', str(self.begins)
 
     def _intervals(self, pos, amount):
         """Get the files that are within the range.
@@ -549,7 +549,7 @@
         
         r = []
         stop = pos + amount
-        p = bisect(self.begins, pos) - 1
+        p = max(bisect(self.begins, pos) - 1,0)
         while p < len(self.ranges):
             begin, end, offset, file = self.ranges[p]
             if begin >= stop:
@@ -708,8 +708,8 @@
         update_pieces = []
 
         if DEBUG:            
-            print str(working_range)
-            print str(update_pieces)
+            print 'working range:', str(working_range)
+            print 'update pieces:', str(update_pieces)
         r = (tuple(working_range), tuple(update_pieces), tuple(disabled_files))
         self.disabled_ranges[f] = r
         return r
@@ -837,8 +837,9 @@
             if not self.files[i][1]:    # length == 0
                 continue
             if self.disabled[i]:
-                for start, end, offset, file in self._get_disabled_ranges(i)[2]:
-                    pfiles.extend([basename(file),getsize(file),int(getmtime(file))])
+                # Removed due to files always ending on pieces
+                #for start, end, offset, file in self._get_disabled_ranges(i)[2]:
+                #    pfiles.extend([basename(file),getsize(file),int(getmtime(file))])
                 continue
             file = self.files[i][0]
             files.extend([i,getsize(file),int(getmtime(file))])
@@ -886,7 +887,7 @@
                     valid_pieces[p] = 1
 
             if DEBUG:
-                print valid_pieces.keys()
+                print 'Saved list of valid pieces:', valid_pieces.keys()
             
             def test(old, size, mtime):
                 """Test that the file has not changed since the status save.                
@@ -933,6 +934,6 @@
             return []
 
         if DEBUG:
-            print valid_pieces.keys()                        
+            print 'Final list of valid pieces:', valid_pieces.keys()                        
         return valid_pieces.keys()
 

Modified: debtorrent/branches/http-listen/DebTorrent/RateLimiter.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/branches/http-listen/DebTorrent/RateLimiter.py?rev=73&op=diff
==============================================================================
--- debtorrent/branches/http-listen/DebTorrent/RateLimiter.py (original)
+++ debtorrent/branches/http-listen/DebTorrent/RateLimiter.py Wed May 30 21:17:44 2007
@@ -112,7 +112,7 @@
 
     def ping(self, delay):
         if DEBUG:
-            print delay
+            print 'ping delay:', delay
         if not self.autoadjust:
             return
         self.pings.append(delay > PING_BOUNDARY)

Modified: debtorrent/branches/http-listen/DebTorrent/piecebuffer.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/branches/http-listen/DebTorrent/piecebuffer.py?rev=73&op=diff
==============================================================================
--- debtorrent/branches/http-listen/DebTorrent/piecebuffer.py (original)
+++ debtorrent/branches/http-listen/DebTorrent/piecebuffer.py Wed May 30 21:17:44 2007
@@ -13,7 +13,7 @@
     True = 1
     False = 0
     
-DEBUG = True
+DEBUG = False
 
 class SingleBuffer:
     def __init__(self, pool):
@@ -22,7 +22,7 @@
 
     def init(self):
         if DEBUG:
-            print self.count
+            print 'new/pooled buffer index:', self.count
             '''
             for x in xrange(6,1,-1):
                 try:
@@ -57,7 +57,7 @@
 
     def release(self):
         if DEBUG:
-            print -self.count
+            print 'released buffer with index:', self.count
         self.pool.release(self)