r243 - branches/rewrite/src

[Otavio Salvador]

Author: otavio
Date: Wed Sep 22 09:46:02 2004
New Revision: 243

Modified:
   branches/rewrite/src/Download.py
Log:
Clean up Download class to remove uneeded issues and imports.

Modified: branches/rewrite/src/Download.py
==============================================================================
--- branches/rewrite/src/Download.py	(original)
+++ branches/rewrite/src/Download.py	Wed Sep 22 09:46:02 2004
@@ -23,10 +23,6 @@
 
 import DisplayInfo
 
-# Need to be removed when test code is removed.
-import sys, string
-import pdb
-
 class DownloadQueue(Queue):
     counter = 0
     
@@ -38,8 +34,10 @@
 class DownloadThread(threading.Thread):
     Lock = threading.Lock()
     
-    def __init__(self):
-        self.DisplayInfo = DisplayInfo.ProgressBar()
+    def __init__(self, DisplayInfo):
+        self.DisplayInfo = DisplayInfo
+        self.ProgressBar = DisplayInfo.ProgressBar()
+        self.DisplayInfo.append(self.ProgressBar)
         threading.Thread.__init__(self)
         
     def run(self):
@@ -59,11 +57,12 @@
 
             self.url = url
 
-            self.DisplayInfo.text = self.url
+            self.ProgressBar.text = self.url
 
             # Store counter information about it
             self.Lock.acquire()
             DownloadQueue.counter += 1
+            self.counter = DownloadQueue.counter
             self.Lock.release()
             
             try:
@@ -74,13 +73,11 @@
                 sys.stderr.flush()
             curl.close()
             f.close()
-            sys.stdout.write(".")
-            sys.stdout.flush()
 
     def progress(self, download_t, download_d, upload_t, upload_d):
-        self.DisplayInfo.max = download_t
-        self.DisplayInfo.current = download_d
-        d.refresh()
+        self.ProgressBar.max = download_t
+        self.ProgressBar.current = download_d
+        self.DisplayInfo.refresh()
 
 class Download:
     """ Download queue """
@@ -97,17 +94,3 @@
                 t = DownloadThread()
                 self.fetchers.append(t)
                 t.start()
-
-urls = open(sys.argv[1]).readlines()
-fileno = 1
-for url in urls:
-    url = string.strip(url)
-    if not url or url[0] == "#":
-        continue
-    filename = "doc_%d" % (fileno)
-    d = DisplayInfo.DisplayInfo()
-    Download(url, filename)
-    for i in Download.fetchers:
-        d.add(i.DisplayInfo)
-    fileno = fileno + 1
-del fileno