X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f062d83d5999fa0540aabef056fa21ef225728fd..518ab6bec62b0f13764a1e0093e0438aa58daa7a:/apps/catalogue/models.py?ds=inline diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 5f4ec923c..7be0f826d 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -6,9 +6,11 @@ from django.contrib.auth.models import User from django.core.files import File from django.template.loader import render_to_string from django.utils.safestring import mark_safe +from django.core.urlresolvers import reverse from newtagging.models import TagBase from newtagging import managers +from catalogue.fields import JSONField from librarian import html, dcparser @@ -20,6 +22,7 @@ TAG_CATEGORIES = ( ('genre', _('genre')), ('theme', _('theme')), ('set', _('set')), + ('book', _('book')), ) @@ -33,15 +36,16 @@ class TagSubcategoryManager(models.Manager): class Tag(TagBase): - name = models.CharField(_('name'), max_length=50, unique=True, db_index=True) + name = models.CharField(_('name'), max_length=50, db_index=True) slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) sort_key = models.SlugField(_('sort key'), max_length=120, db_index=True) category = models.CharField(_('category'), max_length=50, blank=False, null=False, db_index=True, choices=TAG_CATEGORIES) description = models.TextField(_('description'), blank=True) main_page = models.BooleanField(_('main page'), default=False, db_index=True, help_text=_('Show tag on main page')) - + user = models.ForeignKey(User, blank=True, null=True) + book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False) def has_description(self): return len(self.description) > 0 @@ -81,6 +85,8 @@ class Book(models.Model): description = models.TextField(_('description'), blank=True) created_at = models.DateTimeField(_('creation date'), auto_now=True) _short_html = models.TextField(_('short HTML'), editable=False) + parent_number = models.IntegerField(_('parent number'), default=0) + extra_info = JSONField(_('extra information')) # Formats xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True) @@ -88,27 +94,36 @@ class Book(models.Model): pdf_file = models.FileField(_('PDF file'), upload_to=book_upload_path('pdf'), blank=True) odt_file = models.FileField(_('ODT file'), upload_to=book_upload_path('odt'), blank=True) txt_file = models.FileField(_('TXT file'), upload_to=book_upload_path('txt'), blank=True) + mp3_file = models.FileField(_('MP3 file'), upload_to=book_upload_path('mp3'), blank=True) + ogg_file = models.FileField(_('OGG file'), upload_to=book_upload_path('ogg'), blank=True) parent = models.ForeignKey('self', blank=True, null=True, related_name='children') objects = models.Manager() tagged = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) + + + @property + def name(self): + return self.title def short_html(self): if len(self._short_html): return mark_safe(self._short_html) else: - tags = self.tags.filter(~Q(category__in=('set', 'theme'))) + tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book'))) tags = [u'%s' % (tag.get_absolute_url(), tag.name) for tag in tags] formats = [] if self.html_file: - formats.append(u'Czytaj online' % self.html_file.url) + formats.append(u'Czytaj online' % reverse('book_text', kwargs={'slug': self.slug})) if self.pdf_file: formats.append(u'Plik PDF' % self.pdf_file.url) if self.odt_file: formats.append(u'Plik ODT' % self.odt_file.url) + if self.txt_file: + formats.append(u'Plik TXT' % self.txt_file.url) self._short_html = unicode(render_to_string('catalogue/book_short.html', {'book': self, 'tags': tags, 'formats': formats})) @@ -135,8 +150,11 @@ class Book(models.Model): has_html_file.short_description = 'HTML' has_html_file.boolean = True + class AlreadyExists(Exception): + pass + @staticmethod - def from_xml_file(xml_file): + def from_xml_file(xml_file, overwrite=False): from tempfile import NamedTemporaryFile from slughifi import slughifi from markupstring import MarkupString @@ -144,7 +162,19 @@ class Book(models.Model): # Read book metadata book_info = dcparser.parse(xml_file) book_base, book_slug = book_info.url.rsplit('/', 1) - book = Book(title=book_info.title, slug=book_slug) + book, created = Book.objects.get_or_create(slug=book_slug) + + if created: + book_shelves = [] + else: + if not overwrite: + raise Book.AlreadyExists('Book %s already exists' % book_slug) + # Save shelves for this book + book_shelves = list(book.tags.filter(category='set')) + + book.title = book_info.title + book.extra_info = book_info.to_dict() + book._short_html = '' book.save() book_tags = [] @@ -154,50 +184,79 @@ class Book(models.Model): if category == 'author': tag_sort_key = tag_name.last_name tag_name = ' '.join(tag_name.first_names) + ' ' + tag_name.last_name - tag, created = Tag.objects.get_or_create(name=tag_name, - slug=slughifi(tag_name), sort_key=slughifi(tag_sort_key), category=category) - tag.save() + tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name)) + if created: + tag.name = tag_name + tag.sort_key = slughifi(tag_sort_key) + tag.category = category + tag.save() book_tags.append(tag) + + book_tag, created = Tag.objects.get_or_create(slug=('l-' + book.slug)[:120]) + if created: + book_tag.name = book.title[:50] + book_tag.sort_key = ('l-' + book.slug)[:120] + book_tag.category = 'book' + book_tag.save() + book_tags.append(book_tag) + book.tags = book_tags if hasattr(book_info, 'parts'): - for part_url in book_info.parts: + for n, part_url in enumerate(book_info.parts): base, slug = part_url.rsplit('/', 1) child_book = Book.objects.get(slug=slug) child_book.parent = book + child_book.parent_number = n child_book.save() - + + book_descendants = list(book.children.all()) + while len(book_descendants) > 0: + child_book = book_descendants.pop(0) + for fragment in child_book.fragments.all(): + fragment.tags = set(list(fragment.tags) + [book_tag]) + book_descendants += list(child_book.children.all()) + # Save XML and HTML files book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False) html_file = NamedTemporaryFile() - html.transform(book.xml_file.path, html_file) - book.html_file.save('%s.html' % book.slug, File(html_file), save=False) - - # Extract fragments - closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) - book_themes = [] - for fragment in closed_fragments.values(): - text = fragment.to_string() - short_text = '' - if (len(MarkupString(text)) > 240): - short_text = unicode(MarkupString(text)[:160]) - new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book) + if html.transform(book.xml_file.path, html_file): + book.html_file.save('%s.html' % book.slug, File(html_file), save=False) + + # Extract fragments + closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) + book_themes = [] + for fragment in closed_fragments.values(): + text = fragment.to_string() + short_text = '' + if (len(MarkupString(text)) > 240): + short_text = unicode(MarkupString(text)[:160]) + new_fragment, created = Fragment.objects.get_or_create(anchor=fragment.id, book=book, + defaults={'text': text, 'short_text': short_text}) - theme_names = [s.strip() for s in fragment.themes.split(',')] - themes = [] - for theme_name in theme_names: - tag, created = Tag.objects.get_or_create(name=theme_name, - slug=slughifi(theme_name), sort_key=slughifi(theme_name), category='theme') - tag.save() - themes.append(tag) - new_fragment.save() - new_fragment.tags = list(book.tags) + themes - book_themes += themes + try: + theme_names = [s.strip() for s in fragment.themes.split(',')] + except AttributeError: + continue + themes = [] + for theme_name in theme_names: + tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name)) + if created: + tag.name = theme_name + tag.sort_key = slughifi(theme_name) + tag.category = 'theme' + tag.save() + themes.append(tag) + new_fragment.save() + new_fragment.tags = set(list(book.tags) + themes + [book_tag]) + book_themes += themes + + book_themes = set(book_themes) + book.tags = list(book.tags) + list(book_themes) + book_shelves - book_themes = set(book_themes) - book.tags = list(book.tags) + list(book_themes) - return book.save() + book.save() + return book @permalink def get_absolute_url(self): @@ -236,7 +295,7 @@ class Fragment(models.Model): return mark_safe(self._short_html) def get_absolute_url(self): - return '%s#m%s' % (self.book.html_file.url, self.anchor) + return '%s#m%s' % (reverse('book_text', kwargs={'slug': self.book.slug}), self.anchor) class Meta: ordering = ('book', 'anchor',)