X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=513129f9c5d34f91623878ce8e305410bb38a89d;hb=475051efae41a30723cdc1ab82c521cd1accf75b;hp=5c7e8864263f72928930af51bf64af2a686dc924;hpb=5f5912c9d017b01d15f5b772fe1f762baef52d54;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index 5c7e8864..513129f9 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -37,6 +37,7 @@ 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 @@ -51,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! @@ -139,21 +145,47 @@ def html_footer(): """ -#""" + return result + ################################################################################ -def do_pkg(changes_file, session): +def do_pkg(changes_file): + session = DBConn().session() u = Upload() u.pkg.changes_file = changes_file - (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(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() - origchanges = os.path.abspath(u.pkg.changes_file) files = u.pkg.files changes = u.pkg.changes + sources.add(htmlname) for deb_filename, f in files.items(): if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"): @@ -164,36 +196,32 @@ def do_pkg(changes_file, session): u.check_source_against_db(deb_filename, session) u.pkg.changes["suite"] = u.pkg.changes["distribution"] - new = determine_new(u.pkg.changes, files, 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"]: - 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) - check_valid(new) - distribution = changes["distribution"].keys()[0] - examine_package.display_changes(distribution, changes_file) + print >> outfile, html_footer() - 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) + 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) ################################################################################ @@ -240,12 +268,16 @@ def main(): 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, session) + 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))