1 files changed, 53 insertions, 27 deletions

diff --git a/mailman/bin/show_qfiles.py b/mailman/bin/show_qfiles.py
index 3f27ae271..e4b64e0cd 100644
--- a/mailman/bin/show_qfiles.py
+++ b/mailman/bin/show_qfiles.py
@@ -15,49 +15,75 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import sys
-import optparse
+
 from cPickle import load
 
-from mailman.configuration import config
+from mailman.config import config
 from mailman.i18n import _
-from mailman.version import MAILMAN_VERSION
+from mailman.options import Options
 
 
 
-def parseargs():
-    parser = optparse.OptionParser(version=MAILMAN_VERSION,
-                                   usage=_("""\
+class ScriptOptions(Options):
+    usage = _("""
 %%prog [options] qfiles ...
 
-Show the contents of one or more Mailman queue files."""))
-    parser.add_option('-q', '--quiet',
-                      default=False, action='store_true',
-                      help=_("Don't print 'helpful' message delimiters."))
-    parser.add_option('-C', '--config',
-                      help=_('Alternative configuration file to use'))
-    opts, args = parser.parse_args()
-    return parser, opts, args
+Show the contents of one or more Mailman queue files.""")
+
+    def add_options(self):
+        super(ScriptOptions, self).add_options()
+        self.parser.add_option(
+            '-q', '--quiet',
+            default=False, action='store_true',
+            help=_("Don't print 'helpful' message delimiters."))
+        self.parser.add_option(
+            '-s', '--summary',
+            default=False, action='store_true',
+            help=_('Show a summary of queue files.'))
 
 
 
 def main():
-    parser, opts, args = parseargs()
-    config.load(opts.config)
+    options = ScriptOptions()
+    options.initialize()
 
-    for filename in args:
-        if not opts.quiet:
+    if options.options.summary:
+        queue_totals = {}
+        files_by_queue = {}
+        for switchboard in config.switchboards.values():
+            total = 0
+            file_mappings = {}
+            for filename in os.listdir(switchboard.queue_directory):
+                base, ext = os.path.splitext(filename)
+                file_mappings[ext] = file_mappings.get(ext, 0) + 1
+                total += 1
+            files_by_queue[switchboard.queue_directory] = file_mappings
+            queue_totals[switchboard.queue_directory] = total
+        # Sort by queue name.
+        for queue_directory in sorted(files_by_queue):
+            total = queue_totals[queue_directory]
+            print queue_directory
+            print _('\tfile count: $total')
+            file_mappings = files_by_queue[queue_directory]
+            for ext in sorted(file_mappings):
+                print '\t{0}: {1}'.format(ext, file_mappings[ext])
+        return
+    # No summary.
+    for filename in options.arguments:
+        if not options.options.quiet:
             print '====================>', filename
-        fp = open(filename)
-        if filename.endswith(".pck"):
-            msg = load(fp)
-            data = load(fp)
-            if data.get('_parsemsg'):
-                sys.stdout.write(msg)
+        with open(filename) as fp:
+            if filename.endswith('.pck'):
+                msg = load(fp)
+                data = load(fp)
+                if data.get('_parsemsg'):
+                    sys.stdout.write(msg)
+                else:
+                    sys.stdout.write(msg.as_string())
             else:
-                sys.stdout.write(msg.as_string())
-        else:
-            sys.stdout.write(fp.read())
+                sys.stdout.write(fp.read())