[BT++ CVS] BT++/src Managers.py,1.1,1.2 LoaderManager.py,1.6,1.7

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

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

Modified Files:
	Managers.py LoaderManager.py 
Log Message:
- Global upload limit fixed.

Index: Managers.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/Managers.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Managers.py	28 Mar 2003 12:44:25 -0000	1.1
--- Managers.py	28 Mar 2003 12:48:11 -0000	1.2
***************
*** 3,13 ****
  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') ] )
--- 3,18 ----
  from ConfigFile    import Config
  
+ UpMeasure = GlobalMeasure( 20.0,  # MAX RATE PERIOD, 
+                             5.0 ) # UPLOAD RATE FUDGE
+ 
  ManagerUp   = SeedManager  ( [ Config.Get('Paths', 'History'),
                                 Config.Get('Paths', 'Incoming'),
                                 '',
!                                '' ],
!                              upmeasure = UpMeasure )
  
  ManagerDown = LoaderManager( [ Config.Get('Paths', 'Torrent'),
                                 Config.Get('Paths', 'Temp'),
                                 Config.Get('Paths', 'Incoming'),
!                                Config.Get('Paths', 'History') ],
!                              upmeasure = UpMeasure )

Index: LoaderManager.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/LoaderManager.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LoaderManager.py	16 Mar 2003 01:17:58 -0000	1.6
--- LoaderManager.py	28 Mar 2003 12:48:11 -0000	1.7
***************
*** 18,22 ****
      DirTorFinish = ''
      
!     def __init__(self, dirs, refresh = None, log = None, finish = None):
          self.Log     = log
          self.Refresh = refresh
--- 18,22 ----
      DirTorFinish = ''
      
!     def __init__(self, dirs, refresh = None, log = None, finish = None, upmeasure = None):
          self.Log     = log
          self.Refresh = refresh
***************
*** 28,33 ****
          self.DirTorFinish = dirs[3]
  
!         self.UpMeasure = GlobalMeasure( 20.0,  # MAX RATE PERIOD, 
!                                          5.0 ) # UPLOAD RATE FUDGE
  
      def CreateNewLoader(self, torrent):
--- 28,36 ----
          self.DirTorFinish = dirs[3]
  
!         if upmeasure == None:
!             self.UpMeasure = GlobalMeasure( 20.0,  # MAX RATE PERIOD, 
!                                              5.0 ) # UPLOAD RATE FUDGE
!         else:
!             self.UpMeasure = upmeasure
  
      def CreateNewLoader(self, torrent):