[BT++ CVS] BT++/src Loader.py,1.2,1.3 WT++.py,1.3,1.4

[<bel...@us...>]

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

Modified Files:
	Loader.py WT++.py 
Log Message:
Abstraction of seed management, seed managament for WT++, a few bug 
fixes


Index: Loader.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/Loader.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Loader.py	9 Mar 2003 11:49:46 -0000	1.2
--- Loader.py	11 Mar 2003 01:07:07 -0000	1.3
***************
*** 33,37 ****
      Finish  = None
  
!     def __init__(self, torrent, dirs, globup, refresh = None, log = None, finish = None):
  
          self.Refresh = refresh
--- 33,37 ----
      Finish  = None
  
!     def __init__(self, torrent, dirs, globup, refresh = None, log = None, finish = None, CheckExist = false):
  
          self.Refresh = refresh
***************
*** 60,64 ****
          self.Config['DirTorFinish'] = dirs[3]
          
!         if self.Init(torrent) == false:
              raise
          
--- 60,64 ----
          self.Config['DirTorFinish'] = dirs[3]
          
!         if self.Init(torrent, CheckExist) == false:
              raise
          
***************
*** 69,73 ****
  ###########################################################################################################
         
!     def Init(self, tor):
          self.UpdateStatus( fractionDone = -1,
                             timeEst      = -1,
--- 69,73 ----
  ###########################################################################################################
         
!     def Init(self, tor, CheckExist):
          self.UpdateStatus( fractionDone = -1,
                             timeEst      = -1,
***************
*** 101,104 ****
--- 101,109 ----
              self.Config['NumFiles'] = 1
              self.Config['Size']     = torinfo['length']
+             if CheckExist:
+                 if not path.exists( self.Config['Filename'] ):
+                     # Tends to spam log, therefore logged as Trivial
+                     self.OnTrivial('File not readable.')
+                     return false
          else:
              self.Config['Files']    = []
***************
*** 119,122 ****
--- 124,132 ----
                                                'Size':     item['length']
                                               } )
+                 if CheckExist:
+                     if not path.exists( file ):
+                         # Tends to spam log, therefore logged as Trivial
+                         self.OnTrivial("File '"+item['path'][len(item['path'])-1]+"' not readable.")
+                         return false
  
          self.Info['Size'] = self.Config['Size']

Index: WT++.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/WT++.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WT++.py	7 Mar 2003 23:42:15 -0000	1.3
--- WT++.py	11 Mar 2003 01:07:10 -0000	1.4
***************
*** 5,9 ****
  from shutil       import copyfile
  from ConfigFile   import Config
! from WebServer.BTWebServer  import BTWebServer, BTWait, BTHandler
  from threading    import *
  from readline     import *
--- 5,9 ----
  from shutil       import copyfile
  from ConfigFile   import Config
! from WebServer.BTWebServer  import BTWebServer, BTWait, WTLoaders, WTSeeds
  from threading    import *
  from readline     import *
***************
*** 44,47 ****
  
      BTWait.wait()
!     BTHandler.ShutDown()
      
--- 44,48 ----
  
      BTWait.wait()
!     WTLoaders.ShutDown()
!     WTSeeds.ShutDown()