lino 24.11.0__py3-none-any.whl → 24.11.1__py3-none-any.whl

lino/modlib/printing/choicelists.py

@@ -46,14 +46,14 @@ class BuildMethod(Choice):
             names, self.__class__.__name__, names, **kwargs
         )
 
-    def get_target(self, action, elem):
-        "used by `get_target_name`"
+    def get_target(self, action, obj):
+        # Used by get_target_name()
         # assert self.name is not None
         return MediaFile(
             self.use_webdav,
             self.cache_name,
             self.value,
-            elem.filename_root() + self.target_ext,
+            obj.filename_root() + self.target_ext,
         )
 
     def get_target_name(self, action, elem):

lino/modlib/search/models.py

@@ -1,9 +1,8 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2021-2023 Rumma & Ko Ltd
+# Copyright 2021-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import re
-from html import escape
 from lxml import etree
 from django.conf import settings
 
@@ -12,7 +11,7 @@ from lino.core import constants
 from lino.core.utils import get_models
 from lino.core.site import has_elasticsearch, has_haystack
 
-from lino.utils.html import E
+from lino.utils.html import E, escape, mark_safe, format_html
 
 from .roles import SiteSearcher
 
@@ -23,15 +22,17 @@ class SiteSearchBase(dd.VirtualTable):
     required_roles = dd.login_required(SiteSearcher)
     label = _("Search")
     column_names = "description matches"
+    # column_names = "search_overview matches"
     private_apps = frozenset(["sessions", "contenttypes", "users"])
 
-    default_display_modes = {None: constants.DISPLAY_MODE_STORY}
+    default_display_modes = {None: constants.DISPLAY_MODE_LIST}
+    # default_display_modes = {None: constants.DISPLAY_MODE_STORY}
 
     card_layout = """description"""
-    list_layout = """
-    search_overview
-    matches
-    """
+    # list_layout = """
+    # search_overview
+    # matches
+    # """
 
     # _site_search_tables = []
     # @classmethod
@@ -76,6 +77,11 @@ class SiteSearchBase(dd.VirtualTable):
             return False
         return True
 
+    @classmethod
+    def row_as_paragraph(cls, ar, obj):
+        text = "{} #{}".format(obj._meta.verbose_name, obj.pk)
+        return format_html("{} : {}", ar.obj2htmls(obj, text), obj.as_paragraph(ar))
+
     @dd.displayfield(_("Description"))
     def description(self, obj, ar):
         elems = []
@@ -110,7 +116,8 @@ class SiteSearchBase(dd.VirtualTable):
                     s = matches.get(de, None)
                     if s is None:
                         s = str(de.value_from_object(obj))
-                        s = escape(s, quote=False)
+                        # s = escape(s, quote=False)
+                        s = escape(s)
                     r, count = re.subn(w, bold, s, flags=re.IGNORECASE)
                     if count:
                         matches[de] = r
@@ -132,11 +139,10 @@ class SiteSearchBase(dd.VirtualTable):
                 raise Exception("{} : {}".format(e, s))
             # return etree.fromstring(', '.join(chunks))
             # return E.raw(', '.join(chunks))
-        return s
+        return mark_safe(s)
 
 
 class SiteSearch(SiteSearchBase):
-    default_display_modes = {None: constants.DISPLAY_MODE_LIST}
 
     @classmethod
     def get_data_rows(cls, ar):

lino/modlib/system/fixtures/std.py

@@ -0,0 +1,5 @@
+from django.conf import settings
+
+def objects():
+    settings.SITE.site_config.update()
+    return []

lino/modlib/system/models.py

@@ -138,7 +138,7 @@ class SiteConfig(dd.Model):
                 # print("20180502 Created SiteConfig {}".format(
                 #     obj2str(self._site_config, True)))
                 # 20120725
-                # polls_tutorial menu selection `Config --> Site Parameters`
+                # polls_tutorial menu selection `Config --> Site configuration`
                 # said "SiteConfig 1 does not exist"
                 # cannot save the instance here because the db table possibly doesn't yet exit.
                 # ~ self._site_config.save()
@@ -146,7 +146,7 @@ class SiteConfig(dd.Model):
         return cls._site_config
 
     def __str__(self):
-        return force_str(_("Site Parameters"))
+        return force_str(_("Site configuration"))
 
     def update(self, **kw):
         """
@@ -238,6 +238,7 @@ class SiteConfigs(dd.Table):
     detail_layout = dd.DetailLayout(
         """
     default_build_method
+    simulate_today
     # lino.ModelsBySite
     """,
         window_size=(60, "auto"),

lino/modlib/uploads/__init__.py

@@ -9,7 +9,7 @@ from os.path import join
 from lino import ad, _
 from lino.modlib.memo.parser import split_name_rest
 
-UPLOADS_ROOT = "uploads"
+UPLOADS_ROOT = 'uploads'
 VOLUMES_ROOT = 'volumes'
 
 class Plugin(ad.Plugin):
@@ -25,6 +25,10 @@ class Plugin(ad.Plugin):
 
     """
 
+    with_thumbnails = False
+    """Whether to use PIL, the Python Imaging Library.
+    """
+
     # def on_ui_init(self, kernel):
     #     super().on_ui_init(kernel)
     #     self.site.makedirs_if_missing(self.get_uploads_root())
@@ -75,3 +79,8 @@ class Plugin(ad.Plugin):
 
         # site.makedirs_if_missing(self.get_uploads_root())
         # site.makedirs_if_missing(self.get_volumes_root())
+
+    def get_requirements(self, site):
+        if self.with_thumbnails:
+            yield "Pillow"
+            yield "PyMuPDF"

lino/modlib/uploads/choicelists.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2010-2020 Rumma & Ko Ltd
+# Copyright 2010-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from lino.modlib.office.roles import OfficeStaff
 from lino.api import dd, rt, _
+from lino.modlib.office.roles import OfficeStaff
 
 
 class Shortcut(dd.Choice):
@@ -17,7 +17,7 @@ class Shortcut(dd.Choice):
             self.target = target
         self.model_spec = model_spec
         value = model_spec + "." + name
-        super(Shortcut, self).__init__(value, verbose_name, name)
+        super().__init__(value, verbose_name, name)
 
     def get_uploads(self, **kw):
         """Return a queryset with the uploads of this shortcut."""

lino/modlib/uploads/mixins.py

@@ -7,19 +7,24 @@ import shutil
 import uuid
 from pathlib import Path
 
+from rstgen.sphinxconf.sigal_image import parse_image_spec
+from rstgen.sphinxconf.sigal_image import Standard, Thumb, Tiny, Wide, Solo, Duo, Trio
+SMALL_FORMATS = (Thumb, Tiny, Duo, Trio)
+
 from django.db import models
 from django.conf import settings
 from django.core.files.storage import default_storage
 from django.core.exceptions import ValidationError, FieldError
 from django.template.defaultfilters import filesizeformat
+from django.utils.html import format_html
 
-from rstgen.sphinxconf.sigal_image import parse_image_spec
 from lino.core import constants
 from lino.utils import DATE_TO_DIR_TPL
+from lino.utils import needs_update
 from lino.utils.html import E
 from lino.api import dd, rt, _
 from lino.modlib.uploads import UPLOADS_ROOT
-from lino.modlib.memo.mixins import MemoReferrable
+from lino.modlib.comments.mixins import Commentable
 
 # from lino.mixins.sequenced import Sequenced
 # from lino.modlib.gfks.mixins import Controllable
@@ -39,12 +44,6 @@ def safe_filename(name):
     return name
 
 
-def needs_update(src, dest):
-    if dest.exists() and dest.stat().st_mtime >= src.stat().st_mtime:
-        return False
-    return True
-
-
 def make_uploaded_file(filename, src=None, upload_date=None):
     """
     Create a dummy file that looks as if a file had really been uploaded.
@@ -130,8 +129,9 @@ class GalleryViewable(dd.Model):
         return {}
 
 
-class UploadBase(MemoReferrable, GalleryViewable):
-    class Meta(object):
+class UploadBase(Commentable, GalleryViewable):
+
+    class Meta:
         abstract = True
 
     extra_display_modes = {constants.DISPLAY_MODE_GALLERY}
@@ -180,7 +180,8 @@ class UploadBase(MemoReferrable, GalleryViewable):
         dd.logger.info("Wrote uploaded file %s", ff.path)
 
     def get_gallery_item(self, ar):
-        return dict(image_src=self.get_file_url())
+        mf = self.get_media_file()
+        return dict(image_src=mf.get_image_url())
 
     def full_clean(self, *args, **kw):
         super().full_clean(*args, **kw)
@@ -192,39 +193,36 @@ class UploadBase(MemoReferrable, GalleryViewable):
     def get_file_button(self, text=None):
         if text is None:
             text = str(self)
-        url = self.get_file_url()
-        if url is None:
+        mf = self.get_media_file()
+        if mf is None:
             return text
-        return E.a(text, href=url, target="_blank")
+        return E.a(text, href=mf.get_download_url(), target="_blank")
 
     def memo2html(self, ar, text, **ctx):
-        # if not text:
-        #     text = self.description or str(self)
-        # ctx = dict()
-        # text = src + "|" + text
-        url = self.get_file_url()
-        if url is None:
-            return ""
-        ctx.update(src=url)
+        mf = self.get_media_file()
+        if mf is None:
+            return format_html("<em>{}</em>", text or str(self))
+        ctx.update(src=mf.get_download_url())
         ctx.update(href=ar.renderer.obj2url(ar, self))
-        if url.endswith(".pdf"):
+        small_url = mf.get_image_url()
+        if small_url is None or small_url == mf.url:  # non-previewable mimetype
             if not text:
                 text = str(self)
             ctx.update(text=text)
-            tpl = '(<a href="{src}" target="_blank"/>{text}</a>'
-            tpl += '| <a href="{href}""/>detail</a>)'
-            return tpl.format(**ctx)
+            tpl = '(<a href="{src}" target="_blank">{text}</a>'
+            tpl += '| <a href="{href}">detail</a>)'
+            return format_html(tpl, **ctx)
 
         fmt = parse_image_spec(text, **ctx)
+        if isinstance(fmt, SMALL_FORMATS):
+            fmt.context.update(src=small_url)
+
         if not fmt.context["caption"]:
             fmt.context["caption"] = self.description or str(self)
-        # if text:
-        #     ctx.update(caption=text)
 
-        rv = (
-            '<a href="{href}" target="_blank"/><img src="{src}"'
-            + ' style="{style}" title="{caption}"/></a>'
-        ).format(**fmt.context)
+        rv = format_html(
+            '<a href="{href}" target="_blank"><img src="{src}"'
+            + ' style="{style}" title="{caption}"/></a>', **fmt.context)
         # if ar.renderer.front_end.media_name == 'react':
         #     return ('<figure class="lino-memo-image"><img src="{src}" ' +
         #         'style="{style}" title="{caption}"/><figcaption' +

lino/modlib/uploads/models.py

@@ -11,7 +11,7 @@ from django.db import models
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.text import format_lazy
-from django.utils.html import format_html
+from django.utils.html import format_html, mark_safe
 from django.utils.translation import pgettext_lazy as pgettext
 
 from lino.utils.html import E, join_elems
@@ -29,6 +29,7 @@ from lino.modlib.publisher.mixins import Publishable
 from .actions import CameraStream
 from .choicelists import Shortcuts, UploadAreas
 from .mixins import UploadBase
+from .utils import previewer, UploadMediaFile
 
 from . import VOLUMES_ROOT
 
@@ -36,6 +37,7 @@ from . import VOLUMES_ROOT
 class Volume(Referrable):
 
     class Meta:
+        abstract = dd.is_abstract_model(__name__, "Volume")
         app_label = "uploads"
         verbose_name = _("Library volume")
         verbose_name_plural = _("Library volumes")
@@ -50,10 +52,8 @@ class Volume(Referrable):
         return self.ref or self.root_dir
 
     def full_clean(self, *args, **kw):
-        # if self.ref == "uploads":
-        #     raise ValidationError("Invalid reference for a volume.")
         super().full_clean(*args, **kw)
-        pth = Path(dd.plugins.uploads.get_volumes_root(), self.ref)
+        pth = dd.plugins.uploads.get_volumes_root() / self.ref
         if pth.exists():
             if pth.resolve().absolute() != Path(self.root_dir).resolve().absolute():
                 raise ValidationError(
@@ -74,8 +74,9 @@ class Volume(Referrable):
 
 
 class UploadType(BabelNamed):
-    class Meta(object):
+    class Meta:
         abstract = dd.is_abstract_model(__name__, "UploadType")
+        app_label = "uploads"
         verbose_name = _("Upload type")
         verbose_name_plural = _("Upload types")
 
@@ -105,12 +106,13 @@ class UploadType(BabelNamed):
 
 class Upload(UploadBase, UserAuthored, Controllable, Publishable):
 
-    class Meta(object):
+    class Meta:
+        app_label = "uploads"
         abstract = dd.is_abstract_model(__name__, "Upload")
         verbose_name = _("Upload file")
         verbose_name_plural = _("Upload files")
 
-    memo_command = "upload"
+    memo_command = "file"
 
     upload_area = UploadAreas.field(default="general")
     type = dd.ForeignKey("uploads.UploadType", blank=True, null=True)
@@ -134,9 +136,29 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
             s = str(self.type) + " " + s
         return s
 
+    def get_file_path(self):
+        if self.file and self.file.name:
+            return self.file.name
+        elif self.library_file and self.volume_id and self.volume.ref:
+            return VOLUMES_ROOT + "/" + self.volume.ref + "/" + self.library_file
+        return None
+
+    def get_media_file(self):
+        url = self.get_file_path()
+        if url is not None:
+            return UploadMediaFile(url)
+
+    def get_create_comment_text(self, ar):
+        mf = self.get_media_file()
+        if mf is None:
+            return super().get_create_comment_text(ar)
+        return _("Uploaded an {obj}.").format(obj=mf.get_mimetype_description())
+        # or mf.get_image_url() is None:
+        # return _("Uploaded {obj}. [{obj.memo_command} {obj.id}].").format(obj=self)
+
     def get_memo_command(self, ar=None):
         if dd.is_installed("memo"):
-            cmd = f"[upload {self.pk}"
+            cmd = f"[{self.memo_command} {self.pk}"
             if self.description:
                 cmd += " " + self.description + "]"
             else:
@@ -144,24 +166,13 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
             return cmd
         return None
 
-    def get_file_url(self):
-        if self.file.name:
-            return settings.SITE.build_media_url(self.file.name)
-        if self.library_file and self.volume_id and self.volume.ref:
-            return settings.SITE.build_media_url(
-                VOLUMES_ROOT, self.volume.ref, self.library_file)
-            # return self.volume.base_url + self.library_file
-        return None
-
     def get_real_file_size(self):
         if self.file:
             return self.file.size
         if self.volume_id and self.library_file:
-            pth = os.path.join(
-                dd.plugins.uploads.get_volumes_root(),
-                self.volume.ref, self.library_file)
-            # pth = os.path.join(settings.MEDIA_ROOT, self.volume.ref, self.library_file)
-            return os.path.getsize(pth)
+            pth = dd.plugins.uploads.get_volumes_root() / self.volume.ref / self.library_file
+            return pth.stat().st_size
+            # return os.path.getsize(pth)
 
     def disabled_fields(self, ar):
         df = super().disabled_fields(ar)
@@ -169,6 +180,16 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
             df.add("camera_stream")
         return df
 
+    def full_clean(self):
+        super().full_clean()
+        for i in self.check_previews(True):
+            pass
+
+    def check_previews(self, fix):
+        for p in [rt.models.uploads.previewer]:
+            for i in p.check_preview(self, fix):
+                yield i
+
     @dd.displayfield(_("Description"))
     def description_link(self, ar):
         s = str(self)
@@ -184,11 +205,10 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
 
     @dd.chooser()
     def type_choices(self, upload_area):
-        M = dd.resolve_model("uploads.UploadType")
-        # logger.info("20140430 type_choices %s", upload_area)
+        UploadType = rt.models.uploads.UploadType
         if upload_area is None:
-            return M.objects.all()
-        return M.objects.filter(upload_area=upload_area)
+            return UploadType.objects.all()
+        return UploadType.objects.filter(upload_area=upload_area)
 
     def full_clean(self, *args, **kw):
         super().full_clean(*args, **kw)
@@ -205,40 +225,45 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
 
     @dd.htmlbox()
     def preview(self, ar):
-        url = self.get_file_url()
-        if url is None or url.endswith(".pdf"):
+        mf = self.get_media_file()
+        if mf is None:
             txt = _("No preview available")
             return '<p style="text-align: center;padding: 2em;">({})</p>'.format(txt)
-        return '<img src="{}" style="max-width: 100%; max-height: 20em">'.format(url)
+        return '<img src="{}" style="max-width: 100%; max-height: 20em">'.format(mf.get_image_url())
 
     @dd.htmlbox(_("Thumbnail"))
     def thumbnail(self, ar):
         # url = settings.SITE.build_media_url(self.file.name)
-        url = self.get_file_url()
-        return '<img src="{}" style="height: 15ch; max-width: 22.5ch">'.format(url)
-
-    @dd.htmlbox(_("Thumbnail Medium"))
-    def thumbnail_medium(self, ar):
-        # url = settings.SITE.build_media_url(self.file.name)
-        url = self.get_file_url()
-        return '<img src="{}" style="width: 30ch;">'.format(url)
-
-    @dd.htmlbox(_("Thumbnail Large"))
-    def thumbnail_large(self, ar):
-        # url = settings.SITE.build_media_url(self.file.name)
-        url = self.get_file_url()
-        return '<img src="{}" style="width: 70ch;">'.format(url)
+        mf = self.get_media_file()
+        if mf is None:
+            return ""
+        return '<img src="{}" style="height: 15ch; max-width: 22.5ch">'.format(mf.get_image_url())
 
     def as_page(self, ar, **kwargs):
         yield format_html("<h1>{}</h1>", self)
-        url = self.get_file_url()
-        yield format_html('<img src="{}" style="width: 100%;">', url)
+        mf = self.get_media_file()
+        if mf is not None:
+            yield format_html('<img src="{}" style="width: 100%;">', mf.get_image_url())
         if self.description:
             yield escape(self.description)
         if self.source:
             yield _("Source") + ": "
             yield ar.obj2htmls(self.source)
 
+    def as_paragraph(self, ar, **kwargs):
+        rv = self.memo2html(ar, "")
+        # rv = ar.obj2htmls(self)
+        # mf = self.get_media_file()
+        # if mf is not None:
+        #     src = mf.get_image_url()
+        #     if src is not None:
+        #         url = mf.get_download_url()
+        #         rv += f'<a href="{url}"><img src="{src}" style="width: 30%;"></a>'
+        if self.source:
+            rv += format_html(
+                " ({}: {})", _("Source"), ar.obj2htmls(self.source))
+        return mark_safe(rv)
+
     # def get_choices_text(self, ar, actor, field):
     #     if self.file:
     #         return str(obj) + "&nbsp;<span style=\"float: right;\">" + obj.thumbnail + "</span>"
@@ -246,11 +271,12 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
 
 
 dd.update_field(Upload, "user", verbose_name=_("Uploaded by"))
+dd.update_field(Upload, "owner", verbose_name=_("Attached to"))
 
 
 class UploadChecker(Checker):
     verbose_name = _("Check metadata of upload files")
-    model = Upload
+    model = "uploads.Upload"
 
     def get_checkdata_problems(self, obj, fix=False):
         if obj.file:
@@ -267,6 +293,8 @@ class UploadChecker(Checker):
             tpl = "Stored file size {} differs from real file size {}"
             yield (False, format_lazy(tpl, obj.file_size, file_size))
 
+        for i in obj.check_previews(fix):
+            yield i
 
 UploadChecker.activate()
 
@@ -304,7 +332,6 @@ class UploadsFolderChecker(Checker):
 UploadsFolderChecker.activate()
 
 
-
 @dd.receiver(dd.pre_analyze)
 def before_analyze(sender, **kwargs):
     # This is the successor for `quick_upload_buttons`.
@@ -313,6 +340,8 @@ def before_analyze(sender, **kwargs):
     UploadType = sender.models.uploads.UploadType
     Shortcuts = sender.models.uploads.Shortcuts
 
+    # raise Exception(f"20241112 {UploadType}")
+
     for i in Shortcuts.items():
 
         def f(obj, ar):
@@ -341,16 +370,17 @@ def before_analyze(sender, **kwargs):
             elif n == 1:
                 after_show = ar.get_status()
                 obj = sar.data_iterator[0]
-                items.append(
-                    sar.renderer.href_button(
-                        obj.get_file_url(),
-                        _("show"),
-                        target="_blank",
-                        icon_name="page_go",
-                        style="vertical-align:-30%;",
-                        title=_("Open the uploaded file in a new browser window"),
+                if (mf := obj.get_media_file()) is not None:
+                    items.append(
+                        sar.renderer.href_button(
+                            mf.get_download_url(),
+                            _("show"),
+                            target="_blank",
+                            icon_name="page_go",
+                            style="vertical-align:-30%;",
+                            title=_("Open the uploaded file in a new browser window"),
+                        )
                     )
-                )
                 after_show.update(record_id=obj.pk)
                 items.append(
                     sar.window_action_button(
@@ -381,4 +411,7 @@ def before_analyze(sender, **kwargs):
         # logger.info("Installed upload shortcut field %s.%s",
         #             i.model_spec, i.name)
 
+
 from .ui import *
+
+# raise Exception("20241112")

lino/modlib/uploads/ui.py

@@ -66,10 +66,11 @@ class UploadDetail(dd.DetailLayout):
     """
 
     left = """
-    file user
+    file
     volume:10 library_file:40
-    upload_area type description
-    owner
+    user owner
+    upload_area type
+    description
     source
     """
 
@@ -82,6 +83,11 @@ class Uploads(dd.Table):
     required_roles = dd.login_required(UploadsReader)
     column_names = "file type user owner description id *"
     order_by = ["-id"]
+    default_display_modes = {
+        70: constants.DISPLAY_MODE_LIST,
+        None: constants.DISPLAY_MODE_GALLERY
+    }
+    # extra_display_modes = {constants.DISPLAY_MODE_LIST, constants.DISPLAY_MODE_GALLERY}
 
     detail_layout = "uploads.UploadDetail"
 
@@ -197,10 +203,10 @@ class AreaUploads(Uploads):
                     # icon_name='application_form',
                     title=_("Edit metadata of the uploaded file."),
                 )
-                url = m.get_file_url()
-                if url:
+                mf = m.get_media_file()
+                if mf:
                     show = ar.renderer.href_button(
-                        url,
+                        mf.get_download_url(),
                         # u"\u21A7",  # DOWNWARDS ARROW FROM BAR (↧)
                         # u"\u21E8",
                         "\u21f2",  # SOUTH EAST ARROW TO CORNER (⇲)