fixed fix_answer_count and fix_question_count management commands

3 files changed, 10 insertions, 10 deletions

diff --git a/askbot/management/__init__.py b/askbot/management/__init__.py
index 8decc48a..76d9d0e8 100644
--- a/askbot/management/__init__.py
+++ b/askbot/management/__init__.py
@@ -4,8 +4,6 @@ from django.db import transaction
 from askbot.models import signals
 from askbot.utils import console
 
-FORMAT_STRING = '%6.2f%%'#to print progress in percent
-
 class NoArgsJob(NoArgsCommand):
     """Base class for a job command -
     the one that runs the same operation on 
@@ -74,8 +72,8 @@ class NoArgsJob(NoArgsCommand):
             checked_count += 1
 
             progress = 100*float(checked_count)/float(total_count)
-            console.print_progress(FORMAT_STRING, progress)
-        print FORMAT_STRING % 100
+            console.print_progress(checked_count, total_count)
+        console.print_progress(checked_count, total_count)
 
         if changed_count:
             print batch['changed_count_message'] % changed_count
diff --git a/askbot/management/commands/fix_answer_counts.py b/askbot/management/commands/fix_answer_counts.py
index 9f22422e..be5897c4 100644
--- a/askbot/management/commands/fix_answer_counts.py
+++ b/askbot/management/commands/fix_answer_counts.py
@@ -6,6 +6,7 @@ python manage.py fix_answer_counts
 from django.core.management.base import NoArgsCommand
 from django.db.models import signals
 from askbot import models
+from askbot.utils.console import ProgressBar
 
 class Command(NoArgsCommand):
     """Command class for "fix_answer_counts" 
@@ -23,5 +24,8 @@ class Command(NoArgsCommand):
         """function that handles the command job
         """
         self.remove_save_signals()
-        for thread in models.Thread.objects.all():
+        threads = models.Thread.objects.all()
+        count = threads.count()
+        message = 'Fixing answer counts'
+        for thread in ProgressBar(threads.iterator(), count, message):
             thread.update_answer_count()
diff --git a/askbot/management/commands/fix_question_tags.py b/askbot/management/commands/fix_question_tags.py
index d575e651..ed1ee6fb 100644
--- a/askbot/management/commands/fix_question_tags.py
+++ b/askbot/management/commands/fix_question_tags.py
@@ -7,8 +7,6 @@ from askbot.utils import console
 from askbot.models import signals
 from askbot.conf import settings as askbot_settings
 
-FORMAT_STRING = '%6.2f%%'
-
 class Command(NoArgsCommand):
     def handle_noargs(self, **options):
         signal_data = signals.pop_all_db_signal_receivers()
@@ -70,9 +68,9 @@ class Command(NoArgsCommand):
 
             transaction.commit()
             checked_count += 1
-            progress = 100*float(checked_count)/float(total_count)
-            console.print_progress(FORMAT_STRING, progress)
-        print FORMAT_STRING % 100
+            console.print_progress(checked_count, total_count)
+        console.print_progress(checked_count, total_count)
+
         if found_count:
             print '%d problem questions found, tag records restored' % found_count
         else: