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

[Slava Bacherikov]

commit:     da9ac5b7a7b636fdf67a528386e676ee95c10e9a
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Thu Jun 28 22:45:14 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Thu Jun 28 22:45:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=da9ac5b7

Add PackageDetailView

---
 gpackages/apps/packages/models.py       |   13 ++++++++
 gpackages/apps/packages/urls.py         |    7 ++++-
 gpackages/apps/packages/views.py        |   50 +++++++++++++++++++++++++++++-
 gpackages/templates/package.html        |    5 +++
 gpackages/templates/package_object.html |   12 +++++++
 gpackages/templates/packages.html       |   12 +------
 6 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index aa7bd65..1e50175 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -316,6 +316,19 @@ class PackageModel(AbstractDateTimeModel):
             for ebuild in self.ebuilds:
                 l.extend(ebuild.get_ebuilds_and_keywords(arch_list))
         return l
+
+    @models.permalink
+    def get_absolute_url_by_pk(self):
+        return ('package',(), {'pk': self.pk})
+
+    @models.permalink
+    def get_absolute_url(self):
+        # It coold been in many repositories
+        kwargs = { 'category': self.virtual_package.category.category,
+                   'name': self.virtual_package.name }
+        if self.repository.name != 'gentoo':
+            kwargs['repository'] = self.repository.name
+        return ('package',(), kwargs )
             
     class Meta:
         unique_together = ('virtual_package', 'repository')

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.py
index 569417e..3744802 100644
--- a/gpackages/apps/packages/urls.py
+++ b/gpackages/apps/packages/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, include, url
 from views import CategoriesListView, HerdsListView, MaintainersListView, \
                   RepositoriesListView, LicenseGroupsView , EbuildsListView, \
-                  PackagesListsView
+                  PackagesListsView, PackageDetailView
 
 urlpatterns = patterns('',
     url(r'^categories/$', CategoriesListView.as_view(), name = 'categories'),
@@ -11,4 +11,9 @@ urlpatterns = patterns('',
     url(r'^license-groups/$', LicenseGroupsView.as_view(), name = 'license_groups'),
     url(r'^$', EbuildsListView.as_view(), name = 'ebuilds'),
     url(r'^packages/$', PackagesListsView.as_view(), name = 'packages'),
+
+    # In Future I will write my onw URL Resolver !!!
+    #url(r'^package/(?:(?P<pk>\d+)|(?P<category>[^/]+)/(?P<name>[^/]+))/$', PackageDetailView.as_view(), name = 'package'),
+    url(r'^package/(?P<pk>\d+)/$', PackageDetailView.as_view(), name = 'package'),
+    url(r'^package/(?P<category>[^/]+)/(?P<name>[^/:]+)(::(?P<repository>[^/]+))?/$', PackageDetailView.as_view(), name = 'package'),
 )

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 4639555..98672d4 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -1,8 +1,11 @@
-from generic.views import ContextListView, ContextTemplateView
+from django.views.generic import DetailView
+from generic.views import ContextListView, ContextTemplateView, ContextView
 from models import CategoryModel, HerdsModel, MaintainerModel, \
                    RepositoryModel, LicenseGroupModel, EbuildModel, \
                    PackageModel
 
+from django.shortcuts import get_object_or_404
+
 class CategoriesListView(ContextListView):
     extra_context = {'page_name': 'Categories',}
     template_name = 'categories.html'
@@ -52,5 +55,48 @@ class PackagesListsView(ContextListView):
     template_name = 'packages.html'
     context_object_name = 'packages'
     queryset = PackageModel.objects.all(). \
-        select_related('virtual_package', 'virtual_package__category'). \
+        select_related('virtual_package',
+                       'virtual_package__category',
+                       'repository'). \
+        defer('repository__description',
+              'repository__owner_name',
+              'repository__owner_email',
+              'repository__homepage',
+              'repository__official',
+              'repository__quality',
+              'changelog'). \
         prefetch_keywords(arches)
+
+class PackageDetailView(ContextView, DetailView):
+    arches = ['alpha', 'amd64', 'arm', 'hppa', 'ia64', 'ppc', 'ppc64', 'sparc', 'x86']
+    template_name = 'package.html'
+    extra_context = {'page_name': 'Package', 'arches': arches}
+    context_object_name = 'package'
+    queryset = PackageModel.objects.all(). \
+        select_related('virtual_package',
+                       'virtual_package__category',
+                       'repository'). \
+        defer('repository__description',
+              'repository__owner_name',
+              'repository__owner_email',
+              'repository__homepage',
+              'repository__official',
+              'repository__quality',
+              'changelog'). \
+        prefetch_keywords(arches)
+
+    def get_object(self, queryset = None):
+        pk = self.kwargs.get('pk')
+        if pk is not None:
+            return super(PackageDetailView, self).get_object(queryset)
+        if queryset is None:
+            queryset = self.get_queryset()
+
+        name, category = self.kwargs.get('name'), self.kwargs.get('category')
+        repository = self.kwargs.get('repository')
+        if repository is None:
+            repository = 'gentoo'
+        obj = get_object_or_404(queryset, name = name,
+                                          category = category,
+                                          repository__name = repository)
+        return obj

diff --git a/gpackages/templates/package.html b/gpackages/templates/package.html
new file mode 100644
index 0000000..9023001
--- /dev/null
+++ b/gpackages/templates/package.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block content %}
+    {% include 'package_object.html' %}
+{% endblock content %}

diff --git a/gpackages/templates/package_object.html b/gpackages/templates/package_object.html
new file mode 100644
index 0000000..d713d4a
--- /dev/null
+++ b/gpackages/templates/package_object.html
@@ -0,0 +1,12 @@
+{% load url from future %}
+{% load packages %}
+<div class="well package-well">
+    <div class="package-name">
+        <span><a href="{{ package.get_absolute_url }}">{{ package.cp }}</a>:: {{ package.repository.name }}</span>
+        <span class="package_update_datetime">{{ package.updated_datetime }}</span>
+    </div>
+    {% if package.description %}
+        <div style="padding-bottom: 10px; margin 10px;">{{ package.description }}</div>
+    {% endif %}
+    {% render_keywords_table package arches %}
+</div>

diff --git a/gpackages/templates/packages.html b/gpackages/templates/packages.html
index ec6d22a..f7ac01a 100644
--- a/gpackages/templates/packages.html
+++ b/gpackages/templates/packages.html
@@ -1,18 +1,10 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% load packages %}
 
 {% block content %}
 {% for package in packages %}
-    <div class="well package-well">
-        <div class="package-name">
-            <span>{{ package.cp }}</span>
-            <span class="package_update_datetime">{{ package.updated_datetime }}</span>
-        </div>
-        {% if package.description %}
-        <div style="padding-bottom: 10px; margin 10px;">{{ package.description }}</div>
-        {% endif %}
-        {% render_keywords_table package arches %}
-    </div>
+    {% include 'package_object.html' %}
 {% endfor %}
 {% include 'paginator.html' %}
 {% endblock content %}