diff options
| -rw-r--r-- | layerindex/admin.py | 11 | ||||
| -rw-r--r-- | layerindex/migrations/0002_distro.py | 24 | ||||
| -rw-r--r-- | layerindex/models.py | 14 | ||||
| -rw-r--r-- | layerindex/recipeparse.py | 5 | ||||
| -rw-r--r-- | layerindex/restviews.py | 10 | ||||
| -rwxr-xr-x | layerindex/tools/import_classic.py | 2 | ||||
| -rw-r--r-- | layerindex/update_layer.py | 46 | ||||
| -rw-r--r-- | layerindex/urls.py | 3 | ||||
| -rw-r--r-- | layerindex/urls_branch.py | 6 | ||||
| -rw-r--r-- | layerindex/views.py | 29 | ||||
| -rw-r--r-- | templates/layerindex/detail.html | 23 | ||||
| -rw-r--r-- | templates/layerindex/distros.html | 76 | ||||
| -rw-r--r-- | templates/layerindex/layers.html | 1 | ||||
| -rw-r--r-- | templates/layerindex/machines.html | 1 | ||||
| -rw-r--r-- | templates/layerindex/recipes.html | 1 |
15 files changed, 248 insertions, 4 deletions
diff --git a/layerindex/admin.py b/layerindex/admin.py index accb95409b..7339ce1d52 100644 --- a/layerindex/admin.py +++ b/layerindex/admin.py @@ -75,6 +75,16 @@ class MachineAdmin(admin.ModelAdmin): def has_delete_permission(self, request, obj=None): return False +class DistroAdmin(admin.ModelAdmin): + search_fields = ['name'] + list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name'] + readonly_fields = Distro._meta.get_all_field_names() + def has_add_permission(self, request, obj=None): + return False + def has_delete_permission(self, request, obj=None): + return False + + class BBAppendAdmin(admin.ModelAdmin): search_fields = ['filename'] list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name'] @@ -111,6 +121,7 @@ admin.site.register(LayerNote, LayerNoteAdmin) admin.site.register(Recipe, RecipeAdmin) admin.site.register(RecipeFileDependency) admin.site.register(Machine, MachineAdmin) +admin.site.register(Distro, DistroAdmin) admin.site.register(BBAppend, BBAppendAdmin) admin.site.register(BBClass, BBClassAdmin) admin.site.register(RecipeChangeset, RecipeChangesetAdmin) diff --git a/layerindex/migrations/0002_distro.py b/layerindex/migrations/0002_distro.py new file mode 100644 index 0000000000..732007df06 --- /dev/null +++ b/layerindex/migrations/0002_distro.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('layerindex', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Distro', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)), + ('name', models.CharField(max_length=255)), + ('description', models.CharField(max_length=255)), + ('updated', models.DateTimeField(auto_now=True)), + ('layerbranch', models.ForeignKey(to='layerindex.LayerBranch')), + ], + ), + ] diff --git a/layerindex/models.py b/layerindex/models.py index 3fd16d43d3..2343ba7b04 100644 --- a/layerindex/models.py +++ b/layerindex/models.py @@ -361,6 +361,20 @@ class Machine(models.Model): def __str__(self): return '%s (%s)' % (self.name, self.layerbranch.layer.name) +class Distro(models.Model): + layerbranch = models.ForeignKey(LayerBranch) + name = models.CharField(max_length=255) + description = models.CharField(max_length=255) + + updated = models.DateTimeField(auto_now=True) + + def vcs_web_url(self): + url = self.layerbranch.file_url(os.path.join('conf/distro/%s.conf' % self.name)) + return url or '' + + def __str__(self): + return '%s (%s)' % (self.name, self.layerbranch.layer.name) + class BBAppend(models.Model): layerbranch = models.ForeignKey(LayerBranch) diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py index 7f995ec5ab..a9cecfc4b4 100644 --- a/layerindex/recipeparse.py +++ b/layerindex/recipeparse.py @@ -152,6 +152,7 @@ def get_var_files(fn, varlist, d): return varfiles machine_conf_re = re.compile(r'conf/machine/([^/.]*).conf$') +distro_conf_re = re.compile(r'conf/distro/([^/.]*).conf$') bbclass_re = re.compile(r'classes/([^/.]*).bbclass$') def detect_file_type(path, subdir_start): typename = None @@ -171,6 +172,10 @@ def detect_file_type(path, subdir_start): if res: typename = 'bbclass' return (typename, None, res.group(1)) + res = distro_conf_re.match(subpath) + if res: + typename = 'distro' + return (typename, None, res.group(1)) if typename == 'recipe' or typename == 'bbappend': if subdir_start: diff --git a/layerindex/restviews.py b/layerindex/restviews.py index b33d3d19d7..57f1552a78 100644 --- a/layerindex/restviews.py +++ b/layerindex/restviews.py @@ -1,4 +1,4 @@ -from layerindex.models import Branch, LayerItem, LayerNote, LayerBranch, LayerDependency, Recipe, Machine +from layerindex.models import Branch, LayerItem, LayerNote, LayerBranch, LayerDependency, Recipe, Machine, Distro from rest_framework import viewsets, serializers from layerindex.querysethelper import params_to_queryset, get_search_tuple @@ -56,3 +56,11 @@ class MachineSerializer(serializers.ModelSerializer): class MachineViewSet(ParametricSearchableModelViewSet): queryset = Machine.objects.all() serializer_class = MachineSerializer + +class DistroSerializer(serializers.ModelSerializer): + class Meta: + model = Distro + +class DistroViewSet(ParametricSearchableModelViewSet): + queryset = Distro.objects.all() + serializer_class = DistroSerializer diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py index 45ccaa9c19..80c49afb92 100755 --- a/layerindex/tools/import_classic.py +++ b/layerindex/tools/import_classic.py @@ -160,6 +160,7 @@ def main(): layerdir_start = os.path.normpath(oeclassicpath) + os.sep layerrecipes = Recipe.objects.filter(layerbranch=layerbranch) layermachines = Machine.objects.filter(layerbranch=layerbranch) + layerdistros = Distro.objects.filter(layerbranch=layerbranch) layerappends = BBAppend.objects.filter(layerbranch=layerbranch) layerclasses = BBClass.objects.filter(layerbranch=layerbranch) @@ -172,6 +173,7 @@ def main(): layerrecipes.delete() layermachines.delete() + layerdistros.delete() layerappends.delete() layerclasses.delete() for root, dirs, files in os.walk(oeclassicpath): diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 13b508f79d..f2a8b7e7f5 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -115,6 +115,19 @@ def update_machine_conf_file(path, machine): break machine.description = desc +def update_distro_conf_file(path, distro): + logger.debug('Updating distro %s' % path) + desc = "" + with open(path, 'r') as f: + for line in f: + if line.startswith('#@NAME:'): + desc = line[7:].strip() + if line.startswith('#@DESCRIPTION:'): + desc = line[14:].strip() + desc = re.sub(r'Distribution configuration for( running)*( an)*( the)*', '', desc) + break + distro.description = desc + def main(): if LooseVersion(git.__version__) < '0.3.1': logger.error("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script") @@ -161,7 +174,7 @@ def main(): utils.setup_django() import settings - from layerindex.models import LayerItem, LayerBranch, Recipe, RecipeFileDependency, Machine, BBAppend, BBClass + from layerindex.models import LayerItem, LayerBranch, Recipe, RecipeFileDependency, Machine, Distro, BBAppend, BBClass from django.db import transaction logger.setLevel(options.loglevel) @@ -269,6 +282,7 @@ def main(): layerdir_start = os.path.normpath(layerdir) + os.sep layerrecipes = Recipe.objects.filter(layerbranch=layerbranch) layermachines = Machine.objects.filter(layerbranch=layerbranch) + layerdistros = Distro.objects.filter(layerbranch=layerbranch) layerappends = BBAppend.objects.filter(layerbranch=layerbranch) layerclasses = BBClass.objects.filter(layerbranch=layerbranch) if layerbranch.vcs_last_rev != topcommit.hexsha or options.reload: @@ -384,6 +398,15 @@ def main(): else: logger.warn("Renamed machine %s could not be found" % oldpath) other_adds.append(diffitem) + elif oldtypename == 'distro': + results = layerdistros.filter(name=oldfilename) + if len(results): + logger.debug("Rename distro %s to %s" % (results[0], newfilename)) + results[0].name = newfilename + results[0].save() + else: + logger.warn("Renamed distro %s could not be found" % oldpath) + other_adds.append(diffitem) elif oldtypename == 'bbclass': results = layerclasses.filter(name=oldfilename) if len(results): @@ -422,6 +445,8 @@ def main(): layerappends.filter(filepath=filepath).filter(filename=filename).delete() elif typename == 'machine': layermachines.filter(name=filename).delete() + elif typename == 'distro': + layerdistros.filter(name=filename).delete() elif typename == 'bbclass': layerclasses.filter(name=filename).delete() @@ -452,6 +477,12 @@ def main(): machine.name = filename update_machine_conf_file(os.path.join(repodir, path), machine) machine.save() + elif typename == 'distro': + distro = Distro() + distro.layerbranch = layerbranch + distro.name = filename + update_distro_conf_file(os.path.join(repodir, path), distro) + distro.save() elif typename == 'bbclass': bbclass = BBClass() bbclass.layerbranch = layerbranch @@ -483,6 +514,12 @@ def main(): machine = results[0] update_machine_conf_file(os.path.join(repodir, path), machine) machine.save() + elif typename == 'distro': + results = layerdistros.filter(name=filename) + if results: + distro = results[0] + update_distro_conf_file(os.path.join(repodir, path), distro) + distro.save() deps = RecipeFileDependency.objects.filter(layerbranch=layerbranch).filter(path=path) for dep in deps: @@ -523,6 +560,7 @@ def main(): layerrecipe_fns.append(fullpath) layermachines.delete() + layerdistros.delete() layerappends.delete() layerclasses.delete() for root, dirs, files in os.walk(layerdir): @@ -550,6 +588,12 @@ def main(): machine.name = filename update_machine_conf_file(fullpath, machine) machine.save() + elif typename == 'distro': + distro = Distro() + distro.layerbranch = layerbranch + distro.name = filename + update_distro_conf_file(fullpath, distro) + distro.save() elif typename == 'bbclass': bbclass = BBClass() bbclass.layerbranch = layerbranch diff --git a/layerindex/urls.py b/layerindex/urls.py index cbd29ad496..e37db24a5b 100644 --- a/layerindex/urls.py +++ b/layerindex/urls.py @@ -21,6 +21,7 @@ router.register(r'layerBranches', restviews.LayerBranchViewSet) router.register(r'layerDependencies', restviews.LayerDependencyViewSet) router.register(r'recipes', restviews.RecipeViewSet) router.register(r'machines', restviews.MachineViewSet) +router.register(r'distros', restviews.DistroViewSet) urlpatterns = patterns('', url(r'^$', @@ -37,6 +38,8 @@ urlpatterns = patterns('', RedirectView.as_view(url=reverse_lazy('recipe_search', args=('master',)), permanent=False)), url(r'^machines/$', RedirectView.as_view(url=reverse_lazy('machine_search', args=('master',)), permanent=False)), + url(r'^distros/$', + RedirectView.as_view(url=reverse_lazy('distro_search', args=('master',)), permanent=False)), url(r'^submit/$', edit_layer_view, {'template_name': 'layerindex/submitlayer.html'}, name="submit_layer"), url(r'^submit/thanks$', diff --git a/layerindex/urls_branch.py b/layerindex/urls_branch.py index 3313290496..dbfb8a11c7 100644 --- a/layerindex/urls_branch.py +++ b/layerindex/urls_branch.py @@ -7,7 +7,7 @@ from django.conf.urls import * from django.views.defaults import page_not_found from django.core.urlresolvers import reverse_lazy -from layerindex.views import LayerListView, RecipeSearchView, MachineSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, RedirectParamsView, DuplicatesView +from layerindex.views import LayerListView, RecipeSearchView, MachineSearchView, DistroSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, RedirectParamsView, DuplicatesView urlpatterns = patterns('', url(r'^$', @@ -28,6 +28,10 @@ urlpatterns = patterns('', MachineSearchView.as_view( template_name='layerindex/machines.html'), name='machine_search'), + url(r'^distros/$', + DistroSearchView.as_view( + template_name='layerindex/distros.html'), + name='distro_search'), url(r'^edit/(?P<slug>[-\w]+)/$', edit_layer_view, {'template_name': 'layerindex/editlayer.html'}, name="edit_layer"), url(r'^duplicates/$', DuplicatesView.as_view( diff --git a/layerindex/views.py b/layerindex/views.py index 3f9525d725..06045ae6a7 100644 --- a/layerindex/views.py +++ b/layerindex/views.py @@ -10,7 +10,7 @@ from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidde from django.core.urlresolvers import reverse, reverse_lazy, resolve from django.core.exceptions import PermissionDenied from django.template import RequestContext -from layerindex.models import Branch, LayerItem, LayerMaintainer, LayerBranch, LayerDependency, LayerNote, Recipe, Machine, BBClass, BBAppend, RecipeChange, RecipeChangeset, ClassicRecipe +from layerindex.models import Branch, LayerItem, LayerMaintainer, LayerBranch, LayerDependency, LayerNote, Recipe, Machine, Distro, BBClass, BBAppend, RecipeChange, RecipeChangeset, ClassicRecipe from datetime import datetime from itertools import chain from django.views.generic import TemplateView, DetailView, ListView @@ -326,6 +326,7 @@ class LayerDetailView(DetailView): if layerbranch: context['layerbranch'] = layerbranch context['machines'] = layerbranch.machine_set.order_by('name') + context['distros'] = layerbranch.distro_set.order_by('name') context['appends'] = layerbranch.bbappend_set.order_by('filename') context['classes'] = layerbranch.bbclass_set.order_by('name') context['url_branch'] = self.kwargs['branch'] @@ -596,6 +597,32 @@ class MachineSearchView(ListView): return context +class DistroSearchView(ListView): + context_object_name = 'distro_list' + paginate_by = 50 + + def get_queryset(self): + _check_url_branch(self.kwargs) + query_string = self.request.GET.get('q', '') + init_qs = Distro.objects.filter(layerbranch__branch__name=self.kwargs['branch']) + if query_string.strip(): + entry_query = simplesearch.get_query(query_string, ['name', 'description']) + return init_qs.filter(entry_query).order_by('name', 'layerbranch__layer') + + if 'q' in self.request.GET: + return init_qs.order_by('name', 'layerbranch__layer') + + # Be consistent with RecipeSearchView + return Distro.objects.none() + + def get_context_data(self, **kwargs): + context = super(DistroSearchView, self).get_context_data(**kwargs) + context['search_keyword'] = self.request.GET.get('q', '') + context['url_branch'] = self.kwargs['branch'] + context['this_url_name'] = resolve(self.request.path_info).url_name + return context + + class PlainTextListView(ListView): def render_to_response(self, context): "Returns a plain text response rendering of the template" diff --git a/templates/layerindex/detail.html b/templates/layerindex/detail.html index d0d11c05b0..4bd7ecf657 100644 --- a/templates/layerindex/detail.html +++ b/templates/layerindex/detail.html @@ -168,6 +168,9 @@ {% if classes.count > 0 %} <li><a href="#classes" data-toggle="tab">Classes</a></li> {% endif %} + {% if distros.count > 0 %} + <li><a href="#distros" data-toggle="tab">Distros</a></li> + {% endif %} </ul> <div class="tab-content"> @@ -265,6 +268,26 @@ </table> </div> {% endif %} + {% if distros.count > 0 %} + <div class="tab-pane" id="distros"> + <div class="navbar"> + <div class="navbar-inner"> + <a class="brand pull-left">{{ layeritem.name }} distros</a> + </div> + </div> + + <table class="table table-bordered"> + <tbody> + {% for distro in distros %} + <tr> + <td><a href="{{ distro.vcs_web_url }}">{{ distro.name }}</a></td> + <td>{{ distro.description }}</td> + </tr> + {% endfor %} + </tbody> + </table> + </div> + {% endif %} </div> diff --git a/templates/layerindex/distros.html b/templates/layerindex/distros.html new file mode 100644 index 0000000000..70855848e6 --- /dev/null +++ b/templates/layerindex/distros.html @@ -0,0 +1,76 @@ +{% extends "base_toplevel.html" %} +{% load i18n %} + +{% comment %} + + layerindex-web - distro index page template + + Copyright (C) 2013 Intel Corporation + Copyright (C) 2016 Wind River Systems + Licensed under the MIT license, see COPYING.MIT for details + +{% endcomment %} + + +<!-- +{% block title_append %} - distros{% endblock %} +--> + +{% block navs %} +{% autoescape on %} + <li><a href="{% url 'layer_list' url_branch %}">Layers</a></li> + <li><a href="{% url 'recipe_search' url_branch %}">Recipes</a></li> + <li><a href="{% url 'machine_search' url_branch %}">Machines</a></li> + <li class="active"><a href="{% url 'distro_search' url_branch %}">Distros</a></li> +{% endautoescape %} +{% endblock %} + + +{% block content_inner %} +{% autoescape on %} + + + <div class="row-fluid"> + <div class="input-append"> + <form id="filter-form" action="{% url 'distro_search' url_branch %}" method="get"> + <input type="text" class="input-xxlarge" id="appendedInputButtons" placeholder="Search distros" name="q" value="{{ search_keyword }}" /> + <button class="btn" type="submit">search</button> + </form> + </div> + </div> + +{% if distro_list %} + <table class="table table-striped table-bordered distrostable"> + <thead> + <tr> + <th>Distro name</th> + <th class="span9">Description</th> + <th>Layer</th> + </tr> + </thead> + + <tbody> + {% for distro in distro_list %} + <tr> + <td><a href="{{ distro.vcs_web_url }}">{{ distro.name }}</a></td> + <td>{{ distro.description }}</td> + <td><a href="{% url 'layer_item' url_branch distro.layerbranch.layer.name %}">{{ distro.layerbranch.layer.name }}</a></td> + </tr> + {% endfor %} + </tbody> + </table> + + {% if is_paginated %} + {% load pagination %} + {% pagination page_obj %} + {% endif %} +{% else %} + {% if search_keyword %} + <p>No matching distros in database.</p> + {% endif %} +{% endif %} + + +{% endautoescape %} + +{% endblock %} diff --git a/templates/layerindex/layers.html b/templates/layerindex/layers.html index cfc4ebd078..b11ff2f1c0 100644 --- a/templates/layerindex/layers.html +++ b/templates/layerindex/layers.html @@ -21,6 +21,7 @@ <li class="active"><a href="{% url 'layer_list' url_branch %}">Layers</a></li> <li><a href="{% url 'recipe_search' url_branch %}">Recipes</a></li> <li><a href="{% url 'machine_search' url_branch %}">Machines</a></li> + <li><a href="{% url 'distro_search' url_branch %}">Distros</a></li> {% endautoescape %} {% endblock %} diff --git a/templates/layerindex/machines.html b/templates/layerindex/machines.html index e31433c0a6..2a9f947321 100644 --- a/templates/layerindex/machines.html +++ b/templates/layerindex/machines.html @@ -20,6 +20,7 @@ <li><a href="{% url 'layer_list' url_branch %}">Layers</a></li> <li><a href="{% url 'recipe_search' url_branch %}">Recipes</a></li> <li class="active"><a href="{% url 'machine_search' url_branch %}">Machines</a></li> + <li><a href="{% url 'distro_search' url_branch %}">Distros</a></li> {% endautoescape %} {% endblock %} diff --git a/templates/layerindex/recipes.html b/templates/layerindex/recipes.html index 74f3bb431e..60a266756f 100644 --- a/templates/layerindex/recipes.html +++ b/templates/layerindex/recipes.html @@ -20,6 +20,7 @@ <li><a href="{% url 'layer_list' url_branch %}">Layers</a></li> <li class="active"><a href="{% url 'recipe_search' url_branch %}">Recipes</a></li> <li><a href="{% url 'machine_search' url_branch %}">Machines</a></li> + <li><a href="{% url 'distro_search' url_branch %}">Distros</a></li> {% endautoescape %} {% endblock %} |