merge player changes and detail page + search

[wolnelektury.git] / apps / picture / models.py

diff --git a/apps/picture/models.py b/apps/picture/models.py
index 3cb1d89..862c172 100644 (file)
--- a/apps/picture/models.py
+++ b/apps/picture/models.py
@@ -9,7 +9,6 @@ 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
 from slughifi import slughifi
 
 from django.utils.translation import ugettext_lazy as _
@@ -80,7 +79,7 @@ class Picture(models.Model):
         """
         from sortify import sortify
         from django.core.files import File
-        from librarian.picture import WLPicture
+        from librarian.picture import WLPicture, ImageStore
         close_xml_file = False
         close_image_file = False
         # class SimpleImageStore(object):
@@ -98,7 +97,8 @@ class Picture(models.Model):
 
         try:
             # use librarian to parse meta-data
-            picture_xml = WLPicture.from_file(xml_file)
+            picture_xml = WLPicture.from_file(xml_file,
+                                              image_store=ImageStore(picture_storage.path('images')))
                     # image_store=SimpleImageStore
 
             picture, created = Picture.objects.get_or_create(slug=picture_xml.slug)
@@ -167,6 +167,8 @@ class Picture(models.Model):
     @property
     def info(self):
         if not hasattr(self, '_info'):
+            from librarian import dcparser
+            from librarian import picture
             info = dcparser.parse(self.xml_file.path, picture.PictureInfo)
             self._info = info
         return self._info