PyPI - chgksuite - Versions diffs - 0.27.1__tar.gz → 0.27.2__tar.gz - Mend

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(uv run pytest:*)",
+      "Bash(ls:*)",
+      "Bash(python3:*)",
+      "Bash(mv:*)"
+    ]
+  }
+}

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.27.1
+Version: 0.27.2
 Summary: A package for chgk automation
 Project-URL: Homepage, https://gitlab.com/peczony/chgksuite
 Author-email: Alexander Pecheny <ap@pecheny.me>

@@ -27,7 +27,7 @@ QUESTION_LABELS = [
     "number",
     "setcounter",
 ]
-SEP = os.linesep
+SEP = "\n"
 try:
     ENC = sys.stdout.encoding or "utf8"
 except AttributeError:
@@ -152,6 +152,19 @@ def ensure_utf8(s):
     return s
+def read_text_file(filepath, encoding="utf-8"):
+    """Read a text file, fixing corrupted line endings (\r\r\n -> \n) if present."""
+    with open(filepath, "rb") as f:
+        raw = f.read()
+    # Fix corrupted line endings at byte level before decoding
+    if b"\r\r\n" in raw:
+        raw = raw.replace(b"\r\r\n", b"\n")
+    text = raw.decode(encoding)
+    # Normalize any remaining line endings
+    text = text.replace("\r\n", "\n").replace("\r", "\n")
+    return text
 class DummyLogger(object):
     def info(self, *args, **kwargs):
         pass
@@ -370,6 +383,5 @@ def compose_4s(structure, args=None):
                         + SEP
                     )
             tmp = re.sub(r"{}+".format(SEP), SEP, tmp)
-            tmp = tmp.replace("\r\r", "\r")
             result += tmp + SEP
     return result

@@ -12,6 +12,7 @@ from chgksuite.common import (
     get_source_dirs,
     init_logger,
     log_wrap,
+    read_text_file,
     set_lastdir,
 )
 from chgksuite.composer.chgksuite_parser import parse_4s
@@ -74,9 +75,7 @@ def process_file_wrapper(filename, sourcedir, targetdir, args):
 def parse_filepath(filepath, args=None):
     args = args or DefaultArgs()
-    with open(filepath, "r", encoding="utf-8") as input_file:
-        input_text = input_file.read()
-    input_text = input_text.replace("\r", "")
+    input_text = read_text_file(filepath)
     debug_dir = os.path.dirname(os.path.abspath(filepath))
     return parse_4s(
         input_text, randomize=args.randomize, debug=args.debug, debug_dir=debug_dir

@@ -38,6 +38,7 @@ from chgksuite.common import (
     init_logger,
     load_settings,
     log_wrap,
+    read_text_file,
     set_lastdir,
 )
 from chgksuite.composer import gui_compose
@@ -47,7 +48,7 @@ from chgksuite.typotools import re_url
 from chgksuite.typotools import remove_excessive_whitespace as rew
-SEP = os.linesep
+SEP = "\n"
 EDITORS = {
     "win32": "notepad",
     "linux2": "xdg-open",  # python2
@@ -916,6 +917,9 @@ class UnknownEncodingException(Exception):
 def chgk_parse_txt(txtfile, encoding=None, defaultauthor="", args=None, logger=None):
     raw = open(txtfile, "rb").read()
+    # Fix corrupted line endings at byte level before decoding
+    if b"\r\r\n" in raw:
+        raw = raw.replace(b"\r\r\n", b"\n")
     if not encoding:
         if chardet.detect(raw)["confidence"] > 0.7:
             encoding = chardet.detect(raw)["encoding"]
@@ -926,9 +930,10 @@ def chgk_parse_txt(txtfile, encoding=None, defaultauthor="", args=None, logger=N
                 "or resave with a less exotic encoding".format(txtfile)
             )
     text = raw.decode(encoding)
-    text = text.replace("\r", "")
+    # Normalize any remaining line endings
+    text = text.replace("\r\n", "\n").replace("\r", "\n")
     if text[0:10] == "Чемпионат:":
-        return chgk_parse_db(text.replace("\r", ""), debug=args.debug, logger=logger)
+        return chgk_parse_db(text, debug=args.debug, logger=logger)
     return chgk_parse(text.replace("_", "\\_"), defaultauthor=defaultauthor, args=args)

@@ -15,6 +15,7 @@ from chgksuite.common import (
     get_lastdir,
     get_source_dirs,
     log_wrap,
+    read_text_file,
     set_lastdir,
 )
@@ -50,9 +51,7 @@ def upload_file(filepath, trello, list_name=None):
             raise Exception(f"list '{list_name}' not found")
     assert lid is not None
     print(f"uploading to list '{list_['name']}'")
-    content = ""
-    with open(filepath, "r", encoding="utf-8") as f:
-        content = f.read()
+    content = read_text_file(filepath)
     cards = re.split(r"(\r?\n){2,}", content)
     cards = [x for x in cards if x != "" and x != "\n" and x != "\r\n"]
     for card in cards:

@@ -1,5 +1,8 @@
 # What’s new
+## v0.27.2
+- Исправлено несколько багов, в том числе критичный баг, из-за которого программа под Windows выдавала испорченные 4s файлы.
 ## v0.27.0
 - GUI версии теперь не требуют терминала, в них есть окошко, куда выводятся все нужные сообщения.
 - Добавлена поддержка азербайджанского языка (спасибо Tarlan Asadli).

@@ -53,6 +53,9 @@ chgksuite = "chgksuite.__main__:main"
 [tool.hatch.version]
 path = "chgksuite/version.py"
+[tool.hatch.build.targets.sdist]
+exclude = [".venv*"]
 [tool.hatch.build.targets.wheel]
 packages = ["chgksuite"]

	@@ -1 +0,0 @@
1	- ,pecheny,pecheny-CQ5TXQ57J0,20.04.2025 22:07,file:///Users/pecheny/Library/Application%20Support/LibreOffice/4;

@@ -1,3 +0,0 @@
-Вопрос 1. На картинке https://i.imgur.com/M1hXSbw.png показан первый тест, а на https://via.placeholder.com/200x200.png второй.
-Ответ: Два теста.

@@ -1,10 +0,0 @@
-[
-    [
-        "question",
-        "Вопрос 1. На картинке https://i.imgur.com/M1hXSbw.png показан первый тест, а на https://via.placeholder.com/200x200.png второй."
-    ],
-    [
-        "answer",
-        "Ответ: Два теста."
-    ]
-]

@@ -1,10 +0,0 @@
-[
-    [
-        "Question",
-        {
-            "number": "1",
-            "question": "На картинке (img 980865ba6f3fc5ae490b.png) показан первый тест, а на https://via.placeholder.com/200x200.png второй.",
-            "answer": "Два теста."
-        }
-    ]
-]

	@@ -0,0 +1 @@
1	+ __version__ = "0.27.2"

	@@ -1 +0,0 @@
1	- __version__ = "0.27.1"

chgksuite 0.27.1__tar.gz → 0.27.2__tar.gz

chgksuite 0.27.1tar.gz → 0.27.2tar.gz