X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fqueue_report.py;h=0ab0b732d48324c6fef38b3f834a1aa8bdf72a06;hb=fb5b24b09968fc7351f2dc307b8cdc76463bbb0a;hp=77e1e53c230d9ff216faf9b5806ac882775e9faa;hpb=1419ec698cca31a39e2ed8fe7177b986d99ada00;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 77e1e53c..0ab0b732 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -45,6 +45,7 @@ except ImportError: from daklib import utils from daklib.dbconn import DBConn, DBSource, has_new_comment, PolicyQueue, \ get_uid_from_fingerprint +from daklib.policy import PolicyQueueUploadHandler from daklib.textutils import fix_maintainer from daklib.dak_exceptions import * @@ -186,7 +187,7 @@ def header(): continue; c = children[i].getAttribute("class").split(" "); for(var j = 0; j < c.length; j++) { - if(c[j] == "binNEW") { + if(c[j] == "sourceNEW") { if (children[i].style.display == '') children[i].style.display = 'none'; else children[i].style.display = ''; @@ -244,12 +245,12 @@ def footer(): """ def table_header(type, source_count, total_count): - print "
Click to toggle all/binary-NEW packages
%s | " % (source) else: print "%(source)s | " % {'source': source} @@ -369,6 +374,7 @@ RRA:MAX:0.5:288:795 def process_queue(queue, log, rrd_dir): msg = "" type = queue.queue_name + session = DBConn().session() # Divide the .changes into per-source groups per_source = {} @@ -377,6 +383,10 @@ def process_queue(queue, log, rrd_dir): if source not in per_source: per_source[source] = {} per_source[source]["list"] = [] + per_source[source]["processed"] = "" + handler = PolicyQueueUploadHandler(upload, session) + if handler.get_action(): + per_source[source]["processed"] = " | PENDING %s" % handler.get_action() per_source[source]["list"].append(upload) # Determine oldest time and have note status for each source group for source in per_source.keys(): @@ -477,7 +487,7 @@ def process_queue(queue, log, rrd_dir): note = " | [N]" else: note = "" - entries.append([source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename]) + entries.append([source, binary, version_list, arch_list, per_source[source]["processed"], 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. @@ -488,16 +498,16 @@ def process_queue(queue, log, rrd_dir): 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([5,-1,"ao"]) + direction.append([6,-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([5,-1,age]) + direction.append([6,-1,age]) elif i == "an": # Age, newest first. - direction.append([5,1,age]) + direction.append([6,1,age]) elif i == "na": # Name, Ascending. direction.append([0,1,0]) @@ -506,10 +516,10 @@ def process_queue(queue, log, rrd_dir): direction.append([0,-1,0]) elif i == "nl": # Notes last. - direction.append([4,1,0]) + direction.append([5,1,0]) elif i == "nf": # Notes first. - direction.append([4,-1,0]) + direction.append([5,-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 @@ -519,7 +529,7 @@ def process_queue(queue, log, rrd_dir): 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 + (source, binary, version_list, arch_list, processed, 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 @@ -552,31 +562,30 @@ def process_queue(queue, log, rrd_dir): log.write("Changes-File: " + os.path.basename(changes_file) + "\n") log.write("\n") + total_count = len(queue.uploads) + source_count = len(per_source_items) + if Cnf.has_key("Queue-Report::Options::New"): - direction.append([5,1,"ao"]) + direction.append([6,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