chgksuite 0.24.0b3__py3-none-any.whl → 0.24.2__py3-none-any.whl

chgksuite/common.py

@@ -226,17 +226,25 @@ def xlsx_to_results(xlsx_file_path):
     for row in sheet.iter_rows(values_only=True):
         if first:
             assert row[1] == "Название"
-            assert row[3] == "Тур"
+            if row[3] == "Тур":
+                table_type = "tour"
+            elif row[3] in ("1", 1):
+                table_type = "full"
             first = False
             continue
         team_id = row[0]
         team_name = row[1]
-        tour = row[3]
-        results = [x for x in row[4:] if x is not None]
+        if table_type == "tour":
+            tour = row[3]
+            results = [x for x in row[4:] if x is not None]
+        else:
+            tour = 1
+            results = [x for x in row[3:] if x is not None]
         rlen = len(results)
         tour_len[tour] = max(tour_len[tour], rlen)
         res_by_tour[(team_id, team_name)][tour] = results
     results = []
+
     tours = sorted(tour_len)
     for team_tup in res_by_tour:
         team_id, team_name = team_tup
@@ -246,7 +254,7 @@ def xlsx_to_results(xlsx_file_path):
             if len(team_res) < tour_len[tour]:
                 team_res += [0] * (tour_len[tour] - len(team_res))
             for element in team_res:
-                if element in (1, 0):
+                if tryint(element) in (1, 0):
                     mask.append(str(element))
                 else:
                     mask.append("0")

chgksuite/composer/chgksuite_parser.py

@@ -1,7 +1,7 @@
 import codecs
 import random
 import re
-from collections import Counter
+from collections import defaultdict
 
 from chgksuite.common import QUESTION_LABELS, check_question, init_logger, log_wrap
 from chgksuite.typotools import remove_excessive_whitespace as rew
@@ -63,18 +63,27 @@ def process_list(element):
         element[1] = inner_list
 
 
-RE_COUNTER = re.compile("4SCOUNTER([0-9a-zA-Z_]*)")
+RE_COUNTER = "4SCOUNTER(?P<counter_id>[0-9a-zA-Z_]*)"
+RE_SET_COUNTER = "set 4SCOUNTER(?P<counter_id_set>[0-9a-zA-Z_]*) = (?P<counter_value>[0-9+])"
+RE_COUNTER_UNIFY = re.compile(f"({RE_COUNTER}|{RE_SET_COUNTER})")
 
 
 def replace_counters(string_):
-    dd = Counter()
-    match = RE_COUNTER.search(string_)
+    dd = defaultdict(lambda: 1)
+    match = RE_COUNTER_UNIFY.search(string_)
     while match:
         span = match.span()
-        counter_id = match.group(1)
-        dd[counter_id] += 1
-        string_ = string_[: span[0]] + str(dd[counter_id]) + string_[span[1] :]
-        match = RE_COUNTER.search(string_)
+        if re.search(RE_SET_COUNTER, match.group(0)):
+            counter_id = match.group("counter_id_set")
+            counter_value = int(match.group("counter_value"))
+            dd[counter_id] = counter_value
+            string_ = string_[: span[0]] + string_[span[1] :]
+        else:
+            span = match.span()
+            counter_id = match.group("counter_id")
+            string_ = string_[: span[0]] + str(dd[counter_id]) + string_[span[1] :]
+            dd[counter_id] += 1
+        match = RE_COUNTER_UNIFY.search(string_)    
     return string_
 
 

chgksuite/composer/pptx.py

@@ -151,12 +151,12 @@ class PptxExporter(BaseExporter):
         add_line_break = False
         if section:
             r = p.add_run()
-            r.text = replace_no_break_spaces(self.pptx_process_text(section[0][1]))
+            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 = replace_no_break_spaces(
+            r.text = self._replace_no_break(
                 ("\n" if add_line_break else "")
                 + self.pptx_process_text(editor[0][1])
                 + "\n"
@@ -165,7 +165,7 @@ class PptxExporter(BaseExporter):
         if meta:
             for element in meta:
                 r = p.add_run()
-                r.text = replace_no_break_spaces(
+                r.text = self._replace_no_break(
                     ("\n" if add_line_break else "")
                     + self.pptx_process_text(element[1])
                     + "\n"