feat: srb settings (#532)

Author: sergeikobelev

changelog.md

@@ -3,6 +3,7 @@
 ## next
 
 ### Improvements
++ Generation of SRB file (SFR results board) on saving
 + New field - middle name (new Russian requirements)
 + Import of full date of birth
 + Optional build on Pyside2 (Qt5) / Pyside6 (Qt6)

changelog_ru.md

@@ -3,6 +3,7 @@
 ## next
 
 ### Добавление
++ Генерация файла SRB (SFR results board) при сохранении
 + Новое поле - отчество участника (по новым требованиям ЕВСК), также его обработка при импорте и экспорте
 + Дополнительный импорт/экспорт полной даты рождения, а не только года рождения
 + Вариативная сборка на Pyside2 (Qt5) / Pyside6 (Qt6)

languages/ru_RU/LC_MESSAGES/sportorg.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: SportOrg\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-04-12 11:13+0300\n"
-"PO-Revision-Date: 2025-05-13 15:25+0500\n"
+"PO-Revision-Date: 2025-11-09 23:27+0500\n"
 "Last-Translator: SportOrg\n"
 "Language-Team: SportOrg\n"
 "Language: ru_RU\n"
@@ -1763,4 +1763,7 @@ msgid "in list"
 msgstr "в списке"
 
 msgid "Gzip compression"
-msgstr "Сжатие gzip"
+msgstr "Сжатие gzip"
+
+msgid "Generate SRB file (SFR results board)"
+msgstr "Генерация файла SRB (SFR results board) при сохранении"

sportorg/gui/dialogs/settings.py

@@ -95,8 +95,16 @@ def __init__(self, parent):
 
         self.item_save_in_gzip = QCheckBox(translate("Compress files to gzip"))
         self.item_save_in_gzip.setChecked(settings.SETTINGS.file_save_in_gzip)
+
         self.layout.addRow(self.item_save_in_gzip)
 
+        self.item_generate_srb = QCheckBox(
+            translate("Generate SRB file (SFR results board)")
+        )
+        self.item_generate_srb.setChecked(settings.SETTINGS.file_generate_srb)
+
+        self.layout.addRow(self.item_generate_srb)
+
     def save(self):
         old_window_show_toolbar = settings.SETTINGS.window_show_toolbar
         settings.SETTINGS.locale = self.item_lang.currentText()
@@ -107,6 +115,7 @@ def save(self):
         settings.SETTINGS.app_check_updates = self.item_check_updates.isChecked()
         settings.SETTINGS.file_save_in_utf8 = self.item_save_in_utf8.isChecked()
         settings.SETTINGS.file_save_in_gzip = self.item_save_in_gzip.isChecked()
+        settings.SETTINGS.file_generate_srb = self.item_generate_srb.isChecked()
 
         if old_window_show_toolbar != self.item_show_toolbar.isChecked():
             if self.item_show_toolbar.isChecked():

sportorg/gui/main.py

@@ -91,6 +91,9 @@ def load_settings():
             settings.SETTINGS.file_save_in_gzip = Config().configuration.get(
                 "save_in_gzip", True
             )
+            settings.SETTINGS.file_generate_srb = Config().configuration.get(
+                "generate_srb", True
+            )
             settings.SETTINGS.file_open_recent_file = Config().configuration.get(
                 "open_recent_file", True
             )

sportorg/modules/backup/file.py

@@ -5,8 +5,7 @@
 from boltons.fileutils import atomic_rename
 
 from sportorg import settings
-
-from . import json
+from . import json, sfr_results_board
 
 logger = logging.getLogger(__name__)
 
@@ -69,6 +68,13 @@ def save(self) -> None:
         )
         atomic_rename(self._file_name + ".tmp", self._file_name, overwrite=True)
 
+        if settings.SETTINGS.file_generate_srb:
+            self._backup(
+                self._file_name + ".srb",
+                sfr_results_board.dump,
+                "w",
+            )
+
     def open(self) -> None:
         logger.info("Open " + self._file_name)
         self._backup(

sportorg/modules/backup/sfr_results_board.py

@@ -0,0 +1,72 @@
+import os
+
+from sportorg.models.memory import race
+
+
+def dump(file, *, compress=False):
+    r = race()
+    sep = "\t"
+
+    is_rogaine = r.get_setting("result_processing_mode", "time") == "scores"
+    is_ardf = r.get_setting("result_processing_mode", "time") == "ardf"
+    is_relay = r.is_relay()
+
+    for result in r.results:
+        if result.person:
+            line = get_srb_line_for_result(result, sep, is_rogaine, is_ardf, is_relay)
+            if compress:
+                file.write(bytes(line, "utf-8"))
+            else:
+                file.write(line)
+    file.flush()
+    os.fsync(file.fileno())
+
+
+def get_srb_line_for_result(result, sep, is_rogaine, is_ardf, is_relay) -> str:
+    person = result.person
+    if person:
+        uid = str(person.bib)
+        group = ""
+        if person.group:
+            group = person.group.name
+
+        scores_for_sort = 99999
+        if is_rogaine:
+            scores_for_sort -= result.rogaine_score
+        elif is_ardf:
+            scores_for_sort -= result.scores_ardf
+        leg_for_sort = 0
+        if is_relay:
+            leg_for_sort = int(person.bib) // 1000
+        sort = (
+            ("0" + str(leg_for_sort))[-2:] + str(scores_for_sort) + result.get_result()
+        )
+
+        place = "1"
+        if not result.is_status_ok():
+            place = "0"
+        if person.is_out_of_competition:
+            place = "0"
+        res = result.get_result()
+        name = person.full_name
+        team = ""
+        if person.organization:
+            team = person.organization.name
+        line = (
+            uid
+            + sep
+            + group
+            + sep
+            + sort
+            + sep
+            + place
+            + sep
+            + name
+            + sep
+            + team
+            + sep
+            + res
+            + "\n"
+        )
+        return line
+    return ""

sportorg/settings.py

@@ -22,6 +22,7 @@ class Settings:
     file_autosave_interval: int = 300
     file_save_in_utf8: bool = False
     file_save_in_gzip: bool = True
+    file_generate_srb: bool = False
     file_open_recent_file: bool = False
     file_recent: str = ""
     printer_main: str = ""

tests/test_srb_generation.py

@@ -0,0 +1,64 @@
+from sportorg.common.otime import OTime
+from sportorg.language import translate
+from sportorg.models.memory import (
+    ResultSportident,
+    Person,
+    ResultStatus,
+    Organization,
+    Group,
+    race,
+)
+from sportorg.modules.backup.sfr_results_board import get_srb_line_for_result
+
+
+def test_srb_generation():
+    res = ResultSportident()
+    res.place = 12
+    res.finish_time = OTime(hour=12, minute=58, sec=59)
+
+    person = Person()
+    person.name = "Sergei"
+    person.surname = "Petrov"
+    person.set_bib(2023)
+    res.person = person
+
+    group = Group()
+    group.name = "ME"
+    person.group = group
+
+    team = Organization()
+    team.name = "SKI Team"
+    person.organization = team
+
+    line = get_srb_line_for_result(res, "\t", False, False, False)
+    assert line == "2023\tME\t009999912:58:59\t1\tPetrov Sergei\tSKI Team\t12:58:59\n"
+
+    res.rogaine_score = 300
+    race().set_setting("result_processing_mode", "scores")
+    line = get_srb_line_for_result(res, "\t", True, False, False)
+    assert (
+        line
+        == f"2023\tME\t0099699300 {translate('points')} 12:58:59\t1\tPetrov Sergei\tSKI Team\t300 {translate('points')} 12:58:59\n"
+    )
+
+    res.scores_ardf = 500
+    race().set_setting("result_processing_mode", "ardf")
+    line = get_srb_line_for_result(res, "\t", False, True, False)
+    assert (
+        line
+        == f"2023\tME\t0099499500 {translate('points')} 12:58:59\t1\tPetrov Sergei\tSKI Team\t500 {translate('points')} 12:58:59\n"
+    )
+
+    race().set_setting("result_processing_mode", "time")
+    line = get_srb_line_for_result(res, "\t", False, False, True)
+    assert line == "2023\tME\t029999912:58:59\t1\tPetrov Sergei\tSKI Team\t12:58:59\n"
+
+    person.is_out_of_competition = True
+    line = get_srb_line_for_result(res, "\t", False, False, False)
+    assert line == "2023\tME\t009999912:58:59\t0\tPetrov Sergei\tSKI Team\t12:58:59\n"
+
+    person.is_out_of_competition = False
+    res.status = ResultStatus.MISSING_PUNCH
+    res.status_comment = "DSQ"
+    line = get_srb_line_for_result(res, "\t", False, False, False)
+    assert line == "2023\tME\t0099999DSQ\t0\tPetrov Sergei\tSKI Team\tDSQ\n"