lino 25.4.3__py3-none-any.whl → 25.4.4__py3-none-any.whl

lino/__init__.py

@@ -31,7 +31,7 @@ from django import VERSION
 from django.apps import AppConfig
 from django.conf import settings
 import warnings
-__version__ = '25.4.3'
+__version__ = '25.4.4'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/core/site.py

@@ -559,21 +559,13 @@ class Site(object):
                     break
 
         if self.master_site is None:
-            # cache_root = os.environ.get("LINO_CACHE_ROOT", None)
-            # if cache_root:
-            #     # TODO: deprecate
-            #     cr = Path(cache_root).absolute()
-            #     if not cr.exists():
-            #         msg = "LINO_CACHE_ROOT ({0}) does not exist!".format(cr)
-            #         raise Exception(msg)
-            #     self.site_dir = (cr / self.project_name).resolve()
-            #     self.setup_cache_directory()
-            # else:
-            #     self.site_dir = self.project_dir
             self.site_dir = self.project_dir
-            db = self.get_database_settings()
-            if db is not None:
-                self.django_settings.update(DATABASES=db)
+            self.django_settings.update(DATABASES={
+                "default": {
+                    "ENGINE": "django.db.backends.sqlite3",
+                    "NAME": str(self.site_dir / "default.db")
+                }
+            })
         else:
             self.site_dir = self.master_site.site_dir
             self._history_aware_logging = self.master_site._history_aware_logging
@@ -721,15 +713,6 @@ class Site(object):
         # import yaml
         # print("20231019", yaml.dump(d))
 
-    def get_database_settings(self):
-        if self.site_dir is None:
-            pass  # raise Exception("20160516 No site_dir")
-        else:
-            dbname = self.site_dir / "default.db"
-            return {
-                "default": {"ENGINE": "django.db.backends.sqlite3", "NAME": str(dbname)}
-            }
-
     def get_anonymous_user(self):
         # The code below works even when users is not installed
         from lino.modlib.users.choicelists import UserTypes

lino/modlib/checkdata/models.py

@@ -21,6 +21,9 @@ from lino.api import dd, rt, _
 from .choicelists import Checker, Checkers
 from .roles import CheckdataUser
 
+MAX_LENGTH = 250
+MORE = " (...)"
+
 
 class CheckerAction(dd.Action):
     fix_them = False
@@ -150,7 +153,7 @@ class Message(Controllable, UserAuthored):
     checker = Checkers.field(verbose_name=_("Checker"))
     # severity = Severities.field()
     # feedback = Feedbacks.field(blank=True)
-    message = models.CharField(_("Message text"), max_length=250)
+    message = models.CharField(_("Message text"), max_length=MAX_LENGTH)
     # fixable = models.BooleanField(_("Fixable"), default=False)
 
     update_problem = UpdateMessage()
@@ -166,6 +169,11 @@ class Message(Controllable, UserAuthored):
     def __str__(self):
         return self.message
 
+    def full_clean(self):
+        if len(self.message) > MAX_LENGTH:
+            self.message = self.message[:MAX_LENGTH - len(MORE)] + MORE
+        super().full_clean()
+
     @classmethod
     def get_simple_parameters(cls):
         for p in super(Message, cls).get_simple_parameters():

lino/modlib/linod/routing.py

@@ -1,67 +1,70 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2022 Rumma & Ko Ltd
+# Copyright 2022-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from django.urls import re_path
+from django.conf import settings
 from django.core.asgi import get_asgi_application
-from django.utils.functional import LazyObject
 
-from channels.middleware import BaseMiddleware
-from channels.db import database_sync_to_async
-from channels.sessions import SessionMiddlewareStack
-from channels.routing import ProtocolTypeRouter, URLRouter, ChannelNameRouter
+if settings.SITE.plugins.linod.use_channels:
 
-from lino.core.auth import get_user
-from lino.modlib.notify.consumers import ClientConsumer
+    from django.urls import re_path
+    from django.utils.functional import LazyObject
+    from channels.middleware import BaseMiddleware
+    from channels.db import database_sync_to_async
+    from channels.sessions import SessionMiddlewareStack
+    from channels.routing import ProtocolTypeRouter, URLRouter, ChannelNameRouter
 
-from .utils import CHANNEL_NAME
-from .consumers import LinodConsumer
+    from lino.core.auth import get_user
+    from lino.modlib.notify.consumers import ClientConsumer
 
+    from .utils import CHANNEL_NAME
+    from .consumers import LinodConsumer
 
-class UserLazyObject(LazyObject):
-    """
-    Throw a more useful error message when scope['user'] is accessed before it's resolved
-    """
+    class UserLazyObject(LazyObject):
+        """
+        Throw a more useful error message when scope['user'] is accessed before it's resolved
+        """
 
-    def _setup(self):
-        raise ValueError("Accessing scope user before it is ready.")
+        def _setup(self):
+            raise ValueError("Accessing scope user before it is ready.")
 
+    async def _get_user(scope):
+        class Wrapper:
+            def __init__(self, session):
+                self.session = session
 
-async def _get_user(scope):
-    class Wrapper:
-        def __init__(self, session):
-            self.session = session
+        r = Wrapper(scope["session"])
+        return await database_sync_to_async(get_user)(r)
 
-    r = Wrapper(scope["session"])
-    return await database_sync_to_async(get_user)(r)
+    class AuthMiddleware(BaseMiddleware):
+        def populate_scope(self, scope):
+            # Make sure we have a session
+            if "session" not in scope:
+                raise ValueError("AuthMiddleware cannot find session in scope.")
+            # Add it to the scope if it's not there already
+            if "user" not in scope:
+                scope["user"] = UserLazyObject()
 
+        async def resolve_scope(self, scope):
+            scope["user"]._wrapped = await _get_user(scope)
 
-class AuthMiddleware(BaseMiddleware):
-    def populate_scope(self, scope):
-        # Make sure we have a session
-        if "session" not in scope:
-            raise ValueError("AuthMiddleware cannot find session in scope.")
-        # Add it to the scope if it's not there already
-        if "user" not in scope:
-            scope["user"] = UserLazyObject()
+        async def __call__(self, scope, receive=None, send=None):
+            self.populate_scope(scope)
+            await self.resolve_scope(scope)
+            return await self.inner(scope, receive, send)
 
-    async def resolve_scope(self, scope):
-        scope["user"]._wrapped = await _get_user(scope)
+    routes = [re_path(r"^WS/$", ClientConsumer.as_asgi())]
 
-    async def __call__(self, scope, receive=None, send=None):
-        self.populate_scope(scope)
-        await self.resolve_scope(scope)
-        return await self.inner(scope, receive, send)
+    protocol_mapping = dict(
+        websocket=SessionMiddlewareStack(AuthMiddleware(URLRouter(routes))),
+        channel=ChannelNameRouter({CHANNEL_NAME: LinodConsumer.as_asgi()}),
+        http=get_asgi_application(),
+    )
 
+    application = ProtocolTypeRouter(protocol_mapping)
 
-routes = [re_path(r"^WS/$", ClientConsumer.as_asgi())]
+    # raise Exception("20240424")
 
-protocol_mapping = dict(
-    websocket=SessionMiddlewareStack(AuthMiddleware(URLRouter(routes))),
-    channel=ChannelNameRouter({CHANNEL_NAME: LinodConsumer.as_asgi()}),
-    http=get_asgi_application(),
-)
+else:
 
-application = ProtocolTypeRouter(protocol_mapping)
-
-# raise Exception("20240424")
+    application = get_asgi_application()

lino/modlib/publisher/choicelists.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2020-2022 Rumma & Ko Ltd
+# Copyright 2020-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import os
@@ -8,7 +8,7 @@ from copy import copy
 from django.db import models
 from django.conf import settings
 from django.utils import translation
-from django.utils.text import format_lazy
+# from django.utils.text import format_lazy
 
 from lino.api import dd, rt, _
 from lino.utils.html import E, tostring, join_elems
@@ -181,19 +181,40 @@ class SpecialPage(dd.Choice):
     # pointing_field_name = 'publisher.Page.special_page'
     # show_values = True
 
-    def __init__(self, *args, **kwargs):
-        self.default_values = dict()
-        for k in ("ref", "title"):
+    def __init__(self, name, text=None, parent=None, **kwargs):
+        self.parent_value = parent
+        self._default_values = dict()
+        for k in ("ref", "title", "filler", "body"):
             if k in kwargs:
-                self.default_values[k] = kwargs.pop(k)
-        super().__init__(*args, **kwargs)
-        if not "title" in self.default_values:
-            self.default_values["title"] = self.text
-
-    def create_object(self, **kwargs):
-        kwargs.update(self.default_values)
-        kwargs.update(special_page=self)
-        return self.pointing_field.model(**kwargs)
+                self._default_values[k] = kwargs.pop(k)
+        super().__init__(name, text, name, **kwargs)
+        # if (filler := self.default_values.get('filler', None)):
+        #     if "title" not in self.default_values:
+        #         self.default_values["title"] = filler.data_view.get_actor_label()
+        # else:
+        #     if "title" not in self.default_values:
+        #         self.default_values["title"] = self.text
+
+    def on_page_created(self, obj):
+        for k, v in self._default_values.items():
+            setattr(obj, k, v)
+        if obj.filler and not obj.title:
+            obj.title = obj.filler.data_view.get_actor_label()
+        if not obj.title:
+            obj.title = self.text or "20250422"
+        if self.parent_value:
+            psp = self.choicelist.get_by_value(self.parent_value)
+            obj.parent = psp.get_object()
+
+    # def get_object(self, ar):
+    def get_object(self):
+        language = translation.get_language()
+        # if len(settings.SITE.languages) == 1:
+        #     language = translation.get_language()
+        # else:
+        #     language = ar.request.LANGUAGE_CODE
+        # return rt.models.publisher.Page.objects.get(ref=self.defaul_values['ref'], language=language)
+        return rt.models.publisher.Page.objects.get(special_page=self, language=language)
 
 
 class SpecialPages(dd.ChoiceList):
@@ -227,9 +248,9 @@ class SpecialPages(dd.ChoiceList):
 
 add = SpecialPages.add_item
 
-add("100", _("Home"), "home", ref="index", body=_("Welcome to our great website."))
-add("200", _("Terms and conditions"), "terms")
-add("300", _("Privacy policy"), "privacy")
-add("400", _("Cookie settings"), "cookies")
-add("500", _("Copyright"), "copyright")
-add("600", _("About us"), "about")
+add("home", _("Home"), ref="index", body=_("Welcome to our great website."))
+add("terms", _("Terms and conditions"))
+add("privacy", _("Privacy policy"))
+add("cookies", _("Cookie settings"))
+add("copyright", _("Copyright"))
+add("about", _("About us"))

lino/modlib/publisher/config/publisher/page.pub.html

@@ -32,6 +32,30 @@
 </div>
 {% endblock %}
 
+{% block navbar %}
+<nav class="navbar navbar-default" role="navigation">
+  <div class="container-fluid">
+      {% set index_node, home_children = obj.home_and_children(ar) %}
+      <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar-collapsible-content" aria-expanded="false">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="{{ar.get_home_url()}}">{{ index_node.title }}</a>
+      </div>
+      <div class="collapse navbar-collapse" id="bs-navbar-collapsible-content">
+          <ul class="nav navbar-nav">
+              {% for child in home_children %}
+              <li>{{tostring(ar.obj2html(child))}}</li>
+              {% endfor %}
+          </ul>
+      </div>
+   </div>
+</nav>
+{% endblock %}
+
 {% block content %}
 <div class="row-fluid">
   {% for chunk in obj.as_page(ar) %}

lino/modlib/publisher/fixtures/demo2.py

@@ -0,0 +1,12 @@
+from asgiref.sync import async_to_sync
+from django.conf import settings
+from lino.modlib.linod.choicelists import Procedures
+from lino.api import rt
+
+
+def objects():
+    yield None
+    ar = rt.login("robin")
+    if True:  # settings.SITE.use_linod:
+        Procedures.update_publisher_pages.run(ar)
+        # async_to_sync(Procedures.update_publisher_pages.run)(ar)

lino/modlib/publisher/fixtures/std.py

@@ -18,10 +18,11 @@ def objects():
             with translation.override(lng.django_code):
                 kwargs = dict(language=lng.django_code, special_page=sp)
                 kwargs.update(publishing_state="published")
-                kwargs.update(sp.default_values)
+                # kwargs.update(sp.default_values)
                 if lng.suffix:
                     kwargs.update(translated_from=translated_from)
                 obj = Page(**kwargs)
+                sp.on_page_created(obj)
                 yield obj
                 if not lng.suffix:
                     translated_from = obj

lino/modlib/publisher/fixtures/synodalworld.py

@@ -0,0 +1,17 @@
+from lino.api import rt, _
+
+home_children = [
+    (_("Mission"), None, []),
+    (_("Maxim"), None, []),
+    (_("Propaganda"), None, []),
+    (_("About us"), None, [
+        (_("Team"), None, []),
+        (_("History"), None, []),
+        (_("Contact"), None, []),
+        (_("Terms & conditions"), None, []),
+    ]),
+]
+
+
+def objects():
+    return rt.models.publisher.make_demo_pages(home_children)

lino/modlib/publisher/mixins.py

@@ -7,6 +7,7 @@ from lino.utils.html import tostring
 from lino.api import dd, rt, _
 
 from django import http
+from django.db import models
 from django.conf import settings
 from django.utils.translation import get_language
 from lino.core.renderer import add_user_language
@@ -124,6 +125,11 @@ class Publishable(Printable):
     #     # context = dict(obj=self, request=request, language=get_language())
     #     return template.render(**context)
 
+    def home_and_children(self, ar):
+        home = rt.models.publisher.SpecialPages.home.get_object()
+        return home, rt.models.publisher.Page.objects.filter(parent=home)
+        # return dv.model.objects.filter(models.Q(parent=index_node) | models.Q(ref='index'), language=language)
+
     def get_publisher_response(self, ar):
         if not self.is_public():
             return http.HttpResponseNotFound(
@@ -147,6 +153,7 @@ class PublishableContent(Publishable):
     language = dd.LanguageField()
     publishing_state = PublishingStates.field(default="draft")
     filler = PageFillers.field(blank=True, null=True)
+    main_image = dd.ForeignKey('uploads.Upload', blank=True, null=True, verbose_name=_("Main image"))
 
     def get_print_language(self):
         return self.language

lino/modlib/publisher/models.py

@@ -108,6 +108,17 @@ class Page(
     # def as_story_item(self, ar, **kwargs):
     #     return "".join(self.as_page(ar, **kwargs))
 
+    def as_paragraph(self, ar):
+        title = E.b(escape(self.title))
+        url = ar.obj2url(self)
+        if url is not None:
+            title = E.a(title, href=url, style="text-decoration: none; color: black;")
+        body = self.get_body_parsed(ar, short=True)
+        if body:
+            body = " - " + body
+        item = E.li(title, body)
+        return tostring(item)
+
     def toc_html(self, ar, max_depth=1):
         def li(obj):
             # return "<li>{}</li>".format(obj.memo2html(ar, str(obj)))
@@ -134,7 +145,7 @@ class Page(
         else:
             title = "<b>{}</b> — ".format(escape(self.title))
             title += self.get_body_parsed(ar, short=True)
-            title = "<li>{}</i>".format(title)
+            title = "<li>{}</li>".format(title)
         # edit_url = ar.renderer.obj2url(ar, self)
         # url = self.publisher_url(ar)
         # print("20231029", ar.renderer)
@@ -149,6 +160,16 @@ class Page(
 
         # if not self.is_public():
         #     return
+        if hlevel == 1 and self.main_image:
+            yield f"""
+            <div class="row">
+                <div class="center-block">
+                    <a href="#" class="thumbnail">
+                        <img src="{self.main_image.get_media_file().get_image_url()}">
+                    </a>
+                </div>
+            </div>
+            """
 
         if display_mode in ("detail",):
             info = self.get_node_info(ar)

lino/modlib/publisher/ui.py

@@ -131,7 +131,7 @@ class PageDetail(dd.DetailLayout):
     right_panel = """
     ref language
     parent seqno
-    child_node_depth
+    child_node_depth main_image
     #page_type filler
     publishing_state special_page
     publisher.TranslationsByPage
@@ -147,7 +147,7 @@ class Pages(dd.Table):
     ref
     #page_type filler
     """
-    default_display_modes = {None: constants.DISPLAY_MODE_STORY}
+    default_display_modes = {None: constants.DISPLAY_MODE_LIST}
 
 
 class PagesByParent(Pages):

lino/static/bootstrap.css

@@ -1,7 +1,7 @@
 /* styles to be applied after bootstrap css */
 
 .publisher-document {
-	width: 840px;
+	max-width: 840px;
 }
 
 .publisher-toc {

lino/utils/dbfreader.py

@@ -9,9 +9,10 @@ DBF and DBT files when both settings :attr:`use_dbfread
 <lino_xl.lib.tim2lino.Plugin.use_dbf_py>` are `False` (which is default).
 
 Based on original work by Lars Garshol
-http://www.garshol.priv.no/download/software/python/dbfreader.py
+https://www.garshol.priv.no/download/software/python/dbfreader.py
 
-Modified by Luc Saffre to add support for Clipper dialect.
+Modified by Luc Saffre to add support for Clipper dialect. And to work under
+Python 3. And to support char fields longer than 255 characters.
 
 Sources of information:
 
@@ -20,6 +21,7 @@ Sources of information:
 
 `Xbase & dBASE File Format Description by Erik Bachmann
 <https://www.clicketyclick.dk/databases/xbase/format/>`__
+
 """
 
 import datetime
@@ -37,16 +39,11 @@ codepages = {
 
 
 def unpack_long(number):
-    # print(f"20250123 unpack_long {number}")
-    return number[0] + 256 * (
-        number[1] + 256 * (number[2] + 256 * number[3])
-    )
+    return number[0] + 256 * (number[1] + 256 * (number[2] + 256 * number[3]))
 
 
 def unpack_long_rev(number):
-    return number[3] + 256 * (
-        number[2] + 256 * (number[1] + 256 * number[0])
-    )
+    return number[3] + 256 * (number[2] + 256 * (number[1] + 256 * number[0]))
 
 
 def unpack_int(number):
@@ -64,6 +61,7 @@ def hex_analyze(number):
 
 # --- A class for the entire file
 
+
 class DBFFile(object):
     "Represents a single DBF file."
 
@@ -88,7 +86,10 @@ class DBFFile(object):
         day = header[3]
         self.lastUpdate = datetime.date(year, month, day)
         # print(f"20250123 Loading {filename} (last updated {self.lastUpdate})")
+
+        # Number of records in data file:
         self.rec_num = unpack_long(header[4:8])
+        # length of header structure. Stored as binary (little endian), unsigned:
         self.first_rec = unpack_int(header[8:10])
         self.rec_len = unpack_int(header[10:12])
         self.codepage = codepage  # s[header[29]]
@@ -99,13 +100,21 @@ class DBFFile(object):
         while 1:
             ch = infile.read(1)
             # if ch == 0x0D:
-            if ch == b'\r':
+            # if ch == b'\r':
+            if ch == b'\x0D':
                 break
             field = DBFField(ch + infile.read(31), self)
             self.fields[field.name] = field
             self.field_list.append(field)
             # if len(self.field_list) > 20:
             #     sys.exit(1)
+        # print(f"20250423 {self.field_list}")
+        # n = 0
+        # for fld in self.field_list:
+        #     print(f"20250423 {fld.name} {fld.field_type} {
+        #           fld.field_len} {fld.field_places}")
+        #     n += fld.get_len()
+        # print(f"20250423 {n}")
 
         infile.close()
         if self.has_memo():
@@ -155,8 +164,11 @@ class DBFFile(object):
     def get_next_record(self):
         values = {}
         ch = self.infile.read(1)
+        if len(ch) == 0:
+            raise Exception("Unexpected end of file")
         self.recno += 1
-        if ch == 0x1A or len(ch) == 0:
+        # if ch == 0x1A or len(ch) == 0:
+        if ch == b'\x1A':
             return None
         if ch == b"*":
             deleted = True
@@ -170,6 +182,7 @@ class DBFFile(object):
             values[field.get_name()] = field.interpret(data)
         if deleted and not self.deleted:
             return self.get_next_record()
+        # print(f"20250423 found {values}")
         return DBFRecord(self, values, deleted)
 
     def close(self):
@@ -255,11 +268,25 @@ class DBFField(object):
         self.name = buf[:pos].decode()
         # print(f"20250123 field {self.name}")
         self.field_type = chr(buf[11])
-        self.field_pos = unpack_long(buf[12:16])
+        # self.field_pos = unpack_long(buf[12:16])
+        # self.field_pos_raw = buf[12:16]
         self.field_len = buf[16]
-        self.field_places = buf[17]
+        if self.field_type == "C":
+            self.field_places = 0
+            self.field_len += 256 * buf[17]
+            # https://www.clicketyclick.dk/databases/xbase/format/data_types.html
+            # Character fields can be up to 32 KB long (in Clipper and FoxPro)
+            # using decimal count (field_places) as high byte in field length.
+            # It's possible to use up to 64KB long fields by reading length as
+            # unsigned.
+        else:
+            self.field_places = buf[17]
         self.dbf = dbf
 
+    def __repr__(self):
+        return (f"DBFField({self.name}, {self.field_type}, "
+                f"{self.field_len}, {self.field_places})")
+
     # if self.field_type=="M" or self.field_type=="P" or \
     # self.field_type=="G" :
     # self.blockfile=blockfile
@@ -267,8 +294,8 @@ class DBFField(object):
     def get_name(self):
         return self.name
 
-    def get_pos(self):
-        return self.field_pos
+    # def get_pos(self):
+    #     return self.field_pos
 
     def get_type(self):
         return self.field_type
@@ -283,7 +310,7 @@ class DBFField(object):
         # raise Exception("20250123 good")
         # print(f"20250123 interpret {repr(self.field_type)}")
         if self.field_type == "C":
-            if not self.dbf.codepage is None:
+            if self.dbf.codepage is not None:
                 data = data.decode(self.dbf.codepage)
             data = data.strip()
             # ~ if len(data) == 0: return None
@@ -301,6 +328,8 @@ class DBFField(object):
                     # ~ return None
                     return ""
                 raise Exception("bad memo block number %s" % repr(data))
+                # print("20250422 bad memo block number %s" % repr(data))
+                # return ""
             return self.dbf.blockfile.get_block(num)
 
         elif self.field_type == "N":
@@ -316,7 +345,10 @@ class DBFField(object):
             try:
                 return dateparser.parse(data)
             except ValueError as e:
-                raise ValueError("Invalid date value %r (%s)" % (data, e))
+                raise ValueError("Invalid date value %r (%s) in field %s" %
+                                 (data, e, self.name))
+                # print("20250422 Invalid date value %r (%s) in field %s" %
+                #       (data, e, self.name))
             # ~ return data # string "YYYYMMDD", use the time module or mxDateTime
         else:
             raise NotImplementedError("Unknown data type " + self.field_type)
@@ -401,21 +433,21 @@ class DBTFile(object):
 #     primary key
 
 
-class DBFHash(object):
-    def __init__(self, file, key):
-        self.file = DBFFile(file)
-        self.hash = {}
-        self.key = key
-
-        self.file.open()
-        while 1:
-            rec = self.file.get_next_record()
-            if rec is None:
-                break
-            self.hash[rec[self.key]] = rec
-
-    def __getitem__(self, key):
-        return self.hash[key]
+# class DBFHash(object):
+#     def __init__(self, file, key):
+#         self.file = DBFFile(file)
+#         self.hash = {}
+#         self.key = key
+#
+#         self.file.open()
+#         while 1:
+#             rec = self.file.get_next_record()
+#             if rec is None:
+#                 break
+#             self.hash[rec[self.key]] = rec
+#
+#     def __getitem__(self, key):
+#         return self.hash[key]
 
 
 # --- Utility functions

lino/utils/dbhash.py

@@ -14,8 +14,9 @@ from django.conf import settings
 from django.apps import apps
 from django.db.models.deletion import ProtectedError
 
-mod = import_module(settings.SETTINGS_MODULE)
-HASH_FILE = Path(mod.__file__).parent / "dbhash.json"
+# mod = import_module(settings.SETTINGS_MODULE)
+# HASH_FILE = Path(mod.__file__).parent / "dbhash.json"
+HASH_FILE = settings.SITE.site_dir / "dbhash.json"
 
 
 def fmn(m):

{lino-25.4.3.dist-info → lino-25.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.4.3
+Version: 25.4.4
 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

{lino-25.4.3.dist-info → lino-25.4.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lino/.cvsignore,sha256=1vrrWoP-WD8hPfCszHHIiJEi8KUMRCt5WvoKB9TSB1k,28
 lino/SciTEDirectory.properties,sha256=rCYi_e-6h8Yx5DwXhAa6MBPlVINcl6Vv9BQDYZV2_go,28
-lino/__init__.py,sha256=NIz99QDcp3WGCLbrw0KdBjHI4-fjQbLrCUifvYsLnOE,6176
+lino/__init__.py,sha256=UvUTsw4pGmG-8l3eqcbQdedQ1jGLYfZdqOF3no5VCZI,6176
 lino/ad.py,sha256=AQ-vJ4scac1mx3xegXezxnxyOQpV-a0q3VFMJSDbj2s,142
 lino/apps.py,sha256=ECq-dPARDkuhngwNrcipse3b4Irj70HxJs44uWEZFc4,27
 lino/hello.py,sha256=7-PJg7PnEiznyETqGjOwXcKh8rda0qLetpbS2gvRYy0,532
@@ -59,7 +59,7 @@ lino/core/renderer.py,sha256=C00J0L41hLv9b2sAzqSSrT0Lz5Fc78JnwHiq9LqF81c,47310
 lino/core/requests.py,sha256=xIq6kXhjLoYbSkW40_BH-uj0WvmfkvOVLGm2piiGtJo,95835
 lino/core/roles.py,sha256=PXwk436xUupxdbJcygRSYFu7ixfKjAJPQRUQ8sy0lB0,4425
 lino/core/signals.py,sha256=0JT89mkjSbRm57QZcSI9DoThoKUGkyi-egNhuLUKEds,948
-lino/core/site.py,sha256=IBC8XyyUTq7Qt3LSkAidsyPG3sd5eBevBA5abUQgQas,83446
+lino/core/site.py,sha256=WRbYscZ7H8OnYMX0ptxjzNs9R6RvyBUy80f3kETo5Jw,82697
 lino/core/store.py,sha256=6pd4J5Y-U7Muz4mKFSL6K9KEZpJUbpM-I7RQTWyCo-8,51483
 lino/core/tables.py,sha256=Yoj-H2ASW9xIger8kuW8xst5A_tEmtWpV17L11Ebca0,24348
 lino/core/urls.py,sha256=06QlmN1vpxjmb5snO3SPpP6lX1pMdE60bTiBiC77_vQ,2677
@@ -163,7 +163,7 @@ lino/modlib/changes/models.py,sha256=wflXkqKSC-0ZynPGEd6PR4agP6zMuYO6v6v2NcRJgoo
 lino/modlib/changes/utils.py,sha256=4jz8QXgaBxfmCBUvDeZeh7lkdwfTq7OBXBiFhMmANqA,2550
 lino/modlib/checkdata/__init__.py,sha256=raUCoYi4WZLKVLG3GqH0ml1eH_YJXqY-EgXsKUe6iRY,2829
 lino/modlib/checkdata/choicelists.py,sha256=JlBK8VeJK6yAFiqeU1Zx7m2wpDtTpZ1o6YPjnig6g70,5260
-lino/modlib/checkdata/models.py,sha256=MNfvEqwHVw8K9Aoqd2rVvcdRo67vpsCufctj9B6g4qM,13546
+lino/modlib/checkdata/models.py,sha256=csN69hFVkQQcSwxPmY02ofXsWZvA7z2T-N1Pg19t3Wk,13758
 lino/modlib/checkdata/roles.py,sha256=xjQ882-BxYUoHbv2pzebs7MWl6snA2fKivFDTRzW7sQ,295
 lino/modlib/checkdata/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/checkdata/fixtures/checkdata.py,sha256=TY9yIBwB5nEw0e6RTXqRwYdiCaLkkYTwWmFGcVBw2ow,332
@@ -3536,7 +3536,7 @@ lino/modlib/linod/choicelists.py,sha256=Cu82s1QpcGFmKUXJsg-7TSqpaESBCZKOEfxzFlJP
 lino/modlib/linod/consumers.py,sha256=XBjA1fflJ-e9yWRMKXyQAhrOklYzs5JRhEeGMOKWFqM,6730
 lino/modlib/linod/mixins.py,sha256=gZci22_m3GNUNycLSvMelG1sUQLCCho2gniPTegopMs,13027
 lino/modlib/linod/models.py,sha256=yqGytDq7KxkHBCZpwF-7GQdR3nGh6-rBB-gLkvqoouQ,2361
-lino/modlib/linod/routing.py,sha256=FiG0JVqp9TWWkNpl9Y_50UCAJ7ZEImDXkQUhlg4aGL4,2094
+lino/modlib/linod/routing.py,sha256=3pYJT6FbaVMj6rKkDVv3E5VTFFc9nglIDeo6dgAKu8Q,2399
 lino/modlib/linod/utils.py,sha256=dE973Xib6Be1DvNsZ0M5wzY_jpkk35R21WKs-jQPorM,339
 lino/modlib/linod/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/linod/fixtures/linod.py,sha256=qCFU2IktRVEdt1lChwu6kZLLnd4Ppfq_x9_2qGYelTY,1173
@@ -3588,19 +3588,21 @@ lino/modlib/printing/utils.py,sha256=LUO9769wJvHCPZIqeVQ9XAS6UKJ6BfJbiwO8Dt1kHc4
 lino/modlib/printing/config/report/Default.odt,sha256=4X8UD9H_5Th2CELP0C6DTe4g0ZNUPXAg1C00xP3Qluc,10930
 lino/modlib/printing/config/report/Default.wk.html,sha256=4Ssx2LWm1gVpXf0Q4XoSY15WkhqRvx51Upab-IS1nm0,96
 lino/modlib/publisher/__init__.py,sha256=bGQduKmgzr_lU2N6H4q4I5ZmW-3iwdPuT2D8dpiVOiI,2644
-lino/modlib/publisher/choicelists.py,sha256=fxvf0-1Y9YnBXaJVs8ZaNfLLQwyJO4BR3Uz_UeZtM7Q,8066
-lino/modlib/publisher/mixins.py,sha256=eMEZeMQdaEp9tDkA5_YdqFGQec1q7Z1DAJZvU1cmoRM,6229
-lino/modlib/publisher/models.py,sha256=4DbS4-CeMyNnAetEiuWpY9-mrGS0HsXovKiE5DMHOm4,16404
+lino/modlib/publisher/choicelists.py,sha256=gVzjyp1sJ-XewAW-I_bCrKdTLgygLzh1ZwFI1rKyPdo,9070
+lino/modlib/publisher/mixins.py,sha256=yRxAtFSNe9aVvdY-th_a5wmQ76jBfKYWzeNUn-efJMA,6651
+lino/modlib/publisher/models.py,sha256=3g_tPavQ6ZFQsHYkzbBe_LXPeq0TUgsU1JrR6bxuRT0,17149
 lino/modlib/publisher/renderer.py,sha256=9RoyVMQcbwh_GcbDJO8BWhCKe1kpbDc9M45hrMqzpNs,1922
-lino/modlib/publisher/ui.py,sha256=l4QNzMjCdBDaY8qa20S8TWmt9rW_oYR2Qw_HMhSUHtg,4481
+lino/modlib/publisher/ui.py,sha256=qWp3JWhO6zN_HSZvSlolmNTgiZgoJeY2_TIDh9nYf3Q,4491
 lino/modlib/publisher/views.py,sha256=_0ktDagke4TOWVekJOnaRJBrbKqn27Yfz3SC2UnHKTM,2423
 lino/modlib/publisher/config/publisher/base.html,sha256=nrWuN4lhP1O4ORdYTaY3fS2pc90yfUnfDYfm2Jtr7hQ,198
 lino/modlib/publisher/config/publisher/default_list.pub.html,sha256=3ePc4U3xZxE-pqtzlnB9CRQWu8OQrtfXKEjyuc8BBUQ,578
 lino/modlib/publisher/config/publisher/item.pub.html,sha256=973RYgCAYG1SYIB4bwfVZFVTUo0WD2I98PsoPgjQ8XA,154
 lino/modlib/publisher/config/publisher/login.html,sha256=_j_MmwVv_UohMnEDADo99XQmUqGvOWTlCDPW1oaSWpo,495
-lino/modlib/publisher/config/publisher/page.pub.html,sha256=Oxo9FD968sNRgY4GZulRMBZ4A2LHj2oVoWBVNxS7imE,1279
+lino/modlib/publisher/config/publisher/page.pub.html,sha256=jnWP-uhhJZ0fjNHJ1Fo-0AIsiOFopzesOdyVtuSuM_w,2264
 lino/modlib/publisher/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lino/modlib/publisher/fixtures/std.py,sha256=PtFH0JoN5rCGHCzFTYeyX9bBidD3cLdkXPygCrUGdwU,945
+lino/modlib/publisher/fixtures/demo2.py,sha256=KrF672tNLlhMX6EkxKDfcvvE9pGH4k9NgF7Rk5DkiLg,366
+lino/modlib/publisher/fixtures/std.py,sha256=7xpMOr4kd-4SX8uhwxagktUlcXAr6fdZfD-H519CR6g,987
+lino/modlib/publisher/fixtures/synodalworld.py,sha256=aoHrQOu7qPWsPWbvEOfoVMdWQPFYBM85EUmJgcbS0tI,398
 lino/modlib/restful/__init__.py,sha256=9CqWTQkJ2KpLW5MI1bKqKZU_7nXxodxl7HSgc8Agwmw,1506
 lino/modlib/restful/fields.py,sha256=8dik0q2LaCtJhQX1lu-fe-y_38xdhAWy1ZX3EKmJWfs,567
 lino/modlib/restful/serializers.py,sha256=AVyA19UkRUJ9AjlUN0fJyrj1LgfOyp-a2ANcVkecWtA,1143
@@ -4491,7 +4493,7 @@ lino/sphinxcontrib/logo/templates/links.html,sha256=SccaqiI_Fg4lYT_nxDWfGZXLLD8F
 lino/sphinxcontrib/logo/templates/part-of-synodalsoft.html,sha256=tHh0SfRoIqpoxkA5ZA5_Obc_9Bs5Uh4d3qUSC3oprdw,1427
 lino/sphinxcontrib/logo/templates/unused_copyright.html,sha256=ct3QmWrUk0IS6hvr_XH5fMbseTH7CTzKhRH1UOUTWG8,205
 lino/static/blueprint.css,sha256=meK9oC38foNI4x_YuylIU9TJdGiZi4HM4PFAWpjoiiw,131
-lino/static/bootstrap.css,sha256=-8bGCqxOzajs3T4lvqWjTUGvvQ1uwVH886fr4cIKPs4,1156
+lino/static/bootstrap.css,sha256=_fWS3mQj4XzXZVo5KGhZe31uHWjJqXHIck5gRv7AZLY,1160
 lino/static/contacts.Person.jpg,sha256=rNjIfwxfjh0kgrQBeNWyJvBdr5j2y6fo9_VwHU9JNAE,31796
 lino/static/favicon1.ico,sha256=0dr7FW9j_qWDl_z5kKtNhWELExVUblctxH0bfaVoNo0,2238
 lino/static/favicon2.ico,sha256=gtVZpKmRoZqWCgP6GgJkviX1FwPocx8K1P5fTGFOPo0,3906
@@ -4587,8 +4589,8 @@ lino/utils/cycler.py,sha256=2LGMhMJX5At5ln4yZvmNleWROs-CA_YE_UCzxzvxK4U,1548
 lino/utils/daemoncommand.py,sha256=NjGShiz09fddIV0WU0jK2nzO_CwPj1MfdmgwAOYZi4M,11525
 lino/utils/dataserializer.py,sha256=-_xHXaGwDSO6-sYEHEa2BtEmKS8bW6gsYx4dV-GbvDs,3779
 lino/utils/dates.py,sha256=eWF5WxA5uJf51Y9PKvDVBWD8yIf6yBF6oO6TeU3ujzw,1030
-lino/utils/dbfreader.py,sha256=4sXOGBKX6DFQCEPkCMfnJAVneHMyDzJQB5tsYAq90vQ,12205
-lino/utils/dbhash.py,sha256=S2jCCYUItovF8Qkc2kVk5WS14U1c3RjijkUGqYs20_c,3450
+lino/utils/dbfreader.py,sha256=KrGsBAFV2tF9pAd9jsmBAFpZ-yw-CRymZHEn_q9IL90,13784
+lino/utils/dbhash.py,sha256=TMnUGhOFbaip6L2Y4ENhCOS79ujJiO0CyYcOCZyHiK4,3505
 lino/utils/dblogger.py,sha256=kr0YxQY6veymvNg5A4tsvkqW8haRWdwqL0C-_9_QTg0,721
 lino/utils/diag.py,sha256=8BGsPrLd1_Fympy3PKiTpX1MdMWGApXr6IBoVOkWRxE,18314
 lino/utils/djangotest.py,sha256=Phz1qNp0wDonZRja5dxbCk0Xl3a73gZNiKK8v9tAgZg,8334
@@ -4632,8 +4634,8 @@ lino/utils/xml.py,sha256=EGDnO1UaREst9fS7KTESdbHnrrVCwKbRQdvut6B6GmQ,1612
 lino/utils/mldbc/__init__.py,sha256=QqWRlzeXaOmFfbCk-vTY3SZMn1-FCf67XnpZdd_Nim0,1134
 lino/utils/mldbc/fields.py,sha256=tAX8G5UKigr9c6g0F3ARIjZZtg406mdaZ--PWSbiH9E,2873
 lino/utils/mldbc/mixins.py,sha256=CkYe5jDa7xp9fJq_V8zcZf8ocxgIjUgHc9KZccvA_Yw,1945
-lino-25.4.3.dist-info/METADATA,sha256=qsQfxaXAH1QDVcf9nmSab5NgN8yYfHHpyUz8BqGt12E,42534
-lino-25.4.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lino-25.4.3.dist-info/licenses/AUTHORS.rst,sha256=8VEm_G4HOmYEa4oi1nVoKKsdo4JanekEJCefWd2E8vk,981
-lino-25.4.3.dist-info/licenses/COPYING,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-lino-25.4.3.dist-info/RECORD,,
+lino-25.4.4.dist-info/METADATA,sha256=PnRkn-GRvLWsBi5pyAO6iggfwDKypr8ZWdiuhYqRN0Y,42534
+lino-25.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lino-25.4.4.dist-info/licenses/AUTHORS.rst,sha256=8VEm_G4HOmYEa4oi1nVoKKsdo4JanekEJCefWd2E8vk,981
+lino-25.4.4.dist-info/licenses/COPYING,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+lino-25.4.4.dist-info/RECORD,,