chgksuite 0.27.1__py3-none-any.whl → 0.27.2__py3-none-any.whl

chgksuite/common.py

@@ -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

chgksuite/composer/__init__.py

@@ -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

chgksuite/parser.py

@@ -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)
 
 

chgksuite/trello.py

@@ -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:

chgksuite/version.py

@@ -1 +1 @@
-__version__ = "0.27.1"
+__version__ = "0.27.2"

{chgksuite-0.27.1.dist-info → chgksuite-0.27.2.dist-info}/METADATA

@@ -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>

{chgksuite-0.27.1.dist-info → chgksuite-0.27.2.dist-info}/RECORD

@@ -2,15 +2,15 @@ chgksuite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chgksuite/__main__.py,sha256=0-_jfloveTW3SZYW5XEagbyaHKGCiDhGNgcLxsT_dMs,140
 chgksuite/_html2md.py,sha256=IzPlRo4dVZNVdlnoCQFjSEfvpFZ0KdvVzfKSeIt15lM,2454
 chgksuite/cli.py,sha256=fHa7HNJeQeUNXpbqnMnSXHOMpbxpaph6d3KdVNx9uNg,41257
-chgksuite/common.py,sha256=TGXXWjdCS8Fy5Gkxuw7ZN3xh9pTS84ZtvRQj7IYU1E4,11341
+chgksuite/common.py,sha256=27HEx5Us0xXywUAWtjlkhsXs67-Cx7ylJSlUViUsOgU,11778
 chgksuite/lastdir,sha256=BbZVRYZnXBQzJUrl7a2e4xuUcfmq6asNI705pTxBfD4,49
-chgksuite/parser.py,sha256=6T6o3F_oJVe9sl96gCaACCwtuF7lcn2V-24qEMN27zw,45847
+chgksuite/parser.py,sha256=JJ_koqLDHAl-IHUe4sTyOK2gySL6uVW5HJmO1xcqD8Q,46042
 chgksuite/parser_db.py,sha256=Ngh2ZYhAyetb6Sa-5xC9aX8quX9Ar1WheSfhSy-JADw,11105
-chgksuite/trello.py,sha256=UYWemtf6z0jKW3tY-aof7_w2hWqcljYNd891vXFZ8mw,14731
+chgksuite/trello.py,sha256=hc_RMlWrNrPzg9AsgC8KE9ow3JUbetMJM_HuiJlBSIk,14693
 chgksuite/typotools.py,sha256=J2AEQbfcR0HHSu5WCALpj4Ya_ngOMXRh7esJgcybWQM,12797
-chgksuite/version.py,sha256=lnka9HWRxSmlQAffgSpaSitns-Djhy2OArtj9IVwxrY,23
+chgksuite/version.py,sha256=_CerHyxnUJ2hU0sB7noT3JBjjI0ohEM5boAPBoFxOg4,23
 chgksuite/vulture_whitelist.py,sha256=P__p_X0zt10ivddIf81uyxsobV14vFg8uS2lt4foYpc,3582
-chgksuite/composer/__init__.py,sha256=kTQsxgn_ED18DgZjdvh7QuwC36FVbaiv_eYTjj3zdIk,6596
+chgksuite/composer/__init__.py,sha256=a02nOz1QqPi84621-v3JD0Nn1_M0_fHyzKqG5Wp2ahI,6511
 chgksuite/composer/chgksuite_parser.py,sha256=ItlTenviFDuqP-f1960nzD-gRPFDQy4RdOL39PswTvg,9044
 chgksuite/composer/composer_common.py,sha256=kc-_Tc9NjevfXGj4fXoa9fye9AO0EuMSnEPJnS0n-aQ,16281
 chgksuite/composer/db.py,sha256=DI-goR4V69S8bufNfW5smTFG9puiyjcxC1u1TFuhfYs,8162
@@ -56,8 +56,8 @@ chgksuite/resources/regexes_uz_cyr.json,sha256=D4AyaEPEY753I47Ky2Fwol_4kxQsl-Yu9
 chgksuite/resources/template.docx,sha256=Do29TAsg3YbH0rRSaXhVzKEoh4pwXkklW_idWA34HVE,11189
 chgksuite/resources/template.pptx,sha256=hEFWqE-yYpwZ8ejrMCJIPEyoMT3eDqaqtiEeQ7I4fyk,29777
 chgksuite/resources/trello.json,sha256=M5Q9JR-AAJF1u16YtNAxDX-7c7VoVTXuq4POTqYvq8o,555
-chgksuite-0.27.1.dist-info/METADATA,sha256=kYoAhnCWvqOmq_4-8DCDE2KOQR2-47_GIYEkk1l3buY,1152
-chgksuite-0.27.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-chgksuite-0.27.1.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
-chgksuite-0.27.1.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
-chgksuite-0.27.1.dist-info/RECORD,,
+chgksuite-0.27.2.dist-info/METADATA,sha256=zGPoXuzOtUiNMdE7NDeSJE25K6XHaoQ4pPLBkfBLz_c,1152
+chgksuite-0.27.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+chgksuite-0.27.2.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
+chgksuite-0.27.2.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
+chgksuite-0.27.2.dist-info/RECORD,,