%s - Debian NEW package overview

X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=bcf1300e155fcdb0b0077b68b95366f503bc0b87;hb=4c7eee9642e82b6286f807ad92a93e7ef30288e6;hp=19566881ca2d2bdbf6606d8bd1185d3423c0383d;hpb=06b17e68fd4a76e7a12f741f26654e55bff05c79;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py old mode 100644 new mode 100755 index 19566881..bcf1300e --- 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,22 @@ ################################################################################ -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 * # Globals Cnf = None Options = None -Upload = None -projectB = None sources = set() @@ -44,90 +48,149 @@ sources = set() ################################################################################ ################################################################################ -def html_header(name): +def html_header(name, filestoexamine): if name.endswith('.changes'): name = ' '.join(name.split('_')[:2]) - print """ - """ - print "%s - Debian NEW package overview" % (name) - print """ - - - -

- -

-
- - - """ - print """""" % (name) - print """ - - - - - -

-	Debian NEW package overview for %s	-
-	Debian NEW package overview for %s	-

- """ + print """ + + + + %(name)s - Debian NEW package overview + + + + + +

+ +

+ + Debian NEW package overview for %(name)s + +

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

Timestamp: %s (UTC)

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

- -

- """ - print "" - - + print """

Timestamp: %s (UTC)

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

+ + + +

+ + +""" +#""" ################################################################################ -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 - - changes["suite"] = copy.copy(changes["distribution"]) - - # Find out what's new - new = daklib.queue.determine_new(changes, files, projectB, 0) +def do_pkg(changes_file, 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 + + 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"] + + new = determine_new(u.pkg.changes, files, 0) stdout_fd = sys.stdout 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") - html_header(changes["source"]) - - daklib.queue.check_valid(new) - examine_package.display_changes(Upload.pkg.changes_file) + 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 file in new[pkg]["files"]: - if ( files[file].has_key("new") and not - files[file]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ): - if file.endswith(".deb") or file.endswith(".udeb"): - examine_package.check_deb(file) - elif file.endswith(".dsc"): - examine_package.check_dsc(file) + for fn in new[pkg]["files"]: + if (files[fn].has_key("new") and + (files[fn]["type"] == "dsc" or + not re_source_ext.match(files[fn]["type"]))): + filestoexamine.append(fn) + + html_header(changes["source"], filestoexamine) + + check_valid(new) + examine_package.display_changes( u.pkg.changes["distribution"], changes_file) + + 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) html_footer() if sys.stdout != stdout_fd: @@ -139,32 +202,34 @@ def do_pkg(changes_file): def usage (exit_code=0): print """Usage: dak show-new [OPTION]... [CHANGES]... -h, --help show this help and exit. + -p, --html-path [path] override output directory. """ sys.exit(exit_code) ################################################################################ -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")] + 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 @@ -172,20 +237,22 @@ def init(): ################################################################################ def main(): - changes_files = init() + session = DBConn().session() + changes_files = init(session) examine_package.use_html=1 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"])) - to_delete = files.difference(sources) - for file in to_delete: - os.remove(os.path.join(Cnf["Show-New::HTMLPath"],file)) + do_pkg (changes_file, session) + + 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)) ################################################################################