X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3438c79639fca7268c397dd3fcfdcf9ca5014a09..e9cd7fc641895a7702a8f81fcd11c388dd7d9db7:/apps/picture/models.py

diff --git a/apps/picture/models.py b/apps/picture/models.py
index 01f9b8d48..1dfd59618 100644
--- a/apps/picture/models.py
+++ b/apps/picture/models.py
@@ -5,7 +5,12 @@ from sorl.thumbnail import ImageField
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 from django.utils.datastructures import SortedDict
+from django.template.loader import render_to_string
+from django.core.cache import cache
+from catalogue.utils import split_tags
+from django.utils.safestring import mark_safe
 from librarian import dcparser, picture
+from slughifi import slughifi
 
 from django.utils.translation import ugettext_lazy as _
 from newtagging import managers
@@ -50,6 +55,9 @@ class Picture(models.Model):
 
         ret = super(Picture, self).save(force_insert, force_update)
 
+        if reset_short_html:
+            self.reset_short_html()
+
         return ret
 
     def __unicode__(self):
@@ -63,10 +71,11 @@ class Picture(models.Model):
         return self.slug
 
     @classmethod
-    def from_xml_file(cls, xml_file, images_path=None, overwrite=False):
+    def from_xml_file(cls, xml_file, image_file=None, overwrite=False):
         """
         Import xml and it's accompanying image file.
         """
+        from sortify import sortify
         from django.core.files import File
         from librarian.picture import WLPicture
         close_xml_file = False
@@ -78,26 +87,39 @@ class Picture(models.Model):
             # use librarian to parse meta-data
             picture_xml = WLPicture.from_file(xml_file)
 
-            picture, created = Picture.objects.get_or_create(slug=picture_xml.slug)
+            pict, created = Picture.objects.get_or_create(slug=picture_xml.slug)
             if not created and not overwrite:
                 raise Picture.AlreadyExists('Picture %s already exists' % picture_xml.slug)
 
-            picture.title = picture_xml.picture_info.title
+            pict.title = picture_xml.picture_info.title
+
+            #            from nose.tools import set_trace; set_trace()
+            motif_tags = set()
+            for part in picture_xml.partiter():
+                for motif in part['themes']:
+                    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)
 
-            picture.tags = catalogue.models.Tag.tags_from_info(picture_xml.picture_info)
+            pict.tags = catalogue.models.Tag.tags_from_info(picture_xml.picture_info) + \
+                list(motif_tags)
 
-            img = picture_xml.image_file()
-            try:
-                picture.image_file.save(path.basename(picture_xml.image_path), File(img))
-            finally:
-                img.close()
+            if image_file is not None:
+                img = image_file
+            else:
+                img = picture_xml.image_file()
+
+            pict.image_file.save(path.basename(picture_xml.image_path), File(img))
 
-            picture.xml_file.save("%s.xml" % picture.slug, File(xml_file))
-            picture.save()
+            pict.xml_file.save("%s.xml" % pict.slug, File(xml_file))
+            pict.save()
         finally:
             if close_xml_file:
                 xml_file.close()
-        return picture
+        return pict
 
     @classmethod
     def picture_list(cls, filter=None):
@@ -132,3 +154,30 @@ class Picture(models.Model):
             info = dcparser.parse(self.xml_file.path, picture.PictureInfo)
             self._info = info
         return self._info
+
+    def reset_short_html(self):
+        if self.id is None:
+            return
+
+        cache_key = "Picture.short_html/%d" % (self.id)
+        cache.delete(cache_key)
+
+    def short_html(self):
+        if self.id:
+            cache_key = "Picture.short_html/%d" % (self.id)
+            short_html = cache.get(cache_key)
+        else:
+            short_html = None
+
+        if short_html is not None:
+            return mark_safe(short_html)
+        else:
+            tags = self.tags.filter(category__in=('author', 'kind', 'epoch'))
+            tags = split_tags(tags)
+
+            short_html = unicode(render_to_string('picture/picture_short.html',
+                {'picture': self, 'tags': tags}))
+
+            if self.id:
+                cache.set(cache_key, short_html, catalogue.models.CACHE_FOREVER)
+            return mark_safe(short_html)