Simple summary stats class

This is needed to get rid of this info from the Upload "class" so that
it can actually become, well, a class, not a badly and confusingly used
global variable with some attributes

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index 7979b7c18b002a932b3aef890cb571b082f225b9..777e0791afb72dec03b5d17f0ec4e5901bc4f60f 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -54,12 +54,14 @@ import contextlib
 import pwd
 import apt_pkg, apt_inst
 import examine_package
+
 from daklib import database
 from daklib import daklog
 from daklib import queue
 from daklib import utils
 from daklib.regexes import re_no_epoch, re_default_answer, re_isanum
 from daklib.dak_exceptions import CantOpenError, AlreadyLockedError, CantGetLockError
+from daklib.summarystats import SummaryStats
 
 # Globals
 Cnf = None       #: Configuration, apt_pkg.Configuration
@@ -1021,8 +1023,8 @@ def do_pkg(changes_file):
 ################################################################################
 
 def end():
-    accept_count = Upload.accept_count
-    accept_bytes = Upload.accept_bytes
+    accept_count = SummaryStats().accept_count
+    accept_bytes = SummaryStats().accept_bytes
 
     if accept_count:
         sets = "set"

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index bc13f684d6a5c787ba062fc1c6f3c725a69f6194..9d0fdc9393cb6a13269e5e20af3b1eb9ff3047b1 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -58,6 +58,7 @@ from daklib.regexes import re_valid_version, re_valid_pkg_name, re_changelog_ver
                            re_strip_revision, re_strip_srcver, re_spacestrip, \
                            re_isanum, re_no_epoch, re_no_revision, re_taint_free, \
                            re_isadeb, re_extract_src_version, re_issource, re_default_answer
+from daklib.summarystats import SummaryStats
 
 from types import *
 
@@ -1604,8 +1605,8 @@ def main():
             if not Options["No-Action"]:
                 clean_holding()
 
-    accept_count = Upload.accept_count
-    accept_bytes = Upload.accept_bytes
+    accept_count = SummaryStats().accept_count
+    accept_bytes = SummaryStats().accept_bytes
     if accept_count:
         sets = "set"
         if accept_count > 1:

diff --git a/daklib/summarystats.py b/daklib/summarystats.py
new file mode 100755 (executable)
index 0000000..2fe2dc3
--- /dev/null
+++ b/daklib/summarystats.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# vim:set et sw=4:
+
+"""
+Simple summary class for dak
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2001 - 2006 James Troup <james@nocrew.org>
+@copyright: 2009  Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+###############################################################################
+
+from singleton import Singleton
+
+###############################################################################
+
+class SummaryStats(Singleton)
+    def __init__(self, *args, **kwargs):
+        super(SummaryStats, self).__init__(*args, **kwargs)
+
+    def _startup(self):
+        self.reset_accept()
+
+    def reset_accept(self):
+        self.accept_count = 0
+        self.accept_bytes = 0
+