#!/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
################################################################################
-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()
<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[
var o = document.getElementById(id);
toggleObj(o, initial, display);
}
+ function show(id, display) {
+ var o = document.getElementById(id);
+ o.style.display = 'table-row-group';
+ }
function toggleObj(o, initial, display) {
if(! o.style.display)
o.style.display = initial;
//]]>
</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"
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"
print """
<div id="menu">
<p class="title">Navigation</p>
- <p><a href="#changes">.changes</a></p>
- <p><a href="#dsc">.dsc</a></p>
- <p><a href="#source-lintian">source lintian</a></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 """
- <p class="subtitle">%(pkg)s</p>
- <p><a href="#binary-%(pkg)s-control">control file</a></p>
- <p><a href="#binary-%(pkg)s-lintian">binary lintian</a></p>
- <p><a href="#binary-%(pkg)s-contents">.deb contents</a></p>
- <p><a href="#binary-%(pkg)s-copyright">copyright</a></p>
- <p><a href="#binary-%(pkg)s-file-listing">file listing</a></p>
- """%{"pkg":packagename}
+ packagename = fn.split('_')[0]
+ print """
+
<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>"
-
+
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">
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
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 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:
################################################################################
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")]
if Options["help"]:
usage()
- Upload = daklib.queue.Upload(Cnf)
-
- projectB = Upload.projectB
-
return changes_files
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))
################################################################################
projects / dak.git / blobdiff