from django.conf import settings
from django.contrib.contenttypes.fields import GenericRelation
from django.core.files.storage import FileSystemStorage
-from django.utils.datastructures import SortedDict
-from fnpdjango.utils.text.slughifi import slughifi
+from slugify import slugify
from ssify import flush_ssi_includes
+
+from catalogue.models.tag import prefetched_relations
+from catalogue.utils import split_tags
from picture import tasks
from StringIO import StringIO
import jsonfield
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):
- return ", ".join(unicode(t) for t in self.tags.filter(category=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')
+ def tags_by_category(self):
+ return split_tags(self.tags)
+
@permalink
def get_absolute_url(self):
return 'picture.views.picture_detail', [self.slug]
return None
@classmethod
- def from_xml_file(cls, xml_file, image_file=None, image_store=None, overwrite=False):
+ def from_xml_file(cls, xml_file, image_file=None, image_store=None, overwrite=False, search_index=True):
"""
Import xml and it's accompanying image file.
If image file is missing, it will be fetched by librarian.picture.ImageStore
picture.extra_info = picture_xml.picture_info.to_dict()
picture_tags = set(catalogue.models.Tag.tags_from_info(picture_xml.picture_info))
- motif_tags = set()
- thing_tags = set()
+ for tag in picture_tags:
+ if not tag.for_pictures:
+ tag.for_pictures = True
+ tag.save()
area_data = {'themes': {}, 'things': {}}
if part.get('object', None) is not None:
_tags = set()
for objname in part['object'].split(','):
- objname = objname.strip().capitalize()
+ objname = objname.strip()
+ assert objname, 'Empty object name'
+ # str.capitalize() is wrong, because it also lowers letters
+ objname = objname[0].upper() + objname[1:]
tag, created = catalogue.models.Tag.objects.get_or_create(
- slug=slughifi(objname), category='thing')
+ slug=slugify(objname), category='thing')
if created:
tag.name = objname
setattr(tag, 'name_%s' % lang, tag.name)
tag.sort_key = sortify(tag.name)
+ tag.for_pictures = True
tag.save()
- # thing_tags.add(tag)
area_data['things'][tag.slug] = {
'object': objname,
'coords': part['coords'],
}
_tags.add(tag)
+ if not tag.for_pictures:
+ tag.for_pictures = True
+ tag.save()
area = PictureArea.rectangle(picture, 'thing', part['coords'])
area.save()
+ # WTF thing area does not inherit tags from picture and theme area does, is it intentional?
area.tags = _tags
else:
_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')
+ slug=slugify(motif), category='theme')
if created:
tag.name = motif
tag.sort_key = sortify(tag.name)
+ tag.for_pictures = True
tag.save()
# motif_tags.add(tag)
_tags.add(tag)
+ if not tag.for_pictures:
+ tag.for_pictures = True
+ tag.save()
area_data['themes'][tag.slug] = {
'theme': motif,
'coords': part['coords']
area.save()
area.tags = _tags.union(picture_tags)
- picture.tags = picture_tags.union(motif_tags).union(thing_tags)
+ picture.tags = picture_tags
picture.areas_json = area_data
if image_file is not None:
picture.xml_file.save("%s.xml" % picture.slug, File(xml_file))
picture.save()
tasks.generate_picture_html(picture.id)
+ if not settings.NO_SEARCH_INDEX and search_index:
+ tasks.index_picture.delay(picture.id, picture_info=picture_xml.picture_info)
if close_xml_file:
xml_file.close()
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')
-
- if filter:
- pics = pics.filter(filter).distinct()
-
- pics_by_author = SortedDict()
- orphans = []
- for tag in catalogue.models.Tag.objects.filter(category='author'):
- pics_by_author[tag] = []
-
- for pic in pics.iterator():
- authors = list(pic.tags.filter(category='author'))
- if authors:
- for author in authors:
- pics_by_author[author].append(pic)
- else:
- orphans.append(pic)
-
- return pics_by_author, orphans
-
@property
def info(self):
if not hasattr(self, '_info'):
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:
]
for lang in languages
])
+
+ def search_index(self, picture_info=None, index=None, index_tags=True, commit=True):
+ if index is None:
+ from search.index import Index
+ index = Index()
+ try:
+ index.index_picture(self, picture_info)
+ if index_tags:
+ index.index_tags()
+ if commit:
+ index.index.commit()
+ except Exception, e:
+ index.index.rollback()
+ raise e
fnp / wolnelektury.git / blobdiff