%(name)s - Debian NEW package overview

X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=b21efcce43ac336797034dc84bcdf2743bcc15c2;hb=1fa1f22b70c6ee46aea78ee40b9797a574d7c583;hp=445f6d2a54888521abf67b706fa61be20d0af6b4;hpb=c60719bc9a46557970c0c43e90d6f7d0469230b0;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index 445f6d2a..b21efcce 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Output html for packages in NEW +""" Output html for packages in NEW """ # Copyright (C) 2007 Joerg Jaspert # This program is free software; you can redistribute it and/or modify @@ -25,18 +25,18 @@ ################################################################################ -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.queue import determine_new, check_valid +from daklib import utils +from daklib.regexes import re_source_ext # Globals Cnf = None Options = None -Upload = None -projectB = None sources = set() @@ -53,7 +53,7 @@ def html_header(name, filestoexamine): %(name)s - Debian NEW package overview - + - +

-

corner image

Navigation

-

-

-

+

+

+

""" for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine): - packagename = fn.split('_')[0] - print """ -

%(pkg)s

-

-

-

-

-

- """%{"pkg":packagename} + packagename = fn.split('_')[0] + print """ +

%(pkg)s

+

+

+

+

+

+ """%{"pkg":packagename} print "

" - + def html_footer(): print """

Timestamp: %s (UTC)

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

@@ -137,20 +140,19 @@ def html_footer(): 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"]) + c = Changes() + c.load_dot_dak(changes_file) + files = c.files + changes = c.changes + c.changes["suite"] = copy(c.changes["distribution"]) + distribution = c.changes["distribution"].keys()[0] # Find out what's new - new = daklib.queue.determine_new(changes, files, projectB, 0) + new = determine_new(c.changes, c.files, 0) stdout_fd = sys.stdout - htmlname = changes["source"] + "_" + changes["version"] + ".html" + 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)): @@ -159,20 +161,20 @@ def do_pkg(changes_file): 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"] ): + if (c.files[fn].has_key("new") and + (c.files[fn]["type"] == "dsc" or + not re_source_ext.match(c.files[fn]["type"]))): filestoexamine.append(fn) - html_header(changes["source"], filestoexamine) + html_header(c.changes["source"], filestoexamine) - daklib.queue.check_valid(new) - examine_package.display_changes(Upload.pkg.changes_file) + check_valid(new) + examine_package.display_changes( distribution, changes_file) - for fn in filestoexamine: - if fn.endswith(".deb") or fn.endswith(".udeb"): - examine_package.check_deb(fn) - elif fn.endswith(".dsc"): - examine_package.check_dsc(fn) + 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: @@ -191,9 +193,9 @@ def usage (exit_code=0): ################################################################################ def init(): - global Cnf, Options, Upload, projectB + global Cnf, Options - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('h',"help","Show-New::Options::Help"), ("p","html-path","Show-New::HTMLPath","HasArg")] @@ -208,10 +210,6 @@ def init(): if Options["help"]: usage() - Upload = daklib.queue.Upload(Cnf) - - projectB = Upload.projectB - return changes_files @@ -224,15 +222,15 @@ def main(): 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 = 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)) ################################################################################