%(name)s - Debian NEW package overview

X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=513129f9c5d34f91623878ce8e305410bb38a89d;hb=475051efae41a30723cdc1ab82c521cd1accf75b;hp=34baba954940946f1184253da5e40a9cd40cf051;hpb=d9822f04453a1b62ca0aa66e2efeea35f654778f;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py old mode 100644 new mode 100755 index 34baba95..513129f9 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -# Output html for packages in NEW -# Copyright (C) 2007 Joerg Jaspert +""" Output html for packages in NEW """ +# Copyright (C) 2007, 2009 Joerg Jaspert # 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 @@ -25,18 +25,23 @@ ################################################################################ -import copy, os, sys, time +from copy import copy +import os, sys, time import apt_pkg import examine_package -import daklib.database -import daklib.queue -import daklib.utils + +from daklib.dbconn import * +from daklib.queue import determine_new, check_valid, Upload, get_policy_queue +from daklib import utils +from daklib.regexes import re_source_ext +from daklib.config import Config +from daklib import daklog +from daklib.changesutils import * +from daklib.dakmultiprocessing import DakProcessPool # Globals Cnf = None Options = None -Upload = None -projectB = None sources = set() @@ -47,13 +52,13 @@ sources = set() def html_header(name, filestoexamine): if name.endswith('.changes'): name = ' '.join(name.split('_')[:2]) - print """ + result = """ %(name)s - Debian NEW package overview - + - +

-

corner image

+ """%{"name":name} # we assume only one source (.dsc) per changes here - print """ + result += """ " + +"""%{"pkg":packagename} + result += " " + return result def html_footer(): - print """

Timestamp: %s (UTC)

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

Timestamp: %s (UTC)

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

@@ -136,51 +145,83 @@ def html_footer(): """ + return result ################################################################################ def do_pkg(changes_file): - Upload.pkg.changes_file = changes_file - Upload.init_vars() - Upload.update_vars() - files = Upload.pkg.files - changes = Upload.pkg.changes + session = DBConn().session() + u = Upload() + u.pkg.changes_file = changes_file + # We can afoord not to check the signature before loading the changes file + # as we've validated it already (otherwise it couldn't be in new) + # and we can more quickly skip over already processed files this way + u.load_changes(changes_file) + + origchanges = os.path.abspath(u.pkg.changes_file) + + # Still be cautious in case paring the changes file went badly + if u.pkg.changes.has_key('source') and u.pkg.changes.has_key('version'): + htmlname = u.pkg.changes["source"] + "_" + u.pkg.changes["version"] + ".html" + htmlfile = os.path.join(cnf["Show-New::HTMLPath"], htmlname) + else: + # Changes file was bad + print "Changes file %s missing source or version field" % changes_file + session.close() + return + + # Have we already processed this? + if os.path.exists(htmlfile) and \ + os.stat(htmlfile).st_mtime > os.stat(origchanges).st_mtime: + sources.add(htmlname) + session.close() + return (PROC_STATUS_SUCCESS, '%s already up-to-date' % htmlfile) + + # Now we'll load the fingerprint + (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file, session=session) + new_queue = get_policy_queue('new', session ); + u.pkg.directory = new_queue.path + u.update_subst() + files = u.pkg.files + changes = u.pkg.changes + sources.add(htmlname) - changes["suite"] = copy.copy(changes["distribution"]) + for deb_filename, f in files.items(): + if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"): + u.binary_file_checks(deb_filename, session) + u.check_binary_against_db(deb_filename, session) + else: + u.source_file_checks(deb_filename, session) + u.check_source_against_db(deb_filename, session) + u.pkg.changes["suite"] = u.pkg.changes["distribution"] - # Find out what's new - new = daklib.queue.determine_new(changes, files, projectB, 0) + new, byhand = determine_new(u.pkg.changes_file, u.pkg.changes, files, 0, dsc=u.pkg.dsc, session=session) - stdout_fd = sys.stdout + outfile = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w") - htmlname = changes["source"] + "_" + changes["version"] + ".html" - sources.add(htmlname) - # do not generate html output if that source/version already has one. - if not os.path.exists(os.path.join(Cnf["Show-New::HTMLPath"],htmlname)): - sys.stdout = open(os.path.join(Cnf["Show-New::HTMLPath"],htmlname),"w") + filestoexamine = [] + for pkg in new.keys(): + for fn in new[pkg]["files"]: + filestoexamine.append(fn) + + print >> outfile, html_header(changes["source"], filestoexamine) - filestoexamine = [] - for pkg in new.keys(): - for fn in new[pkg]["files"]: - if ( files[fn].has_key("new") and not - files[fn]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ): - filestoexamine.append(fn) + check_valid(new, session) + distribution = changes["distribution"].keys()[0] + print >> outfile, examine_package.display_changes(distribution, changes_file) - html_header(changes["source"], filestoexamine) + for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine): + print >> outfile, examine_package.check_dsc(distribution, fn, session) + for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine): + print >> outfile, examine_package.check_deb(distribution, fn, session) - daklib.queue.check_valid(new) - examine_package.display_changes(Upload.pkg.changes_file) + print >> outfile, html_footer() - for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine): - examine_package.check_dsc(fn) - for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine): - examine_package.check_deb(fn) + outfile.close() + session.close() - html_footer() - if sys.stdout != stdout_fd: - sys.stdout.close() - sys.stdout = stdout_fd + return (PROC_STATUS_SUCCESS, '%s already updated' % htmlfile) ################################################################################ @@ -193,28 +234,28 @@ def usage (exit_code=0): ################################################################################ -def init(): - global Cnf, Options, Upload, projectB +def init(session): + global cnf, Options - Cnf = daklib.utils.get_conf() + cnf = Config() Arguments = [('h',"help","Show-New::Options::Help"), ("p","html-path","Show-New::HTMLPath","HasArg")] for i in ["help"]: - if not Cnf.has_key("Show-New::Options::%s" % (i)): - Cnf["Show-New::Options::%s" % (i)] = "" + if not cnf.has_key("Show-New::Options::%s" % (i)): + cnf["Show-New::Options::%s" % (i)] = "" + + changes_files = apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv) + if len(changes_files) == 0: + new_queue = get_policy_queue('new', session ); + changes_files = utils.get_changes_files(new_queue.path) - changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Show-New::Options") + Options = cnf.SubTree("Show-New::Options") if Options["help"]: usage() - Upload = daklib.queue.Upload(Cnf) - - projectB = Upload.projectB - return changes_files @@ -222,20 +263,26 @@ def init(): ################################################################################ def main(): - changes_files = init() + session = DBConn().session() + changes_files = init(session) examine_package.use_html=1 + pool = DakProcessPool() for changes_file in changes_files: - changes_file = daklib.utils.validate_changes_file_arg(changes_file, 0) + changes_file = utils.validate_changes_file_arg(changes_file, 0) if not changes_file: continue print "\n" + changes_file - do_pkg (changes_file) - files = set(os.listdir(Cnf["Show-New::HTMLPath"])) + pool.apply_async(do_pkg, (changes_file,)) + do_pkg(changes_file) + pool.close() + pool.join() + + files = set(os.listdir(cnf["Show-New::HTMLPath"])) to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources)) - for file in to_delete: - os.remove(os.path.join(Cnf["Show-New::HTMLPath"],file)) + for f in to_delete: + os.remove(os.path.join(cnf["Show-New::HTMLPath"],f)) ################################################################################