[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/apps/packages/templatetags/, ...

[Slava Bacherikov]

commit:     2b8d34a766395927b86fb0f358442927b6fd6036
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Wed Jun 27 22:52:35 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Wed Jun 27 22:52:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=2b8d34a7

Add keywords table.

---
 gpackages/apps/packages/keywords.py              |   25 ++++++++++++
 gpackages/apps/packages/models.py                |   43 ++++++++++++++++++++-
 gpackages/apps/packages/templatetags/packages.py |    4 ++
 gpackages/templates/ebuilds.html                 |   44 +--------------------
 gpackages/templates/keywords_table.html          |   27 +++++++++++++
 gpackages/templates/packages.html                |   46 +---------------------
 6 files changed, 102 insertions(+), 87 deletions(-)

diff --git a/gpackages/apps/packages/keywords.py b/gpackages/apps/packages/keywords.py
new file mode 100644
index 0000000..0ab1e87
--- /dev/null
+++ b/gpackages/apps/packages/keywords.py
@@ -0,0 +1,25 @@
+from functools import total_ordering
+from package_info.generic import ToStrMixin
+
+class KeywordRepr(ToStrMixin):
+
+    __slots__ = ('status', 'arch')
+
+    status_repr_list = ('', '+', '~','-')
+    status_class_list = ('blank', 'stable', 'unstable', 'hardmask')
+    
+    def __init__(self, arch, status):
+        self.arch = arch
+        self.status = status
+
+    @property
+    def status_repr(self):
+        return self.status_repr_list[self.status + 1]
+
+    @property
+    def status_class(self):
+        return self.status_class_list[self.status + 1]
+
+    def __unicode__(self):
+        return unicode(self.status_repr + self.arch)
+

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index 290516c..187088e 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -1,10 +1,11 @@
 from django.db import models
-
 from package_info.abstract import AbstractCategory, AbstarctPackage, \
                                   AbstractEbuild
 import managers
 from package_info.generic import get_from_kwargs_and_del
 from package_info.repo_info import REPOS_TYPE
+# relative
+from .keywords import KeywordRepr
 
 from django.core.validators import URLValidator, validate_email 
 from django.core.exceptions import ValidationError
@@ -305,6 +306,13 @@ class PackageModel(AbstractDateTimeModel):
         self.metadata_hash = package.metadata_sha1
         self.description = package.description
 
+    def get_ebuilds_and_keywords(self, arch_list):
+        l = []
+        for ebuild in self.ebuildmodel_set.order_by('-version', '-revision'):
+            l.extend(ebuild.get_ebuilds_and_keywords(arch_list))
+        return l
+            
+
     class Meta:
         unique_together = ('virtual_package', 'repository')
         ordering = ('-updated_datetime',)
@@ -438,6 +446,39 @@ class EbuildModel(AbstractDateTimeModel):
     def fullversion(self):
         return '%s%s' %  (self.version, ('-'+ self.revision if self.revision else ''))
 
+    def get_keywords(self, arch_list):
+        keywords_dict = self.get_keywords_dict(arch_list)
+        return (KeywordRepr(arch, keywords_dict[arch]) for arch in arch_list)
+
+    def get_keywords_dict(self, arch_list):
+        arch_set = set(arch_list)
+        keywords_list = self.load_keywords(arch_set)
+        keywords_cache_dict = {}
+        for keyword in keywords_list:
+            keywords_cache_dict[keyword.arch.name] = keyword
+
+        keywords_dict = {}
+        keyword_wild = keywords_cache_dict.get('*')
+        for arch in arch_list:
+            keyword_obj = keywords_cache_dict.get(arch)
+            status = -1
+            if keyword_obj is not None:
+                status = keyword_obj.status
+            elif keyword_wild is not None:
+                status = keyword_wild.status
+            keywords_dict[arch] = status
+
+        return keywords_dict
+
+    def load_keywords(self, arch_set):
+        arch_set.add('*')
+        return self.keyword_set.filter(arch__name__in = arch_set).select_related('arch')
+
+    def get_ebuilds_and_keywords(self, arch_list):
+        # Maybe copy object ? !!
+        self.keywords = self.get_keywords(arch_list)
+        return (self, )
+
     class Meta:
         unique_together = ('package', 'version', 'revision')
         ordering = ('-updated_datetime',)

diff --git a/gpackages/apps/packages/templatetags/packages.py b/gpackages/apps/packages/templatetags/packages.py
index 80fe826..45c756d 100644
--- a/gpackages/apps/packages/templatetags/packages.py
+++ b/gpackages/apps/packages/templatetags/packages.py
@@ -10,6 +10,10 @@ def last_updated():
     l = RepositoryModel.objects.only('updated_datetime').latest('updated_datetime')
     return {'last_updated': l.updated_datetime}
 
+@××××××××.inclusion_tag('keywords_table.html')
+def render_keywords_table(obj, *arch_list):
+    ebuilds = obj.get_ebuilds_and_keywords(arch_list)
+    return {'arches': arch_list, 'ebuilds' : ebuilds}
 
 def text_sincode(text):
     text_l = map(lambda x: '&#%s;' % ord(x), text)

diff --git a/gpackages/templates/ebuilds.html b/gpackages/templates/ebuilds.html
index 81ca0b8..ef51a43 100644
--- a/gpackages/templates/ebuilds.html
+++ b/gpackages/templates/ebuilds.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load packages %}
 
 {% block content %}
 {% for ebuild in ebuilds %}
@@ -8,48 +9,7 @@
             <span class="package_update_datetime">{{ ebuild.updated_datetime }}</span>
         </div>
         <div style="padding-bottom: 10px; margin 10px;">{{ ebuild.description }}</div>
-        <table class="keywords table table-bordered table-condensed">
-            <colgroup>
-                <col class="span2">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-            </colgroup>
-            <thead>
-                <tr class="">
-                    <th class=""></th>
-                    <th class="">alpha</th>
-                    <th class="">amd64</th>
-                    <th class="">arm</th>
-                    <th class="">hppa</th>
-                    <th class="">ia64</th>
-                    <th class="">ppc</th>
-                    <th class="">ppc64</th>
-                    <th class="">sparc</th>
-                    <th class="">x86</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td class="ebuild">{{ ebuild.fullversion }}</td>
-                    <td class="blank"></td>
-                    <td class="unstable">~</td>
-                    <td class="blank"></td>
-                    <td class="blank"></td>
-                    <td class="blank"></td>
-                    <td class="blank"></td>
-                    <td class="blank"></td>
-                    <td class="blank"></td>
-                    <td class="unstable">~</td>
-                </tr>
-            </tbody>
-        </table>
+        {% render_keywords_table ebuild 'alpha' 'amd64' 'arm' 'hppa' 'ia64' 'ppc' 'ppc64' 'sparc' 'x86' %}
     </div>
 {% endfor %}
 {% include 'paginator.html' %}

diff --git a/gpackages/templates/keywords_table.html b/gpackages/templates/keywords_table.html
new file mode 100644
index 0000000..38cba68
--- /dev/null
+++ b/gpackages/templates/keywords_table.html
@@ -0,0 +1,27 @@
+<table class="keywords table table-bordered table-condensed">
+    <colgroup>
+        <col class="span2">
+        {% for arch in arches %}
+            <col class="span1">
+        {% endfor %}
+
+    </colgroup>
+    <thead>
+        <tr class="">
+            <th class=""></th>
+            {% for arch in arches %}
+                <th class="">{{ arch }}</th>
+            {% endfor %}
+        </tr>
+    </thead>
+    <tbody>
+        {% for ebuild in ebuilds %}
+        <tr>
+            <td class="ebuild">{{ ebuild.fullversion }}</td>
+            {% for keyword in ebuild.keywords %}
+            <td class="{{ keyword.status_class }}">{{ keyword.status_repr }}</td>
+            {% endfor %}
+        </tr>
+        {% endfor %}
+    </tbody> 
+</table>

diff --git a/gpackages/templates/packages.html b/gpackages/templates/packages.html
index adead16..b6600dc 100644
--- a/gpackages/templates/packages.html
+++ b/gpackages/templates/packages.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load packages %}
 
 {% block content %}
 {% for package in packages %}
@@ -10,50 +11,7 @@
         {% if package.description %}
         <div style="padding-bottom: 10px; margin 10px;">{{ package.description }}</div>
         {% endif %}
-        <table class="keywords table table-bordered table-condensed">
-            <colgroup>
-                <col class="span2">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-                <col class="span1">
-            </colgroup>
-            <thead>
-                <tr class="">
-                    <th class=""></th>
-                    <th class="">alpha</th>
-                    <th class="">amd64</th>
-                    <th class="">arm</th>
-                    <th class="">hppa</th>
-                    <th class="">ia64</th>
-                    <th class="">ppc</th>
-                    <th class="">ppc64</th>
-                    <th class="">sparc</th>
-                    <th class="">x86</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for ebuild in package.ebuildmodel_set.all_by_numbers %}
-                    <tr>
-                        <td class="ebuild">{{ ebuild.fullversion }}</td>
-                        <td class="blank"></td>
-                        <td class="unstable">~</td>
-                        <td class="blank"></td>
-                        <td class="blank"></td>
-                        <td class="blank"></td>
-                        <td class="blank"></td>
-                        <td class="blank"></td>
-                        <td class="blank"></td>
-                        <td class="unstable">~</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
+        {% render_keywords_table package 'alpha' 'amd64' 'arm' 'hppa' 'ia64' 'ppc' 'ppc64' 'sparc' 'x86' %}
     </div>
 {% endfor %}
 {% include 'paginator.html' %}