woo, that was quick

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,11 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2006-??-?? 1.1.2
+Fixed:
+- progress display in roundup-admin reindex
+
+
 2006-03-03 1.1.1
 Fixed:
 - failure with browsers not sending "Accept-Language" header

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.196 2006-03-03 02:02:50 richard Exp $
+#$Id: back_anydbm.py,v 1.197 2006-03-03 02:51:13 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -35,7 +35,7 @@
 
 import whichdb, os, marshal, re, weakref, string, copy, time, shutil, logging
 
-from roundup import hyperdb, date, password, roundupdb, security
+from roundup import hyperdb, date, password, roundupdb, security, support
 from roundup.backends import locking
 from roundup.i18n import _
 
@@ -123,14 +123,19 @@ def getSessionManager(self):
     def getOTKManager(self):
         return OneTimeKeys(self)
 
-    def reindex(self, classname=None):
+    def reindex(self, classname=None, show_progress=False):
         if classname:
             classes = [self.getclass(classname)]
         else:
             classes = self.classes.values()
         for klass in classes:
-            for nodeid in klass.list():
-                klass.index(nodeid)
+            if show_progress:
+                for nodeid in support.Progress('Reindex %s'%klass.classname,
+                        klass.list()):
+                    klass.index(nodeid)
+            else:
+                for nodeid in klass.list():
+                    klass.index(nodeid)
         self.indexer.save_index()
 
     def __repr__(self):

roundup/support.py

@@ -114,7 +114,7 @@ def display(self):
         elif self.total:
             s = '%s %2d%%'%(self.info, self.num * 100. / self.total)
         else:
-            s = '%s 0%% (ETA %02d:%02d:%02d)'%(self.info, H, M, S)
+            s = '%s %d done'%(self.info, self.num)
         sys.stdout.write(s + ' '*(75-len(s)) + '\r')
         sys.stdout.flush()