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

backward compatibility changes

Browse source
This commit is contained in:
Tomas Kopecek 2017-03-14 11:53:52 +01:00
parent 323987e376
commit e6effec7e1
5 changed files with 158 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

39
www/kojiweb/index.py
View file

@ -672,18 +672,19 @@ def taskinfo(environ, taskID):
values['full_result_text'] = full_result_text
values['abbr_result_text'] = abbr_result_text
output = server.listTaskOutput(task['id'])
output = [p[len(koji.pathinfo.topdir):] for p in output]
output.sort(_sortByExtAndName)
values['output'] = output
topurl = environ['koji.options']['KojiFilesURL']
pathinfo = koji.PathInfo(topdir=topurl)
values['pathinfo'] = pathinfo
paths = [] # (volume, relpath) tuples
for relname, volumes in server.listTaskOutput(task['id'], all_volumes=True).iteritems():
paths += [(volume, relname) for volume in volumes]
values['output'] = sorted(paths, cmp = _sortByExtAndName)
if environ['koji.currentUser']:
values['perms'] = server.getUserPerms(environ['koji.currentUser']['id'])
else:
values['perms'] = []
topurl = environ['koji.options']['KojiFilesURL']
values['pathinfo'] = koji.PathInfo(topdir=topurl)
return _genHTML(environ, 'taskinfo.chtml')
def taskstatus(environ, taskID):
@ -693,11 +694,11 @@ def taskstatus(environ, taskID):
task = server.getTaskInfo(taskID)
if not task:
return ''
files = server.listTaskOutput(taskID, stat=True)
files = server.listTaskOutput(taskID, stat=True, all_volumes=True)
output = '%i:%s\n' % (task['id'], koji.TASK_STATES[task['state']])
for filename, file_stats in files.items():
output += '%s:%s\n' % (filename, file_stats['st_size'])
for filename, volumes_data in files.iteritems():
for volume, file_stats in volumes_data.iteritems():
output += '%s:%s:%s\n' % (volume, filename, file_stats['st_size'])
return output
def resubmittask(environ, taskID):
@ -717,19 +718,19 @@ def canceltask(environ, taskID):
_redirect(environ, 'taskinfo?taskID=%i' % taskID)
def _sortByExtAndName(a, b):
"""Sort two filenames, first by extension, and then by name."""
aRoot, aExt = os.path.splitext(os.path.basename(a))
bRoot, bExt = os.path.splitext(os.path.basename(b))
"""Sort two filename tuples, first by extension, and then by name."""
aRoot, aExt = os.path.splitext(os.path.basename(a[1]))
bRoot, bExt = os.path.splitext(os.path.basename(b[1]))
return cmp(aExt, bExt) or cmp(aRoot, bRoot)
def getfile(environ, taskID, name, offset=None, size=None):
def getfile(environ, taskID, name, volume='DEFAULT', offset=None, size=None):
server = _getServer(environ)
taskID = int(taskID)
output = server.listTaskOutput(taskID, stat=True)
name = os.path.join(koji.pathinfo.topdir, name[1:])
file_info = output.get(name)
if not file_info:
output = server.listTaskOutput(taskID, stat=True, all_volumes=True)
try:
file_info = output[name][volume]
except KeyError:
raise koji.GenericError('no file "%s" output by task %i' % (name, taskID))
mime_guess = mimetypes.guess_type(name, strict=False)[0]

6
www/kojiweb/taskinfo.chtml
View file

@ -412,10 +412,10 @@ $value
<tr>
<th>Output</th>
<td>
#for $filename in $output
<a href="$pathinfo.topdir$urllib.quote($filename)">$filename</a><br/>
#for $volume, $filename in $output
<a href="$pathinfo.task($task.id, volume=$volume)/$urllib.quote($filename)">$filename</a><br/>
#if $filename.endswith('.log')
(<a href="getfile?taskID=$task.id&name=$urllib.quote($filename)&offset=-4000">tail</a>)
(<a href="getfile?taskID=$task.id&volume=$volume&name=$urllib.quote($filename)&offset=-4000">tail</a>)
#end if
<br/>
#end for

11
www/static/js/watchlogs.js
View file

@ -51,8 +51,8 @@ function handleStatus(event) {
var logs = {};
for (var i = 1; i < lines.length; i++) {
data = lines[i].split(":");
var filename = data[0];
var filesize = parseInt(data[1]);
var filename = data[0] + ":" + data[1];
var filesize = parseInt(data[2]);
if (filename.indexOf(".log") != -1) {
logs[filename] = filesize;
}
@ -140,8 +140,11 @@ function outputLog() {
chunkSize = currentSize - currentOffset;
}
var req = new XMLHttpRequest();
req.open("GET", baseURL + "/getfile?taskID=" + currentTaskID + "&name=" + currentLog +
"&offset=" + currentOffset + "&size=" + chunkSize, true);
var data = currentLog.split(':');
var volume = data[0];
var filename = data[1];
req.open("GET", baseURL + "/getfile?taskID=" + currentTaskID + "&name=" + filename +
"&volume=" + volume + "&offset=" + currentOffset + "&size=" + chunkSize, true);
req.onreadystatechange = handleLog;
req.send(null);
if (headerElement != null) {