Fixed bug in the total items count. Added new option --quiet to the action diff. This option doesn't show the report if there aren't differences.

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40224
This commit is contained in:
Andres Moreira 2008-09-11 14:59:16 +00:00
parent 2b6bcd61df
commit 23814537b3
1 changed files with 20 additions and 16 deletions

View File

@ -34,6 +34,7 @@ class Command(ScrapyCommand):
parser.add_option("--target", dest="targets", action="append", help="crawl TARGET instead of recorded urls/domains. can be passed multiple times")
# adding option to update
parser.add_option("--pages", dest="pages", action="store_true", help="update all the pages in the replay file, recording it again.")
parser.add_option("-q", "--quiet", dest="quiet", action="store_true", help="no verbose mode in option diff.")
def process_options(self, args, opts):
if args:
@ -81,7 +82,7 @@ class Command(ScrapyCommand):
def action_update(self, opts):
self.replay.update(args=opts.targets, opts=opts.__dict__)
if (opts.pages):
args = ['decobot-ctl.py', 'crawl']
args = ['scrapy-crawl', 'crawl']
args.extend(self.replay.options['args'])
for k in self.replay.options['opts']:
if self.replay.options['opts'][k]:
@ -119,25 +120,28 @@ class Command(ScrapyCommand):
chcount, chreport = self._report_differences(self.before_db, self.now_db, guids_both)
s = "CRAWLING DIFFERENCES REPORT\n\n"
if chcount == 0 and opts.quiet:
s = ""
else:
s = "CRAWLING DIFFERENCES REPORT\n\n"
s += "Total items : %d\n" % (len(guids_both) - chcount)
s += " Items OK : %d\n" % (len(guids_both) - chcount)
s += " New items : %d\n" % len(guids_new)
s += " Missing items : %d\n" % len(guids_missing)
s += " Changed items : %d\n" % chcount
s += "Total items : %d\n" % (len(guids_both) + len(guids_new) + len(guids_missing))
s += " Items OK : %d\n" % (len(guids_both) - chcount)
s += " New items : %d\n" % len(guids_new)
s += " Missing items : %d\n" % len(guids_missing)
s += " Changed items : %d\n" % chcount
s += "\n"
s += "- NEW ITEMS (%d) -----------------------------------------\n" % len(guids_new)
s += self._format_items([self.now_db[g] for g in guids_new])
s += "\n"
s += "- NEW ITEMS (%d) -----------------------------------------\n" % len(guids_new)
s += self._format_items([self.now_db[g] for g in guids_new])
s += "\n"
s += "- MISSING ITEMS (%d) -------------------------------------\n" % len(guids_missing)
s += self._format_items([self.before_db[g] for g in guids_missing])
s += "\n"
s += "- MISSING ITEMS (%d) -------------------------------------\n" % len(guids_missing)
s += self._format_items([self.before_db[g] for g in guids_missing])
s += "\n"
s += "- CHANGED ITEMS (%d) -------------------------------------\n" % chcount
s += chreport
s += "\n"
s += "- CHANGED ITEMS (%d) -------------------------------------\n" % chcount
s += chreport
return s