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

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

@@ -6,6 +6,12 @@
     {% if isinstance(obj, rt.models.publisher.Page) -%}
     {{obj.get_prev_link(ar)}} | {{obj.get_next_link(ar)}} |
     {% endif -%}
+    {% if dd.is_installed('react') %}
+        {% set ar_react = obj.get_default_table().request(parent=ar, permalink_uris=True, renderer=dd.plugins.react.renderer) %}
+        {% if ar_react.obj2url(obj) %}
+        {{ tostring(ar_react.obj2html(obj, text='Edit')) }} |
+        {% endif %}
+    {% endif %}
     {% if ar.request and ar.request.path != '/' -%}
         <a href="{{ar.get_home_url()}}">{{_("Home")}}</a>
     {% else -%}
@@ -32,6 +38,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,30 @@
+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():
+    image = rt.models.uploads.Upload.objects.first()
+    print('='*80)
+    print(image)
+    def iterate(iterable):
+        try:
+            for obj in iterable:
+                yield iterate(obj)
+        except TypeError:
+            if (obj := iterable).title == 'Mission':
+                obj.main_image = image
+            yield obj
+    for obj in rt.models.publisher.make_demo_pages(home_children):
+        yield iterate(obj)
+

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

@@ -9,10 +9,13 @@ from django.conf import settings
 from django.utils import translation
 from django.utils.translation import pgettext_lazy
 
-from lorem import get_paragraph
 from django.utils import translation
 from django.conf import settings
 
+try:
+    from lorem import get_paragraph
+except ImportError:
+    lorem = None
 
 # from django.utils.translation import get_language
 from django.utils.html import mark_safe
@@ -108,6 +111,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 +148,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)
@@ -161,9 +175,20 @@ class Page(
 
         # if display_mode in ("detail", "story"):
         if display_mode == "detail":
-            if hlevel == 1 and not dd.plugins.memo.use_markup:
+            if hlevel == 1 and not dd.plugins.memo.use_markup and self.ref != 'index':
                 yield self.toc_html(ar)
 
+            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>
+                """
+
             # yield self.body_full_preview
             yield self.get_body_parsed(ar, short=False)
 

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/__init__.py

@@ -63,7 +63,6 @@ import traceback
 from dateutil.relativedelta import relativedelta
 import re
 from decimal import Decimal
-from collections import OrderedDict
 from urllib.parse import urlencode
 
 # import locale
@@ -76,6 +75,7 @@ from etgen.utils import join_elems
 
 from lino.utils.cycler import Cycler
 from lino.utils.code import codefiles, codetime
+from .sums import SumCollector
 
 from rstgen.utils import confirm, i2d, i2t
 
@@ -609,61 +609,6 @@ def puts(s):
     print(s)
 
 
-class SumCollector(object):
-    """A dictionary of sums to be collected using an arbitrary key.
-
-    This is also included in the default context used by the Jinja
-    renderer (:mod:`lino.modlib.jinja`) when rendering templates,
-    which makes it a more complete solution for a problem asked also
-    elsewhere, e.g. on `Stackoverflow
-    <https://stackoverflow.com/questions/7537439/how-to-increment-a-variable-on-a-for-loop-in-jinja-template>`__.
-
-    See examples in :doc:`/topics/utils`.
-
-    """
-
-    def __init__(self):
-        self._sums = OrderedDict()
-
-    def collect(self, k, value):
-        """Add the given value to the sum at the given key k."""
-        if value is None:
-            return
-        if k in self._sums:
-            # print("20230614 a", k, "=", self._sums[k], "+", value)
-            self._sums[k] += value
-        else:
-            # print("20230614 b", k, "=", value)
-            self._sums[k] = value
-
-    def __getattr__(self, k):
-        return self._sums.get(k)
-
-    def __getitem__(self, k):
-        return self._sums.get(k)
-
-    def total(self):
-        return sum(self._sums.values())
-
-    def items(self, *args, **kwargs):
-        return self._sums.items(*args, **kwargs)
-
-    def keys(self, *args, **kwargs):
-        return self._sums.keys(*args, **kwargs)
-
-    def values(self, *args, **kwargs):
-        return self._sums.values(*args, **kwargs)
-
-    def __len__(self):
-        return self._sums.__len__()
-
-    def __str__(self):
-        return str(self._sums)
-
-    def __repr__(self):
-        return repr(self._sums)
-
-
 class SimpleSingleton(object):
     _instance = None
 

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/utils/sums.py

@@ -0,0 +1,75 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2012-2025 Rumma & Ko Ltd
+# License: GNU Affero General Public License v3 (see file COPYING for details)
+# Documentation: https://dev.lino-framework.org/plugins/accounting.html
+
+from collections import OrderedDict
+from decimal import Decimal, ROUND_HALF_UP
+
+ZERO = Decimal(0)
+CENT = Decimal('.01')
+HUNDRED = Decimal('100.00')
+ONE = Decimal('1.00')
+MAX_AMOUNT = Decimal("9999999.00")
+
+
+def myround(d):
+    return d.quantize(CENT, rounding=ROUND_HALF_UP)
+
+
+class SumCollector:
+    """A dictionary of sums to be collected using an arbitrary key.
+
+    This is also included in the default context used by the Jinja
+    renderer (:mod:`lino.modlib.jinja`) when rendering templates,
+    which makes it a more complete solution for a problem asked also
+    elsewhere, e.g. on `Stackoverflow
+    <https://stackoverflow.com/questions/7537439/how-to-increment-a-variable-on-a-for-loop-in-jinja-template>`__.
+
+    See examples in :doc:`/topics/utils`.
+
+    """
+
+    def __init__(self):
+        self._sums = OrderedDict()
+
+    def collect(self, k, value):
+        """Add the given value to the sum at the given key k."""
+        if value is None:
+            return
+        if k in self._sums:
+            # print("20230614 a", k, "=", self._sums[k], "+", value)
+            self._sums[k] += value
+        else:
+            # print("20230614 b", k, "=", value)
+            self._sums[k] = value
+
+    def myround(self):
+        self._sums = {k: myround(v) for k, v in self._sums.items()}
+
+    def __getattr__(self, k):
+        return self._sums.get(k)
+
+    def __getitem__(self, k):
+        return self._sums.get(k)
+
+    def total(self):
+        return sum(self._sums.values())
+
+    def items(self, *args, **kwargs):
+        return self._sums.items(*args, **kwargs)
+
+    def keys(self, *args, **kwargs):
+        return self._sums.keys(*args, **kwargs)
+
+    def values(self, *args, **kwargs):
+        return self._sums.values(*args, **kwargs)
+
+    def __len__(self):
+        return self._sums.__len__()
+
+    def __str__(self):
+        return str(self._sums)
+
+    def __repr__(self):
+        return repr(self._sums)