chgksuite 0.24.0b1__py3-none-any.whl → 0.24.0b2__py3-none-any.whl

chgksuite/cli.py

@@ -81,6 +81,26 @@ class ArgparseBuilder:
             advanced=True,
             argtype="radiobutton",
         )
+        self.add_argument(
+            parser,
+            "--replace_no_break_spaces",
+            choices=["on", "off"],
+            default=default_overrides.get("replace_no_break_spaces") or "on",
+            help="add non-breaking spaces where applicable",
+            caption="Добавить неразрывные пробелы",
+            advanced=True,
+            argtype="radiobutton",
+        )
+        self.add_argument(
+            parser,
+            "--replace_no_break_hyphens",
+            choices=["on", "off"],
+            default=default_overrides.get("replace_no_break_hyphens") or "on",
+            help="add non-breaking hyphens where applicable",
+            caption="Добавить неразрывные дефисы",
+            advanced=True,
+            argtype="radiobutton",
+        )
         self.add_argument(
             parser,
             "-v",

chgksuite/composer/composer_common.py

@@ -17,7 +17,7 @@ import toml
 from PIL import Image
 
 import chgksuite.typotools as typotools
-from chgksuite.common import get_chgksuite_dir, init_logger, log_wrap, DummyLogger
+from chgksuite.common import DummyLogger, get_chgksuite_dir, init_logger, log_wrap
 from chgksuite.typotools import re_lowercase, re_percent, re_uppercase, re_url
 
 
@@ -68,7 +68,9 @@ def make_filename(s, ext, args, addsuffix=""):
     if addsuffix:
         bn += addsuffix
     if args.add_ts == "on":
-        return "{}_{}.{}".format(bn, datetime.datetime.now().strftime("%Y%m%dT%H%M"), ext)
+        return "{}_{}.{}".format(
+            bn, datetime.datetime.now().strftime("%Y%m%dT%H%M"), ext
+        )
     return bn + "." + ext
 
 
@@ -401,6 +403,13 @@ class BaseExporter:
         else:
             self.logger = init_logger("composer", debug=self.args.debug)
 
+    def _replace_no_break(self, s):
+        return typotools.replace_no_break(
+            s,
+            spaces=self.args.replace_no_break_spaces == "on",
+            hyphens=self.args.replace_no_break_hyphens == "on",
+        )
+
     def parse_4s_elem(self, *args, **kwargs):
         kwargs["logger"] = self.logger
         return _parse_4s_elem(*args, **kwargs)

chgksuite/composer/docx.py

@@ -14,7 +14,6 @@ from docx.shared import Pt as DocxPt
 
 from chgksuite.common import log_wrap, replace_escaped
 from chgksuite.composer.composer_common import BaseExporter, backtick_replace, parseimg
-from chgksuite.typotools import replace_no_break_spaces
 
 WHITEN = {
     "handout": False,
@@ -126,7 +125,7 @@ class DocxExporter(BaseExporter):
                     else:
                         text = run[1]["for_print"]
                     if kwargs.get("replace_no_break_spaces"):
-                        text = replace_no_break_spaces(text)
+                        text = self._replace_no_break(text)
                     r = para.add_run(text)
                 elif run[0] == "hyperlink" and not (
                     whiten and self.args.spoilers == "whiten"
@@ -175,7 +174,7 @@ class DocxExporter(BaseExporter):
                 else:
                     text = run[1]
                     if kwargs.get("replace_no_break_spaces"):
-                        text = replace_no_break_spaces(text)
+                        text = self._replace_no_break(text)
                     r = para.add_run(text)
                     if "italic" in run[0]:
                         r.italic = True
@@ -206,9 +205,7 @@ class DocxExporter(BaseExporter):
         return hyperlink
 
     def add_question(
-        self,
-        element, skip_qcount=False, screen_mode=False,
-        external_para=None
+        self, element, skip_qcount=False, screen_mode=False, external_para=None
     ):
         q = element[1]
         if external_para is None:
@@ -326,8 +323,12 @@ class DocxExporter(BaseExporter):
         table.cell(0, 0).paragraphs[0].add_run("Версия для ведущего\n").bold = True
         table.cell(0, 1).paragraphs[0].add_run("Версия для экрана\n").bold = True
 
-        self.add_question(element, screen_mode=False, external_para=table.cell(0, 0).paragraphs[0])
-        self.add_question(element, screen_mode=True, external_para=table.cell(0, 1).paragraphs[0])
+        self.add_question(
+            element, screen_mode=False, external_para=table.cell(0, 0).paragraphs[0]
+        )
+        self.add_question(
+            element, screen_mode=True, external_para=table.cell(0, 1).paragraphs[0]
+        )
 
         self.doc.add_paragraph()
 

chgksuite/composer/lj.py

@@ -17,7 +17,7 @@ from chgksuite.composer.composer_common import (
     md5,
     parseimg,
 )
-from chgksuite.typotools import re_lowercase, re_uppercase, replace_no_break_spaces
+from chgksuite.typotools import re_lowercase, re_uppercase
 
 
 class LjExporter(BaseExporter):
@@ -375,7 +375,7 @@ class LjExporter(BaseExporter):
             else:
                 res += self.htmlrepl(run[1])
         if replace_spaces:
-            res = replace_no_break_spaces(res)
+            res = self._replace_no_break(res)
         return res
 
     @staticmethod

chgksuite/composer/openquiz.py

@@ -10,7 +10,6 @@ from chgksuite.composer.composer_common import (
     Imgur,
     parseimg,
 )
-from chgksuite.typotools import replace_no_break_spaces
 
 MEDIA_STUB = {"Key": "", "Type": "Picture"}
 

chgksuite/composer/pptx.py

@@ -10,7 +10,6 @@ from pptx.util import Pt as PptxPt
 
 from chgksuite.common import log_wrap, replace_escaped
 from chgksuite.composer.composer_common import BaseExporter, backtick_replace, parseimg
-from chgksuite.typotools import replace_no_break_spaces
 
 
 class PptxExporter(BaseExporter):
@@ -51,7 +50,7 @@ class PptxExporter(BaseExporter):
     def pptx_format(self, el, para, tf, slide, replace_spaces=True):
         def r_sp(text):
             if replace_spaces:
-                return replace_no_break_spaces(text)
+                return self._replace_no_break(text)
             return text
 
         if isinstance(el, list):
@@ -127,7 +126,7 @@ class PptxExporter(BaseExporter):
         for punct in (".", ",", "!", "?", ":"):
             s = s.replace(" " + punct, punct)
         if replace_spaces:
-            s = replace_no_break_spaces(s)
+            s = self._replace_no_break(s)
         s = s.strip()
         return s
 

chgksuite/composer/telegram.py

@@ -1,7 +1,7 @@
-import importlib
 import os
 import random
 import re
+import shutil
 import sqlite3
 import time
 
@@ -27,12 +27,13 @@ class TelegramExporter(BaseExporter):
         try:
             self.init_tg()
         except (errors.AuthKeyUnregisteredError, sqlite3.OperationalError) as e:
-            self.logger.warning(f"Session error: {str(e)}")
             filepath = os.path.join(
                 self.chgksuite_dir, self.args.tgaccount + ".session"
             )
+            new_filepath = filepath + ".bak"
+            self.logger.warning(f"Session error: {str(e)}. Moving session: {filepath} -> {new_filepath}")
             if os.path.isfile(filepath):
-                os.remove(filepath)
+                shutil.move(filepath, new_filepath)
             self.init_tg()
         self.qcount = 1
         self.number = 1
@@ -328,22 +329,8 @@ class TelegramExporter(BaseExporter):
         )
         root_msg_in_chat = result.messages[0]
 
-        channel_username = getattr(self.channel_entity, "username", None)
-        chat_username = getattr(self.chat_entity, "username", None)
-
-        if channel_username:
-            root_msg_link = f"https://t.me/{channel_username}/{root_msg.id}"
-        else:
-            root_msg_link = f"https://t.me/c/{str(self.channel_id)[4:]}/{root_msg.id}"
-
-        if chat_username:
-            root_msg_in_chat_link = (
-                f"https://t.me/{chat_username}/{root_msg_in_chat.id}"
-            )
-        else:
-            root_msg_in_chat_link = (
-                f"https://t.me/c/{str(self.chat_id)[4:]}/{root_msg_in_chat.id}"
-            )
+        root_msg_link = self.get_message_link(root_msg, self.channel_entity)
+        root_msg_in_chat_link = self.get_message_link(root_msg_in_chat, self.chat_entity)
 
         self.logger.info(
             f"Posted message {root_msg_link} ({root_msg_in_chat_link} in chat)"

chgksuite/typotools.py

@@ -252,21 +252,23 @@ def get_dashes_right(s):
     return s
 
 
-def replace_no_break_spaces(s):
-    for sp in NO_BREAK_SEQUENCES + [x.title() for x in NO_BREAK_SEQUENCES]:
-        r_from = "(^|[ \u00a0]){sp} ".format(sp=sp)
-        r_to = "\\g<1>{sp}\u00a0".format(sp=sp)
-        s = re.sub(r_from, r_to, s)
-    for sp in NO_BREAK_SEQUENCES_LEFT + [x.title() for x in NO_BREAK_SEQUENCES_LEFT]:
-        r_from = " {sp}([ \u00a0]|$)".format(sp=sp)
-        r_to = "\u00a0{sp}\\g<1>".format(sp=sp)
-        s = re.sub(r_from, r_to, s)
-    srch = re_nbh.search(s)
-    while srch:
-        s = s.replace(
-            srch.group("word"), srch.group("word").replace("-", "\u2011")
-        )  # non-breaking hyphen
+def replace_no_break(s, spaces=True, hyphens=True):
+    if spaces:
+        for sp in NO_BREAK_SEQUENCES + [x.title() for x in NO_BREAK_SEQUENCES]:
+            r_from = "(^|[ \u00a0]){sp} ".format(sp=sp)
+            r_to = "\\g<1>{sp}\u00a0".format(sp=sp)
+            s = re.sub(r_from, r_to, s)
+        for sp in NO_BREAK_SEQUENCES_LEFT + [x.title() for x in NO_BREAK_SEQUENCES_LEFT]:
+            r_from = " {sp}([ \u00a0]|$)".format(sp=sp)
+            r_to = "\u00a0{sp}\\g<1>".format(sp=sp)
+            s = re.sub(r_from, r_to, s)
+    if hyphens:
         srch = re_nbh.search(s)
+        while srch:
+            s = s.replace(
+                srch.group("word"), srch.group("word").replace("-", "\u2011")
+            )  # non-breaking hyphen
+            srch = re_nbh.search(s)
     return s
 
 

chgksuite/version.py

@@ -1 +1 @@
-__version__ = "0.24.0b1"
+__version__ = "0.24.0b2"

{chgksuite-0.24.0b1.dist-info → chgksuite-0.24.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: chgksuite
-Version: 0.24.0b1
+Version: 0.24.0b2
 Summary: A package for chgk automation
 Home-page: https://gitlab.com/peczony/chgksuite
 Author: Alexander Pecheny
@@ -33,6 +33,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{chgksuite-0.24.0b1.dist-info → chgksuite-0.24.0b2.dist-info}/RECORD

@@ -1,25 +1,25 @@
 chgksuite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chgksuite/__main__.py,sha256=0-_jfloveTW3SZYW5XEagbyaHKGCiDhGNgcLxsT_dMs,140
-chgksuite/cli.py,sha256=cs3uoMDdlVwj8JjyfMbGkQdvRt2L9tmdakBuQJ-En3s,31165
+chgksuite/cli.py,sha256=8YoHWfc-wv6gdYMPH3X8HxV9SG70S7M6IQqavJaBXV4,31990
 chgksuite/common.py,sha256=lHQG72HghaBudr1X6ognGbrKmStW5k9nGSLdoxydMSA,10834
 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=YHClK2g44-i_RBS0pNjIcwts1Uv-6QIUrMr0xhz1ZY8,12664
-chgksuite/version.py,sha256=EhoxcBd-7ecA74Nba0hiIt3gNKIAWMmx0smPrVxcPhE,25
+chgksuite/typotools.py,sha256=Jdk65Wn_bXqpQtOT7PkBZyD2ZG1MBeeZFPMzcHEPkf4,12771
+chgksuite/version.py,sha256=0Oh9QRxXRu7bku7hpnaBfS0Bood-SOaN3j3uUzin3lM,25
 chgksuite/vulture_whitelist.py,sha256=P__p_X0zt10ivddIf81uyxsobV14vFg8uS2lt4foYpc,3582
 chgksuite/composer/__init__.py,sha256=MAOVZIYXmZmD6nNQSo9DueV6b5RgxF7_HGeLvsAhMJs,6490
 chgksuite/composer/chgksuite_parser.py,sha256=gOFAqPXRh-I5_GAPM6j1Jki-Wcdald5vPp2vFU1NwOM,8303
-chgksuite/composer/composer_common.py,sha256=4Y5M6l7CwsXQE_DSaBQgQXUi6OHFIYjPUgBFyP61FVI,15056
+chgksuite/composer/composer_common.py,sha256=S5ipehxep6LlGIZ9dcBnifbVaMYXijMhq6-pUHRISo8,15309
 chgksuite/composer/db.py,sha256=71cINE_V8s6YidvqpmBmmlWbcXraUEGZA1xpVFAUENw,8173
-chgksuite/composer/docx.py,sha256=JHgBsGVglayVPI12cEieU50-dMkVFMN-dnaT7_-JHIc,18376
+chgksuite/composer/docx.py,sha256=5MASXACM-ztWrr3VdO8HZ-W-hWWQ5TY1jXMsCQIufGc,18346
 chgksuite/composer/latex.py,sha256=WtLdUICxeX4_5vHEJRF0YhFLpTsOUwBkQFunQS488FA,9248
-chgksuite/composer/lj.py,sha256=K6B0xp6SJkgCPLPZreXLY3n7rvq4Urj7OH3cAhOziWo,15239
-chgksuite/composer/openquiz.py,sha256=y8tjPaD3lIMcQFGBaFGvx7B5iQW5Ihzeer1CPcopXOs,7076
-chgksuite/composer/pptx.py,sha256=1kp2Sxzsk7zXVnsciep0geaUol0Sw2A-xbi95I67S8Y,19177
+chgksuite/composer/lj.py,sha256=nty3Zs3N1H0gNK378U04aAHo71_5cABhCM1Mm9jiUEA,15213
+chgksuite/composer/openquiz.py,sha256=CWGxb_cPG2Qh3dQ3hu0pS5fOfhKc8klZuO38Lo9hUF8,7020
+chgksuite/composer/pptx.py,sha256=05JxulgU80jBmxRqC3cFh0q_B3bMUCe31JzLYvnNZYM,19119
 chgksuite/composer/reddit.py,sha256=-Eg4CqMHhyGGfCteVwdQdtE1pfUXQ42XcP5OYUrBXmo,3878
 chgksuite/composer/stats.py,sha256=GbraSrjaZ8Mc2URs5aGAsI4ekboAKzlJJOqsbe96ELA,3995
-chgksuite/composer/telegram.py,sha256=HLSTmZvK54I8EfgcEpyKCsXj5i2ETR7xCnQ0cw5xLT4,26044
+chgksuite/composer/telegram.py,sha256=Af0LJIjz3vO5OiQikV7XQObx4ABJewBp7YqHRt0P4GY,25670
 chgksuite/composer/telegram_parser.py,sha256=50WqOuvzzdMJJm5wsSLS49oURAQRYToPnbPJjQbMYC4,8096
 chgksuite/resources/cheader.tex,sha256=Jfe3LESk0VIV0HCObbajSQpEMljaIDAIEGSs6YY9rTk,3454
 chgksuite/resources/fix-unnumbered-sections.sty,sha256=FN6ZSWC6MvoRoThPm5AxCF98DdgcxbxyBYG6YImM05s,1409
@@ -43,9 +43,9 @@ chgksuite/resources/regexes_uz_cyr.json,sha256=cIQrNXbjDzRwvywDlicy7m6VEvgpE3V1D
 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.24.0b1.dist-info/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
-chgksuite-0.24.0b1.dist-info/METADATA,sha256=WYB2NUdETBk5leavlerf1k8BSmszdVhqP9DBLey5nyE,1287
-chgksuite-0.24.0b1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-chgksuite-0.24.0b1.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
-chgksuite-0.24.0b1.dist-info/top_level.txt,sha256=cSWiRBOGZW9nIO6Rv1IrEfwPgV2ZWs87QV9wPXeBGqM,10
-chgksuite-0.24.0b1.dist-info/RECORD,,
+chgksuite-0.24.0b2.dist-info/licenses/LICENSE,sha256=_a1yfntuPmctLsuiE_08xMSORuCfGS8X5hQph2U_PUw,1081
+chgksuite-0.24.0b2.dist-info/METADATA,sha256=YbM_s5ki5fEblYecm8L3X1ScDldUlrvXQJgRdEbDawI,1309
+chgksuite-0.24.0b2.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+chgksuite-0.24.0b2.dist-info/entry_points.txt,sha256=lqjX6ULQZGDt0rgouTXBuwEPiwKkDQkSiNsT877A_Jg,54
+chgksuite-0.24.0b2.dist-info/top_level.txt,sha256=cSWiRBOGZW9nIO6Rv1IrEfwPgV2ZWs87QV9wPXeBGqM,10
+chgksuite-0.24.0b2.dist-info/RECORD,,

{chgksuite-0.24.0b1.dist-info → chgksuite-0.24.0b2.dist-info}/WHEEL

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