Menu
▾
▴
[BT++ CVS] BT++/src/TabTrans Loader.py,1.3,1.4 LoaderManager.py,1.4,1.5
|
From: <bel...@us...> - 2003-02-25 23:43:19
|
Update of /cvsroot/btplusplus/BT++/src/TabTrans
In directory sc8-pr-cvs1:/tmp/cvs-serv4449/src/TabTrans
Modified Files:
Loader.py LoaderManager.py
Log Message:
WebServer & Completed abstraction of LoaderManager
Index: Loader.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/Loader.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Loader.py 22 Feb 2003 16:47:48 -0000 1.3
--- Loader.py 25 Feb 2003 23:43:16 -0000 1.4
***************
*** 1,4 ****
from ConfigFile import Config, ConfigFile
! from TabLog.LogWindow import Log
from os import remove, rename, path, getpid, path, makedirs
--- 1,4 ----
from ConfigFile import Config, ConfigFile
! from BTConstants import *
from os import remove, rename, path, getpid, path, makedirs
***************
*** 25,37 ****
from core.bencode import bencode, bdecode
- from wxPython.wx import *
-
###########################################################################################################
###########################################################################################################
class Loader:
! def __init__(self, torrent, globup, refresh):
self.Refresh = refresh
self.FlagEnd = Event()
--- 25,36 ----
from core.bencode import bencode, bdecode
###########################################################################################################
###########################################################################################################
class Loader:
! def __init__(self, torrent, globup, refresh, log = None):
self.Refresh = refresh
+ self.Log = log
self.FlagEnd = Event()
***************
*** 121,124 ****
--- 120,124 ----
def StartHashing(self):
self.ThrHashing.start()
+ self.OnTrivialInfo('Hashing started')
def StartDownload( self ):
***************
*** 132,135 ****
--- 132,136 ----
self.ThrDownload.setDaemon(false)
self.ThrDownload.start()
+ self.OnTrivialInfo('Download started')
def PauseDownload( self ):
***************
*** 145,148 ****
--- 146,151 ----
upRate = 0,
activity = 'Paused' )
+
+ self.OnTrivialInfo('Download Paused')
###########################################################################################################
***************
*** 200,205 ****
if upRate != None:
self.Info['SpeedUp'] = float(upRate) / (1 << 10)
!
! self.Refresh()
###########################################################################################################
--- 203,211 ----
if upRate != None:
self.Info['SpeedUp'] = float(upRate) / (1 << 10)
!
! try:
! self.Refresh()
! except:
! pass
###########################################################################################################
***************
*** 250,261 ****
try:
rename( self.Config['TorFull'], path.join(Config.Get('Paths','History'), self.Config['Tor']) )
except:
self.OnError('Could not move torrent.')
def OnFail(self, reason, errorfunc = None, doneflag = None):
! wxMessageBox('failed: ' + reason)
def OnError(self, ErrorMsg):
! Log( 'Error [' + self.Config['File'] + ']: ' + ErrorMsg, [255,0,0])
###########################################################################################################
--- 256,287 ----
try:
rename( self.Config['TorFull'], path.join(Config.Get('Paths','History'), self.Config['Tor']) )
+ self.OnInfo( 'Download complete' )
except:
self.OnError('Could not move torrent.')
def OnFail(self, reason, errorfunc = None, doneflag = None):
! try:
! self.Log( 'Failed [' + self.Config['File'] + ']: ' + reason, loglevel = LOG_CRITICAL)
! except:
! pass
def OnError(self, ErrorMsg):
! try:
! self.Log( 'Error [' + self.Config['File'] + ']: ' + ErrorMsg, loglevel = LOG_ERROR)
! except:
! pass
!
! def OnInfo(self, Info):
! try:
! self.Log( '[' + self.Config['File'] + ']: ' + Info, loglevel = LOG_INFO)
! except:
! pass
!
! def OnTrivialInfo(self, Info):
! try:
! self.Log( '[' + self.Config['File'] + ']: ' + Info, loglevel = LOG_TRIVIAL)
! except:
! pass
!
###########################################################################################################
***************
*** 334,337 ****
--- 360,364 ----
self.FlagHash.set()
self.Hashed = true
+ self.OnTrivialInfo('Hashing complete')
###########################################################################################################
Index: LoaderManager.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/TabTrans/LoaderManager.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LoaderManager.py 22 Feb 2003 19:02:53 -0000 1.4
--- LoaderManager.py 25 Feb 2003 23:43:16 -0000 1.5
***************
*** 3,11 ****
from Loader import Loader
from core.CurrentRateMeasure import GlobalMeasure
!
! false = 0
! true = 1
!
! from TabLog.LogWindow import Log
class LoaderManager:
--- 3,7 ----
from Loader import Loader
from core.CurrentRateMeasure import GlobalMeasure
! from BTConstants import *
class LoaderManager:
***************
*** 20,28 ****
def CreateNewLoader(self, torrent):
try:
! loader = Loader(torrent, self.UpMeasure, self.Refresh)
self.Loaders.append( loader )
! Log( 'Added torrent "' + torrent + '"...' )
except:
! Log( 'Error adding torrent "' + torrent + '"...' )
###########################################################################################################
--- 16,30 ----
def CreateNewLoader(self, torrent):
try:
! loader = Loader(torrent, self.UpMeasure, self.Refresh, self.Log)
self.Loaders.append( loader )
! try:
! self.Log( 'Added torrent "' + torrent + '"...', loglevel = LOG_INFO )
! except:
! pass
except:
! try:
! self.Log( 'Error adding torrent "' + torrent + '"...', loglevel = LOG_ERROR )
! except:
! pass
###########################################################################################################
|
