X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=8152bfa63e7e9c4cabe85754dc8a7aa1059bc334;hb=b79fdbd11acc8e8f4bd1d7a1a001524c645f0714;hp=2f92bcf676eb42b2bf79085467a5ed0880d8da1e;hpb=7d1cafada3e00596f44f5d2ab1e8f2cf71d2bd8b;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 2f92bcf6..8152bfa6 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -43,8 +43,8 @@ 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 +from daklib.dbconn import DBConn, DBSource, has_new_comment, PolicyQueue, \ + get_uid_from_fingerprint from daklib.textutils import fix_maintainer from daklib.dak_exceptions import * @@ -56,7 +56,7 @@ 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 @@ -178,6 +178,7 @@ def header(): Debian NEW and BYHAND Packages @@ -222,6 +224,7 @@ def header(): def footer(): print "

Timestamp: %s (UTC)

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

There are graphs about the queues available.

" print """
@@ -244,8 +247,8 @@ def table_header(type, source_count, total_count): print "

Summary for: %s

" % (type) print "

Summary for: binary-%s only

" % (type) print """ +

Click to toggle all/binary-NEW packages

-

Click to toggle all/binary-NEW packages

" % (trclass) - print "" % (source) + if "binNEW" in trclass: + print "" % (source) + else: + print "" % {'source': source} print " printed from subroutine table_row. if len(entries) > 0: - total_count = len(changes_files) - source_count = len(per_source_items) 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 @@ -585,8 +575,6 @@ def process_changes_files(changes_files, type, log, rrd_dir): msg += format % (source, version_list, arch_list, note, time_pp(last_modified)) if msg: - total_count = len(changes_files) - source_count = len(per_source_items) print type.upper() print "-"*len(type) print @@ -594,7 +582,6 @@ def process_changes_files(changes_files, type, log, rrd_dir): print "%s %s source package%s / %s %s package%s in total." % (source_count, type, plural(source_count), total_count, type, plural(total_count)) print - ################################################################################ def main(): @@ -612,27 +599,24 @@ def main(): if not Cnf.has_key("Queue-Report::Options::%s" % (i)): Cnf["Queue-Report::Options::%s" % (i)] = "" - apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv) + apt_pkg.parse_commandline(Cnf, Arguments, sys.argv) - Options = Cnf.SubTree("Queue-Report::Options") + Options = Cnf.subtree("Queue-Report::Options") if Options["Help"]: usage() if Cnf.has_key("Queue-Report::Options::New"): header() - # Initialize db so we can get the NEW comments - dbconn = DBConn() - - directories = [ ] + queue_names = [] if Cnf.has_key("Queue-Report::Options::Directories"): for i in Cnf["Queue-Report::Options::Directories"].split(","): - directories.append(i) + queue_names.append(i) elif Cnf.has_key("Queue-Report::Directories"): - directories = Cnf.ValueList("Queue-Report::Directories") + queue_names = Cnf.value_list("Queue-Report::Directories") else: - directories = [ "byhand", "new" ] + queue_names = [ "byhand", "new" ] if Cnf.has_key("Queue-Report::Options::Rrd"): rrd_dir = Cnf["Queue-Report::Options::Rrd"] @@ -646,24 +630,18 @@ def main(): # Open the report file f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w") - for directory in directories: - changes_files = glob.glob("%s/*.changes" % (Cnf["Dir::Queue::%s" % (directory)])) - process_changes_files(changes_files, directory, f, rrd_dir) + session = DBConn().session() + + for queue_name in queue_names: + queue = session.query(PolicyQueue).filter_by(queue_name=queue_name).first() + if queue is not None: + process_queue(queue, f, rrd_dir) + else: + utils.warn("Cannot find queue %s" % queue_name) if Cnf.has_key("Queue-Report::Options::822"): f.close() - if Cnf.has_key("Queue-Report::Options::New"): - for dir in directories: - print """ -

%s, last day

-

%s, last week

-

%s, last month

-

%s, last year

-

%s, last 5 years

-

%s, last 10 years

-""" % ((dir,)*12) - if Cnf.has_key("Queue-Report::Options::New"): footer()
""" print "Package count in %s: %s |  Total Package count: %s" % (type, source_count, total_count) @@ -288,7 +291,10 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing else: print "
%s%s%(source)s" for vers in version.split(): print "%s
" % (source, utils.html_escape(vers), utils.html_escape(vers)) @@ -309,8 +315,8 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing if sponsor: try: (login, domain) = sponsor.split("@", 1) - print "Sponsor: %s@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) - except Exception, e: + print "Sponsor: %s@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) + except Exception as e: pass print "Fingerprint: %s" % (fingerprint) @@ -360,42 +366,33 @@ RRA:MAX:0.5:288:795 ############################################################ -def process_changes_files(changes_files, type, log, rrd_dir): +def process_queue(queue, log, rrd_dir): msg = "" - cache = {} - # Read in all the .changes files - for filename in changes_files: - try: - u = Upload() - u.load_changes(filename) - cache[filename] = copy(u.pkg.changes) - cache[filename]["filename"] = filename - except Exception, e: - print "WARNING: Exception %s" % e - continue + type = queue.queue_name + # Divide the .changes into per-source groups per_source = {} - for filename in cache.keys(): - source = cache[filename]["source"] - if not per_source.has_key(source): + for upload in queue.uploads: + source = upload.changes.source + if source not in per_source: per_source[source] = {} per_source[source]["list"] = [] - per_source[source]["list"].append(cache[filename]) + per_source[source]["list"].append(upload) # Determine oldest time and have note status for each source group for source in per_source.keys(): source_list = per_source[source]["list"] first = source_list[0] - oldest = os.stat(first["filename"])[stat.ST_MTIME] + oldest = time.mktime(first.changes.created.timetuple()) have_note = 0 for d in per_source[source]["list"]: - mtime = os.stat(d["filename"])[stat.ST_MTIME] + mtime = time.mktime(d.changes.created.timetuple()) if Cnf.has_key("Queue-Report::Options::New"): if mtime > oldest: oldest = mtime else: if mtime < oldest: oldest = mtime - have_note += has_new_comment(d["source"], d["version"]) + have_note += has_new_comment(d.changes.source, d.changes.version) per_source[source]["oldest"] = oldest if not have_note: per_source[source]["note_state"] = 0; # none @@ -406,7 +403,7 @@ def process_changes_files(changes_files, type, log, rrd_dir): 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)) + update_graph_database(rrd_dir, type, len(per_source_items), len(queue.uploads)) entries = [] max_source_len = 0 @@ -421,31 +418,25 @@ def process_changes_files(changes_files, type, log, rrd_dir): changeby = {} changedby="" sponsor="" - filename=i[1]["list"][0]["filename"] + filename=i[1]["list"][0].changes.changesname last_modified = time.time()-i[1]["oldest"] - source = i[1]["list"][0]["source"] + source = i[1]["list"][0].changes.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 = {} + binary_list = i[1]["list"][0].binaries + binary = ', '.join([ b.package for b in binary_list ]) + arches = set() + versions = set() for j in i[1]["list"]: - changesbase = os.path.basename(j["filename"]) - try: - session = DBConn().session() - dbc = session.query(DBChange).filter_by(changesname=changesbase).one() - session.close() - except Exception, e: - print "Can't find changes file in NEW for %s (%s)" % (changesbase, e) - dbc = None + dbc = j.changes + changesbase = dbc.changesname 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"]) = \ - fix_maintainer (j["maintainer"]) - except ParseMaintError, msg: + fix_maintainer (dbc.maintainer) + except ParseMaintError as msg: print "Problems while parsing maintainer address\n" maintainer["maintainername"] = "Unknown" maintainer["maintaineremail"] = "Unknown" @@ -454,31 +445,30 @@ def process_changes_files(changes_files, type, log, rrd_dir): try: (changeby["changedby822"], changeby["changedby2047"], changeby["changedbyname"], changeby["changedbyemail"]) = \ - fix_maintainer (j["changed-by"]) - except ParseMaintError, msg: + fix_maintainer (dbc.changedby) + 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"] - versions[version] = "" - arches_list = arches.keys() + distribution=dbc.distribution.split() + closes=dbc.closes + + 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 dbc.architecture.split(): + arches.add(arch) + versions.add(dbc.version) + arches_list = list(arches) arches_list.sort(utils.arch_compare_sw) arch_list = " ".join(arches_list) - version_list = " ".join(versions.keys()) + version_list = " ".join(versions) if len(version_list) > max_version_len: max_version_len = len(version_list) if len(arch_list) > max_arch_len: @@ -548,7 +538,7 @@ def process_changes_files(changes_files, type, log, rrd_dir): (name, mail) = changedby.split(":", 1) log.write("Changed-By: " + name + " <"+mail+">" + "\n") if sponsor: - log.write("Sponsored-By: " + sponsor + "\n") + log.write("Sponsored-By: " + "@".join(sponsor.split("@")[:2]) + "\n") log.write("Distribution:") for dist in distribution: log.write(" " + dist) @@ -563,13 +553,13 @@ def process_changes_files(changes_files, type, log, rrd_dir): log.write("\n") if Cnf.has_key("Queue-Report::Options::New"): + total_count = len(queue.uploads) + source_count = len(per_source_items) 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