X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=ce88d09ffc235acd4f9531dad344cf896bf7261e;hb=198a51de73241876ec967153459668555949c8ff;hp=aa1c54da702bd7f2cbbde182a0ac7a10fa081ad9;hpb=f4376ddbdb29017d84f876b06ebf0aed14c4e811;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index aa1c54da..9c0d2926 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Produces a report on NEW and BYHAND packages +""" Produces a report on NEW and BYHAND packages """ # Copyright (C) 2001, 2002, 2003, 2005, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -34,14 +34,22 @@ ################################################################################ -import copy, glob, os, stat, sys, time +from copy import copy +import glob, os, stat, sys, time import apt_pkg -from daklib import queue +try: + import rrdtool +except ImportError: + pass + from daklib import utils +from daklib.queue import Upload +from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, \ + get_uid_from_fingerprint, get_policy_queue +from daklib.textutils import fix_maintainer from daklib.dak_exceptions import * Cnf = None -Upload = None direction = [] row_number = 0 @@ -49,13 +57,16 @@ row_number = 0 def usage(exit_code=0): print """Usage: dak queue-report -Prints a report of packages in queue directories (usually new and byhand). +Prints a report of packages in queues (usually new and byhand). -h, --help show this help and exit. + -8, --822 writes 822 formated output to the location set in dak.conf -n, --new produce html-output -s, --sort=key sort output according to key, see below. -a, --age=key if using sort by age, how should time be treated? If not given a default of hours will be used. + -r, --rrd=key Directory where rrd files to be updated are stored + -d, --directories=key A comma seperated list of queues to be scanned Sorting Keys: ao=age, oldest first. an=age, newest first. na=name, ascending nd=name, descending @@ -157,118 +168,213 @@ def sortfunc(a,b): ############################################################ def header(): - print """ - - Debian NEW and BYHAND Packages - - - - -

- -

-
- - - - - - - - - - -

-	Debian NEW and BYHAND Packages	-
-	Debian NEW and BYHAND Packages	-

- """ + print """ + + + + + + + Debian NEW and BYHAND Packages + + + + +

+ +

+ + Debian NEW and BYHAND Packages + +

+ """ def footer(): - print "

Timestamp: %s (UTC)

" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime())) - print "

Hint: Age is the youngest upload of the package, if there is more than one version.

" - print "

You may want to look at the REJECT-FAQ for possible reasons why one of the above packages may get rejected.

" - print """ -

- -

+ print "

Timestamp: %s (UTC)

" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime())) + print "

There are graphs about the queues available.

" + + print """ + """ - print "" -def table_header(type): - print "

Summary for: %s

" % (type) - print """ +def table_header(type, source_count, total_count): + print "

Summary for: %s

" % (type) + print "" % (type) + print """ +

Click to toggle all/binary-NEW packages

+ + - - - - - - - + + + + + + + - """ + + + """ -def table_footer(type, source_count, total_count): - print "

+ """ + print "Package count in %s: %s | Total Package count: %s" % (type, source_count, total_count) + print """ +
Package	Version	Arch	Distribution	Age	Maintainer	Closes	Package	Version	Arch	Distribution	Age	Upload info	Closes

\n" - print "

Package count in %s: %s\n" % (type, source_count) - print "
Total Package count: %s

\n" % (total_count) +def table_footer(type): + print "" -def table_row(source, version, arch, last_mod, maint, distribution, closes): +def table_row(source, version, arch, last_mod, maint, distribution, closes, fingerprint, sponsor, changedby): global row_number + trclass = "sid" + session = DBConn().session() + for dist in distribution: + if dist == "experimental": + trclass = "exp" + + if not len(session.query(DBSource).filter_by(source = source).all()): + trclass += " binNEW" + session.commit() + if row_number % 2 != 0: - print "" + print "" % (trclass) else: - print "" + print "" % (trclass) - tdclass = "sid" - for dist in distribution: - if dist == "experimental": - tdclass = "exp" - print "%s" % (tdclass, source) - print "" % (tdclass) + print "%s" % (source) + print "" for vers in version.split(): - print "%s
" % (source, vers, vers) - print "%s" % (tdclass, arch, tdclass) + print "%s
" % (source, utils.html_escape(vers), utils.html_escape(vers)) + print "" + print "%s" % (arch) + print "" for dist in distribution: - print "%s
" % (dist) - print "%s" % (tdclass, last_mod) - (name, mail) = maint.split(":") + print "%s
" % (dist) + print "" + print "%s" % (last_mod) + (name, mail) = maint.split(":", 1) + + print "" + print "Maintainer: %s
" % (utils.html_escape(mail), utils.html_escape(name)) + (name, mail) = changedby.split(":", 1) + print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name)) + + if sponsor: + try: + (login, domain) = sponsor.split("@", 1) + print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) + except Exception as e: + pass + + print "Fingerprint: %s" % (fingerprint) + print "" - print "%s" % (tdclass, mail, name) - print "" % (tdclass) + print "" for close in closes: - print "#%s
" % (close, close) + print "#%s
" % (utils.html_escape(close), utils.html_escape(close)) print "" row_number+=1 ############################################################ -def process_changes_files(changes_files, type): +def update_graph_database(rrd_dir, type, n_source, n_binary): + if not rrd_dir: + return + + rrd_file = os.path.join(rrd_dir, type.lower()+'.rrd') + update = [rrd_file, "N:%s:%s" % (n_source, n_binary)] + + try: + rrdtool.update(*update) + except rrdtool.error: + create = [rrd_file]+""" +--step +300 +--start +0 +DS:ds0:GAUGE:7200:0:1000 +DS:ds1:GAUGE:7200:0:1000 +RRA:AVERAGE:0.5:1:599 +RRA:AVERAGE:0.5:6:700 +RRA:AVERAGE:0.5:24:775 +RRA:AVERAGE:0.5:288:795 +RRA:MAX:0.5:1:600 +RRA:MAX:0.5:6:700 +RRA:MAX:0.5:24:775 +RRA:MAX:0.5:288:795 +""".strip().split("\n") + try: + rc = rrdtool.create(*create) + ru = rrdtool.update(*update) + except rrdtool.error as e: + print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e)) + except NameError: + pass + +############################################################ + +def process_changes_files(changes_files, type, log, rrd_dir): msg = "" cache = {} # Read in all the .changes files for filename in changes_files: try: - Upload.pkg.changes_file = filename - Upload.init_vars() - Upload.update_vars() - cache[filename] = copy.copy(Upload.pkg.changes) + u = Upload() + u.load_changes(filename) + cache[filename] = copy(u.pkg.changes) cache[filename]["filename"] = filename - except: - break + except Exception as e: + print "WARNING: Exception %s" % e + continue # Divide the .changes into per-source groups per_source = {} for filename in cache.keys(): @@ -291,7 +397,7 @@ def process_changes_files(changes_files, type): else: if mtime < oldest: oldest = mtime - have_note += (d.has_key("process-new note")) + have_note += has_new_comment(d["source"], d["version"]) per_source[source]["oldest"] = oldest if not have_note: per_source[source]["note_state"] = 0; # none @@ -302,34 +408,71 @@ def process_changes_files(changes_files, type): per_source_items = per_source.items() per_source_items.sort(sg_compare) + update_graph_database(rrd_dir, type, len(per_source_items), len(changes_files)) + entries = [] max_source_len = 0 max_version_len = 0 max_arch_len = 0 - maintainer = {} - maint="" - distribution="" - closes="" for i in per_source_items: + maintainer = {} + maint="" + distribution="" + closes="" + fingerprint="" + changeby = {} + changedby="" + sponsor="" + filename=i[1]["list"][0]["filename"] last_modified = time.time()-i[1]["oldest"] source = i[1]["list"][0]["source"] if len(source) > max_source_len: max_source_len = len(source) + binary_list = i[1]["list"][0]["binary"].keys() + binary = ', '.join(binary_list) arches = {} versions = {} for j in i[1]["list"]: - if Cnf.has_key("Queue-Report::Options::New"): + changesbase = os.path.basename(j["filename"]) + try: + session = DBConn().session() + dbc = session.query(DBChange).filter_by(changesname=changesbase).one() + session.close() + except Exception as e: + print "Can't find changes file in NEW for %s (%s)" % (changesbase, e) + dbc = None + + if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options::822"): try: (maintainer["maintainer822"], maintainer["maintainer2047"], maintainer["maintainername"], maintainer["maintaineremail"]) = \ - utils.fix_maintainer (j["maintainer"]) - except ParseMaintError, msg: + fix_maintainer (j["maintainer"]) + except ParseMaintError as msg: print "Problems while parsing maintainer address\n" maintainer["maintainername"] = "Unknown" maintainer["maintaineremail"] = "Unknown" maint="%s:%s" % (maintainer["maintainername"], maintainer["maintaineremail"]) + # ...likewise for the Changed-By: field if it exists. + try: + (changeby["changedby822"], changeby["changedby2047"], + changeby["changedbyname"], changeby["changedbyemail"]) = \ + fix_maintainer (j["changed-by"]) + except ParseMaintError as msg: + (changeby["changedby822"], changeby["changedby2047"], + changeby["changedbyname"], changeby["changedbyemail"]) = \ + ("", "", "", "") + changedby="%s:%s" % (changeby["changedbyname"], changeby["changedbyemail"]) + distribution=j["distribution"].keys() closes=j["closes"].keys() + if dbc: + fingerprint = dbc.fingerprint + sponsor_name = get_uid_from_fingerprint(fingerprint).name + sponsor_email = get_uid_from_fingerprint(fingerprint).uid + "@debian.org" + if sponsor_name != maintainer["maintainername"] and sponsor_name != changeby["changedbyname"] and \ + sponsor_email != maintainer["maintaineremail"] and sponsor_name != changeby["changedbyemail"]: + sponsor = sponsor_email + for arch in j["architecture"].keys(): arches[arch] = "" version = j["version"] @@ -346,7 +489,7 @@ def process_changes_files(changes_files, type): note = " | [N]" else: note = "" - entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes]) + entries.append([source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename]) # direction entry consists of "Which field, which direction, time-consider" where # time-consider says how we should treat last_modified. Thats all. @@ -357,16 +500,16 @@ def process_changes_files(changes_files, type): age = Cnf["Queue-Report::Options::Age"] if Cnf.has_key("Queue-Report::Options::New"): # If we produce html we always have oldest first. - direction.append([4,-1,"ao"]) + direction.append([5,-1,"ao"]) else: if Cnf.has_key("Queue-Report::Options::Sort"): for i in Cnf["Queue-Report::Options::Sort"].split(","): if i == "ao": # Age, oldest first. - direction.append([4,-1,age]) + direction.append([5,-1,age]) elif i == "an": # Age, newest first. - direction.append([4,1,age]) + direction.append([5,1,age]) elif i == "na": # Name, Ascending. direction.append([0,1,0]) @@ -375,36 +518,72 @@ def process_changes_files(changes_files, type): direction.append([0,-1,0]) elif i == "nl": # Notes last. - direction.append([3,1,0]) + direction.append([4,1,0]) elif i == "nf": # Notes first. - direction.append([3,-1,0]) + direction.append([4,-1,0]) entries.sort(lambda x, y: sortfunc(x, y)) # Yes, in theory you can add several sort options at the commandline with. But my mind is to small # at the moment to come up with a real good sorting function that considers all the sidesteps you # have with it. (If you combine options it will simply take the last one at the moment). # Will be enhanced in the future. + if Cnf.has_key("Queue-Report::Options::822"): + # print stuff out in 822 format + for entry in entries: + (source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry + + # We'll always have Source, Version, Arch, Mantainer, and Dist + # For the rest, check to see if we have them, then print them out + log.write("Source: " + source + "\n") + log.write("Binary: " + binary + "\n") + log.write("Version: " + version_list + "\n") + log.write("Architectures: ") + log.write( (", ".join(arch_list.split(" "))) + "\n") + log.write("Age: " + time_pp(last_modified) + "\n") + log.write("Last-Modified: " + str(int(time.time()) - int(last_modified)) + "\n") + log.write("Queue: " + type + "\n") + + (name, mail) = maint.split(":", 1) + log.write("Maintainer: " + name + " <"+mail+">" + "\n") + if changedby: + (name, mail) = changedby.split(":", 1) + log.write("Changed-By: " + name + " <"+mail+">" + "\n") + if sponsor: + log.write("Sponsored-By: " + "@".join(sponsor.split("@")[:2]) + "\n") + log.write("Distribution:") + for dist in distribution: + log.write(" " + dist) + log.write("\n") + log.write("Fingerprint: " + fingerprint + "\n") + if closes: + bug_string = "" + for bugs in closes: + bug_string += "#"+bugs+", " + log.write("Closes: " + bug_string[:-2] + "\n") + log.write("Changes-File: " + os.path.basename(changes_file) + "\n") + log.write("\n") + if Cnf.has_key("Queue-Report::Options::New"): - direction.append([4,1,"ao"]) + direction.append([5,1,"ao"]) entries.sort(lambda x, y: sortfunc(x, y)) # Output for a html file. First table header. then table_footer. # Any line between them is then a printed from subroutine table_row. if len(entries) > 0: - table_header(type.upper()) - for entry in entries: - (source, version_list, arch_list, note, last_modified, maint, distribution, closes) = entry - table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes) total_count = len(changes_files) source_count = len(per_source_items) - table_footer(type.upper(), source_count, total_count) - else: + table_header(type.upper(), source_count, total_count) + for entry in entries: + (source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = entry + table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby) + table_footer(type.upper()) + elif not Cnf.has_key("Queue-Report::Options::822"): # The "normal" output without any formatting. format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old\n" % (max_source_len, max_version_len, max_arch_len) msg = "" for entry in entries: - (source, version_list, arch_list, note, last_modified, undef, undef, undef) = entry + (source, binary, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry msg += format % (source, version_list, arch_list, note, time_pp(last_modified)) if msg: @@ -421,13 +600,16 @@ def process_changes_files(changes_files, type): ################################################################################ def main(): - global Cnf, Upload + global Cnf Cnf = utils.get_conf() Arguments = [('h',"help","Queue-Report::Options::Help"), ('n',"new","Queue-Report::Options::New"), + ('8','822',"Queue-Report::Options::822"), ('s',"sort","Queue-Report::Options::Sort", "HasArg"), - ('a',"age","Queue-Report::Options::Age", "HasArg")] + ('a',"age","Queue-Report::Options::Age", "HasArg"), + ('r',"rrd","Queue-Report::Options::Rrd", "HasArg"), + ('d',"directories","Queue-Report::Options::Directories", "HasArg")] for i in [ "help" ]: if not Cnf.has_key("Queue-Report::Options::%s" % (i)): Cnf["Queue-Report::Options::%s" % (i)] = "" @@ -438,18 +620,47 @@ def main(): if Options["Help"]: usage() - Upload = queue.Upload(Cnf) - if Cnf.has_key("Queue-Report::Options::New"): header() - directories = Cnf.ValueList("Queue-Report::Directories") - if not directories: - directories = [ "byhand", "new" ] + # Initialize db so we can get the NEW comments + dbconn = DBConn() + + queue_names = [ ] + + if Cnf.has_key("Queue-Report::Options::Directories"): + for i in Cnf["Queue-Report::Options::Directories"].split(","): + queue_names.append(i) + elif Cnf.has_key("Queue-Report::Directories"): + queue_names = Cnf.ValueList("Queue-Report::Directories") + else: + queue_names = [ "byhand", "new" ] + + if Cnf.has_key("Queue-Report::Options::Rrd"): + rrd_dir = Cnf["Queue-Report::Options::Rrd"] + elif Cnf.has_key("Dir::Rrd"): + rrd_dir = Cnf["Dir::Rrd"] + else: + rrd_dir = None + + f = None + if Cnf.has_key("Queue-Report::Options::822"): + # Open the report file + f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w") + + session = dbconn.session() + + for queue_name in queue_names: + queue = get_policy_queue(queue_name, session) + if queue: + directory = os.path.abspath(queue.path) + changes_files = glob.glob("%s/*.changes" % (directory)) + process_changes_files(changes_files, os.path.basename(directory), f, rrd_dir) + else: + utils.warn("Cannot find queue %s" % queue_name) - for directory in directories: - changes_files = glob.glob("%s/*.changes" % (Cnf["Dir::Queue::%s" % (directory)])) - process_changes_files(changes_files, directory) + if Cnf.has_key("Queue-Report::Options::822"): + f.close() if Cnf.has_key("Queue-Report::Options::New"): footer()

Summary for: %s

Summary for: %s

Summary for: binary-%s only