From 7f067e5153040b540a67b92389d07f508f0368b4 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Mon, 25 May 2009 21:32:13 +0100 Subject: [PATCH] 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 --- dak/process_new.py | 6 ++++-- dak/process_unchecked.py | 5 +++-- daklib/summarystats.py | 43 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100755 daklib/summarystats.py diff --git a/dak/process_new.py b/dak/process_new.py index 7979b7c1..777e0791 100755 --- 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 bc13f684..9d0fdc93 100755 --- 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 index 00000000..2fe2dc3a --- /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 +@copyright: 2001 - 2006 James Troup +@copyright: 2009 Joerg Jaspert +@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 + -- 2.39.5