X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=33e26594238c6e4944622cd5edcf132892a95f84;hb=ce92ea18c6e14348f16f0e50b2d70ba54381b0aa;hp=f1e5287f9b29f337a6d1629a194a2ae7b6a6f267;hpb=b07852aa10727e959844a3f3b4d5b8a6bce00dbf;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py old mode 100644 new mode 100755 index f1e5287f..33e26594 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -36,8 +36,10 @@ import copy, glob, os, stat, sys, time import apt_pkg -import daklib.queue as queue -import daklib.utils as utils +import cgi +from daklib import queue +from daklib import utils +from daklib.dak_exceptions import * Cnf = None Upload = None @@ -156,100 +158,133 @@ 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 """ + """ - print "" -def table_header(type): +def table_header(type, source_count, total_count): print "

Summary for: %s

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

+ + - - - - - - - + + + + + + + - """ + + + """ -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" + for dist in distribution: + if dist == "experimental": + trclass = "exp" + 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) + print "%s
" % (dist) + print "" + print "%s" % (last_mod) (name, mail) = maint.split(":") - print "%s" % (tdclass, mail, name) - print "" % (tdclass) + print "" + print "Maintainer: %s
" % (utils.html_escape(mail), utils.html_escape(name)) + (name, mail) = changedby.split(":") + print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name)) + + try: + (login, domain) = sponsor.split("@") + print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) + except: + pass + + print "Fingerprint: %s" % (fingerprint) + print "" + + print "" for close in closes: - print "#%s
" % (close, close) + print "#%s
" % (utils.html_escape(close), utils.html_escape(close)) print "" row_number+=1 @@ -305,11 +340,15 @@ def process_changes_files(changes_files, type): 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="" last_modified = time.time()-i[1]["oldest"] source = i[1]["list"][0]["source"] if len(source) > max_source_len: @@ -322,13 +361,27 @@ def process_changes_files(changes_files, type): (maintainer["maintainer822"], maintainer["maintainer2047"], maintainer["maintainername"], maintainer["maintaineremail"]) = \ utils.fix_maintainer (j["maintainer"]) - except utils.ParseMaintError, msg: + except ParseMaintError, 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"]) = \ + utils.fix_maintainer (j["changed-by"]) + except ParseMaintError, msg: + (changeby["changedby822"], changeby["changedby2047"], + changeby["changedbyname"], changeby["changedbyemail"]) = \ + ("", "", "", "") + changedby="%s:%s" % (changeby["changedbyname"], changeby["changedbyemail"]) + distribution=j["distribution"].keys() closes=j["closes"].keys() + fingerprint=j["fingerprint"] + if j.has_key("sponsoremail"): + sponsor=j["sponsoremail"] for arch in j["architecture"].keys(): arches[arch] = "" version = j["version"] @@ -345,7 +398,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, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby]) # direction entry consists of "Which field, which direction, time-consider" where # time-consider says how we should treat last_modified. Thats all. @@ -390,20 +443,20 @@ def process_changes_files(changes_files, type): # 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) + table_header(type.upper(), source_count, total_count) + for entry in entries: + (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry + table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby) + table_footer(type.upper()) else: # 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, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef) = entry msg += format % (source, version_list, arch_list, note, time_pp(last_modified)) if msg: