[BT++ CVS] BT++/src Managers.py,NONE,1.1 BT++.py,1.3,1.4 ConfigFile.py,1.5,1.6 Loader.py,1.3,1.4

[<sir...@us...>]

Update of /cvsroot/btplusplus/BT++/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23881/src

Modified Files:
	BT++.py ConfigFile.py Loader.py 
Added Files:
	Managers.py 
Log Message:
- Updated to wxPython 2.4.0.7 (no source changes).
- Updated to BT 3.2 (some Loader changes + core).
- Moved some stuff.

--- NEW FILE: Managers.py ---
from LoaderManager import LoaderManager
from SeedManager   import SeedManager
from ConfigFile    import Config

ManagerUp   = SeedManager  ( [ Config.Get('Paths', 'History'),
                               Config.Get('Paths', 'Incoming'),
                               '',
                               '' ] )

ManagerDown = LoaderManager( [ Config.Get('Paths', 'Torrent'),
                               Config.Get('Paths', 'Temp'),
                               Config.Get('Paths', 'Incoming'),
                               Config.Get('Paths', 'History') ] )

Index: BT++.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/BT++.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BT++.py	16 Mar 2003 01:17:57 -0000	1.3
--- BT++.py	28 Mar 2003 12:44:25 -0000	1.4
***************
*** 53,57 ****
      
      # Copy torrent file
!     if len(argv) == 2:
          try:
              copyfile(argv[1], path.join(Config.Get('Paths', 'Torrent'), path.split(argv[1])[1]))
--- 53,57 ----
      
      # Copy torrent file
!     if len(argv) > 1:
          try:
              copyfile(argv[1], path.join(Config.Get('Paths', 'Torrent'), path.split(argv[1])[1]))

Index: ConfigFile.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/ConfigFile.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConfigFile.py	9 Mar 2003 12:10:03 -0000	1.5
--- ConfigFile.py	28 Mar 2003 12:44:25 -0000	1.6
***************
*** 39,43 ****
          'GridCol1':  80,
          'GridCol2':  80,
!         'GridCol3':  70,
          'GridCol4': 120,
          'GridCol5':  70,
--- 39,43 ----
          'GridCol1':  80,
          'GridCol2':  80,
!         'GridCol3':  90,
          'GridCol4': 120,
          'GridCol5':  70,

Index: Loader.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/Loader.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Loader.py	11 Mar 2003 01:07:07 -0000	1.3
--- Loader.py	28 Mar 2003 12:44:25 -0000	1.4
***************
*** 341,344 ****
--- 341,350 ----
  
          try:
+             rm = [None]
+             def data_flunked(amount, rm = rm, errorfunc = None):
+                 if rm[0] is not None:
+                     rm[0](amount)
+                 self.OnTrivialInfo('A piece failed hash check, re-downloading it.')
+         
              self.Obj['StorageWrapper'] = \
                        StorageWrapper( self.Obj['Storage'],
***************
*** 350,354 ****
                                        self.UpdateStatus,
                                        self.FlagEnd,
!                                       1 ) # HASHING
          except:
              self.OnError('Trouble creating StorageWrapper.')
--- 356,361 ----
                                        self.UpdateStatus,
                                        self.FlagEnd,
!                                       1, # HASHING
!                                       data_flunked )
          except:
              self.OnError('Trouble creating StorageWrapper.')
***************
*** 454,458 ****
                               self.Config['InfoHash'],
                               40 ) # MAX INITIATE
! 
          self.Obj['Rerequester'] = \
                    Rerequester( self.Config['Tracker'],
--- 461,465 ----
                               self.Config['InfoHash'],
                               40 ) # MAX INITIATE
!         
          self.Obj['Rerequester'] = \
                    Rerequester( self.Config['Tracker'],
***************
*** 471,475 ****
                                 self.Config['InfoHash'],
                                 60, # HTTP TIMEOUT,
!                                self.OnError )
  
          self.Obj['DownloaderFeedback'] = \
--- 478,486 ----
                                 self.Config['InfoHash'],
                                 60, # HTTP TIMEOUT,
!                                self.OnError,
!                                40, # MAX INITIATE
!                                self.FlagEnd )
! 
!         self.Log('Here')
  
          self.Obj['DownloaderFeedback'] = \
***************
*** 483,487 ****
                                        self.Config['Size'],
                                        self.FlagEnd,
!                                       2.0 ) # DISPLAY INTERVAL
  
          self.UpdateStatus(activity = 'Downloading')
--- 494,499 ----
                                        self.Config['Size'],
                                        self.FlagEnd,
!                                       2.0, # DISPLAY INTERVAL
!                                       0 ) # STDOUT DISPLAY
  
          self.UpdateStatus(activity = 'Downloading')
***************
*** 490,492 ****
          self.Obj['RawServer'].listen_forever( self.Obj['Encrypter'] )
          self.Obj['Rerequester'].announce(2)
-         
\ No newline at end of file
--- 502,503 ----