from django.utils.datastructures import SortedDict
from fnpdjango.utils.text.slughifi import slughifi
from ssify import flush_ssi_includes
+
+from catalogue.models.tag import prefetched_relations
from picture import tasks
from StringIO import StringIO
import jsonfield
class PictureArea(models.Model):
picture = models.ForeignKey('picture.Picture', related_name='areas')
area = jsonfield.JSONField(_('area'), default={}, editable=False)
- kind = models.CharField(_('kind'), max_length=10, blank=False,
- null=False, db_index=True,
- choices=(('thing', _('thing')),
- ('theme', _('theme'))))
-
- objects = models.Manager()
- tagged = managers.ModelTaggedItemManager(catalogue.models.Tag)
- tags = managers.TagDescriptor(catalogue.models.Tag)
+ kind = models.CharField(
+ _('kind'), max_length=10, blank=False, null=False, db_index=True,
+ choices=(('thing', _('thing')), ('theme', _('theme'))))
+
+ objects = models.Manager()
+ tagged = managers.ModelTaggedItemManager(catalogue.models.Tag)
+ tags = managers.TagDescriptor(catalogue.models.Tag)
tag_relations = GenericRelation(catalogue.models.Tag.intermediary_table_model)
short_html_url_name = 'picture_area_short'
Picture resource.
"""
- title = models.CharField(_('title'), max_length=32767)
- slug = models.SlugField(_('slug'), max_length=120, db_index=True, unique=True)
- sort_key = models.CharField(_('sort key'), max_length=120, db_index=True, editable=False)
- sort_key_author = models.CharField(_('sort key by author'), max_length=120, db_index=True, editable=False, default=u'')
- created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
- changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
- xml_file = models.FileField('xml_file', upload_to="xml", storage=picture_storage)
- image_file = ImageField(_('image_file'), upload_to="images", storage=picture_storage)
- html_file = models.FileField('html_file', upload_to="html", storage=picture_storage)
- areas_json = jsonfield.JSONField(_('picture areas JSON'), default={}, editable=False)
- extra_info = jsonfield.JSONField(_('extra information'), default={})
- culturepl_link = models.CharField(blank=True, max_length=240)
- wiki_link = models.CharField(blank=True, max_length=240)
-
- width = models.IntegerField(null=True)
- height = models.IntegerField(null=True)
-
- objects = models.Manager()
- tagged = managers.ModelTaggedItemManager(catalogue.models.Tag)
- tags = managers.TagDescriptor(catalogue.models.Tag)
+ title = models.CharField(_('title'), max_length=32767)
+ slug = models.SlugField(_('slug'), max_length=120, db_index=True, unique=True)
+ sort_key = models.CharField(_('sort key'), max_length=120, db_index=True, editable=False)
+ sort_key_author = models.CharField(
+ _('sort key by author'), max_length=120, db_index=True, editable=False, default=u'')
+ created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
+ changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
+ xml_file = models.FileField(_('xml file'), upload_to="xml", storage=picture_storage)
+ image_file = ImageField(_('image file'), upload_to="images", storage=picture_storage)
+ html_file = models.FileField(_('html file'), upload_to="html", storage=picture_storage)
+ areas_json = jsonfield.JSONField(_('picture areas JSON'), default={}, editable=False)
+ extra_info = jsonfield.JSONField(_('extra information'), default={})
+ culturepl_link = models.CharField(blank=True, max_length=240)
+ wiki_link = models.CharField(blank=True, max_length=240)
+
+ width = models.IntegerField(null=True)
+ height = models.IntegerField(null=True)
+
+ objects = models.Manager()
+ tagged = managers.ModelTaggedItemManager(catalogue.models.Tag)
+ tags = managers.TagDescriptor(catalogue.models.Tag)
tag_relations = GenericRelation(catalogue.models.Tag.intermediary_table_model)
short_html_url_name = 'picture_short'
pass
class Meta:
- ordering = ('sort_key',)
+ ordering = ('sort_key_author', 'sort_key')
verbose_name = _('picture')
verbose_name_plural = _('pictures')
self.sort_key = sortify(self.title)[:120]
try:
- author = self.tags.filter(category='author')[0].sort_key
- except IndexError:
+ author = self.authors().first().sort_key
+ except AttributeError:
author = u''
self.sort_key_author = author
def __unicode__(self):
return self.title
- def author_str(self):
- return ", ".join(str(t) for t in self.tags.filter(category='author'))
+ def authors(self):
+ return self.tags.filter(category='author')
+
+ def tag_unicode(self, category):
+ relations = prefetched_relations(self, category)
+ if relations:
+ return ', '.join(rel.tag.name for rel in relations)
+ else:
+ return ', '.join(self.tags.filter(category=category).values_list('name', flat=True))
+
+ def author_unicode(self):
+ return self.tag_unicode('author')
@permalink
def get_absolute_url(self):
- return ('picture.views.picture_detail', [self.slug])
+ return 'picture.views.picture_detail', [self.slug]
def get_initial(self):
try:
close_xml_file = False
close_image_file = False
-
if image_file is not None and not isinstance(image_file, File):
image_file = File(open(image_file))
close_image_file = True
motif_tags = set()
thing_tags = set()
- area_data = {'themes':{}, 'things':{}}
+ area_data = {'themes': {}, 'things': {}}
# Treat all names in picture XML as in default language.
lang = settings.LANGUAGE_CODE
_tags = set()
for objname in part['object'].split(','):
objname = objname.strip().capitalize()
- tag, created = catalogue.models.Tag.objects.get_or_create(slug=slughifi(objname), category='thing')
+ tag, created = catalogue.models.Tag.objects.get_or_create(
+ slug=slughifi(objname), category='thing')
if created:
tag.name = objname
setattr(tag, 'name_%s' % lang, tag.name)
tag.sort_key = sortify(tag.name)
tag.save()
- #thing_tags.add(tag)
+ # thing_tags.add(tag)
area_data['things'][tag.slug] = {
'object': objname,
'coords': part['coords'],
_tags = set()
for motifs in part['themes']:
for motif in motifs.split(','):
- tag, created = catalogue.models.Tag.objects.get_or_create(slug=slughifi(motif), category='theme')
+ tag, created = catalogue.models.Tag.objects.get_or_create(
+ slug=slughifi(motif), category='theme')
if created:
tag.name = motif
tag.sort_key = sortify(tag.name)
tag.save()
- #motif_tags.add(tag)
+ # motif_tags.add(tag)
_tags.add(tag)
area_data['themes'][tag.slug] = {
'theme': motif,
from PIL import ImageDraw, ImageFont
from librarian import get_resource
- annotated = Image.new(img.mode,
- (img.size[0], img.size[1] + 40),
- (255, 255, 255)
- )
+ annotated = Image.new(img.mode, (img.size[0], img.size[1] + 40), (255, 255, 255))
annotated.paste(img, (0, 0))
annotation = Image.new('RGB', (img.size[0] * 3, 120), (255, 255, 255))
ImageDraw.Draw(annotation).text(
annotated.paste(annotation.resize((img.size[0], 40), Image.ANTIALIAS), (0, img.size[1]))
return annotated
+ # WTF/unused
@classmethod
def picture_list(cls, filter=None):
"""Generates a hierarchical listing of all pictures
Pictures are optionally filtered with a test function.
"""
- pics = cls.objects.all().order_by('sort_key')\
- .only('title', 'slug', 'image_file')
+ pics = cls.objects.all().order_by('sort_key').only('title', 'slug', 'image_file')
if filter:
pics = pics.filter(filter).distinct()
pics_by_author[tag] = []
for pic in pics.iterator():
- authors = list(pic.tags.filter(category='author'))
+ authors = list(pic.authors().only('pk'))
if authors:
for author in authors:
pics_by_author[author].append(pic)
return self._info
def pretty_title(self, html_links=False):
- picture = self
- names = [(tag.name, tag.get_absolute_url())
- for tag in self.tags.filter(category='author')]
+ names = [(tag.name, tag.get_absolute_url()) for tag in self.authors().only('name', 'category', 'slug')]
names.append((self.title, self.get_absolute_url()))
if html_links:
fnp / wolnelektury.git / blobdiff