Update of /cvsroot/btplusplus/BT++/src/core
In directory sc8-pr-cvs1:/tmp/cvs-serv19487/src/core
Modified Files:
Storage.py Rerequester.py DownloaderFeedback.py
Log Message:
- Fixed core bug.
- Modified 'AddTorrent' downloading.
- History shows uploaded (transfered) MB.
- Fixed bug in right-click-menu of the history tab.
- Corrected some of the grid info display.
Index: Storage.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/core/Storage.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Storage.py 28 Mar 2003 13:38:04 -0000 1.4
--- Storage.py 31 Mar 2003 14:15:29 -0000 1.5
***************
*** 70,76 ****
def set_readonly(self):
# may raise IOError or OSError
! for file, old in self.handles.items():
! self.handles[file] = open(file, 'rb')
old.close()
def close(self):
--- 70,78 ----
def set_readonly(self):
# may raise IOError or OSError
! for file in self.whandles.keys():
! old = self.handles[file]
! old.flush()
old.close()
+ self.handles[file] = open(file, 'rb')
def close(self):
***************
*** 108,111 ****
--- 110,114 ----
for file, begin, end in self._intervals(pos, len(s)):
if not self.whandles.has_key(file):
+ self.handles[file].close()
self.handles[file] = open(file, 'rb+')
self.whandles[file] = 1
Index: Rerequester.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/core/Rerequester.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Rerequester.py 28 Mar 2003 12:44:28 -0000 1.2
--- Rerequester.py 31 Mar 2003 14:15:30 -0000 1.3
***************
*** 7,10 ****
--- 7,11 ----
from threading import Thread, Lock
from traceback import print_exc
+ from socket import error
true = 1
false = 0
***************
*** 80,84 ****
self.postrequest(r, callback)
self.externalsched(add)
! except IOError, e:
if set():
def fail(self = self, r = 'Problem connecting to tracker - ' + str(e)):
--- 81,85 ----
self.postrequest(r, callback)
self.externalsched(add)
! except (IOError, error), e:
if set():
def fail(self = self, r = 'Problem connecting to tracker - ' + str(e)):
Index: DownloaderFeedback.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/core/DownloaderFeedback.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DownloaderFeedback.py 28 Mar 2003 12:44:28 -0000 1.2
--- DownloaderFeedback.py 31 Mar 2003 14:15:31 -0000 1.3
***************
*** 17,21 ****
finflag,
interval,
! sp ):
self.choker = choker
self.add_task = add_task
--- 17,23 ----
finflag,
interval,
! sp,
! up,
! down ):
self.choker = choker
self.add_task = add_task
***************
*** 29,32 ****
--- 31,36 ----
self.interval = interval
self.sp = sp
+ self.up = up
+ self.down = down
self.lastids = []
self.display()
***************
*** 87,91 ****
self.spew()
if self.finflag.isSet():
! self.statusfunc(upRate = self.upfunc())
return
timeEst = self.remainingfunc()
--- 91,95 ----
self.spew()
if self.finflag.isSet():
! self.statusfunc(upRate = self.upfunc(), up = self.up (), down = self.down ())
return
timeEst = self.remainingfunc()
***************
*** 95,100 ****
if timeEst is not None:
self.statusfunc(timeEst = timeEst, fractionDone = fractionDone,
! downRate = self.downfunc(), upRate = self.upfunc())
else:
self.statusfunc(fractionDone = fractionDone,
! downRate = self.downfunc(), upRate = self.upfunc())
--- 99,104 ----
if timeEst is not None:
self.statusfunc(timeEst = timeEst, fractionDone = fractionDone,
! downRate = self.downfunc(), upRate = self.upfunc(), up = self.up(), down = self.down())
else:
self.statusfunc(fractionDone = fractionDone,
! downRate = self.downfunc(), upRate = self.upfunc(), up = self.up(), down = self.down())
|
