show-new: query database only when needed

[dak.git] / dak / show_new.py

diff --git a/dak/show_new.py b/dak/show_new.py
index 9cb0890199d7210a985f6eee946c9d3d7f3288b7..3bd1726408f37ef19d149fb523d3c63bb1724704 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -162,6 +162,14 @@ def do_pkg(changes_file):
     origchanges = os.path.abspath(u.pkg.changes_file)
     files = u.pkg.files
     changes = u.pkg.changes
+    htmlname = changes["source"] + "_" + changes["version"] + ".html"
+    htmlfile = os.path.join(cnf["Show-New::HTMLPath"], htmlname)
+
+    if os.path.exists(htmlfile):
+        if os.stat(htmlfile).st_mtime > os.stat(origchanges).st_mtime:
+            sources.add(htmlname)
+            session.close()
+            return
 
     for deb_filename, f in files.items():
         if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"):
@@ -172,9 +180,8 @@ def do_pkg(changes_file):
             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, session)
 
-    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)):
@@ -187,16 +194,18 @@ def do_pkg(changes_file):
 
         print >> outfile, html_header(changes["source"], filestoexamine)
 
-        check_valid(new)
+        check_valid(new, session)
         distribution = changes["distribution"].keys()[0]
         print >> outfile, examine_package.display_changes(distribution, changes_file)
 
         for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
-            print >> outfile, examine_package.check_dsc(distribution, fn)
+            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)
+            print >> outfile, examine_package.check_deb(distribution, fn, session)
 
         print >> outfile, html_footer()
+
+       outfile.close()
     session.close()
 
 ################################################################################