chgksuite 0.24.3__py3-none-any.whl → 0.25.0__py3-none-any.whl

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

@@ -5,10 +5,11 @@ import re
 import toml
 from pptx import Presentation
 from pptx.dml.color import RGBColor
+from pptx.enum.text import MSO_AUTO_SIZE, MSO_VERTICAL_ANCHOR, PP_ALIGN
 from pptx.util import Inches as PptxInches
 from pptx.util import Pt as PptxPt
 
-from chgksuite.common import log_wrap, replace_escaped
+from chgksuite.common import log_wrap, replace_escaped, tryint
 from chgksuite.composer.composer_common import BaseExporter, backtick_replace, parseimg
 
 
@@ -130,6 +131,14 @@ class PptxExporter(BaseExporter):
         s = s.strip()
         return s
 
+    def apply_vertical_alignment_if_needed(self, text_frame):
+        align = self.c["textbox"].get("vertical_align")
+        if align:
+            text_frame.auto_size = MSO_AUTO_SIZE.NONE
+            text_frame.margin_top = 0
+            text_frame.margin_bottom = 0
+            text_frame.vertical_anchor = getattr(MSO_VERTICAL_ANCHOR, align.upper())
+
     def _process_block(self, block):
         section = [x for x in block if x[0] == "section"]
         editor = [x for x in block if x[0] == "editor"]
@@ -139,6 +148,7 @@ class PptxExporter(BaseExporter):
         slide = self.prs.slides.add_slide(self.BLANK_SLIDE)
         textbox = self.get_textbox(slide)
         tf = textbox.text_frame
+        self.apply_vertical_alignment_if_needed(tf)
         tf.word_wrap = True
         text_for_size = (
             (self.recursive_join([x[1] for x in section]) or "")
@@ -150,10 +160,16 @@ class PptxExporter(BaseExporter):
         p = self.init_paragraph(tf, text=text_for_size)
         add_line_break = False
         if section:
-            r = p.add_run()
-            r.text = self._replace_no_break(self.pptx_process_text(section[0][1]))
-            r.font.size = PptxPt(self.c["text_size_grid"]["section"])
-            add_line_break = True
+            if self.c.get("tour_as_question_number"):
+                txt = self.pptx_process_text(section[0][1])
+                if self.c.get("tour_as_question_number") == "caps":
+                    txt = txt.upper()
+                self.set_question_number(slide, number=txt)
+            else:
+                r = p.add_run()
+                r.text = self._replace_no_break(self.pptx_process_text(section[0][1]))
+                r.font.size = PptxPt(self.c["text_size_grid"]["section"])
+                add_line_break = True
         if editor:
             r = p.add_run()
             r.text = self._replace_no_break(
@@ -206,10 +222,18 @@ class PptxExporter(BaseExporter):
         qntextbox = self.get_textbox_qnumber(slide)
         qtf = qntextbox.text_frame
         qtf_p = self.init_paragraph(qtf)
+        if self.c["number_textbox"].get("align"):
+            qtf_p.alignment = getattr(PP_ALIGN, self.c["number_textbox"]["align"].upper())
         qtf_r = qtf_p.add_run()
+        if self.c.get("question_number_format") == "caps" and tryint(number):
+            number = f"ВОПРОС {number}"
         qtf_r.text = number
+        if self.c["number_textbox"].get("bold"):
+            qtf_r.font.bold = True
         if self.c["number_textbox"].get("color"):
             qtf_r.font.color.rgb = RGBColor(*self.c["number_textbox"]["color"])
+        if self.c["number_textbox"].get("font_size"):
+            qtf_r.font.size = PptxPt(self.c["number_textbox"]["font_size"])
 
     def _get_handout_from_4s(self, text):
         if isinstance(text, list):
@@ -336,10 +360,14 @@ class PptxExporter(BaseExporter):
             image, slide, allowbigimage=allowbigimage
         )
         tf = textbox.text_frame
+        self.apply_vertical_alignment_if_needed(tf)
         tf.word_wrap = True
         self.set_question_number(slide, self.number)
         question_text = self.pptx_process_text(q["question"], image=image)
-        p = self.init_paragraph(tf, text=question_text, coeff=coeff)
+        if self.c.get("force_text_size_question"):
+            p = self.init_paragraph(tf, size=self.c["force_text_size_question"])
+        else:
+            p = self.init_paragraph(tf, text=question_text, coeff=coeff)
         self.pptx_format(question_text, p, tf, slide)
 
     def recursive_join(self, s):
@@ -352,13 +380,12 @@ class PptxExporter(BaseExporter):
         slide = self.prs.slides.add_slide(self.BLANK_SLIDE)
         textbox = self.get_textbox(slide)
         tf = textbox.text_frame
+        self.apply_vertical_alignment_if_needed(tf)
         tf.word_wrap = True
         if number is not None:
             self.set_question_number(slide, number)
         p = self.init_paragraph(tf, text=handout)
-        self.pptx_format(
-            self.pptx_process_text(handout), p, tf, slide
-        )
+        self.pptx_format(self.pptx_process_text(handout), p, tf, slide)
 
     def process_question_text(self, q):
         image = self._get_image_from_4s(q["question"])
@@ -375,31 +402,19 @@ class PptxExporter(BaseExporter):
         if image and image["big"] and text_is_duplicated:
             self.add_slide_with_image(image, number=self.number)
 
-    def process_question(self, q):
-        if "number" not in q:
-            self.qcount += 1
-        if "setcounter" in q:
-            self.qcount = int(q["setcounter"])
-        self.number = str(self.qcount if "number" not in q else q["number"])
-
-        if isinstance(q["question"], list):
-            for i in range(len(q["question"][1])):
-                qn = copy.deepcopy(q)
-                qn["question"][1] = q["question"][1][: i + 1]
-                self.process_question_text(qn)
+    def add_answer_slide(self, q):
+        slide = self.prs.slides.add_slide(self.BLANK_SLIDE)
+        if self.c.get("override_answer_caption"):
+            self.set_question_number(slide, self.c["override_answer_caption"])
         else:
-            self.process_question_text(q)
-
-        if self.c["add_plug"]:
-            slide = self.prs.slides.add_slide(self.BLANK_SLIDE)
             self.set_question_number(slide, self.number)
-        slide = self.prs.slides.add_slide(self.BLANK_SLIDE)
-        self.set_question_number(slide, self.number)
         fields = ["answer"]
         if q.get("zachet") and self.c.get("add_zachet"):
             fields.append("zachet")
         if self.c["add_comment"] and "comment" in q:
             fields.append("comment")
+        if self.c["add_source"] and "source" in q:
+            fields.append("source")
         textbox = None
         coeff = 1
         for field in fields:
@@ -410,6 +425,7 @@ class PptxExporter(BaseExporter):
         if not textbox:
             textbox = self.get_textbox(slide)
         tf = textbox.text_frame
+        self.apply_vertical_alignment_if_needed(tf)
         tf.word_wrap = True
 
         text_for_size = self.recursive_join(
@@ -423,7 +439,18 @@ class PptxExporter(BaseExporter):
             text_for_size += "\n" + self.recursive_join(
                 self.pptx_process_text(q["comment"])
             )
-        p = self.init_paragraph(tf, text=text_for_size, coeff=coeff)
+        if q.get("source") and self.c.get("add_source"):
+            text_for_size += "\n" + self.recursive_join(
+                self.pptx_process_text(q["source"])
+            )
+        if q.get("author") and self.c.get("add_author"):
+            text_for_size += "\n" + self.recursive_join(
+                self.pptx_process_text(q["author"])
+            )
+        if self.c.get("force_text_size_answer"):
+            p = self.init_paragraph(tf, size=self.c["force_text_size_answer"])
+        else:
+            p = self.init_paragraph(tf, text=text_for_size, coeff=coeff)
         r = p.add_run()
         r.text = f"{self.get_label(q, 'answer')}: "
         r.font.bold = True
@@ -442,6 +469,38 @@ class PptxExporter(BaseExporter):
             r.text = 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:
+            source_text = self.pptx_process_text(q["source"])
+            r = p.add_run()
+            r.text = 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:
+            author_text = self.pptx_process_text(q["author"])
+            r = p.add_run()
+            r.text = f"\n{self.get_label(q, 'author')}: "
+            r.font.bold = True
+            self.pptx_format(author_text, p, tf, slide)
+
+    def process_question(self, q):
+        if "number" not in q:
+            self.qcount += 1
+        if "setcounter" in q:
+            self.qcount = int(q["setcounter"])
+        self.number = str(self.qcount if "number" not in q else q["number"])
+
+        if isinstance(q["question"], list):
+            for i in range(len(q["question"][1])):
+                qn = copy.deepcopy(q)
+                qn["question"][1] = q["question"][1][: i + 1]
+                self.process_question_text(qn)
+        else:
+            self.process_question_text(q)
+
+        if self.c["add_plug"]:
+            slide = self.prs.slides.add_slide(self.BLANK_SLIDE)
+            self.set_question_number(slide, self.number)
+        self.add_answer_slide(q)
 
     def determine_size(self, text, coeff=1):
         text = self.recursive_join(text)
@@ -451,13 +510,16 @@ class PptxExporter(BaseExporter):
                 return element["size"]
         return self.c["text_size_grid"]["smallest"]
 
-    def init_paragraph(self, text_frame, text=None, coeff=1):
+    def init_paragraph(self, text_frame, text=None, coeff=1, size=None):
         p = text_frame.paragraphs[0]
         p.font.name = self.c["font"]["name"]
-        size = self.c["text_size_grid"]["default"]
-        if text:
-            size = self.determine_size(text, coeff=coeff)
-        p.font.size = PptxPt(size)
+        if size:
+            _size = size
+        else:
+            _size = self.c["text_size_grid"]["default"]
+            if text:
+                _size = self.determine_size(text, coeff=coeff)
+        p.font.size = PptxPt(_size)
         return p
 
     def export(self, outfilename):

chgksuite/version.py

@@ -1 +1 @@
-__version__ = "0.24.3"
+__version__ = "0.25.0"

{chgksuite-0.24.3.dist-info → chgksuite-0.25.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.24.3
+Version: 0.25.0
 Summary: A package for chgk automation
 Home-page: https://gitlab.com/peczony/chgksuite
 Author: Alexander Pecheny

{chgksuite-0.24.3.dist-info → chgksuite-0.25.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 chgksuite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chgksuite/__main__.py,sha256=0-_jfloveTW3SZYW5XEagbyaHKGCiDhGNgcLxsT_dMs,140
 chgksuite/cli.py,sha256=8YoHWfc-wv6gdYMPH3X8HxV9SG70S7M6IQqavJaBXV4,31990
-chgksuite/common.py,sha256=FkEntLcVTApjLtTFTDf2QiMOath05i322wcmJIFjztQ,11093
+chgksuite/common.py,sha256=VkOhoBA_P3qY5VgtvfrBjOsm5uVNL2s2Th2AhGB2pg8,11207
 chgksuite/parser.py,sha256=AVNeTUgv0aGHsxWunV_7bM4Ul2hbDslkzqg0dU49lic,37285
 chgksuite/parser_db.py,sha256=W1--OcDnx18mehH1T2ISHu3Saeq-9mqHo-xJopNySXI,11135
 chgksuite/trello.py,sha256=BG1Qb_W7Uu4o3Mfc_tK71ElU8ysdSplGlj_sAKfvUn4,14730
 chgksuite/typotools.py,sha256=Jdk65Wn_bXqpQtOT7PkBZyD2ZG1MBeeZFPMzcHEPkf4,12771
-chgksuite/version.py,sha256=FVT3zgMnGxhctio1D7Bj2hvIqrqQQ-a9tvDQYKSSekk,23
+chgksuite/version.py,sha256=Mu4JbSLl5nr-J2figk5hmW2mrw4skf_oeIzxbnpcgwY,23
 chgksuite/vulture_whitelist.py,sha256=P__p_X0zt10ivddIf81uyxsobV14vFg8uS2lt4foYpc,3582
 chgksuite/composer/__init__.py,sha256=MAOVZIYXmZmD6nNQSo9DueV6b5RgxF7_HGeLvsAhMJs,6490
 chgksuite/composer/chgksuite_parser.py,sha256=MFcLUWbccMqo3OYEuaAIA0loEvWM_PNS9vR7c1z_c60,8843
@@ -16,7 +16,7 @@ chgksuite/composer/docx.py,sha256=5MASXACM-ztWrr3VdO8HZ-W-hWWQ5TY1jXMsCQIufGc,18
 chgksuite/composer/latex.py,sha256=WtLdUICxeX4_5vHEJRF0YhFLpTsOUwBkQFunQS488FA,9248
 chgksuite/composer/lj.py,sha256=nty3Zs3N1H0gNK378U04aAHo71_5cABhCM1Mm9jiUEA,15213
 chgksuite/composer/openquiz.py,sha256=4adZewvRXpZhKrh9H4epKoMMDhmki9US55-Q0LcpZW0,7019
-chgksuite/composer/pptx.py,sha256=lmLld5CCNfndmLwWz2rRqZFyPIUxl0Dvk6wO1jW_c5s,19116
+chgksuite/composer/pptx.py,sha256=P4BewZj7TCiTM5atXxD1qvgW6GDWArp3NfwBN-7ytjg,22143
 chgksuite/composer/reddit.py,sha256=-Eg4CqMHhyGGfCteVwdQdtE1pfUXQ42XcP5OYUrBXmo,3878
 chgksuite/composer/stats.py,sha256=GbraSrjaZ8Mc2URs5aGAsI4ekboAKzlJJOqsbe96ELA,3995
 chgksuite/composer/telegram.py,sha256=H65LS79JZ3aCcqeq_SrnUU4E4yro1f-EZxCM3IrIyyQ,46526
@@ -45,9 +45,9 @@ chgksuite/resources/template.docx,sha256=Do29TAsg3YbH0rRSaXhVzKEoh4pwXkklW_idWA3
 chgksuite/resources/template.pptx,sha256=hEFWqE-yYpwZ8ejrMCJIPEyoMT3eDqaqtiEeQ7I4fyk,29777
 chgksuite/resources/template_shorin.pptx,sha256=hEFWqE-yYpwZ8ejrMCJIPEyoMT3eDqaqtiEeQ7I4fyk,29777
 chgksuite/resources/trello.json,sha256=M5Q9JR-AAJF1u16YtNAxDX-7c7VoVTXuq4POTqYvq8o,555
-chgksuite-0.24.3.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
-chgksuite-0.24.3.dist-info/METADATA,sha256=WLpNUNLKen1BwBbn0w5MTDg7WhVyPUmwIZnPt81eFp8,1294
-chgksuite-0.24.3.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-chgksuite-0.24.3.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
-chgksuite-0.24.3.dist-info/top_level.txt,sha256=cSWiRBOGZW9nIO6Rv1IrEfwPgV2ZWs87QV9wPXeBGqM,10
-chgksuite-0.24.3.dist-info/RECORD,,
+chgksuite-0.25.0.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
+chgksuite-0.25.0.dist-info/METADATA,sha256=ueTN4kr6BEoh8PvfvlbFTRfaWY5Lf7QBYvJQmONLZ3M,1294
+chgksuite-0.25.0.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+chgksuite-0.25.0.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
+chgksuite-0.25.0.dist-info/top_level.txt,sha256=cSWiRBOGZW9nIO6Rv1IrEfwPgV2ZWs87QV9wPXeBGqM,10
+chgksuite-0.25.0.dist-info/RECORD,,

{chgksuite-0.24.3.dist-info → chgksuite-0.25.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any