X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fshow_new.py;h=7396d3ccd99af1b357b6fdb1ae19d64163c61a0d;hb=3b8862ae0e21fae9fc552d4df160f45684976d7d;hp=bcf1300e155fcdb0b0077b68b95366f503bc0b87;hpb=ab7ef648bcd71efb08d2f4949abe8ad0ac3251a0;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index bcf1300e..7396d3cc 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)
@@ -139,11 +145,13 @@ 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)
@@ -154,6 +162,14 @@ def do_pkg(changes_file, session):
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)
+
+ 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
for deb_filename, f in files.items():
if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"):
@@ -164,38 +180,30 @@ 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)
- filestoexamine = []
- for pkg in new.keys():
- 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)
+ print >> outfile, html_header(changes["source"], filestoexamine)
- html_header(changes["source"], filestoexamine)
+ check_valid(new, session)
+ distribution = changes["distribution"].keys()[0]
+ print >> outfile, examine_package.display_changes(distribution, changes_file)
- check_valid(new)
- examine_package.display_changes( u.pkg.changes["distribution"], changes_file)
+ 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)
- 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)
+ print >> outfile, html_footer()
- html_footer()
- if sys.stdout != stdout_fd:
- sys.stdout.close()
- sys.stdout = stdout_fd
+ outfile.close()
+ session.close()
################################################################################
@@ -242,12 +250,15 @@ 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,))
+ pool.close()
+ pool.join()
files = set(os.listdir(cnf["Show-New::HTMLPath"]))
to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))