X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=3b052c18307be406181eef8d2c5e308101998339;hb=2d1714245f6df36ec2c7f2d7154b23e331f150a5;hp=be3d51147130f83675dd2cdbe70b681425e32393;hpb=78bbcfb3e67e1303a432b0bce3882ba81f91dd50;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index be3d5114..3b052c18 100755 --- 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 +# 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 @@ -30,8 +30,14 @@ import os, sys, time import apt_pkg import examine_package -from daklib.queue import determine_new, check_valid +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 @@ -46,7 +52,7 @@ sources = set() def html_header(name, filestoexamine): if name.endswith('.changes'): name = ' '.join(name.split('_')[:2]) - print """ + result = """ + """%{"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 """

+ result = """

Timestamp: %s (UTC)

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

Valid HTML 4.01! @@ -134,50 +145,67 @@ def html_footer(): """ + return result ################################################################################ def do_pkg(changes_file): - c = Changes() - c.load_dot_dak(changes_file) - files = c.files - changes = c.changes + session = DBConn().session() + u = Upload() + u.pkg.changes_file = changes_file + (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file) + u.load_changes(changes_file) + new_queue = get_policy_queue('new', session ); + u.pkg.directory = new_queue.path + u.update_subst() + origchanges = os.path.abspath(u.pkg.changes_file) + files = u.pkg.files + changes = u.pkg.changes + htmlname = changes["source"] + "_" + changes["version"] + ".html" + sources.add(htmlname) - c.changes["suite"] = copy(c.changes["distribution"]) - distribution = c.changes["distribution"].keys()[0] - # Find out what's new - new = determine_new(c.changes, c.files, 0) + htmlfile = os.path.join(cnf["Show-New::HTMLPath"], htmlname) + if os.path.exists(htmlfile) and \ + os.stat(htmlfile).st_mtime > os.stat(origchanges).st_mtime: + session.close() + return (PROC_STATUS_SUCCESS, '%s already up-to-date' % htmlfile) - stdout_fd = sys.stdout + 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"] - htmlname = c.changes["source"] + "_" + c.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") + new, byhand = determine_new(u.pkg.changes_file, u.pkg.changes, files, 0, dsc=u.pkg.dsc, session=session) - filestoexamine = [] - for pkg in new.keys(): - for fn in new[pkg]["files"]: - if ( c.files[fn].has_key("new") and not - c.files[fn]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ): - filestoexamine.append(fn) + outfile = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w") - html_header(c.changes["source"], filestoexamine) + filestoexamine = [] + for pkg in new.keys(): + for fn in new[pkg]["files"]: + filestoexamine.append(fn) - check_valid(new) - examine_package.display_changes( distribution, changes_file) + print >> outfile, html_header(changes["source"], filestoexamine) - for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine): - examine_package.check_dsc(distribution, fn) - for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine): - examine_package.check_deb(distribution, fn) + check_valid(new, session) + distribution = changes["distribution"].keys()[0] + print >> outfile, examine_package.display_changes(distribution, changes_file) - html_footer() - if sys.stdout != stdout_fd: - sys.stdout.close() - sys.stdout = stdout_fd + 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) + + print >> outfile, html_footer() + + outfile.close() + session.close() + + return (PROC_STATUS_SUCCESS, '%s already updated' % htmlfile) ################################################################################ @@ -190,20 +218,24 @@ def usage (exit_code=0): ################################################################################ -def init(): - global Cnf, Options +def init(session): + global cnf, Options - Cnf = 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,Arguments,sys.argv) - Options = Cnf.SubTree("Show-New::Options") + 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) + + Options = cnf.SubTree("Show-New::Options") if Options["help"]: usage() @@ -215,20 +247,25 @@ 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 = 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,)) + pool.close() + pool.join() + + files = set(os.listdir(cnf["Show-New::HTMLPath"])) to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources)) for f in to_delete: - os.remove(os.path.join(Cnf["Show-New::HTMLPath"],f)) + os.remove(os.path.join(cnf["Show-New::HTMLPath"],f)) ################################################################################