diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index e3f6a4ee23..92a3b50801 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html @@ -175,8 +175,8 @@
+ {% block custombuttons%} {% endblock %} {% if tablecols %} - {% block custombuttons%} {% endblock %}
+ +
+{% endif %} +{%endblock%} diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top_projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/basetable_top_projectbuilds.html new file mode 100644 index 0000000000..bfefff5e33 --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top_projectbuilds.html @@ -0,0 +1,16 @@ +{% extends "basetable_top.html" %} + +{%block custombuttons %} +{% if MANAGED %} +
+ + +
+{% endif %} +{%endblock%} diff --git a/bitbake/lib/toaster/toastergui/templates/build.html b/bitbake/lib/toaster/toastergui/templates/build.html index bef1f15399..f20f041749 100644 --- a/bitbake/lib/toaster/toastergui/templates/build.html +++ b/bitbake/lib/toaster/toastergui/templates/build.html @@ -6,83 +6,11 @@ {% block pagecontent %}
- {% if not objects.paginator.count and not request.GET.filter and not request.GET.search %} - -
- -
-
-

This is Toaster

-

A web interface to BitBake, the Yocto Project build system.

-

- Show me the manual - I want to contribute -

-
-
- Yocto Project -
-
-
- {% endif %} - {%if mru.count > 0%} -
-

- Recent Builds -

-
- {% for build in mru %} -
-
-
- {%if build.outcome == build.SUCCEEDED%}{%elif build.outcome == build.FAILED%}{%else%}{%endif%} - {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - - {% endif %} - 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}}) - {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - - {% endif %} -
- {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} -
- {% if build.errors_no %} - {{build.errors_no}} error{{build.errors_no|pluralize}} - {% endif %} -
-
- {% if build.warnings_no %} - {{build.warnings_no}} warning{{build.warnings_no|pluralize}} - {% endif %} -
-
- Build time: {{ build.timespent|sectohms }} -
- {%endif%}{%if build.outcome == build.IN_PROGRESS %} -
-
-
-
-
-
ETA: in {{build.eta|naturaltime}}
- {%endif%} -
-
+ {% include "mrb_section.html" %} - {% endfor %}{%endif%} - {% if not objects.paginator.count and not request.GET.filter and not request.GET.search %} - - {% if mru.count == 0 %} -
-

All builds

-
-
- Toaster has not recorded any builds yet. Go build something with Knotty or Hob -
- {% endif %} - {% else %} + {% if 1 %}

{% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %} @@ -108,7 +36,7 @@ {% else %} - {% include "basetable_top.html" %} + {% include "basetable_top_buildprojects.html" %} {% for build in objects %} diff --git a/bitbake/lib/toaster/toastergui/templates/landing.html b/bitbake/lib/toaster/toastergui/templates/landing.html new file mode 100644 index 0000000000..071edf86ef --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/landing.html @@ -0,0 +1,66 @@ +{% extends "base.html" %} + +{% load static %} +{% load projecttags %} +{% load humanize %} + +{% block pagecontent %} + +
+
+ +
+ +
+
+

+ This is Toaster +

+

+ A web interface to + + BitBake + + , the + + Yocto Project + + build system. +

+

+ + Show me the manual + + + I want to contribute + +

+
+
+ + Yocto Project + +
+
+
+ +
+

+ All builds +

+
+
+ Toaster has not recorded any builds yet. Go build something with + + Knotty + + or + + Hob + +
+
+ +{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html new file mode 100644 index 0000000000..5ba0b08495 --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html @@ -0,0 +1,102 @@ +{% load static %} +{% load projecttags %} +{% load humanize %} + + +{%if mru.count > 0%} + +
+

+ Latest Builds +

+
+
+ {% for build in mru %} +
+ {% if build.project %} + {{build.project.name}} + {% endif %} + +
+
+ {%if build.outcome == build.SUCCEEDED%}{%elif build.outcome == build.FAILED%}{%else%}{%endif%} + {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} + + {% endif %} + 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}}) + {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} + + {% endif %} +
+ {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} +
+ {% if build.errors_no %} + {{build.errors_no}} error{{build.errors_no|pluralize}} + {% endif %} +
+
+ {% if build.warnings_no %} + {{build.warnings_no}} warning{{build.warnings_no|pluralize}} + {% endif %} +
+
+ + Build time: {{ build.timespent|sectohms }} + + {% if build.project %} + Run again + {% endif %} +
+ {%endif%} + {%if build.outcome == build.IN_PROGRESS %} +
+
+
+
+
+
ETA: in {{build.eta|naturaltime}}
+ {%endif%} +
+
+ + {% endfor %} +
+ + + +{%endif%} + diff --git a/bitbake/lib/toaster/toastergui/templates/projects.html b/bitbake/lib/toaster/toastergui/templates/projects.html new file mode 100644 index 0000000000..432f025d3c --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/projects.html @@ -0,0 +1,36 @@ +{% extends "base.html" %} + +{% load static %} +{% load projecttags %} +{% load humanize %} + +{% block pagecontent %} + + + {% include "mrb_section.html" %} + + +
+

+ All projects +

+
+ +{% include "basetable_top_projectbuilds.html" %} + {% for o in objects %} + + {{o.name}} + {{o.release.name}} + {{o.get_current_machine_name}} + {{o.get_number_of_builds}} + {{o.get_last_outcome}} + {{o.get_last_target}} + {{o.get_last_errors}} + {{o.get_last_warnings}} + {{o.get_last_imgfiles}} + {{o.updated|date:"d/m/y H:i"}} + + {% endfor %} +{% include "basetable_bottom.html" %} + +{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py index b953aa1580..4a97eb7ac4 100644 --- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py +++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py @@ -24,6 +24,7 @@ import re from django import template from django.utils import timezone from django.template.defaultfilters import filesizeformat +import json as JsonLib register = template.Library() @@ -40,6 +41,16 @@ def sectohms(time): hours = int(tdsec / 3600) return "%02d:%02d:%02d" % (hours, int((tdsec - (hours * 3600))/ 60), int(tdsec) % 60) + +@register.filter(name = 'mapselect') +def mapselect(value, argument): + return map(lambda x: vars(x)[argument], value) + + +@register.filter(name = "json") +def json(value): + return JsonLib.dumps(value) + @register.assignment_tag def query(qs, **kwargs): """ template tag which allows queryset filtering. Usage: diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index e642e32036..07821b6036 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py @@ -21,6 +21,8 @@ from django.views.generic import RedirectView urlpatterns = patterns('toastergui.views', # landing page + url(r'^landing/$', 'landing', name='landing'), + url(r'^builds/$', 'builds', name='all-builds'), # build info navigation url(r'^build/(?P\d+)$', 'builddashboard', name="builddashboard"), @@ -74,6 +76,7 @@ urlpatterns = patterns('toastergui.views', url(r'^targets/$', 'targets', name='targets'), url(r'^machines/$', 'machines', name='machines'), + url(r'^projects/$', 'projects', name='all-projects'), url(r'^project/(?P\d+)/$', 'project', name='project'), url(r'^project/(?P\d+)/configuration$', 'projectconf', name='projectconf'), url(r'^project/(?P\d+)/builds$', 'projectbuilds', name='projectbuilds'), @@ -85,5 +88,5 @@ urlpatterns = patterns('toastergui.views', # default redirection - url(r'^$', RedirectView.as_view( url= 'builds/')), + url(r'^$', RedirectView.as_view( url= 'landing')), ) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 66113cfdf3..38d67e378f 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -38,6 +38,51 @@ from datetime import timedelta from django.utils import formats import json + +# all new sessions should come through the landing page; +# determine in which mode we are running in, and redirect appropriately +def landing(request): + if toastermain.settings.MANAGED and Build.objects.count() == 0 and Project.objects.count() > 0: + return redirect(reverse('all-projects'), permanent = False) + + if Build.objects.all().count() > 0: + return redirect(reverse('all-builds'), permanent = False) + + return render(request, 'landing.html') + +def _project_recent_build_list(prj): + # build requests not yet started + return (map(lambda x: { + "id": x.pk, + "targets" : map(lambda y: {"target": y.target }, x.brtarget_set.all()), + "status": x.get_state_display(), + }, prj.buildrequest_set.filter(state__lt = BuildRequest.REQ_INPROGRESS).order_by("-pk")) + + # build requests started, but with no build yet + map(lambda x: { + "id": x.pk, + "targets" : map(lambda y: {"target": y.target }, x.brtarget_set.all()), + "status": x.get_state_display(), + }, prj.buildrequest_set.filter(state = BuildRequest.REQ_INPROGRESS, build = None).order_by("-pk")) + + # build requests that failed + map(lambda x: { + "id": x.pk, + "targets" : map(lambda y: {"target": y.target }, x.brtarget_set.all()), + "status": x.get_state_display(), + "errors": map(lambda y: {"type": y.errtype, "msg": y.errmsg, "tb": y.traceback}, x.brerror_set.all()), + }, prj.buildrequest_set.filter(state = BuildRequest.REQ_FAILED).order_by("-pk")) + + # and already made builds + map(lambda x: { + "id": x.pk, + "targets": map(lambda y: {"target": y.target }, x.target_set.all()), + "status": x.get_outcome_display(), + "completed_on" : x.completed_on.strftime('%s')+"000", + "build_time" : (x.completed_on - x.started_on).total_seconds(), + "build_page_url" : reverse('builddashboard', args=(x.pk,)), + "completeper": x.completeper(), + "eta": x.eta().ctime(), + }, prj.build_set.all())) + + def _build_page_range(paginator, index = 1): try: page = paginator.page(index) @@ -219,6 +264,8 @@ def _save_parameters_cookies(response, pagesize, orderby, request): response.set_cookie(key='orderby', value=html_parser.unescape(orderby), path=request.path) return response + + # shows the "all builds" page def builds(request): template = 'build.html' @@ -242,7 +289,7 @@ def builds(request): build_info = _build_page_range(Paginator(queryset, pagesize), request.GET.get('page', 1)) # build view-specific information; this is rendered specifically in the builds page, at the top of the page (i.e. Recent builds) - build_mru = Build.objects.filter(completed_on__gte=(timezone.now()-timedelta(hours=24))).order_by("-started_on")[:3] + build_mru = Build.objects.order_by("-started_on")[:3] # set up list of fstypes for each build fstypes_map = {}; @@ -2553,6 +2600,84 @@ if toastermain.settings.MANAGED: } return render(request, template, context) + + + + def projects(request): + template="projects.html" + + (pagesize, orderby) = _get_parameters_values(request, 10, 'updated:-') + mandatory_parameters = { 'count': pagesize, 'page' : 1, 'orderby' : orderby } + retval = _verify_parameters( request.GET, mandatory_parameters ) + if retval: + return _redirect_parameters( 'all-projects', request.GET, mandatory_parameters) + + queryset_all = Project.objects.all() + + # boilerplate code that takes a request for an object type and returns a queryset + # for that object type. copypasta for all needed table searches + (filter_string, search_term, ordering_string) = _search_tuple(request, Project) + queryset_with_search = _get_queryset(Project, queryset_all, None, search_term, ordering_string, 'updated:-') + queryset = _get_queryset(Project, queryset_all, filter_string, search_term, ordering_string, 'updated:-') + + # retrieve the objects that will be displayed in the table; projects a paginator and gets a page range to display + project_info = _build_page_range(Paginator(queryset, pagesize), request.GET.get('page', 1)) + + # build view-specific information; this is rendered specifically in the builds page, at the top of the page (i.e. Recent builds) + build_mru = Build.objects.order_by("-started_on")[:3] + + + + context = { + 'mru' : build_mru, + + 'objects' : project_info, + 'objectname' : "projects", + 'default_orderby' : 'id:-', + 'search_term' : search_term, + 'total_count' : queryset_with_search.count(), + 'tablecols': [ + {'name': 'Project', + 'orderfield': _get_toggle_order(request, "name"), + 'ordericon':_get_toggle_order_icon(request, "name"), + 'orderkey' : 'name', + }, + {'name': 'Release', + 'qhelp' : "The version of the build system used by the project", + 'orderfield': _get_toggle_order(request, "release__name"), + 'ordericon':_get_toggle_order_icon(request, "release__name"), + 'orderkey' : 'release__name', + }, + {'name': 'Machine', + 'qhelp': "The hardware currently selected for the project", + }, + {'name': 'Number of builds', + 'qhelp': "How many builds have been run for the project", + }, + {'name': 'Last outcome', 'clclass': 'loutcome', + 'qhelp': "Tells you if the last project build completed successfully or failed", + }, + {'name': 'Last target', 'clclass': 'ltarget', + 'qhelp': "The last project build target(s): one or more recipes or image recipes", + }, + {'name': 'Last errors', 'clclass': 'lerrors', + 'qhelp': "How many errors were encountered during the last project build (if any)", + }, + {'name': 'Last warnings', 'clclass': 'lwarnings', + 'qhelp': "How many warnigns were encountered during the last project build (if any)", + }, + {'name': 'Last image files', 'clclass': 'limagefiles', 'hidden': 1, + 'qhelp': "The root file system types produced by the last project build", + }, + {'name': 'Last updated', 'clclass': 'updated', + 'orderfield': _get_toggle_order(request, "updated"), + 'ordericon':_get_toggle_order_icon(request, "updated"), + 'orderkey' : 'updated', + } + ] + } + return render(request, template, context) + else: # these are pages that are NOT available in interactive mode def managedcontextprocessor(request): @@ -2599,3 +2724,6 @@ else: def projectbuilds(request): raise Exception("page not available in interactive mode") + + def projects(request): + raise Exception("page not available in interactive mode")