#!/usr/bin/env python
""" Output html for packages in NEW """
-# Copyright (C) 2007 Joerg Jaspert <joerg@debian.org>
+# Copyright (C) 2007, 2009 Joerg Jaspert <joerg@debian.org>
# 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
import apt_pkg
import examine_package
-from daklib.queue import determine_new, check_valid
+from daklib import policy
+from daklib.dbconn import *
from daklib import utils
-from daklib.regexes import re_source_ext
+from daklib.config import Config
+from daklib import daklog
+from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
+from multiprocessing import Manager, TimeoutError
# Globals
Cnf = None
Options = None
-sources = set()
+manager = Manager()
+sources = manager.list()
+htmlfiles_to_process = manager.list()
+timeout_str = "Timed out while processing"
################################################################################
################################################################################
################################################################################
-def html_header(name, filestoexamine):
+def html_header(name, missing):
if name.endswith('.changes'):
name = ' '.join(name.split('_')[:2])
- print """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ result = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
<head>
<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 rel="shortcut icon" href="http://www.debian.org/favicon.ico" />
+ <link rel="shortcut icon" href="https://www.debian.org/favicon.ico" />
<script type="text/javascript">
//<![CDATA[
<!--
</head>
<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"
+ <a href="https://www.debian.org/">
+ <img src="https://www.debian.org/logos/openlogo-nd-50.png"
alt="debian logo" /></a>
- <a href="http://www.debian.org/">
- <img src="http://www.debian.org/Pics/debian.png"
+ <a href="https://www.debian.org/">
+ <img src="https://www.debian.org/Pics/debian.png"
alt="Debian Project" /></a>
</div>
<div id="titleblock">
- <img src="http://www.debian.org/Pics/red-upperleft.png"
+ <img src="https://www.debian.org/Pics/red-upperleft.png"
id="red-upperleft" alt="corner image"/>
- <img src="http://www.debian.org/Pics/red-lowerleft.png"
+ <img src="https://www.debian.org/Pics/red-lowerleft.png"
id="red-lowerleft" alt="corner image"/>
- <img src="http://www.debian.org/Pics/red-upperright.png"
+ <img src="https://www.debian.org/Pics/red-upperright.png"
id="red-upperright" alt="corner image"/>
- <img src="http://www.debian.org/Pics/red-lowerright.png"
+ <img src="https://www.debian.org/Pics/red-lowerright.png"
id="red-lowerright" alt="corner image"/>
<span class="title">
Debian NEW package overview for %(name)s
</span>
</div>
+
"""%{"name":name}
# we assume only one source (.dsc) per changes here
- print """
+ result += """
<div id="menu">
<p class="title">Navigation</p>
<p><a href="#changes" onclick="show('changes-body')">.changes</a></p>
<p><a href="#dsc" onclick="show('dsc-body')">.dsc</a></p>
<p><a href="#source-lintian" onclick="show('source-lintian-body')">source lintian</a></p>
- """
- for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine):
- packagename = fn.split('_')[0]
- print """
+
+"""
+ for binarytype, packagename in filter(lambda m: m[0] in ('deb', 'udeb'), missing):
+ result += """
<p class="subtitle">%(pkg)s</p>
<p><a href="#binary-%(pkg)s-control" onclick="show('binary-%(pkg)s-control-body')">control file</a></p>
<p><a href="#binary-%(pkg)s-lintian" onclick="show('binary-%(pkg)s-lintian-body')">binary lintian</a></p>
<p><a href="#binary-%(pkg)s-contents" onclick="show('binary-%(pkg)s-contents-body')">.deb contents</a></p>
<p><a href="#binary-%(pkg)s-copyright" onclick="show('binary-%(pkg)s-copyright-body')">copyright</a></p>
<p><a href="#binary-%(pkg)s-file-listing" onclick="show('binary-%(pkg)s-file-listing-body')">file listing</a></p>
- """%{"pkg":packagename}
- print " </div>"
+
+"""%{"pkg":packagename}
+ result += " </div>"
+ return result
def html_footer():
- print """ <p class="validate">Timestamp: %s (UTC)</p>"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
- print """ <p><a href="http://validator.w3.org/check?uri=referer">
- <img src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"
- style="border: none; height: 31px; width: 88px" /></a>
- <a href="http://jigsaw.w3.org/css-validator/check/referer">
- <img src="http://jigsaw.w3.org/css-validator/images/vcss"
- alt="Valid CSS!" style="border: none; height: 31px; width: 88px" /></a>
- </p>
- </body>
-</html>
-"""
+ result = """ <p class="validate">Timestamp: %s (UTC)</p>
+"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+ result += "</body></html>"
+ return result
################################################################################
-def do_pkg(changes_file):
- c = Changes()
- c.load_dot_dak(changes_file)
- files = c.files
- changes = c.changes
+def do_pkg(upload_id):
+ cnf = Config()
+
+ session = DBConn().session()
+ upload = session.query(PolicyQueueUpload).filter_by(id=upload_id).one()
+
+ queue = upload.policy_queue
+ changes = upload.changes
+
+ origchanges = os.path.join(queue.path, changes.changesname)
+ print origchanges
- c.changes["suite"] = copy(c.changes["distribution"])
- distribution = c.changes["distribution"].keys()[0]
- # Find out what's new
- new = determine_new(c.changes, c.files, 0)
+ htmlname = "{0}_{1}.html".format(changes.source, changes.version)
+ htmlfile = os.path.join(cnf['Show-New::HTMLPath'], htmlname)
- stdout_fd = sys.stdout
+ # Have we already processed this?
+ if os.path.exists(htmlfile) and \
+ os.stat(htmlfile).st_mtime > time.mktime(changes.created.timetuple()):
+ with open(htmlfile, "r") as fd:
+ if fd.read() != timeout_str:
+ sources.append(htmlname)
+ return (PROC_STATUS_SUCCESS,
+ '%s already up-to-date' % htmlfile)
- 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)):
- sys.stdout = open(os.path.join(Cnf["Show-New::HTMLPath"],htmlname),"w")
+ # Go, process it... Now!
+ htmlfiles_to_process.append(htmlfile)
+ sources.append(htmlname)
- filestoexamine = []
- for pkg in new.keys():
- for fn in new[pkg]["files"]:
- 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)
+ group = cnf.get('Dinstall::UnprivGroup') or None
- html_header(c.changes["source"], filestoexamine)
+ with open(htmlfile, 'w') as outfile:
+ with policy.UploadCopy(upload, group=group) as upload_copy:
+ handler = policy.PolicyQueueUploadHandler(upload, session)
+ missing = [ (o['type'], o['package']) for o in handler.missing_overrides() ]
+ distribution = changes.distribution
- check_valid(new)
- examine_package.display_changes( distribution, changes_file)
+ print >>outfile, html_header(changes.source, missing)
+ print >>outfile, examine_package.display_changes(distribution, origchanges)
- 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)
+ if upload.source is not None and ('dsc', upload.source.source) in missing:
+ fn = os.path.join(upload_copy.directory, upload.source.poolfile.basename)
+ print >>outfile, examine_package.check_dsc(distribution, fn, session)
+ for binary in upload.binaries:
+ if (binary.binarytype, binary.package) not in missing:
+ continue
+ fn = os.path.join(upload_copy.directory, binary.poolfile.basename)
+ print >>outfile, examine_package.check_deb(distribution, fn, session)
- html_footer()
- if sys.stdout != stdout_fd:
- sys.stdout.close()
- sys.stdout = stdout_fd
+ print >>outfile, html_footer()
+
+ session.close()
+ htmlfiles_to_process.remove(htmlfile)
+ return (PROC_STATUS_SUCCESS, '{0} already updated'.format(htmlfile))
################################################################################
################################################################################
-def init():
- global Cnf, Options
+def init(session):
+ global cnf, Options
- Cnf = utils.get_conf()
+ cnf = Config()
Arguments = [('h',"help","Show-New::Options::Help"),
- ("p","html-path","Show-New::HTMLPath","HasArg")]
+ ("p","html-path","Show-New::HTMLPath","HasArg"),
+ ('q','queue','Show-New::Options::Queue','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,Arguments,sys.argv)
- Options = Cnf.SubTree("Show-New::Options")
+ changesnames = apt_pkg.parse_commandline(cnf.Cnf,Arguments,sys.argv)
+ Options = cnf.subtree("Show-New::Options")
if Options["help"]:
usage()
- return changes_files
+ queue_names = Options.find('Queue', 'new').split(',')
+ uploads = session.query(PolicyQueueUpload) \
+ .join(PolicyQueueUpload.policy_queue).filter(PolicyQueue.queue_name.in_(queue_names)) \
+ .join(PolicyQueueUpload.changes).order_by(DBChange.source)
+
+ if len(changesnames) > 0:
+ uploads = uploads.filter(DBChange.changesname.in_(changesnames))
+
+ return uploads
################################################################################
################################################################################
def main():
- changes_files = init()
-
- examine_package.use_html=1
-
- 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)
- files = set(os.listdir(Cnf["Show-New::HTMLPath"]))
- to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))
+ examine_package.use_html = True
+ pool = DakProcessPool(processes=5)
+
+ session = DBConn().session()
+ upload_ids = [ u.id for u in init(session) ]
+ session.close()
+
+ for upload_id in upload_ids:
+ pool.apply_async(do_pkg, [upload_id])
+ pool.close()
+
+ #p.wait(timeout=600)
+ pool.join()
+ for htmlfile in htmlfiles_to_process:
+ with open(htmlfile, "w") as fd:
+ fd.write(timeout_str)
+
+ files = set(os.listdir(cnf["Show-New::HTMLPath"]))
+ to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))
for f in to_delete:
- os.remove(os.path.join(Cnf["Show-New::HTMLPath"],f))
+ os.remove(os.path.join(cnf["Show-New::HTMLPath"],f))
################################################################################