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

lino/modlib/uploads/models.py

@@ -14,6 +14,10 @@ from django.utils.text import format_lazy
 from django.utils.html import format_html, mark_safe
 from django.utils.translation import pgettext_lazy as pgettext
 
+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 lino.utils.html import E, join_elems
 from lino.api import dd, rt, _
 from lino.modlib.gfks.mixins import Controllable
@@ -112,7 +116,7 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
         verbose_name = _("Upload file")
         verbose_name_plural = _("Upload files")
 
-    memo_command = "file"
+    memo_command = "upload"
 
     upload_area = UploadAreas.field(default="general")
     type = dd.ForeignKey("uploads.UploadType", blank=True, null=True)
@@ -129,7 +133,8 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
         elif self.file:
             s = filename_leaf(self.file.name)
         elif self.library_file:
-            s = "{}:{}".format(self.volume.ref, self.library_file)
+            s = filename_leaf(self.library_file)
+            # s = "{}:{}".format(self.volume.ref, self.library_file)
         else:
             s = str(self.id)
         if self.type:
@@ -158,12 +163,13 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
 
     def get_memo_command(self, ar=None):
         if dd.is_installed("memo"):
-            cmd = f"[{self.memo_command} {self.pk}"
-            if self.description:
-                cmd += " " + self.description + "]"
-            else:
-                cmd += "]"
-            return cmd
+            return f"[{self.memo_command} {self.pk} {self}]"
+            # cmd = f"[{self.memo_command} {self.pk}"
+            # if self.description:
+            #     cmd += " " + self.description + "]"
+            # else:
+            #     cmd += "]"
+            # return cmd
         return None
 
     def get_real_file_size(self):
@@ -180,16 +186,6 @@ 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)
@@ -214,6 +210,13 @@ class Upload(UploadBase, UserAuthored, Controllable, Publishable):
         super().full_clean(*args, **kw)
         if self.type is not None:
             self.upload_area = self.type.upload_area
+        for i in self.check_previews(True):
+            pass
+
+    def check_previews(self, fix):
+        p = rt.models.uploads.previewer
+        for i in p.check_preview(self, fix):
+            yield i
 
     def get_gallery_item(self, ar):
         d = super().get_gallery_item(ar)
@@ -415,3 +418,50 @@ def before_analyze(sender, **kwargs):
 from .ui import *
 
 # raise Exception("20241112")
+
+
+@dd.receiver(dd.post_startup)
+def setup_memo_commands(sender=None, **kwargs):
+    # Adds another memo command for Upload
+    # See :doc:`/specs/memo`
+
+    if not sender.is_installed('memo'):
+        return
+
+    def file2html(self, ar, text, **ctx):
+        """
+        Insert an image tag of the specified upload file.
+        """
+        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 not mf.is_image():
+            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 format_html(tpl, **ctx)
+
+        fmt = parse_image_spec(text, **ctx)
+        # TODO: When an image is inserted with format "wide", we should not use
+        # the thumbnail but the original file. But for a PDF file we must always
+        # use the img_src because the download_url is not an image.
+        fmt.context.update(src=mf.get_image_url())
+        # if isinstance(fmt, SMALL_FORMATS):
+        #     fmt.context.update(src=img_src)
+        # else:
+        #     print(f"20241116 {fmt} {fmt.context}")
+
+        if not fmt.context["caption"]:
+            fmt.context["caption"] = self.description or str(self)
+
+        rv = format_html(
+            '<a href="{href}" target="_blank"><img src="{src}"'
+            + ' style="{style}" title="{caption}"/></a>', **fmt.context)
+        return rv
+
+    mp = sender.plugins.memo.parser
+    mp.register_django_model('file', rt.models.uploads.Upload, rnd=file2html)

lino/modlib/uploads/utils.py

@@ -32,6 +32,12 @@ class UploadMediaFile:
             url += ".png"
         return previewer.base_dir + "/" + url
 
+    def is_image(self):
+        # whether this can be rendered in an <img> tag
+        if self.get_image_name() is None:
+            return False
+        return self.suffix in previewer.PREVIEW_SUFFIXES
+
     def get_mimetype_description(self):
         if self.suffix == ".pdf":
             return _("PDF file")

lino/modlib/users/mixins.py

@@ -159,13 +159,16 @@ class My(dbtables.Table):
 
     @classmethod
     def get_actor_label(self):
+        if self._label is not None:
+            return self._label
         if self.model is None:
-            return self._label or self.__name__
-        # return self._label or \
-        #     _("My %s") % self.model._meta.verbose_name_plural
-        return self._label or format_lazy(
-            _("My {}"), self.model._meta.verbose_name_plural
-        )
+            return self.__name__
+        return format_lazy(_("My {}"), self.model._meta.verbose_name_plural)
+
+    @classmethod
+    def setup_request(cls, ar):
+        super().setup_request(ar)
+        ar.obvious_fields.add("user")
 
     @classmethod
     def param_defaults(self, ar, **kw):

lino/modlib/users/models.py

@@ -27,7 +27,6 @@ from .actions import SendWelcomeMail, CreateAccount, ResetPassword, VerifyUser,
 
 # from .actions import SignIn
 from lino.modlib.about.choicelists import TimeZones, DateFormats
-from lino.modlib.system.choicelists import DashboardLayouts
 from lino.modlib.publisher.mixins import Publishable
 
 from lino.core.roles import Supervisor
@@ -120,7 +119,6 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
         time_zone = dd.DummyField()
 
     date_format = DateFormats.field(default="default")
-    dashboard_layout = DashboardLayouts.field(blank=True, null=True)
 
     ledger = dd.ForeignKey("ledgers.Ledger", null=True, blank=True)
 

lino/modlib/users/ui.py

@@ -39,7 +39,7 @@ class UserDetail(dd.DetailLayout):
     username user_type:20
     first_name last_name
     email status
-    time_zone #dashboard_layout
+    time_zone
     """
     box2 = """
     id language

lino/modlib/weasyprint/choicelists.py

@@ -1,8 +1,9 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2016-2020 Rumma & Ko Ltd
+# Copyright 2016-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import os
+from pathlib import Path
 from copy import copy
 
 try:
@@ -10,11 +11,20 @@ try:
 except ImportError:
     HTML = None
 
+try:
+    import bulma
+    from weasyprint import CSS
+    BULMA_CSS = Path(bulma.__file__).parent / "static/bulma/css/style.min.css"
+    assert BULMA_CSS.exists()
+except ImportError:
+    BULMA_CSS = None
+
+
+
 from django.conf import settings
 from django.utils import translation
 
 from lino.api import dd
-
 from lino.modlib.jinja.choicelists import JinjaBuildMethod
 from lino.modlib.printing.choicelists import BuildMethods
 
@@ -29,17 +39,17 @@ class WeasyHtmlBuildMethod(WeasyBuildMethod):
     target_ext = ".html"
     name = "weasy2html"
 
-    def html2file(self, html, filename):
-        open(filename, "w").write(html)
-
 
 class WeasyPdfBuildMethod(WeasyBuildMethod):
     target_ext = ".pdf"
     name = "weasy2pdf"
 
-    def html2file(self, html, filename):
+    def html2file(self, html, filename, context):
         pdf = HTML(string=html)
-        pdf.write_pdf(filename)
+        if BULMA_CSS and context.get('use_bulma_css', False):
+            pdf.write_pdf(filename, stylesheets=[CSS(filename=BULMA_CSS)])
+        else:
+            pdf.write_pdf(filename)
 
 
 add = BuildMethods.add_item_instance

lino/utils/choosers.py

@@ -108,6 +108,7 @@ class ChoiceConverter(Converter):
 
     def convert(self, **kw):
         value = kw.get(self.field.name)
+        # print(f"20241203 convert {self.field.name}")
 
         if value is not None:
             if not isinstance(value, self.field.choicelist.item_class):
@@ -190,7 +191,16 @@ class ManyToManyConverter(LookupConverter):
 
 def make_converter(f, lookup_fields={}):
     from lino.core.gfks import GenericForeignKey
+    from lino.core.fields import VirtualField
 
+    # if f.name == 'rating_type':
+    #     print(f"20241203 {f.__class__}")
+
+    # selector = f
+
+    if isinstance(f, VirtualField):
+        # print(f"20241203 {f.name} {f.return_type.name}")
+        f = f.return_type
     if isinstance(f, models.ForeignKey):
         return ForeignKeyConverter(f, lookup_fields.get(f.name, "pk"))
     if isinstance(f, GenericForeignKey):
@@ -206,8 +216,7 @@ def make_converter(f, lookup_fields={}):
     from lino.core import choicelists
 
     if isinstance(f, choicelists.ChoiceListField):
-        # if f.name == 'p_book':
-        # print "20131012 b", f
+        # print(f"20241203c {f.__class__}")
         return ChoiceConverter(f)
 
 
@@ -244,18 +253,22 @@ class Chooser(FieldChooser):
         from lino.core.gfks import is_foreignkey
         from lino.core.choicelists import ChoiceListField
 
-        if isinstance(field, ChoiceListField):
+        selector = field
+        if isinstance(field, fields.VirtualField):
+            selector = field.return_type
+
+        if isinstance(selector, ChoiceListField):
             self.simple_values = getattr(meth, "simple_values", False)
             self.instance_values = getattr(meth, "instance_values", True)
             self.force_selection = getattr(
                 meth, "force_selection", self.force_selection
             )
-        elif is_foreignkey(field):
-            pass
-        elif isinstance(field, fields.VirtualField) and isinstance(
-            field.return_type, models.ForeignKey
-        ):
+        elif is_foreignkey(selector):
             pass
+        # elif isinstance(field, fields.VirtualField) and isinstance(
+        #     field.return_type, models.ForeignKey
+        # ):
+        #     pass
         else:
             self.simple_values = getattr(meth, "simple_values", False)
             self.instance_values = getattr(meth, "instance_values", False)

lino/utils/instantiator.py

@@ -210,6 +210,15 @@ def create_and_get(model, **kw):
     o = create(model, **kw)
     return model.objects.get(pk=o.pk)
 
+def make_if_needed(model, **values):
+    qs = model.objects.filter(**values)
+    if qs.count() == 1:
+        pass # ok, nothing to do
+    elif qs.count() == 0:
+        return model(**values)
+    else:
+        raise Exception(f"Multiple {model._meta.verbose_name_plural} for {values}")
+
 
 def _test():
     import doctest

lino/utils/soup.py

@@ -251,12 +251,12 @@ ALLOWED_ATTRIBUTES["span"] = {
     "data-value",
     "contenteditable",
 }
-ALLOWED_ATTRIBUTES["p"] = {"align"}
+ALLOWED_ATTRIBUTES["p"] = {"align", "style"}
 
-def safe_css(attr, css):
-    if attr == "style":
-        return re.sub("(width|height):[^;]+;", "", css)
-    return css
+# def safe_css(attr, css):
+#     if attr == "style":
+#         return re.sub("(width|height):[^;]+;", "", css)
+#     return css
 
 def sanitize(old):
 

{lino-24.11.1.dist-info → lino-25.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: lino
-Version: 24.11.1
+Version: 25.1.1
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino
@@ -666,6 +666,8 @@ License:                     GNU AFFERO GENERAL PUBLIC LICENSE
         if any, to sign a "copyright disclaimer" for the program, if necessary.
         For more information on this, and how to apply and follow the GNU AGPL, see
         <https://www.gnu.org/licenses/>.
+License-File: AUTHORS.rst
+License-File: COPYING
 Keywords: Django,React,customized,framework
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment