]> git.decadent.org.uk Git - dak.git/blobdiff - dak/show_new.py
projects / dak.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
dak/show_new.py: Replace Changes() object use with an Upload() object.
[dak.git] / dak / show_new.py
diff --git a/dak/show_new.py b/dak/show_new.py
old mode 100644 (file)
new mode 100755 (executable)
index 34baba9..b67930a
--- 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 <joerg@debian.org>
 
 # 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, Upload
+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):
     <meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8"
     />
     <title>%(name)s - Debian NEW package overview</title>
-    <link type="text/css" rel="stylesheet" href="style.css" />
+    <link type="text/css" rel="stylesheet" href="/style.css" />
     <link rel="shortcut icon" href="http://www.debian.org/favicon.ico" />
     <script type="text/javascript">
       //<![CDATA[
@@ -79,7 +79,7 @@ def html_header(name, filestoexamine):
       //]]>
     </script>
   </head>
-  <body>
+  <body id="NEW-details-page">
     <div id="logo">
       <a href="http://www.debian.org/">
         <img src="http://www.debian.org/logos/openlogo-nd-50.png"
@@ -89,7 +89,6 @@ def html_header(name, filestoexamine):
         alt="Debian Project" /></a>
     </div>
     <div id="titleblock">
-
       <img src="http://www.debian.org/Pics/red-upperleft.png"
       id="red-upperleft" alt="corner image"/>
       <img src="http://www.debian.org/Pics/red-lowerleft.png"
@@ -141,16 +140,15 @@ 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"])
+    upload = Upload()
+    upload.load_changes(changes_file)
 
+    files = upload.pkg.files
+    changes = upload.pkg.changes
+    upload.pkg.changes["suite"] = copy(upload.pkg.changes["distribution"])
+    distribution = upload.pkg.changes["distribution"].keys()[0]
     # Find out what's new
-    new = daklib.queue.determine_new(changes, files, projectB, 0)
+    new = determine_new(upload.pkg.changes, upload.pkg.files, 0)
 
     stdout_fd = sys.stdout
 
@@ -163,19 +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 (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)
 
-        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 filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
-            examine_package.check_dsc(fn)
+            examine_package.check_dsc(distribution, fn)
         for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
-            examine_package.check_deb(fn)
+            examine_package.check_deb(distribution, fn)
 
         html_footer()
         if sys.stdout != stdout_fd:
@@ -194,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")]
@@ -211,10 +210,6 @@ def init():
     if Options["help"]:
         usage()
 
-    Upload = daklib.queue.Upload(Cnf)
-
-    projectB = Upload.projectB
-
     return changes_files
 
 
@@ -227,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))
 
 ################################################################################
 
dak changes to support and test code signing