on-goin dev: search, dataset, picture. crafter and content batteries. updated requirements.

Author: guzmud

panpub/filters.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import django_filters
+
+from panpub.models import Crafter, Corpus, Content, Text
+
+
+class CrafterFilter(django_filters.FilterSet):
+    class Meta:
+        model = Crafter
+        fields = ['user', ]
+
+
+class CorpusFilter(django_filters.FilterSet):
+    class Meta:
+        model = Corpus
+        fields = ['name', 'license', 'datestamp']
+
+
+class ContentFilter(django_filters.FilterSet):
+    class Meta:
+        models = Content
+        fields = ['name', 'license', 'datestamp',
+                  'claims', 'corpuses']
+
+
+class TextFilter(django_filters.FilterSet):
+    class Meta:
+        models = Text
+        fields = ['name', 'license', 'datestamp',
+                  'claims', 'corpuses']

panpub/models.py

@@ -51,6 +51,9 @@ def get_absolute_url(self):
     def __str__(self):
         return self.name
 
+    def filefriendly_name(self):
+        return slugify(self.name)
+
     def only():
         contents = Content.objects.values_list('pk', flat=True)
         return Corpus.objects.exclude(pk__in=contents)
@@ -145,9 +148,6 @@ def save(self):
         else:
             super(Text, self).save()
 
-    def filefriendly_name(self):
-        return slugify(self.name)
-
     def available_pubformats(self):
         # pdf requires xetex
         return ('gfm',
@@ -179,8 +179,102 @@ def export(self, pubformat='markdown'):
             return datafile, filename, filelen
 
 
+class Dataset(Content):
+
+    tablib_formats = ('csv',
+                      'json',
+                      'xls',
+                      'yaml',
+                      'tsv',
+                      'html',
+                      'xlsx',
+                      'ods',
+                      'dbf',
+                      'df',
+                      )
+
+    document = models.FileField(
+        upload_to='{}/datasets/'.format(PANPUB_MEDIA),
+        )
+
+    def get_absolute_url(self):
+        return reverse('Dataset_detail', args=[str(self.pk), ])
+
+    def save(self):
+        pass
+
+    def available_pubformats(self):
+        return tablib_formats+'latex'  #TODO
+
+    def export(self, pubformat='csv'):
+        pass
+
+
 class Picture(Content):
-    document = models.FileField(upload_to='{}/pictures/'.format(PANPUB_MEDIA))
+
+    pillow_formats = ('bmp',
+                      'eps',
+                      'gif',
+                      'icns',
+                      'ico',
+                      'im',
+                      'jpeg',
+                      'jpeg2000',
+                      'msp',
+                      'pcx',
+                      'png',
+                      'ppm',
+                      'sgi',
+                      'spider',
+                      'tga',
+                      'tiff',
+                      'webp',
+                      'xbm',
+                      )
+
+    pillow_r_formats = ('blp',
+                        'cur',
+                        'dcx',
+                        'dds',
+                        'fli',
+                        'flc',
+                        'fpx',
+                        'ftex',
+                        'gbr',
+                        'gd',
+                        'imt',
+                        'iptc/naa',
+                        'mcidas',
+                        'mic',
+                        'mpo',
+                        'pcd',
+                        'pixar',
+                        'psd',
+                        'wal',
+                        'xpm',
+                        ) + pillow_formats
+
+    pillow_w_formats = ('palm',
+                        'pdf',
+                        'xvthumbnail',
+                        ) + pillow_formats
+
+    document = models.FileField(
+        upload_to='{}/pictures/'.format(PANPUB_MEDIA),
+        )
+
+    def get_absolute_url(self):
+        return reverse('Picture_detail', args=[str(self.pk), ])
+
+    def save(self):
+        pass
+
+    def available_pubformats(self):
+        return pillow_w_formats
+
+    def export(self, pubformat='png'):
+        pass
+
 
 
 class Record(Content):

panpub/templates/panpub/content_detail.html

@@ -0,0 +1,5 @@
+<h1>{{ content.name }}</h1>
+
+<p>{{ content.description }} ({{ content.datestamp.created }})</p>
+
+<p>{{ content.claims }}</p>

panpub/templates/panpub/content_list.html

@@ -0,0 +1,7 @@
+<ul>
+{% for content in contents %}
+    <li>{{ content.name }}: {{ content.description }} ({{ content.datestamp.created }}) - {{ content.claims }}</li>
+{% empty %}
+    <li>No content yet.</li>
+{% endfor %}
+</ul>

panpub/templates/panpub/crafter_detail.html

@@ -0,0 +1,7 @@
+<h1>{{ crafter.user.username }}</h1>
+
+<ul>
+{% for claim in crafter.claims %}
+    <li>{{ claim }}</li>
+{% endfor %}
+</ul>

panpub/templates/panpub/crafter_list.html

@@ -0,0 +1,7 @@
+<ul>
+{% for crafter in crafters %}
+    <li>{{ crafter.user.username }}: {{ crafter.claims }}</li>
+{% empty %}
+    <li>No crafter yet.</li>
+{% endfor %}
+</ul>

panpub/urls.py

@@ -2,64 +2,110 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import url
 
-from panpub import views
+from django_filters.views import FilterView
+
+from panpub import filters, views
 
 urlpatterns = [
+    url(
+        regex="^crafter/(?P<pk>\d+)/$",
+        view=views.CrafterDetail.as_view(),
+        name='crafter_detail',
+    ),
+    url(
+        regex="^crafter/search/$",
+        view=FilterView.as_view(filterset_class=filters.CrafterFilter),
+        name='crafter_search',
+    ),
+    url(
+        regex="^crafter/$",
+        view=views.CrafterList.as_view(),
+        name='crafter_list',
+    ),
+
     url(
         regex="^corpus/~create/$",
         view=views.CorpusCreate.as_view(),
-        name='Corpus_create',
+        name='corpus_create',
     ),
     url(
         regex="^corpus/(?P<pk>\d+)/~delete/$",
         view=views.CorpusDelete.as_view(),
-        name='Corpus_delete',
+        name='corpus_delete',
     ),
     url(
         regex="^corpus/(?P<pk>\d+)/$",
         view=views.CorpusDetail.as_view(),
-        name='Corpus_detail',
+        name='corpus_detail',
     ),
     url(
         regex="^corpus/(?P<pk>\d+)/~update/$",
         view=views.CorpusUpdate.as_view(),
-        name='Corpus_update',
+        name='corpus_update',
+    ),
+    url(
+        regex="^corpus/search/$",
+        view=FilterView.as_view(filterset_class=filters.CorpusFilter),
+        name='corpus_search',
     ),
     url(
         regex="^corpus/$",
         view=views.CorpusList.as_view(),
-        name='Corpus_list',
+        name='corpus_list',
     ),
+
+    url(
+        regex="^content/(?P<pk>\d+)/$",
+        view=views.ContentDetail.as_view(),
+        name='content_detail',
+    ),
+    url(
+        regex="^content/search/$",
+        view=FilterView.as_view(filterset_class=filters.ContentFilter),
+        name='content_search',
+    ),
+    url(
+        regex="^content/$",
+        view=views.ContentList.as_view(),
+        name='content_list',
+    ),
+
     url(
         regex="^text/~create/$",
         view=views.TextCreate.as_view(),
-        name='Text_create',
+        name='text_create',
     ),
     url(
         regex="^text/(?P<pk>\d+)/~delete/$",
         view=views.TextDelete.as_view(),
-        name='Text_delete',
+        name='text_delete',
     ),
     url(
         regex="^text/(?P<pk>\d+)/$",
         view=views.TextDetail.as_view(),
-        name='Text_detail',
+        name='text_detail',
     ),
     url(
         regex="^text/(?P<pk>\d+)/~update/$",
         view=views.TextUpdate.as_view(),
-        name='Text_update',
+        name='text_update',
     ),
     url(
         regex="^text/(?P<text_id>\d+)/export/(?P<export_format>\w+)/$",
         view=views.text_export,
         name='text_export',
     ),
+    url(
+        regex="^text/search/$",
+        view=FilterView.as_view(filterset_class=filters.TextFilter),
+        name='text_search',
+    ),
     url(
         regex="^text/$",
         view=views.TextList.as_view(),
-        name='Text_list',
+        name='text_list',
     ),
+
     url(
         regex="op/export/$",
         view=views.panpub_export,

panpub/views.py

@@ -12,12 +12,25 @@
 )
 
 from panpub.models import (
+        Crafter,
 	Corpus,
+        Content,
 	Text,
         )
 from panpub import utils
 
 
+class CrafterList(ListView):
+    model = Crafter
+    context_object_name = 'crafters'
+    paginate_by = 10
+
+
+class CrafterDetail(DetailView):
+    model = Crafter
+    context_object_name = 'crafter'
+
+
 class CorpusCreate(CreateView):
     model = Corpus
     fields = ['name', 'datestamp', 'description']
@@ -42,6 +55,17 @@ class CorpusList(ListView):
     paginate_by = 10
 
 
+class ContentList(ListView):
+    model = Content
+    context_object_name = 'contents'
+    paginate_by = 10
+
+
+class ContentDetail(DetailView):
+    model = Content
+    context_object_name = 'content'
+
+
 class TextCreate(CreateView):
     model = Text
     fields = ['name', 'description', 'document', 'input_type']

requirements.txt

@@ -1,2 +1,5 @@
-pypandoc
+django-filter
 django-markdown-deux
+pypandoc
+tablib[pandas]
+ujson