chgksuite 0.26.0b1__tar.gz → 0.26.0b3__tar.gz

{chgksuite-0.26.0b1/chgksuite.egg-info → chgksuite-0.26.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.26.0b1
+Version: 0.26.0b3
 Summary: A package for chgk automation
 Home-page: https://gitlab.com/peczony/chgksuite
 Author: Alexander Pecheny
@@ -20,12 +20,14 @@ Requires-Dist: parse
 Requires-Dist: Pillow
 Requires-Dist: ply
 Requires-Dist: pypandoc
+Requires-Dist: pypdf
 Requires-Dist: pyperclip
 Requires-Dist: python-docx
 Requires-Dist: python-pptx
-Requires-Dist: requests
 Requires-Dist: python-telegram-bot
+Requires-Dist: requests
 Requires-Dist: toml
+Requires-Dist: watchdog
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{chgksuite-0.26.0b1 → chgksuite-0.26.0b3}/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__
@@ -817,6 +819,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 +1061,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-0.26.0b1 → chgksuite-0.26.0b3}/chgksuite/composer/pptx.py

@@ -439,7 +439,7 @@ class PptxExporter(BaseExporter):
             fields.append("zachet")
         if self.c["add_comment"] and "comment" in q:
             fields.append("comment")
-        if self.c["add_source"] and "source" in q:
+        if self.c.get("add_source") and "source" in q:
             fields.append("source")
         textbox = None
         coeff = 1
@@ -492,12 +492,12 @@ class PptxExporter(BaseExporter):
             r = self.add_run(p, f"\n{self.get_label(q, 'comment')}: ")
             r.font.bold = True
             self.pptx_format(comment_text, p, tf, slide)
-        if self.c["add_source"] and "source" in q:
+        if self.c.get("add_source") and "source" in q:
             source_text = self.pptx_process_text(q["source"])
             r = self.add_run(p, f"\n{self.get_label(q, 'source')}: ")
             r.font.bold = True
             self.pptx_format(source_text, p, tf, slide)
-        if self.c["add_author"] and "author" in q:
+        if self.c.get("add_author") and "author" in q:
             author_text = self.pptx_process_text(q["author"])
             r = self.add_run(p, f"\n{self.get_label(q, 'author')}: ")
             r.font.bold = True

{chgksuite-0.26.0b1 → chgksuite-0.26.0b3}/chgksuite/composer/telegram.py

@@ -852,7 +852,7 @@ class TelegramExporter(BaseExporter):
 
                 # Wait for a forwarded message with channel information
                 channel_id = self.wait_for_forwarded_message(
-                    entity_type="channel", check_type=True, string_id=channel_result
+                    entity_type="channel", check_type=True
                 )
                 if channel_id:
                     self.save_username(channel_result, channel_id)
@@ -875,7 +875,7 @@ class TelegramExporter(BaseExporter):
 
                 # Wait for a forwarded message with chat information
                 chat_id = self.wait_for_forwarded_message(
-                    entity_type="chat", check_type=False, string_id=chat_result
+                    entity_type="chat", check_type=False
                 )
                 if not chat_id:
                     self.logger.error("Failed to get chat ID from forwarded message")
@@ -891,7 +891,6 @@ class TelegramExporter(BaseExporter):
                         entity_type="chat",
                         check_type=False,
                         add_msg=error_msg,
-                        string_id=chat_result,
                     )
                 if chat_id:
                     self.save_username(chat_result, chat_id)
@@ -1117,11 +1116,15 @@ class TelegramExporter(BaseExporter):
 
             # Look for a forwarded message in recent messages
             cursor = self.db_conn.cursor()
+            if self.created_at:
+                threshold = "'" + self.created_at + "'"
+            else:
+                threshold = "datetime('now', '-2 minutes')"
             cursor.execute(
-                """
+                f"""
                 SELECT raw_data, created_at
                 FROM messages 
-                WHERE created_at > datetime('now', '-2 minutes')
+                WHERE created_at > {threshold}
                 ORDER BY created_at DESC
             """
             )

chgksuite-0.26.0b3/chgksuite/version.py

@@ -0,0 +1 @@
+__version__ = "0.26.0b3"

{chgksuite-0.26.0b1 → chgksuite-0.26.0b3/chgksuite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.26.0b1
+Version: 0.26.0b3
 Summary: A package for chgk automation
 Home-page: https://gitlab.com/peczony/chgksuite
 Author: Alexander Pecheny
@@ -20,12 +20,14 @@ Requires-Dist: parse
 Requires-Dist: Pillow
 Requires-Dist: ply
 Requires-Dist: pypandoc
+Requires-Dist: pypdf
 Requires-Dist: pyperclip
 Requires-Dist: python-docx
 Requires-Dist: python-pptx
-Requires-Dist: requests
 Requires-Dist: python-telegram-bot
+Requires-Dist: requests
 Requires-Dist: toml
+Requires-Dist: watchdog
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{chgksuite-0.26.0b1 → chgksuite-0.26.0b3}/chgksuite.egg-info/requires.txt

@@ -8,9 +8,11 @@ parse
 Pillow
 ply
 pypandoc
+pypdf
 pyperclip
 python-docx
 python-pptx
-requests
 python-telegram-bot
+requests
 toml
+watchdog

{chgksuite-0.26.0b1 → chgksuite-0.26.0b3}/history.md

@@ -1,5 +1,8 @@
 # What’s new
 
+## v0.25.1
+- Исправлен баг выкладывания пакета в телеграм
+
 ## v0.25.0
 - Адаптация к новому формату выходных таблиц турнирного сайта
 - Улучшения выгрузки PPTX

{chgksuite-0.26.0b1 → chgksuite-0.26.0b3}/setup.py

@@ -54,11 +54,13 @@ setup(
         "Pillow",
         "ply",
         "pypandoc",
+        "pypdf",
         "pyperclip",
         "python-docx",
         "python-pptx",
-        "requests",
         "python-telegram-bot",
+        "requests",
         "toml",
+        "watchdog",
     ]
 )

chgksuite-0.26.0b1/chgksuite/version.py

@@ -1 +0,0 @@
-__version__ = "0.26.0b1"