SoL 5.0.dev5__tar.gz → 5.0.dev6__tar.gz

{sol-5.0.dev5 → sol-5.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SoL
-Version: 5.0.dev5
+Version: 5.0.dev6
 Summary: Carrom tournaments management
 Keywords: web,wsgi,pyramid,carrom,tournaments,swiss system,knockout system,round-robin system
 Author-Email: Lele Gaifax <lele@metapensiero.it>

{sol-5.0.dev5 → sol-5.0.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "SoL"
-version = "5.0.dev5"
+version = "5.0.dev6"
 description = "Carrom tournaments management"
 authors = [
     { name = "Lele Gaifax", email = "lele@metapensiero.it" },
@@ -106,7 +106,7 @@ requires = [
 build-backend = "pdm.backend"
 
 [tool.bumpversion]
-current_version = "5.0.dev5"
+current_version = "5.0.dev6"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)(?:\\.(?P<pre_label>[a-zA-Z-]+)(?P<pre_number>0|[1-9]\\d*))?"
 serialize = [
     "{major}.{minor}.{pre_label}{pre_number}",
@@ -212,3 +212,16 @@ reportUnknownVariableType = false
 reportUnnecessaryComparison = false
 reportUntypedFunctionDecorator = false
 reportUnusedCallResult = false
+
+[tool.ruff]
+src = [
+    "src",
+]
+
+[tool.ruff.format]
+quote-style = "single"
+
+[tool.ruff.lint.isort]
+case-sensitive = true
+force-single-line = true
+order-by-type = false

{sol-5.0.dev5 → sol-5.0.dev6}/src/sol/__init__.py

@@ -61,27 +61,29 @@ This application implements the following features:
 * browseable history thru a light HTML readonly interface
 """
 
+from __future__ import annotations
+
 # This is injected automatically at release time
-__exact_version__ = 'v5.0.dev5'
+__exact_version__ = 'v5.0.dev6'
 
 import logging
 from os import makedirs
-from os.path import dirname, exists, join
+from os.path import dirname
+from os.path import exists
+from os.path import join
 
+import zope.sqlalchemy
 from metapensiero.extjs.desktop.pyramid import configure
-
 from pyramid.config import Configurator
 from pyramid.csrf import SessionCSRFStoragePolicy
 from pyramid.response import FileResponse
-from pyramid.session import JSONSerializer, SignedCookieSessionFactory
-
+from pyramid.session import SignedCookieSessionFactory
 from sqlalchemy import engine_from_config
 from sqlalchemy.orm import sessionmaker
-import zope.sqlalchemy
+from webob.cookies import JSONSerializer
 
 from .i18n import locale_negotiator
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -106,7 +108,7 @@ class OnlyForTestingPredicate:
         self.val = val
 
     def text(self):
-        return "only_for_testing = %r" % (self.val,)
+        return 'only_for_testing = %r' % (self.val,)
 
     phash = text
 
@@ -130,24 +132,29 @@ def main(global_config, **settings):
     if bckdir and bckdir != 'None' and not exists(bckdir):  # pragma: nocover
         makedirs(bckdir, mode=0o700)
 
-    timeout = settings.get('session.timeout', 24*60*60)
+    timeout = settings.get('session.timeout', 24 * 60 * 60)
     if timeout == 'None':  # pragma: no cover
         timeout = None
     else:
         timeout = int(timeout)
 
-    reissue_time = settings.get('session.reissue_time', 24*60*60)
+    reissue_time = settings.get('session.reissue_time', 24 * 60 * 60)
     if reissue_time == 'None':  # pragma: no cover
         reissue_time = None
     else:
         reissue_time = int(reissue_time)
 
-    session_factory = SignedCookieSessionFactory(settings['session.secret'],
-                                                 timeout=timeout,
-                                                 reissue_time=reissue_time,
-                                                 serializer=JSONSerializer())
-    config = Configurator(settings=settings, session_factory=session_factory,
-                          locale_negotiator=locale_negotiator)
+    session_factory = SignedCookieSessionFactory(
+        settings['session.secret'],
+        timeout=timeout,
+        reissue_time=reissue_time,
+        serializer=JSONSerializer(),
+    )
+    config = Configurator(
+        settings=settings,
+        session_factory=session_factory,
+        locale_negotiator=locale_negotiator,
+    )
 
     config.set_csrf_storage_policy(SessionCSRFStoragePolicy())
 
@@ -160,7 +167,7 @@ def main(global_config, **settings):
 
     config.add_translation_dirs('sol:locale/')
 
-    config.add_static_view('static', 'static', cache_max_age=12*60*60)
+    config.add_static_view('static', 'static', cache_max_age=12 * 60 * 60)
 
     config.add_route('favicon', '/favicon.ico')
     config.add_view(favicon_view, route_name='favicon')
@@ -208,9 +215,9 @@ def main(global_config, **settings):
     # tourney
 
     config.add_route('assign_prizes', '/tourney/assignPrizes')
-    config.add_route('boards', '/tourney/boards')
     config.add_route('competitors', '/tourney/competitors')
     config.add_route('countdown', '/tourney/countdown')
+    config.add_route('current_matches', '/tourney/current_matches')
     config.add_route('delete_from_turn', '/tourney/deleteFromTurn')
     config.add_route('final_turn', '/tourney/finalTurn')
     config.add_route('matches', '/tourney/matches')
@@ -224,13 +231,23 @@ def main(global_config, **settings):
     config.add_route('tourney_players', '/tourney/players')
     config.add_route('update_ranking', '/tourney/updateRanking')
     config.add_route('get_board_self_edit_url', '/tourney/getBoardSelfEditURL')
-    config.add_route('get_competitor1_self_edit_url', '/tourney/getCompetitor1SelfEditURL')
-    config.add_route('get_competitor2_self_edit_url', '/tourney/getCompetitor2SelfEditURL')
-
-    config.add_route('test_create_random_finals', '/tourney/createRandomFinals',
-                     only_for_testing=True)
-    config.add_route('test_create_random_scores', '/tourney/createRandomScores',
-                     only_for_testing=True)
+    config.add_route(
+        'get_competitor1_self_edit_url', '/tourney/getCompetitor1SelfEditURL'
+    )
+    config.add_route(
+        'get_competitor2_self_edit_url', '/tourney/getCompetitor2SelfEditURL'
+    )
+
+    config.add_route(
+        'test_create_random_finals',
+        '/tourney/createRandomFinals',
+        only_for_testing=True,
+    )
+    config.add_route(
+        'test_create_random_scores',
+        '/tourney/createRandomScores',
+        only_for_testing=True,
+    )
 
     # lit
 
@@ -292,6 +309,7 @@ def main(global_config, **settings):
         # r.tm is the transaction manager used by pyramid_tm
         lambda r: get_tm_session(r.tm),
         'dbsession',
-        reify=True)
+        reify=True,
+    )
 
     return config.make_wsgi_app()

{sol-5.0.dev5 → sol-5.0.dev6}/src/sol/i18n.py

@@ -6,19 +6,24 @@
 # :Copyright: © 2013, 2014, 2018, 2020, 2022, 2023, 2024 Lele Gaifax
 #
 
+from __future__ import annotations
+
 from gettext import translation
 from string import Template
 
-from pycountry import LOCALES_DIR, countries, languages
-from pyramid.i18n import TranslationStringFactory
-from pyramid.threadlocal import get_current_registry, get_current_request
-
+from pycountry import LOCALES_DIR
+from pycountry import countries
+from pycountry import languages
+from pyramid.threadlocal import get_current_registry
+from pyramid.threadlocal import get_current_request
+from translationstring import TranslationStringFactory
 
 DOMAIN = 'sol-server'
-"The translation domain of the server side"
+'The translation domain of the server side'
+
 
 translatable_string = TranslationStringFactory(DOMAIN)
-"A function to make a translatable string."
+'A function to make a translatable string.'
 
 
 available_languages = []
@@ -67,10 +72,12 @@ def translator(request):
     """
 
     if request is not None:
+
         def wrapper(*args, **kw):
             if 'domain' not in kw:
                 kw['domain'] = DOMAIN
             return request.localizer.translate(*args, **kw)
+
         return wrapper
     else:
         return lambda s, **kw: Template(s).substitute(**kw.get('mapping', {}))
@@ -138,7 +145,7 @@ def country_name(code, request=None):
     try:
         t = translation('iso3166-1', LOCALES_DIR, languages=[lname])
     except FileNotFoundError:
-        gettext = lambda x: x        # noqa
+        gettext = lambda x: x  # noqa
     else:
         gettext = t.gettext
 
@@ -167,7 +174,7 @@ def countries_names(request=None):
     try:
         t = translation('iso3166-1', LOCALES_DIR, languages=[lname])
     except FileNotFoundError:  # pragma: nocover
-        gettext = lambda x: x        # noqa
+        gettext = lambda x: x  # noqa
     else:
         gettext = t.gettext
 
@@ -177,8 +184,8 @@ def countries_names(request=None):
     # official ISO code...
     t = translator(request)
     _ = translatable_string
-    result.append(dict(code="eur", name=t(_('Europe'))))
-    result.append(dict(code="wrl", name=t(_('World'))))
+    result.append(dict(code='eur', name=t(_('Europe'))))
+    result.append(dict(code='wrl', name=t(_('World'))))
     return result
 
 
@@ -201,8 +208,10 @@ def language_name(code, request=None):
                 ct = translation('iso3166-1', LOCALES_DIR, languages=[lname]).gettext
             except FileNotFoundError:  # pragma: nocover
                 ct = lambda x: x  # noqa
-            return '%s (%s)' % (lt(languages.get(alpha_2=lcode).name),
-                                ct(countries.get(alpha_2=ccode).name))
+            return '%s (%s)' % (
+                lt(languages.get(alpha_2=lcode).name),
+                ct(countries.get(alpha_2=ccode).name),
+            )
         else:
             return lt(languages.get(alpha_2=code).name)
 
@@ -230,7 +239,65 @@ def languages_names(request=None):
             result.append(dict(code=code, name=lt(languages.get(alpha_2=code).name)))
         else:
             lcode, ccode = code.split('_')
-            result.append(dict(code=code,
-                               name='%s (%s)' % (lt(languages.get(alpha_2=lcode).name),
-                                                 ct(countries.get(alpha_2=ccode).name))))
+            result.append(
+                dict(
+                    code=code,
+                    name='%s (%s)'
+                    % (
+                        lt(languages.get(alpha_2=lcode).name),
+                        ct(countries.get(alpha_2=ccode).name),
+                    ),
+                )
+            )
     return result
+
+
+_ = translatable_string
+
+_ORDINALS = (
+    None,
+    _('the first'),
+    _('the second'),
+    _('the third'),
+    _('the fourth'),
+    _('the fifth'),
+    _('the sixth'),
+    _('the seventh'),
+    _('the eighth'),
+    _('the ninth'),
+    _('the tenth'),
+    _('the eleventh'),
+    _('the twelfth'),
+    _('the thirteenth'),
+    _('the fourteenth'),
+    _('the fifteenth'),
+    _('the sixteenth'),
+)
+
+_ORDINALPS = (
+    None,
+    _('of the first'),
+    _('of the second'),
+    _('of the third'),
+    _('of the fourth'),
+    _('of the fifth'),
+    _('of the sixth'),
+    _('of the seventh'),
+    _('of the eighth'),
+    _('of the ninth'),
+    _('of the tenth'),
+    _('of the eleventh'),
+    _('of the twelfth'),
+    _('of the thirteenth'),
+    _('of the fourteenth'),
+    _('of the fifteenth'),
+    _('of the sixteenth'),
+)
+
+
+def ordinal(num):
+    return gettext(_ORDINALS[num]) if 0 < num < len(_ORDINALS) else str(num)
+
+
+def ordinalp(num):
+    return gettext(_ORDINALPS[num]) if 0 < num < len(_ORDINALPS) else str(num)

{sol-5.0.dev5 → sol-5.0.dev6}/src/sol/locale/en_GB/LC_MESSAGES/sol-client.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SoL 5.0.dev5\n"
+"Project-Id-Version: SoL 5.0.dev6\n"
 "Report-Msgid-Bugs-To: lele@metapensiero.it\n"
-"POT-Creation-Date: 2024-05-29 13:54+0200\n"
+"POT-Creation-Date: 2024-07-02 19:04+0200\n"
 "PO-Revision-Date: 2024-05-29 13:55+0200\n"
 "Last-Translator: Lele Gaifax <lele@metapensiero.it>\n"
 "Language-Team: en-GB <lele@metapensiero.it>\n"
@@ -359,7 +359,7 @@ msgstr "Carrom playing rules."
 msgid "Carrom tournaments management"
 msgstr "Carrom tournaments management"
 
-#: src/sol/static/app/view/Boards.js:224
+#: src/sol/static/app/view/Tables.js:224
 msgid "Carromboard #{0}"
 msgstr "Carromboard #{0}"
 
@@ -553,7 +553,7 @@ msgstr "Create next round."
 msgid "Creating knockout tourney…"
 msgstr "Creating knockout tourney…"
 
-#: src/sol/static/app/view/Boards.js:143
+#: src/sol/static/app/view/Tables.js:143
 msgid "Current round pairings"
 msgstr "Current round pairings"
 
@@ -1024,7 +1024,7 @@ msgstr "Old password"
 msgid "Only image files allowed"
 msgstr "Only image files allowed"
 
-#: src/sol/static/app/view/Boards.js:66
+#: src/sol/static/app/view/Tables.js:66
 msgid "Only new round pairings can be manually adjusted."
 msgstr "Only new round pairings can be manually adjusted."