Changeset 2137

Timestamp:

07/04/2008 09:02:45 (4 years ago)

Author:

cbkm

Message:

Update bbreporter.py to newer version (oops!) and add GPLv3 LICENSE file.

Location:

box/trunk/contrib/bbreporter

Files:

• LICENSE (added)
• bbreporter.py (modified) (12 diffs)

box/trunk/contrib/bbreporter/bbreporter.py

@@ -5 +5 @@
 # Copyright: (C) 2007 Three A IT Limited
 # Author: Kenny Millington <kenny.millington@3ait.co.uk>
-# Version: $Id: bbreporter.py,v 1.15 2007-11-14 11:13:38 kenny Exp $
 #
 # Credit: This script is based on the ideas of BoxReport.pl by Matt Brown of 
@@ -84 +83 @@
                  log_file="/var/log/syslog", email_to=None, 
                  email_from="report@boxbackup", rotate=False, 
-                 verbose=False, stats=False):
+                 verbose=False, stats=False, sort=False):
         
         # Config options
@@ -94 +93 @@
         self.verbose_report = verbose
         self.usage_stats = stats
+        self.sort_files = sort
         
         # Regex's
@@ -107 +107 @@
         # Reset report data to default values
         self.hostname = ""
-        self.patched_files = {}
-        self.synced_files = {}
-        self.uploaded_files = {}
+        self.patched_files = []
+        self.synced_files = []
+        self.uploaded_files = []
         self.warnings = []
         self.errors = []
@@ -198 +198 @@
     def _parse_syslog(self):
         lfh = open(self.log_file)
+        
+        patched_files = {}
+        uploaded_files = {}
+        synced_files = {}
         
         for line in lfh:
@@ -234 +238 @@
                     # We found a patch event, add the file to the patched_files.
                     if data[5] == "Uploading patch to file":
-                        self.patched_files[data[6]] = ""
+                        patched_files[data[6]] = ""
 
                     # We found an upload event, add to uploaded files.
                     elif data[5] == "Uploading complete file":
-                        self.uploaded_files[data[6]] = ""
+                        uploaded_files[data[6]] = ""
                     
                     # We found another upload event.
                     elif data[5] == "Uploaded file":
-                        self.uploaded_files[data[6]] = ""
+                        uploaded_files[data[6]] = ""
                     
                     # We found a sync event, add the file to the synced_files.
                     elif data[5] == "Synchronised file":
-                        self.synced_files[data[6]] = ""
+                        synced_files[data[6]] = ""
                 
                     # We found a warning, add the warning to the warnings.
@@ -255 +259 @@
                     elif data[5] == "ERROR":
                         self.errors.append(data[6])
-
+        
+        
+        self.patched_files = patched_files.keys()
+        self.uploaded_files = uploaded_files.keys()
+        self.synced_files = synced_files.keys()
+        
+        # There's no point running the sort functions if we're not going
+        # to display the resultant lists.
+        if self.sort_files and self.verbose_report:
+            self.patched_files.sort()
+            self.uploaded_files.sort()
+            
+        
         lfh.close()
     
@@ -317 +333 @@
                 report.append("Uploaded Files (%d)" % len(self.uploaded_files))
                 report.append("---------------------")
-                for file in self.uploaded_files.keys():
+                for file in self.uploaded_files:
                     report.append(file)
                 report.append("")
@@ -325 +341 @@
                 report.append("Patched Files (%d)" % len(self.patched_files))
                 report.append("---------------------")
-                for file in self.patched_files.keys():
+                for file in self.patched_files:
                     report.append(file)
                 report.append("")
@@ -447 +463 @@
     verbose = False 
     stats = False
+    sort = False
 
     # Parse the options
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "srvhl:c:t:f:", 
+        opts, args = getopt.getopt(sys.argv[1:], "osrvhl:c:t:f:", 
                         ["help", "logfile=", "configfile=","email-to=", 
-                         "email-from=","rotate","verbose","stats"])
+                         "email-from=","rotate","verbose","stats","sort"])
     except getopt.GetoptError:
         usage()
@@ -472 +489 @@
         elif(opt in ("--stats", "-s")):
             stats = True
+        elif(opt in ("--sort", "-o")):
+            sort = True
         elif(opt in ("--help", "-h")):
             usage()
@@ -478 +497 @@
     # Run the reporter
     bbr = BoxBackupReporter(configfile, logfile, email_to, email_from, 
-                            rotate, verbose, stats)
+                            rotate, verbose, stats, sort)
     try:
         bbr.run()