Fix: Uglier but supported by Chrome

[wolnelektury.git] / apps / catalogue / models / bookmedia.py

diff --git a/apps/catalogue/models/bookmedia.py b/apps/catalogue/models/bookmedia.py
index bf05e21..6291329 100644 (file)
--- a/apps/catalogue/models/bookmedia.py
+++ b/apps/catalogue/models/bookmedia.py
@@ -2,13 +2,14 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+import json

 from collections import namedtuple
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.datastructures import SortedDict
 import jsonfield
 from collections import namedtuple
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.datastructures import SortedDict
 import jsonfield

+from fnpdjango.utils.text.slughifi import slughifi

 from catalogue.fields import OverwritingFileField
 from catalogue.fields import OverwritingFileField

-from catalogue.utils import book_upload_path

 
 
 class BookMedia(models.Model):
 
 
 class BookMedia(models.Model):


@@ -22,11 +23,13 @@ class BookMedia(models.Model):
     format_choices = [(k, _('%s file') % t.name)
             for k, t in formats.items()]
 
     format_choices = [(k, _('%s file') % t.name)
             for k, t in formats.items()]
 

-    type        = models.CharField(_('type'), choices=format_choices, max_length="100")
-    name        = models.CharField(_('name'), max_length="100")
-    file        = OverwritingFileField(_('file'), upload_to=book_upload_path())
-    uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False)
-    extra_info  = jsonfield.JSONField(_('extra information'), default='{}', editable=False)
+    type = models.CharField(_('type'), db_index=True, choices=format_choices, max_length=20)
+    name = models.CharField(_('name'), max_length=512)
+    file = OverwritingFileField(_('file'), max_length=600,
+        upload_to=lambda i, _n: 'book/%(ext)s/%(name)s.%(ext)s' % {
+                    'ext': i.ext(), 'name': slughifi(i.name)})
+    uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False, db_index=True)
+    extra_info = jsonfield.JSONField(_('extra information'), default={}, editable=False)

     book = models.ForeignKey('Book', related_name='media')
     source_sha1 = models.CharField(null=True, blank=True, max_length=40, editable=False)
 
     book = models.ForeignKey('Book', related_name='media')
     source_sha1 = models.CharField(null=True, blank=True, max_length=40, editable=False)
 


@@ -60,6 +63,9 @@ class BookMedia(models.Model):
         remove_zip("%s_%s" % (self.book.slug, self.type))
 
         extra_info = self.extra_info
         remove_zip("%s_%s" % (self.book.slug, self.type))
 
         extra_info = self.extra_info

+        if isinstance(extra_info, basestring):
+            # Walkaround for weird jsonfield 'no-decode' optimization.
+            extra_info = json.loads(extra_info)

         extra_info.update(self.read_meta())
         self.extra_info = extra_info
         self.source_sha1 = self.read_source_sha1(self.file.path, self.type)
         extra_info.update(self.read_meta())
         self.extra_info = extra_info
         self.source_sha1 = self.read_source_sha1(self.file.path, self.type)


@@ -78,10 +84,10 @@ class BookMedia(models.Model):
                 audio = id3.ID3(self.file.path)
                 artist_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE1'))
                 director_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE3'))
                 audio = id3.ID3(self.file.path)
                 artist_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE1'))
                 director_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE3'))

-                project = ", ".join([t.data for t in audio.getall('PRIV') 
-                        if t.owner=='wolnelektury.pl?project'])
-                funded_by = ", ".join([t.data for t in audio.getall('PRIV') 
-                        if t.owner=='wolnelektury.pl?funded_by'])
+                project = ", ".join([t.data for t in audio.getall('PRIV')
+                        if t.owner == 'wolnelektury.pl?project'])
+                funded_by = ", ".join([t.data for t in audio.getall('PRIV')
+                        if t.owner == 'wolnelektury.pl?funded_by'])

             except:
                 pass
         elif self.type == 'ogg':
             except:
                 pass
         elif self.type == 'ogg':


@@ -98,6 +104,9 @@ class BookMedia(models.Model):
         return {'artist_name': artist_name, 'director_name': director_name,
                 'project': project, 'funded_by': funded_by}
 
         return {'artist_name': artist_name, 'director_name': director_name,
                 'project': project, 'funded_by': funded_by}
 

+    def ext(self):
+        return self.formats[self.type].ext
+

     @staticmethod
     def read_source_sha1(filepath, filetype):
         """
     @staticmethod
     def read_source_sha1(filepath, filetype):
         """


@@ -109,14 +118,14 @@ class BookMedia(models.Model):
         if filetype == 'mp3':
             try:
                 audio = id3.ID3(filepath)
         if filetype == 'mp3':
             try:
                 audio = id3.ID3(filepath)

-                return [t.data for t in audio.getall('PRIV') 
-                        if t.owner=='wolnelektury.pl?flac_sha1'][0]
+                return [t.data for t in audio.getall('PRIV')
+                        if t.owner == 'wolnelektury.pl?flac_sha1'][0]

             except:
                 return None
         elif filetype == 'ogg':
             try:
                 audio = mutagen.File(filepath)
             except:
                 return None
         elif filetype == 'ogg':
             try:
                 audio = mutagen.File(filepath)

-                return audio.get('flac_sha1', [None])[0] 
+                return audio.get('flac_sha1', [None])[0]

             except:
                 return None
         else:
             except:
                 return None
         else: