[Pkg-debile-commits] [debile-web] 03/03: Update for debile 1.3.1 db schema changes
Jon Severinsson
jonno-guest at moszumanska.debian.org
Thu Apr 10 14:42:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
jonno-guest pushed a commit to branch master
in repository debile-web.
commit f24d40128cff72e0c727f36880b552956b76490a
Author: Jon Severinsson <jon at severinsson.net>
Date: Sat Apr 5 17:11:49 2014 +0200
Update for debile 1.3.1 db schema changes
---
debileweb/blueprints/frontend.py | 39 +++++++++++++++++++++-----------
templates/job.html | 48 ++++++++++++++++++++++++++++++++++------
templates/source.html | 8 +++++++
3 files changed, 75 insertions(+), 20 deletions(-)
diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index b278b69..e244443 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -23,13 +23,11 @@
from flask import Blueprint, render_template, request, redirect
from flask.ext.jsonpify import jsonify
-from sqlalchemy.orm import joinedload
from debian.debian_support import Version
from debile.master.utils import make_session
-from debile.master.orm import (Person, Builder, Suite, Component, Arch, Check,
- Group, GroupSuite, Source, Maintainer, Binary,
- Job, JobDependencies, Result)
+from debile.master.orm import (Person, Builder, Suite, Check,
+ Group, GroupSuite, Source, Maintainer, Job)
from debileweb.blueprints.forms import SearchPackageForm
from debileweb.blueprints.consts import PREFIXES, ENTRIES_PER_PAGE, ENTRIES_PER_LIST_PAGE
@@ -622,7 +620,8 @@ def job(job_id, group_name="", package_name="", package_version="", version=""):
info['source_link'] = '/source/%s/%s/%s' % \
(job.group.name, job.source.name, job.source.version)
info['binary_link'] = '/job/%s/%s/%s/%d' % \
- (job.group.name, job.binary.name, job.binary.version, job.binary.build_job_id) if (job.binary and job.binary.build_job_id) else None
+ (job.group.name, job.binary.name, job.binary.version, job.binary.build_job_id) \
+ if (job.binary and job.binary.build_job_id) else None
info['builder_link'] = "/builder/%s" % job.builder.name if job.builder else None
info['job_runtime'] = None
@@ -633,18 +632,32 @@ def job(job_id, group_name="", package_name="", package_version="", version=""):
info['job_runtime'] = '%dh %02dm %02ds' % \
(hours, minutes, seconds)
- info['dud_name'] = "%d.dud" % job.id
- info['log_name'] = "%d.log" % job.id
- info['firehose_name'] = "%d.firehose.xml" % job.id
- special_files = [info['dud_name'], info['log_name'], info['firehose_name']]
- try:
- info['files'] = sorted([x for x in os.listdir(job.files_path) if x not in special_files])
- except OSError:
- info['files'] = []
+ results_info = []
+ for result in job.results:
+ try:
+ resultinfo = {}
+ resultinfo['result'] = result
+ resultinfo['dud_name'] = None
+ resultinfo['log_name'] = None
+ resultinfo['firehose_name'] = None
+ resultinfo['files'] = []
+ for fname in os.listdir(result.path):
+ if fname.endswith(".dud"):
+ resultinfo['dud_name'] = fname
+ elif fname.endswith(".log"):
+ resultinfo['log_name'] = fname
+ elif fname.endswith(".firehose.xml"):
+ resultinfo['firehose_name'] = fname
+ else:
+ resultinfo['files'] += [fname]
+ results_info.append(resultinfo)
+ except OSError:
+ pass
return render_template('job.html', **{
"job": job,
"info": info,
+ "results_info": results_info,
})
diff --git a/templates/job.html b/templates/job.html
index 9cb4bbb..0900d77 100644
--- a/templates/job.html
+++ b/templates/job.html
@@ -60,6 +60,18 @@
<div class='desc_value'><a href='{{info.builder_link}}'>{{job.builder.name}}</a></div>
</div>
{% endif %}
+ {% if job.assigned_at %}
+ <div class='desc_line'>
+ <div class='desc_key'>Assigned</div>
+ <div class='desc_value'>{{job.assigned_at|ago}}</div>
+ </div>
+ {% endif %}
+ {% if job.finished_at %}
+ <div class='desc_line'>
+ <div class='desc_key'>Finished</div>
+ <div class='desc_value'>{{job.finished_at|ago}}</div>
+ </div>
+ {% endif %}
{% if info.job_runtime %}
<div class='desc_line'>
<div class='desc_key'>Build time</div>
@@ -100,32 +112,54 @@
</div>
</div>
- {% if job.finished_at %}
+ {% for info in results_info %}
<div class='block'>
- <h3>Downloads</h3>
+ <h3>Result {{info.result.id}}</h3>
+ <div class='desc_line'>
+ <div class='desc_key'>Uploaded</div>
+ <div class='desc_value'>{{info.result.uploaded_at|ago}}</div>
+ </div>
<div class='desc_line'>
- <div class='desc_key'>Uploaded dud</div>
- <div class='desc_value'><a href='{{job.files_url}}/{{info.dud_name}}'>{{info.dud_name}}</a></div>
+ <div class='desc_key'>Job dud</div>
+ <div class='desc_value'><a href='{{info.result.url}}/{{info.dud_name}}'>{{info.dud_name}}</a></div>
</div>
<div class='desc_line'>
<div class='desc_key'>Job Log</div>
- <div class='desc_value'><a href='{{job.files_url}}/{{info.log_name}}'>{{info.log_name}}</a></div>
+ <div class='desc_value'><a href='{{info.result.url}}/{{info.log_name}}'>{{info.log_name}}</a></div>
</div>
<div class='desc_line'>
<div class='desc_key'>Firehose Report</div>
- <div class='desc_value'><a href='{{job.files_url}}/{{info.firehose_name}}'>{{info.firehose_name}}</a></div>
+ <div class='desc_value'><a href='{{info.result.url}}/{{info.firehose_name}}'>{{info.firehose_name}}</a></div>
</div>
{% if info.files %}
<div class='desc_line'>
<div class='desc_key'>Additional Files</div>
<div class='desc_value'>
{% for file in info.files %}
- <a href='{{job.files_url}}/{{file}}'>{{file}}</a><br />
+ <a href='{{info.result.url}}/{{file}}'>{{file}}</a><br />
{% endfor %}
</div>
</div>
{% endif %}
</div>
+ {% endfor %}
+
+ {% if job.built_binary %}
+ <div class='block'>
+ <h3>Binary packages</h3>
+ <div class='desc_line'>
+ <div class='desc_key'>Uploaded</div>
+ <div class='desc_value'>{{job.built_binary.uploaded_at|ago}}</div>
+ </div>
+ <div class='desc_line'>
+ <div class='desc_key'>Binary packages</div>
+ <div class='desc_value'>
+ {% for deb in job.built_binary.debs %}
+ <a href='{{deb.url}}'>{{deb.filename}}</a><br />
+ {% endfor %}
+ </div>
+ </div>
+ </div>
{% endif %}
{% endblock %}
diff --git a/templates/source.html b/templates/source.html
index a254ae0..c7d5c05 100644
--- a/templates/source.html
+++ b/templates/source.html
@@ -51,6 +51,14 @@
<div class='desc_key'>Uploader</div>
<div class='desc_value'><a href='{{info.uploader_link}}'>{{source.uploader.name}}</a></div>
</div>
+ <div class='desc_line'>
+ <div class='desc_key'>Uploaded</div>
+ <div class='desc_value'>{{source.uploaded_at|ago}}</div>
+ </div>
+ <div class='desc_line'>
+ <div class='desc_key'>Dsc</div>
+ <div class='desc_value'><a href='{{source.dsc_url}}'>{{source.dsc_filename}}</a></div>
+ </div>
</div>
<div class='block'>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git
More information about the Pkg-debile-commits
mailing list