chgksuite 0.26.0b10__py3-none-any.whl → 0.26.1__py3-none-any.whl

chgksuite/composer/latex.py

@@ -199,11 +199,11 @@ class LatexExporter(BaseExporter):
         firsttour = True
         for element in self.structure:
             if element[0] == "heading":
-                tex += "\n{{\\huge {}}}\n" "\\vspace{{0.8em}}\n".format(
+                tex += "\n{{\\huge {}}}\n\\vspace{{0.8em}}\n".format(
                     self.tex_element_layout(element[1])
                 )
             if element[0] == "date":
-                tex += "\n{{\\large {}}}\n" "\\vspace{{0.8em}}\n".format(
+                tex += "\n{{\\large {}}}\n\\vspace{{0.8em}}\n".format(
                     self.tex_element_layout(element[1])
                 )
             if element[0] in {"meta", "editor"}:

chgksuite/composer/pptx.py

@@ -5,7 +5,12 @@ import re
 import toml
 
 from chgksuite.common import log_wrap, replace_escaped, tryint
-from chgksuite.composer.composer_common import BaseExporter, backtick_replace, parseimg
+from chgksuite.composer.composer_common import (
+    BaseExporter,
+    backtick_replace,
+    parseimg,
+    remove_accents_standalone,
+)
 from pptx import Presentation
 from pptx.dml.color import RGBColor
 from pptx.enum.text import MSO_AUTO_SIZE, MSO_VERTICAL_ANCHOR, PP_ALIGN
@@ -109,15 +114,20 @@ class PptxExporter(BaseExporter):
                         r.font.underline = True
 
     def pptx_process_text(
-        self, s, image=None, strip_brackets=True, replace_spaces=True
+        self,
+        s,
+        image=None,
+        strip_brackets=True,
+        replace_spaces=True,
+        do_not_remove_accents=False,
     ):
         hs = self.labels["question_labels"]["handout_short"]
         if isinstance(s, list):
             for i in range(len(s)):
                 s[i] = self.pptx_process_text(s[i], image=image)
             return s
-        if not self.args.do_not_remove_accents:
-            s = s.replace("\u0301", "")
+        if not (self.args.do_not_remove_accents or do_not_remove_accents):
+            s = remove_accents_standalone(s, self.labels)
         if strip_brackets:
             s = self.remove_square_brackets(s)
             s = s.replace("]\n", "]\n\n")
@@ -408,7 +418,9 @@ class PptxExporter(BaseExporter):
         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, do_not_remove_accents=True), p, tf, slide
+        )
 
     def process_question_text(self, q):
         image = self._get_image_from_4s(q["question"])

chgksuite/composer/telegram.py

@@ -126,7 +126,9 @@ class TelegramExporter(BaseExporter):
             if result:
                 msg_data = json.loads(result["raw_data"])
                 if msg_data["message"]["chat"]["type"] != "private":
-                    print("You should post to the PRIVATE chat, not to the channel/group")
+                    print(
+                        "You should post to the PRIVATE chat, not to the channel/group"
+                    )
                     continue
                 self.control_chat_id = msg_data["message"]["chat"]["id"]
                 self.send_api_request(
@@ -869,7 +871,7 @@ class TelegramExporter(BaseExporter):
                     raise Exception("Failed to get channel ID from forwarded message")
         else:
             raise Exception("Channel ID is undefined")
-        
+
         # Handle chat resolution
         if isinstance(chat_result, int):
             chat_id = chat_result
@@ -881,7 +883,9 @@ class TelegramExporter(BaseExporter):
                     f"Please write a message in the discussion group with text: {self.chat_auth_uuid}"
                 )
                 print("This will allow me to extract the group ID automatically.")
-                print("The bot MUST be added do the group and made admin, else it won't work!")
+                print(
+                    "The bot MUST be added do the group and made admin, else it won't work!"
+                )
                 print("=" * 50 + "\n")
 
                 # Wait for a forwarded message with chat information
@@ -1158,7 +1162,10 @@ class TelegramExporter(BaseExporter):
                     if get_text(msg_data) != self.chat_auth_uuid:
                         continue
                     extracted_id = msg_data["message"]["chat"]["id"]
-                    if extracted_id == channel_numeric_id or extracted_id == self.control_chat_id:
+                    if (
+                        extracted_id == channel_numeric_id
+                        or extracted_id == self.control_chat_id
+                    ):
                         self.logger.warning(
                             "User posted a message in the channel, not the discussion group"
                         )
@@ -1168,7 +1175,7 @@ class TelegramExporter(BaseExporter):
                                 "chat_id": self.control_chat_id,
                                 "text": (
                                     "⚠️ You posted a message in the channel, not in the discussion group."
-                                )
+                                ),
                             },
                         )
                         # Skip this message and continue waiting
@@ -1176,7 +1183,10 @@ class TelegramExporter(BaseExporter):
                 elif entity_type == "channel":
                     if msg_data["message"]["chat"]["id"] != self.control_chat_id:
                         continue
-                    if "message" in msg_data and "forward_from_chat" in msg_data["message"]:
+                    if (
+                        "message" in msg_data
+                        and "forward_from_chat" in msg_data["message"]
+                    ):
                         forward_info = msg_data["message"]["forward_from_chat"]
 
                         # Extract chat ID from the message
@@ -1187,9 +1197,10 @@ class TelegramExporter(BaseExporter):
                         else:
                             extracted_id = chat_id
                 # For channels, check the type; for chats, accept any type except "channel" if check_type is False
-                if extracted_id and ((check_type and forward_info.get("type") == "channel") or (
-                    not check_type
-                )):
+                if extracted_id and (
+                    (check_type and forward_info.get("type") == "channel")
+                    or (not check_type)
+                ):
                     resolved = True
                     self.created_at = row["created_at"]
                     self.logger.info(

chgksuite/handouter/runner.py

@@ -124,6 +124,9 @@ class HandoutGenerator:
 
     def generate(self):
         for block in self.parse_input(self.args.filename):
+            if not block:
+                self.blocks.append("\n\\clearpage\n")
+                continue
             if self.args.debug:
                 print(block)
             if block.get("for_question"):

chgksuite/handouter/utils.py

@@ -45,8 +45,29 @@ def wrap_val(key, val):
     return val.strip()
 
 
+def split_array_by_value(arr, delimiter):
+    result = []
+    current_subarray = []
+    for item in arr:
+        if item == delimiter:
+            result.append(current_subarray)
+            current_subarray = []
+        else:
+            current_subarray.append(item)
+    result.append(current_subarray)
+    return result
+
+
+def split_blocks(contents):
+    lines = contents.split("\n")
+    sp = ["\n".join(x) for x in split_array_by_value(lines, "---")]
+    if not sp[0].strip():
+        sp = sp[1:]
+    return sp
+
+
 def parse_handouts(contents):
-    blocks = contents.split("\n---\n")
+    blocks = split_blocks(contents)
     result = []
     for block_ in blocks:
         block = block_.strip()

chgksuite/parser.py

@@ -3,6 +3,7 @@
 import base64
 import codecs
 import datetime
+import hashlib
 import itertools
 import json
 import os
@@ -13,12 +14,14 @@ import subprocess
 import sys
 import tempfile
 import urllib
+import time
 
 import bs4
 import chardet
 import dashtable
 import mammoth
 import pypandoc
+import requests
 import toml
 from bs4 import BeautifulSoup
 from parse import parse
@@ -26,11 +29,11 @@ from parse import parse
 import chgksuite.typotools as typotools
 from chgksuite.common import (
     QUESTION_LABELS,
-    DefaultArgs,
     DefaultNamespace,
     DummyLogger,
     check_question,
     compose_4s,
+    get_chgksuite_dir,
     get_lastdir,
     init_logger,
     load_settings,
@@ -40,6 +43,7 @@ from chgksuite.common import (
 from chgksuite.composer import gui_compose
 from chgksuite.composer.composer_common import make_filename
 from chgksuite.parser_db import chgk_parse_db
+from chgksuite.typotools import re_url
 from chgksuite.typotools import remove_excessive_whitespace as rew
 
 ENC = sys.stdout.encoding or "utf8"
@@ -107,7 +111,7 @@ class ChgkParser:
 
     def __init__(self, defaultauthor=None, args=None, logger=None):
         self.defaultauthor = defaultauthor
-        args = args or DefaultArgs()
+        args = args or DefaultNamespace()
         self.regexes = load_regexes(args.regexes)
         self.logger = logger or init_logger("parser")
         self.args = args
@@ -121,6 +125,148 @@ class ChgkParser:
         if self.args.language == "en":
             self.args.typography_quotes = "off"
 
+    def _setup_image_cache(self):
+        """Setup image download cache directory and load existing cache"""
+        if not hasattr(self, "_image_cache"):
+            self.image_cache_dir = os.path.join(
+                get_chgksuite_dir(), "downloaded_images"
+            )
+            os.makedirs(self.image_cache_dir, exist_ok=True)
+
+            self.image_cache_file = os.path.join(
+                get_chgksuite_dir(), "image_download_cache.json"
+            )
+            if os.path.isfile(self.image_cache_file):
+                try:
+                    with open(self.image_cache_file, encoding="utf8") as f:
+                        self._image_cache = json.load(f)
+                except (json.JSONDecodeError, OSError):
+                    self._image_cache = {}
+            else:
+                self._image_cache = {}
+
+    def _download_image(self, url):
+        """Download image from URL and return local filename"""
+        self._setup_image_cache()
+        url = url.replace("\\", "")
+
+        # Check cache first
+        url_hash = hashlib.sha256(url.encode("utf-8")).hexdigest()[:20]
+        if url_hash in self._image_cache:
+            cached_filename = self._image_cache[url_hash]
+            cached_path = os.path.join(self.image_cache_dir, cached_filename)
+            if os.path.isfile(cached_path):
+                return cached_path
+
+        # Determine file extension
+        parsed_url = urllib.parse.urlparse(url)
+        path_lower = parsed_url.path.lower()
+        ext = None
+        for image_ext in [".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".svg"]:
+            if path_lower.endswith(image_ext):
+                ext = image_ext
+                break
+
+        if not ext:
+            # Try to guess from URL structure
+            if any(
+                img_ext in path_lower
+                for img_ext in [
+                    ".jpg",
+                    ".jpeg",
+                    ".png",
+                    ".webp",
+                    ".gif",
+                    ".bmp",
+                    ".svg",
+                ]
+            ):
+                for image_ext in [
+                    ".jpg",
+                    ".jpeg",
+                    ".png",
+                    ".webp",
+                    ".gif",
+                    ".bmp",
+                    ".svg",
+                ]:
+                    if image_ext in path_lower:
+                        ext = image_ext
+                        break
+            else:
+                ext = ".jpg"  # Default extension
+
+        filename = url_hash + ext
+        filepath = os.path.join(self.image_cache_dir, filename)
+
+        try:
+            self.logger.info(f"Downloading image from {url}")
+            headers = {
+                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+                "Accept": "image/png,image/jpeg,image/webp,image/gif,image/*,*/*;q=0.8",
+                "Accept-Language": "en-US,en;q=0.9",
+                "Accept-Encoding": "gzip, deflate, br",
+                "Connection": "keep-alive",
+                "Upgrade-Insecure-Requests": "1",
+            }
+            response = requests.get(url, timeout=30, stream=True, headers=headers)
+            response.raise_for_status()
+            time.sleep(0.5)  # rate limiting
+
+            with open(filepath, "wb") as f:
+                for chunk in response.iter_content(chunk_size=8192):
+                    f.write(chunk)
+
+            # Update cache
+            self._image_cache[url_hash] = filename
+            with open(self.image_cache_file, "w", encoding="utf8") as f:
+                json.dump(self._image_cache, f, indent=2, sort_keys=True)
+
+            return filepath
+
+        except Exception as e:
+            self.logger.warning(f"Failed to download image from {url}: {e}")
+            return None
+
+    def _process_images_in_text(self, text):
+        """Process text to find image URLs and replace them with local references"""
+        if not text or not getattr(self.args, "download_images", False):
+            return text
+
+        if isinstance(text, list):
+            return [self._process_images_in_text(item) for item in text]
+
+        if not isinstance(text, str):
+            return text
+
+        # Find all URLs in the text
+        for match in re_url.finditer(text):
+            url = match.group(0)
+            url_lower = url.lower()
+
+            # Check if it's a direct image URL
+            if any(
+                url_lower.endswith(ext)
+                for ext in [".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".svg"]
+            ):
+                local_filename = self._download_image(url)
+                if local_filename:
+                    # Replace URL with chgksuite image syntax
+                    img_reference = f"(img {local_filename})"
+                    text = text.replace(url, img_reference)
+
+        return text
+
+    def _process_question_images(self, question):
+        """Process a question dict to download images from URLs"""
+        if not getattr(self.args, "download_images", False):
+            return
+
+        # Process all fields except 'source'
+        for field in question:
+            if field != "source":
+                question[field] = self._process_images_in_text(question[field])
+
     def merge_to_previous(self, index):
         target = index - 1
         if self.structure[target][1]:
@@ -513,7 +659,19 @@ class ChgkParser:
         ):
             self.merge_to_next(0)
 
-        for _id, element in enumerate(self.structure):
+        if debug:
+            with codecs.open("debug_3a.json", "w", "utf8") as f:
+                f.write(
+                    json.dumps(
+                        list(enumerate(self.structure)), ensure_ascii=False, indent=4
+                    )
+                )
+
+        idx = 0
+        cycle = -1
+        while idx < len(self.structure):
+            cycle += 1
+            element = self.structure[idx]
             if element[0] == "":
                 element[0] = "meta"
             if element[0] in regexes and element[0] not in [
@@ -524,19 +682,43 @@ class ChgkParser:
                 if element[0] == "question":
                     try:
                         num = regexes["question"].search(element[1])
-                        if num:
-                            self.structure.insert(_id, ["number", num.group(1)])
+                        if num and num.group("number"):
+                            self.structure.insert(idx, ["number", num.group("number")])
+                            idx += 1
                     except Exception as e:
+                        num = None
                         sys.stderr.write(
-                            f"exception at line 445 of parser: {type(e)} {e}\n"
+                            f"exception at setting number: {type(e)} {e}\n"
                         )
-                # TODO: переделать корявую обработку авторки на нормальную
-                before_replacement = element[1]
-                element[1] = regexes[element[0]].sub("", element[1], 1)
+                    if (
+                        num is None
+                        or num and not num.group("number")
+                    ) and (
+                        ("нулевой вопрос" in element[1].lower())
+                        or ("разминочный вопрос" in element[1].lower())
+                    ):
+                        self.structure.insert(idx, ["number", "0"])
+                        idx += 1
+                if element[0] == "question":
+                    lines = element[1].split(SEP)
+                    for i, line in enumerate(lines):
+                        if regexes["question"].search(line):
+                            lines[i] = regexes["question"].sub("", line, 1)
+                    element[1] = SEP.join([x.strip() for x in lines if x.strip()])
+                    before_replacement = None
+                else:
+                    before_replacement = element[1]
+                    element[1] = regexes[element[0]].sub("", element[1], 1)
                 if element[1].startswith(SEP):
                     element[1] = element[1][len(SEP) :]
-                if element[0] == "author" and "авторка:" in before_replacement.lower():
+                # TODO: переделать корявую обработку авторки на нормальную
+                if (
+                    element[0] == "author"
+                    and before_replacement
+                    and "авторка:" in before_replacement.lower()
+                ):
                     element[1] = "!!Авторка" + element[1]
+            idx += 1
 
         if debug:
             with codecs.open("debug_4.json", "w", "utf8") as f:
@@ -551,7 +733,7 @@ class ChgkParser:
                 try:
                     num = regexes["question"].search(element[1])
                     if num:
-                        self.structure.insert(_id, ["number", num.group(1)])
+                        self.structure.insert(_id, ["number", num.group("number")])
                 except Exception as e:
                     sys.stderr.write(
                         f"exception at line 470 of parser: {type(e)} {e}\n"
@@ -559,7 +741,6 @@ class ChgkParser:
                 element[1] = regexes["question"].sub("", element[1])
 
             # detect inner lists
-
             mo = {
                 m for m in re.finditer(r"(\s+|^)(\d+)[\.\)]\s*(?!\d)", element[1], re.U)
             }
@@ -636,6 +817,7 @@ class ChgkParser:
             ):
                 if self.defaultauthor and "author" not in current_question:
                     current_question["author"] = self.defaultauthor
+                self._process_question_images(current_question)
                 check_question(current_question, logger=logger)
                 final_structure.append(["Question", current_question])
                 current_question = {}
@@ -669,6 +851,7 @@ class ChgkParser:
         if current_question != {}:
             if self.defaultauthor and "author" not in current_question:
                 current_question["author"] = self.defaultauthor
+            self._process_question_images(current_question)
             check_question(current_question, logger=logger)
             final_structure.append(["Question", current_question])
 
@@ -712,6 +895,11 @@ class ChgkParser:
             elif element[0] == "tour" and self.args.tour_numbers_as_words == "on":
                 element[1] = f"{self.TOUR_NUMBERS_AS_WORDS[tour_cnt]} тур"
                 tour_cnt += 1
+            elif element[0] not in ["Question", "source"] and getattr(
+                self.args, "download_images", False
+            ):
+                # Process images in metadata fields (excluding source)
+                element[1] = self._process_images_in_text(element[1])
 
         if debug:
             with codecs.open("debug_final.json", "w", "utf8") as f:
@@ -721,7 +909,8 @@ class ChgkParser:
 
 def chgk_parse(text, defaultauthor=None, args=None):
     parser = ChgkParser(defaultauthor=defaultauthor, args=args)
-    return parser.parse(text)
+    parsed = parser.parse(text)
+    return parsed
 
 
 class UnknownEncodingException(Exception):
@@ -767,7 +956,7 @@ def ensure_line_breaks(tag):
 
 def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
     logger = logger or DummyLogger()
-    args = args or DefaultArgs()
+    args = args or DefaultNamespace()
     for_ol = {}
 
     def get_number(tag):
@@ -795,6 +984,11 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
         else:
             with open(docxfile, "rb") as docx_file:
                 html = mammoth.convert_to_html(docx_file).value
+        if args.debug:
+            with codecs.open(
+                os.path.join(target_dir, "debugdebug.pydocx"), "w", "utf8"
+            ) as dbg:
+                dbg.write(html)
         input_docx = (
             html.replace("</strong><strong>", "")
             .replace("</em><em>", "")

chgksuite/resources/regexes_by.json

@@ -1,7 +1,7 @@
 {
     "tour": "^(#\\s+)?Т[Уу][Рр]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
     "tourrev": "^([0-9IVXLCDM]+)\\s[Тт][Уу][Рр]([\\.:])?$",
-    "question": "П[Ыы][Тт][Аа][Нн][Ьь]?[Нн][Ее]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "question": "П[Ыы][Тт][Аа][Нн][Ьь]?[Нн][Ее]\\s?[№N]?(?P<number>[0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
     "handout": "Р[Аа][Зз][Дд][Аа][Тт]([Аа][Чч][Нн]|[Кк][Аа][Вв])[Ыы][\\s\\s][Мм][Аа][Тт][Ээ][Рр][Ыы][Яя][Лл][\\.:]",
     "answer": "А[Дд][Кк][Аа][Зз][Ыы]?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "zachet": "З[Аа][Лл][Іі][Кк]\\s?[\\.:]",

chgksuite/resources/regexes_en.json

@@ -1,7 +1,7 @@
 {
     "tour": "^(#\\s+)?(B[Ll][Oo][Cc][Kk]|R[Oo][Uu][Nn][Dd])\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
     "tourrev": "^([0-9IVXLCDM]+)\\s(B[Ll][Oo][Cc][Kk]|R[Oo][Uu][Nn][Dd])([\\.:])?$",
-    "question": "Q[Uu][Ee][Ss][Tt][Ii][Oo][Nn]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "question": "Q[Uu][Ee][Ss][Tt][Ii][Oo][Nn]\\s?[№N]?(?P<number>[0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
     "answer": "A[Nn][Ss][Ww][Ee][Rr]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "handout": "^H[Aa][Nn][Dd][Oo][Uu][Tt][\\.:]",
     "zachet": "A[Cc][Ee][Pp][Tt]\\s?[\\.:]",

chgksuite/resources/regexes_kz_cyr.json

@@ -1,6 +1,6 @@
 {
     "tour": "^(#\\s+)?([0-9]+)\\s?[-–—]\\s?[Тт][Уу][Рр]\\s*$",
-    "question": "([0-9]+)\\s?[-–—]\\s?\\sС[Ұұ][Рр][Аа][Ққ]([\\.:]|\n|\r\n|$)",
+    "question": "(?P<number>[0-9]+)\\s?[-–—]\\s?\\sС[Ұұ][Рр][Аа][Ққ]([\\.:]|\n|\r\n|$)",
     "handout": "^Ү[Лл][Ее][Сс][Тт][Іі][Рр][Уу][\\s\\s][Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][Ыы][\\.:]",
     "answer": "Ж[Аа][Уу][Аа][Пп]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "zachet": "Қ[Аа][Бб][Ыы][Лл][Дд][Аа][Нн][Аа][Тт][Ыы][Нн]\\s[Жж][Аа][Уу][Аа][Пп](\\([Тт][Аа][Рр]\\))?\\s?[\\.:]",

chgksuite/resources/regexes_ru.json

@@ -1,7 +1,7 @@
 {
     "tour": "^(#\\s+)?Т[Уу][Рр]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
     "tourrev": "^([0-9IVXLCDM]+|[Пп][Ее][Рр][Вв][Ыы][Йй]|[Вв][Тт][Оо][Рр][Оо][Йй]|[Тт][Рр][Ее][Тт][Ии][Йй]|[Чч][Ее][Тт][Вв][Ее][Рр][Тт][Ыы][Йй]|[Пп][Яя][Тт][Ыы][Йй]|[Шш][Ее][Сс][Тт][Оо][Йй]|[Сс][Ее][Дд][Ьь][Мм][Оо][Йй]|[Вв][Оо][Сс][Ьь][Мм][Оо][Йй]|[Дд][Ее][Вв][Яя][Тт][Ыы][Йй]|[Дд][Ее][Сс][Яя][Тт][Ыы][Йй])\\s[Тт][Уу][Рр]([\\.:])?$",
-    "question": "В[Оо][Пп][Рр][Оо][Сс]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "question": "^([Нн][Уу][Лл][Ее][Вв][Оо][Йй]|[Рр][Аа][Зз][Мм][Ии][Нн][Оо][Чч][Нн][Ыы][Йй])? ?[Вв][Оо][Пп][Рр][Оо][Сс]\\s?[№N]?(?P<number>[0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
     "handout": "^Р[Аа][Зз][Дд][Аа][Тт][Оо][Чч][Нн][Ыы][Йй]\\s+[Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][\\.:]",
     "answer": "О[Тт][Вв][Ее][Тт][Ыы]?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "zachet": "З[Аа][Чч][ЕеЁё][Тт]\\s?[\\.:]",

chgksuite/resources/regexes_sr.json

@@ -1,7 +1,7 @@
 {
     "tour": "^(#\\s+)?R[Uu][Nn][Dd][Aa]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
     "tourrev": "^([0-9IVXLCDM]+)\\sR[Uu][Nn][Dd][Aa]([\\.:])?$",
-    "question": "P[Ii][Tt][Aa][Nn][Jj][Ee]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "question": "P[Ii][Tt][Aa][Nn][Jj][Ee]\\s?[№N]?(?P<number>[0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
     "answer": "O[Dd][Gg][Oo][Vv][Oo][Rr]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "handout": "^(M[Aa][Tt][Ee][Rr][Ii][Jj][Aa][Ll]|P[Oo][Dd][Ee][Ll][Jj][Ee][Nn][Oo])[\\.:]",
     "zachet": "P[Rr][Ii][Hh][Vv][Aa][Tt][Aa]\\s[Ss][Ee]\\s?[\\.:]",

chgksuite/resources/regexes_ua.json

@@ -1,7 +1,7 @@
 {
     "tour": "^(#\\s+)?Т[Уу][Рр]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
     "tourrev": "^([0-9IVXLCDM]+)\\s[Тт][Уу][Рр]([\\.:])?$",
-    "question": "З[Аа][Пп][Ии][Тт][Аа][Нн][Нн][Яя]\\s?[№N]?([0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "question": "З[Аа][Пп][Ии][Тт][Аа][Нн][Нн][Яя]\\s?[№N]?(?P<number>[0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
     "handout": "Р[Оо][Зз][Дд][Аа][Тт][Кк][Оо][Вв][Ии][Йй][\\s\\s][Мм][Аа][Тт][Ее][Рр][Іі][Аа][Лл][\\.:]",
     "answer": "В[Іі][Дд][Пп][Оо][Вв][Іі][Дд][Ьь]?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "zachet": "З[Аа][Лл][Іі][Кк]\\s?[\\.:]",

chgksuite/resources/regexes_uz_cyr.json

@@ -1,6 +1,6 @@
 {
     "tour": "^(#\\s+)?([0-9]+)\\s?[-–—]\\s?[Тт][Уу][Рр]\\s*$",
-    "question": "([0-9]+)\\s?[-–—]\\s?\\sС[Аа][Вв][Оо][Лл]([\\.:]|\n|\r\n|$)",
+    "question": "(?P<number>[0-9]+)\\s?[-–—]\\s?\\sС[Аа][Вв][Оо][Лл]([\\.:]|\n|\r\n|$)",
     "answer": "Ж[Аа][Вв][Оо][Бб]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
     "handout": "Т[Аа][Рр][Ққ][Аа][Тт][Мм][Аа][\\s\\s][Мм][Аа][Тт][Ее][Рр][Ии][Аа][Лл][\\.:]",
     "zachet": "Қ[Аа][Бб][Уу][Лл]\\s?[\\.:]",

chgksuite/version.py

@@ -1 +1 @@
-__version__ = "0.26.0b10"
+__version__ = "0.26.1"

{chgksuite-0.26.0b10.dist-info → chgksuite-0.26.1.dist-info}/METADATA

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