[BT++ CVS] BT++/src InfoManager.py,1.3,1.4

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

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

Modified Files:
	InfoManager.py 
Log Message:
InfoServer fix (hopefully)
Display of SizeUp/SizeDown, server start time
Added strict hasing to configure

Index: InfoManager.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/InfoManager.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InfoManager.py	29 Mar 2003 11:40:12 -0000	1.3
--- InfoManager.py	31 Mar 2003 17:33:56 -0000	1.4
***************
*** 38,72 ****
      def DownLoader(self):
          self.Updating = True
-         h = self.opener.open(self.server)
          try: self.log('['+self.server+'] Info Download started', loglevel = LOG_TRIVIAL)
          except: pass
!         data = h.read()
!         if h.iscompressed():
!             try: self.log('['+self.server+'] Info Download finished (compressed)', loglevel = LOG_TRIVIAL)
!             except: pass
!         else:
!             try: self.log('['+self.server+'] Info Download finished', loglevel = LOG_TRIVIAL)
!             except: pass
!         h.close()
!         failed = False
!         try: 
              data = bdecode(data)
          except:
-             try: self.log('['+self.server+'] Info Download failed', loglevel = LOG_TRIVIAL)
-             except: pass
              failed = True
-         
-         files = {}    
-         try: files = data['files']
-         except: pass
-         for loader in self.loaders:
-             if files.has_key(loader.Config['InfoHash']):
-                 info = files[loader.Config['InfoHash']]
-                 loader.UpdateExtendedInfo(info['complete'], info['incomplete'])
-             else:
-                 loader.UpdateExtendedInfo('error')
          if failed:
              self.refreshed = time() - (60 * self.update)
          else:
              self.refreshed = time()
          self.Updating = False
--- 38,72 ----
      def DownLoader(self):
          self.Updating = True
          try: self.log('['+self.server+'] Info Download started', loglevel = LOG_TRIVIAL)
          except: pass
!         try:
!             h = self.opener.open(self.server)
!             data = h.read()
!             compressed = h.iscompressed()
!             h.close()
              data = bdecode(data)
+             files = data['files']
+             failed = False
          except:
              failed = True
          if failed:
+             for loader in self.loaders:
+                 loader.UpdateExtendedInfo('error')
+             try: self.log('['+self.server+'] Info Download failed', loglevel = LOG_TRIVIAL)
+             except: pass
              self.refreshed = time() - (60 * self.update)
          else:
+             for loader in self.loaders:
+                 if files.has_key(loader.Config['InfoHash']):
+                     info = files[loader.Config['InfoHash']]
+                     loader.UpdateExtendedInfo(info['complete'], info['incomplete'])
+                 else:
+                     loader.UpdateExtendedInfo('error')
+             if compressed:
+                 try: self.log('['+self.server+'] Info Download finished (compressed)', loglevel = LOG_TRIVIAL)
+                 except: pass
+             else:
+                 try: self.log('['+self.server+'] Info Download finished', loglevel = LOG_TRIVIAL)
+                 except: pass
              self.refreshed = time()
          self.Updating = False