particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better web display for metadata_only imports

Browse source
This commit is contained in:
Mike McLean 2015-11-16 16:36:56 -05:00
parent 6c6bef9630
commit 3e663b8556
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
www/kojiweb/archiveinfo.chtml
View file

@ -19,6 +19,11 @@
<th>File Name</th><td>$archive.filename</td>
#end if
</tr>
#if $archive.metadata_only
<tr>
<th>Metadata only</th><td>True (file not imported)</td>
</tr>
#end if
<tr>
<th>File Type</th><td>$archive_type.description</td>
</tr>

14
www/kojiweb/buildinfo.chtml
View file

@ -111,7 +111,11 @@
#set $rpmpath = $pathinfo.rpm($rpm)
<tr>
<td></td>
#if $rpm.metadata_only
<td>$rpmfile (<a href="rpminfo?rpmID=$rpm.id">info</a>) (metadata only)</td>
#else
<td>$rpmfile (<a href="rpminfo?rpmID=$rpm.id">info</a>) (<a href="$nvrpath/$rpmpath">download</a>)</td>
#end if
</tr>
#end for
#end if
@ -175,12 +179,10 @@
<tr>
<td/>
<td>
#if $mavenbuild
$archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$pathinfo.mavenbuild($build)/$pathinfo.mavenfile($archive)">download</a>)
#elif $winbuild
$pathinfo.winfile($archive) (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$pathinfo.winbuild($build)/$pathinfo.winfile($archive)">download</a>)
#elif $imagebuild
$archive.filename (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$pathinfo.imagebuild($build)/$archive.filename">download</a>)
#if $archive.metadata_only
$archive.display (<a href="archiveinfo?archiveID=$archive.id">info</a>)
#else
$archive.display (<a href="archiveinfo?archiveID=$archive.id">info</a>) (<a href="$archive.dl_url">download</a>)
#end if
</td>
</tr>

14
www/kojiweb/index.py
View file

@ -1098,7 +1098,18 @@ def buildinfo(environ, buildID):
archivetype = None
archives = server.listArchives(build['id'], type=archivetype, queryOpts={'order': 'filename'})
archivesByExt = {}
topurl = environ['koji.options']['KojiFilesURL']
pathinfo = koji.PathInfo(topdir=topurl)
for archive in archives:
if mavenbuild:
archive['display'] = archive['filename']
archive['dl_url'] = '/'.join([pathinfo.mavenbuild(build), pathinfo.mavenfile(archive)])
elif winbuild:
archive['display'] = pathinfo.winfile(archive)
archive['dl_url'] = '/'.join([pathinfo.winbuild(build), pathinfo.winfile(archive)])
elif imagebuild:
archive['display'] = archive['filename']
archive['dl_url'] = '/'.join([pathinfo.imagebuild(build), archive['filename']])
archivesByExt.setdefault(os.path.splitext(archive['filename'])[1][1:], []).append(archive)
rpmsByArch = {}
@ -1197,8 +1208,7 @@ def buildinfo(environ, buildID):
else:
values['estCompletion'] = None
topurl = environ['koji.options']['KojiFilesURL']
values['pathinfo'] = koji.PathInfo(topdir=topurl)
values['pathinfo'] = pathinfo
return _genHTML(environ, 'buildinfo.chtml')
def builds(environ, userID=None, tagID=None, packageID=None, state=None, order='-build_id', start=None, prefix=None, inherited='1', latest='1', type=None):