fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix <cite> in autocomplete
[wolnelektury.git]
/
src
/
catalogue
/
models
/
book.py
diff --git
a/src/catalogue/models/book.py
b/src/catalogue/models/book.py
index
140ba50
..
cdb1100
100644
(file)
--- a/
src/catalogue/models/book.py
+++ b/
src/catalogue/models/book.py
@@
-14,6
+14,7
@@
import django.dispatch
from django.contrib.contenttypes.fields import GenericRelation
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _, get_language
from django.contrib.contenttypes.fields import GenericRelation
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _, get_language
+from django.utils.deconstruct import deconstructible
import jsonfield
from fnpdjango.storage import BofhFileSystemStorage
from ssify import flush_ssi_includes
import jsonfield
from fnpdjango.storage import BofhFileSystemStorage
from ssify import flush_ssi_includes
@@
-30,18
+31,22
@@
from wolnelektury.utils import makedirs
bofh_storage = BofhFileSystemStorage()
bofh_storage = BofhFileSystemStorage()
-def _make_upload_to(path):
-
def _upload_to(i, n
):
- return path % i.slug
- return _upload_to
+@deconstructible
+
class UploadToPath(object
):
+ def __init__(self, path):
+ self.path = path
+ def __call__(self, instance, filename):
+ return self.path % instance.slug
-_cover_upload_to = _make_upload_to('book/cover/%s.jpg')
-_cover_thumb_upload_to = _make_upload_to('book/cover_thumb/%s.jpg')
+
+_cover_upload_to = UploadToPath('book/cover/%s.jpg')
+_cover_thumb_upload_to = UploadToPath('book/cover_thumb/%s.jpg')
+_cover_api_thumb_opload_to = UploadToPath('book/cover_api_thumb/%s.jpg')
def _ebook_upload_to(upload_path):
def _ebook_upload_to(upload_path):
- return
_make_upload_to
(upload_path)
+ return
UploadToPath
(upload_path)
class Book(models.Model):
class Book(models.Model):
@@
-75,6
+80,11
@@
class Book(models.Model):
null=True, blank=True,
upload_to=_cover_thumb_upload_to,
max_length=255)
null=True, blank=True,
upload_to=_cover_thumb_upload_to,
max_length=255)
+ cover_api_thumb = EbookField(
+ 'cover_api_thumb', _('cover thumbnail for API'),
+ null=True, blank=True,
+ upload_to=_cover_api_thumb_opload_to,
+ max_length=255)
ebook_formats = constants.EBOOK_FORMATS
formats = ebook_formats + ['html', 'xml']
ebook_formats = constants.EBOOK_FORMATS
formats = ebook_formats + ['html', 'xml']
@@
-195,6
+205,9
@@
class Book(models.Model):
else:
return self.media.filter(type=type_).exists()
else:
return self.media.filter(type=type_).exists()
+ def has_audio(self):
+ return self.has_media('mp3')
+
def get_media(self, type_):
if self.has_media(type_):
if type_ in Book.formats:
def get_media(self, type_):
if self.has_media(type_):
if type_ in Book.formats:
@@
-388,6
+401,11
@@
class Book(models.Model):
meta_tags = Tag.tags_from_info(book_info)
meta_tags = Tag.tags_from_info(book_info)
+ for tag in meta_tags:
+ if not tag.for_books:
+ tag.for_books = True
+ tag.save()
+
book.tags = set(meta_tags + book_shelves)
cover_changed = old_cover != book.cover_info()
book.tags = set(meta_tags + book_shelves)
cover_changed = old_cover != book.cover_info()
@@
-421,6
+439,7
@@
class Book(models.Model):
if 'cover' not in dont_build:
book.cover.build_delay()
book.cover_thumb.build_delay()
if 'cover' not in dont_build:
book.cover.build_delay()
book.cover_thumb.build_delay()
+ book.cover_api_thumb.build_delay()
# Build HTML and ebooks.
book.html_file.build_delay()
# Build HTML and ebooks.
book.html_file.build_delay()
@@
-523,6
+542,7
@@
class Book(models.Model):
if 'cover' not in app_settings.DONT_BUILD:
self.cover.build_delay()
self.cover_thumb.build_delay()
if 'cover' not in app_settings.DONT_BUILD:
self.cover.build_delay()
self.cover_thumb.build_delay()
+ self.cover_api_thumb.build_delay()
for format_ in constants.EBOOK_FORMATS_WITH_COVERS:
if format_ not in app_settings.DONT_BUILD:
getattr(self, '%s_file' % format_).build_delay()
for format_ in constants.EBOOK_FORMATS_WITH_COVERS:
if format_ not in app_settings.DONT_BUILD:
getattr(self, '%s_file' % format_).build_delay()