chgksuite 0.25.0b4__py3-none-any.whl → 0.26.0__py3-none-any.whl

chgksuite/cli.py

@@ -12,6 +12,8 @@ from chgksuite.common import (
     load_settings,
 )
 from chgksuite.composer import gui_compose
+from chgksuite.handouter.runner import gui_handouter
+from chgksuite.handouter.tex_internals import GREYTEXT_LANGS
 from chgksuite.parser import gui_parse
 from chgksuite.trello import gui_trello
 from chgksuite.version import __version__
@@ -70,37 +72,6 @@ class ArgparseBuilder:
             advanced=True,
             argtype="filename",
         )
-        self.add_argument(
-            parser,
-            "--add_ts",
-            "-ts",
-            choices=["on", "off"],
-            default=default_overrides.get("add_ts") or "off",
-            help="append timestamp to filenames",
-            caption="Добавить временную отметку в имя файла",
-            advanced=True,
-            argtype="radiobutton",
-        )
-        self.add_argument(
-            parser,
-            "--replace_no_break_spaces",
-            choices=["on", "off"],
-            default=default_overrides.get("replace_no_break_spaces") or "on",
-            help="add non-breaking spaces where applicable",
-            caption="Добавить неразрывные пробелы",
-            advanced=True,
-            argtype="radiobutton",
-        )
-        self.add_argument(
-            parser,
-            "--replace_no_break_hyphens",
-            choices=["on", "off"],
-            default=default_overrides.get("replace_no_break_hyphens") or "on",
-            help="add non-breaking hyphens where applicable",
-            caption="Добавить неразрывные дефисы",
-            advanced=True,
-            argtype="radiobutton",
-        )
         self.add_argument(
             parser,
             "-v",
@@ -296,6 +267,55 @@ class ArgparseBuilder:
             caption="Обработка строчек, состоящих из одного числа",
             argtype="radiobutton",
         )
+        self.add_argument(
+            cmdparse,
+            "--tour_numbers_as_words",
+            choices=["on", "off"],
+            default=default_overrides.get("tour_numbers_as_words") or "off",
+            help="force tour numbers as words",
+            caption="Номера туров словами",
+            advanced=True,
+            argtype="radiobutton",
+        )
+        self.add_argument(
+            cmdparse,
+            "--download_images",
+            action="store_true",
+            help="download images from direct URLs and replace with local references",
+            caption="Скачивать изображения по прямым ссылкам",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdparse,
+            "--add_ts",
+            "-ts",
+            choices=["on", "off"],
+            default=default_overrides.get("add_ts") or "off",
+            help="append timestamp to filenames",
+            caption="Добавить временную отметку в имя файла",
+            advanced=True,
+            argtype="radiobutton",
+        )
+        self.add_argument(
+            cmdparse,
+            "--replace_no_break_spaces",
+            choices=["on", "off"],
+            default=default_overrides.get("replace_no_break_spaces") or "on",
+            help="add non-breaking spaces where applicable",
+            caption="Добавить неразрывные пробелы",
+            advanced=True,
+            argtype="radiobutton",
+        )
+        self.add_argument(
+            cmdparse,
+            "--replace_no_break_hyphens",
+            choices=["on", "off"],
+            default=default_overrides.get("replace_no_break_hyphens") or "on",
+            help="add non-breaking hyphens where applicable",
+            caption="Добавить неразрывные дефисы",
+            advanced=True,
+            argtype="radiobutton",
+        )
 
         cmdcompose = subparsers.add_parser("compose")
         self.add_argument(
@@ -332,6 +352,37 @@ class ArgparseBuilder:
             caption="Client ID для API Imgur",
             advanced=True,
         )
+        self.add_argument(
+            cmdcompose,
+            "--add_ts",
+            "-ts",
+            choices=["on", "off"],
+            default=default_overrides.get("add_ts") or "off",
+            help="append timestamp to filenames",
+            caption="Добавить временную отметку в имя файла",
+            advanced=True,
+            argtype="radiobutton",
+        )
+        self.add_argument(
+            cmdcompose,
+            "--replace_no_break_spaces",
+            choices=["on", "off"],
+            default=default_overrides.get("replace_no_break_spaces") or "on",
+            help="add non-breaking spaces where applicable",
+            caption="Добавить неразрывные пробелы",
+            advanced=True,
+            argtype="radiobutton",
+        )
+        self.add_argument(
+            cmdcompose,
+            "--replace_no_break_hyphens",
+            choices=["on", "off"],
+            default=default_overrides.get("replace_no_break_hyphens") or "on",
+            help="add non-breaking hyphens where applicable",
+            caption="Добавить неразрывные дефисы",
+            advanced=True,
+            argtype="radiobutton",
+        )
         cmdcompose_filetype = cmdcompose.add_subparsers(dest="filetype")
         cmdcompose_docx = cmdcompose_filetype.add_parser("docx")
         self.add_argument(
@@ -393,6 +444,15 @@ class ArgparseBuilder:
             advanced=True,
             caption='Без переноса строки после "Вопрос N."',
         )
+
+        self.add_argument(
+            cmdcompose_docx,
+            "--only_question_number",
+            action="store_true",
+            help="only show question number",
+            advanced=True,
+            caption='Без слова "Вопрос" в "Вопрос N."',
+        )
         self.add_argument(
             cmdcompose_docx,
             "--randomize",
@@ -817,6 +877,205 @@ class ArgparseBuilder:
             caption="Не открывать браузер",
         )
 
+        cmdhandouts = subparsers.add_parser("handouts")
+        cmdhandouts_subcommands = cmdhandouts.add_subparsers(dest="handoutssubcommand")
+        cmdhandouts_run = self.add_parser(cmdhandouts_subcommands, "run")
+        self.add_argument(
+            cmdhandouts_run,
+            "filename",
+            help="file with handouts",
+            caption="Имя файла с раздатками",
+            filetypes=[("handouts files", "*.hndts"), ("text files", "*.txt")],
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--lang",
+            default="ru",
+            argtype="radiobutton",
+            choices=sorted(GREYTEXT_LANGS.keys()),
+            help="language",
+            caption="Язык",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--compress",
+            action="store_true",
+            help="compress",
+            caption="Сжать файл после вёрстки (требует установленного ghostscript)",
+            advanced=True,
+        )
+        self.add_argument(cmdhandouts_run, "--font", "-f", help="font", caption="Шрифт")
+        self.add_argument(
+            cmdhandouts_run,
+            "--font_size",
+            type=int,
+            default=14,
+            help="font size",
+            caption="Размер шрифта",
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--pdfsettings",
+            choices=["screen", "ebook", "printer", "prepress", "default"],
+            default="default",
+            advanced=True,
+            caption="Настройки pdfsettings для ghostscript",
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--paperwidth",
+            type=float,
+            default=210,
+            help="paper width",
+            caption="Ширина бумаги",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--paperheight",
+            type=float,
+            default=297,
+            help="paper height",
+            caption="Высота бумаги",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--margin_top",
+            type=float,
+            default=5,
+            help="top margin",
+            caption="Верхний отступ",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--margin_bottom",
+            type=float,
+            default=5,
+            help="bottom margin",
+            caption="Нижний отступ",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--margin_left",
+            type=float,
+            default=5,
+            help="left margin",
+            caption="Левый отступ",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--margin_right",
+            type=float,
+            default=5,
+            help="right margin",
+            caption="Правый отступ",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--boxwidth",
+            type=float,
+            help="box width",
+            caption="Ширина блока",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--boxwidthinner",
+            type=float,
+            help="box width inner",
+            caption="Внутренняя ширина блока",
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_run,
+            "--tikz_mm",
+            type=float,
+            default=2,
+            help="tikz_mm width",
+            caption="Ширина tikz_mm",
+            advanced=True,
+        )
+
+        cmdhandouts_generate = self.add_parser(cmdhandouts_subcommands, "generate")
+        self.add_argument(
+            cmdhandouts_generate,
+            "filename",
+            help="file with questions packet",
+            caption="Имя файла с пакетом",
+            filetypes=[("chgksuite files", "*.4s")],
+        )
+        self.add_argument(
+            cmdhandouts_generate,
+            "--lang",
+            default="ru",
+            help="language",
+            caption="Язык",
+            argtype="radiobutton",
+            choices=sorted(GREYTEXT_LANGS.keys()),
+            advanced=True,
+        )
+        self.add_argument(
+            cmdhandouts_generate,
+            "--separate",
+            action="store_true",
+            help="Generate separate handouts for each question",
+            caption="Сгенерировать отдельный файл с раздатками для каждого вопроса",
+        )
+        self.add_argument(
+            cmdhandouts_generate,
+            "--list-handouts",
+            "-l",
+            action="store_true",
+            help="Generate a file with a list of handouts",
+            caption="Сгенерировать файл со списком раздаток",
+        )
+
+        cmdhandouts_pack = self.add_parser(cmdhandouts_subcommands, "pack")
+        self.add_argument(
+            cmdhandouts_pack,
+            "folder",
+            help="input directory",
+            caption="Папка с раздатками",
+        )
+        self.add_argument(
+            cmdhandouts_pack,
+            "--output_filename_prefix",
+            "-o",
+            default="packed_handouts",
+            help="output filename prefix",
+            caption="Префикс имени выходного файла",
+        )
+        self.add_argument(
+            cmdhandouts_pack,
+            "--n_teams",
+            "-n",
+            type=int,
+            required=True,
+            help="number of teams",
+            caption="Количество команд",
+        )
+        self.add_argument(
+            cmdhandouts_pack,
+            "--font",
+            "-f",
+            help="font",
+            caption="Шрифт",
+        )
+
+        cmdhandouts_install = self.add_parser(cmdhandouts_subcommands, "install")
+        self.add_argument(
+            cmdhandouts_install,
+            "--tectonic_package_regex",
+            advanced=True,
+            caption="Переопределить имя файла с релизом tectonic",
+        )
+
 
 def single_action(args, use_wrapper, resourcedir):
     if use_wrapper:
@@ -860,6 +1119,8 @@ def single_action(args, use_wrapper, resourcedir):
         gui_compose(args)
     if args.action == "trello":
         gui_trello(args)
+    if args.action == "handouts":
+        gui_handouter(args)
 
 
 def app():

chgksuite/common.py

@@ -224,6 +224,8 @@ def xlsx_to_results(xlsx_file_path):
     res_by_tour = defaultdict(lambda: defaultdict(list))
     tour_len = defaultdict(lambda: 0)
     for row in sheet.iter_rows(values_only=True):
+        if not any(x for x in row):
+            continue
         if first:
             assert row[1] == "Название"
             if row[3] == "Тур":
@@ -233,6 +235,8 @@ def xlsx_to_results(xlsx_file_path):
             first = False
             continue
         team_id = row[0]
+        if not tryint(team_id):
+            continue
         team_name = row[1]
         if table_type == "tour":
             tour = row[3]

chgksuite/composer/composer_common.py

@@ -415,6 +415,8 @@ class BaseExporter:
         return _parse_4s_elem(*args, **kwargs)
 
     def get_label(self, question, field, number=None):
+        if field == "question" and self.args.only_question_number:
+            return str(question.get("number") or number)
         if field in ("question", "tour"):
             lbl = (question.get("overrides") or {}).get(field) or self.labels[
                 "question_labels"