X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1959361810afbb5f1de88b7d717da32979c7235d..111a23185d6f47f692540fb145dc5604c47aee67:/src/catalogue/fields.py

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index c4dec7e3f..ee64ee4d1 100644
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -1,9 +1,9 @@
 # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
+from importlib.metadata import version
 import io
 import os
-import pkg_resources
 import random
 import time
 from urllib.request import urlopen
@@ -151,7 +151,7 @@ class EbookField(models.FileField):
 
     def get_current_etag(self):
         MediaInsertSet = apps.get_model('annoy', 'MediaInsertSet')
-        librarian_version = pkg_resources.get_distribution("librarian").version
+        librarian_version = version("librarian")
         etag = librarian_version
         mis = MediaInsertSet.get_for_format(self.ext)
         if mis is not None:
@@ -350,7 +350,6 @@ class HtmlField(EbookField):
                             tag.name = theme_name
                             setattr(tag, "name_%s" % lang, theme_name)
                             tag.sort_key = sortify(theme_name.lower())
-                            tag.for_books = True
                             tag.save()
                         themes.append(tag)
                     elif lang is not None:
@@ -380,10 +379,6 @@ class HtmlField(EbookField):
 
                 new_fragment.save()
                 new_fragment.tags = set(meta_tags + themes)
-                for theme in themes:
-                    if not theme.for_books:
-                        theme.for_books = True
-                        theme.save()
             book.html_built.send(sender=type(self), instance=book)
             return True
         return False
@@ -403,6 +398,26 @@ class HtmlField(EbookField):
         return wldoc.as_html(gallery_path=gal_path, gallery_url=gal_url, base_url=absolute_url(gal_url))
 
 
+class HtmlNonotesField(EbookField):
+    ext = 'html'
+    for_parents = False
+    directory = 'html_nonotes'
+
+    @staticmethod
+    def transform(wldoc, book):
+        # ugly, but we can't use wldoc.book_info here
+        from librarian import DCNS
+        url_elem = wldoc.edoc.getroot().find('.//' + DCNS('identifier.url'))
+        if url_elem is None:
+            gal_url = ''
+            gal_path = ''
+        else:
+            slug = url_elem.text.rstrip('/').rsplit('/', 1)[1]
+            gal_url = gallery_url(slug=slug)
+            gal_path = gallery_path(slug=slug)
+        return wldoc.as_html(gallery_path=gal_path, gallery_url=gal_url, base_url=absolute_url(gal_url), flags=['nonotes'])
+
+
 class CoverField(EbookField):
     ext = 'jpg'
     directory = 'cover'