From 971c89f68b859e56663fb1940beb3c94ba64e02c Mon Sep 17 00:00:00 2001 From: Magnus Granberg Date: Sun, 10 Jan 2016 18:49:39 +0100 Subject: add build page --- python/tbc_www/urls.py | 3 +- python/tbc_www/views.py | 62 +++++++++++++++++++- python/templates/includes/frontpage/new_logs | 2 +- python/templates/pages/new/logs/build/index.html | 72 ++++++++++++++++++++++++ python/templates/pages/new/logs/index.html | 46 +++++++++++++++ 5 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 python/templates/pages/new/logs/build/index.html create mode 100644 python/templates/pages/new/logs/index.html diff --git a/python/tbc_www/urls.py b/python/tbc_www/urls.py index 60f00d4..6198beb 100644 --- a/python/tbc_www/urls.py +++ b/python/tbc_www/urls.py @@ -4,8 +4,9 @@ urlpatterns = patterns('tbc_www.views', url(r'^home/$', 'home'), url(r'^packages/$', 'categories'), url(r'^categories/(?P\d+)/$', 'packages'), - url(r'^package/(?P\d+)/$', 'ebuilds'), + url(r'^packages/(?P\d+)/$', 'ebuilds'), url(r'^ebuild/(?P\d+)/$', 'ebuild'), + url(r'^new/logs/build/(?P\d+)/$', 'new_logs_build'), url(r'^new/logs/$', 'new_logs'), url(r'^new/repomanqa/$', 'new_repomanqa'), url(r'^new/$', 'new_main'), diff --git a/python/tbc_www/views.py b/python/tbc_www/views.py index df2af96..29e561d 100644 --- a/python/tbc_www/views.py +++ b/python/tbc_www/views.py @@ -7,7 +7,8 @@ from django.conf import settings from gentoo_www.models import SiteSettings, Layout, Pages, SubPages, Sponsors, Posts from tbc_www.models import EbuildsMetadata, BuildLogs, BuildJobs, BuildLogsQa, \ BuildJobsUse, Categories, CategoriesMetadata, Packages, PackagesMetadata, Ebuilds, \ - Repos, EbuildsKeywords, BuildLogsErrors, EbuildsRestrictions, EbuildsIuse, PackagesRepoman + Repos, EbuildsKeywords, BuildLogsErrors, EbuildsRestrictions, EbuildsIuse, PackagesRepoman, \ + BuildLogsConfig, BuildLogsUse, BuildLogsQa import re def default_TmpDict(pagerequest): @@ -237,3 +238,62 @@ def new_logs(request): alist.append(adict2) TmpDict['BL_tmp'] = alist return render(request, 'pages/' + pagerequest + '/logs/index.html', TmpDict) + +def new_logs_build(request, buildlog_id): + pagerequest = 'new' + TmpDict = default_TmpDict(pagerequest) + B = BuildLogs.objects.get(BuildLogId = buildlog_id) + EM = EbuildsMetadata.objects.get(EbuildId = B.EbuildId.EbuildId) + PM = PackagesMetadata.objects.get(PackageId__PackageId = B.EbuildId.PackageId.PackageId) + BLI = {} + BLI['BuildLogId'] = buildlog_id + BLI['EbuildId'] = B.EbuildId.EbuildId + BLI['C'] = B.EbuildId.PackageId.CategoryId.Category + BLI['P'] = B.EbuildId.PackageId.Package + BLI['V'] = B.EbuildId.Version + BLI['R'] = B.EbuildId.PackageId.RepoId.Repo + BLI['EC'] = EM.Commit + BLI['PD'] = EM.Descriptions + BLI['PC'] = PM.Gitlog + BLI['Fail'] = B.Fail + if B.Fail: + BLI['BE_tmp'] = BuildLogsErrors.objects.filter(BuildLogId = buildlog_id) + BLI['Summery_text'] = B.SummeryText + if B.BugId == "0": + BLI['BugId'] = False + else: + BLI['BugId'] = B.BugId + BC = BuildLogsConfig.objects.get(BuildLogId = buildlog_id) + #CEO_tmp = ConfigsEmergeOptions.objects.filter(ConfigId = BC.ConfigId.ConfigId) + BU_tmp = BuildLogsUse.objects.filter(BuildLogId = BC.BuildLogId) + config_eoption = [] + BLI['configid'] = BC.ConfigId.ConfigId + BLI['hostname'] = BC.ConfigId.HostName + BLI['config'] = BC.ConfigId.SetupId.Setup + BLI['profile'] = BC.ConfigId.SetupId.Profile + BLI['logid'] = BC.LogId + BLI['logname'] = BC.LogName[1:] + BLI['emerge_info_text'] = BC.EInfoId.EmergeInfoText + #for CEO in CEO_tmp: + # config_eoption.append(CEO.EmergeOptionId.EOption) + #BLI['emerge_option'] = config_eoption + if not BU_tmp == []: + use_enable = [] + use_disable = [] + for BU in BU_tmp: + if BU.Status: + use_enable.append(BU.UseId.Flag) + else: + use_disable.append(BU.UseId.Flag) + if not use_enable == []: + BLI['use_enable'] = use_enable + if not use_disable == []: + BLI['use_disable'] = use_disable + try: + BRQ = BuildLogsQa.objects.get(BuildLogId = B.BuildLogId) + BLI['RepomanQA'] = BRQ.SummeryText + except BuildLogsQa.DoesNotExist as e: + BLI['RepomanQA'] = False + print(BLI) + TmpDict['BLI'] = BLI + return render(request, 'pages/' + pagerequest + '/logs/build/index.html', TmpDict) \ No newline at end of file diff --git a/python/templates/includes/frontpage/new_logs b/python/templates/includes/frontpage/new_logs index 3074c4d..a1dd4d2 100644 --- a/python/templates/includes/frontpage/new_logs +++ b/python/templates/includes/frontpage/new_logs @@ -1,7 +1,7 @@ {% for B in BL%} - + + +
+
+ {{ BL.SummeryText|linebreaksbr }} + {% if BL.PR %} + {{ BL.PR|linebreaksbr }} + {% endif %} +
+
+ + {% endfor %} + + +{% endblock %} \ No newline at end of file -- cgit v1.2.3-65-gdbad
+ {{ B.C }}/{{ B.P }}-{{ B.V }}::{{ B.R }}

{{ B.SummeryText|truncatewords:3 }}

 diff --git a/python/templates/pages/new/logs/build/index.html b/python/templates/pages/new/logs/build/index.html new file mode 100644 index 0000000..9ae0656 --- /dev/null +++ b/python/templates/pages/new/logs/build/index.html @@ -0,0 +1,72 @@ +{% extends "layout/base.html" %} +{% block content %} +
+

{{ BLI.C }}/{{ BLI.P }}-{{ BLI.V }}::{{ BLI.R }} + {% if BLI.Fail %} + {% for BE in BLI.BE_tmp %} + {% if BE.ErrorId.ErrorId == 1 %} + {{ BE.ErrorId.ErrorName|upper }} + {% elif BE.ErrorId.ErrorId == 2 %} + {{ BE.ErrorId.ErrorName|upper }} + {% elif BE.ErrorId.ErrorId == 3 %} + OTHERS + {% else %} + {{ BE.ErrorId.ErrorName|upper }} + {% endif %} + {% endfor %} + {% else %} + OK + {% endif %} +

+
+
+
+

Host information

+ Host: {{ BLI.hostname }}
+ Config: {{BLI.config }}
+ Profile: {{BLI.profile }}
+ Emerge options : +
+ {% if BLI.use_enable %} +
+

Enabled useflags

+ {% for use in BLI.use_enable %} + {{ use }} + {% endfor %} +
+ {% endif %} + {% if BLI.use_disable %} +
+

Disabled useflags

+ {% for use in BLI.use_disable %} + {{ use }} + {% endfor %} +
+{% endif %} +
+
+
+ {% if BLI.Summery_text %} +

Summery:

+ {{ BLI.Summery_text|linebreaks }} + {% endif %} +
+
+
+
+ {% if BLI.RepomanQA %} +

Repoman QA Summery:

+ {{ BLI.RepomanQA|linebreaks }} + {% endif %} +
+
+
+
+ {% if BLI.logname %} +
+ Log file name:{{ BLI.logname }}
+ Raw log
+ {% endif %} +
+
+{% endblock %} \ No newline at end of file diff --git a/python/templates/pages/new/logs/index.html b/python/templates/pages/new/logs/index.html new file mode 100644 index 0000000..656ad7e --- /dev/null +++ b/python/templates/pages/new/logs/index.html @@ -0,0 +1,46 @@ +{% extends "layout/base.html" %} +{% block content %} +
+

New Logs's

+
+ {% if BL.Fail %} + {% for BE in BL.BE_tmp %} + {% if BE.BuildLogId.BuildLogId == BL.BuildLogId %} + {% if BE.ErrorId.ErrorId == 1 or BE.ErrorId.ErrorId == 2 %} + {{ BE.ErrorId.ErrorName|upper }} + {% elif BE.ErrorId.ErrorId == 3 %} + OTHERS + {% else %} + {{ BE.ErrorId.ErrorName|upper }} + {% endif %} + {% endif %} + {% endfor %} + {% else %} + OK + {% endif %} + More info +