chgksuite 0.26.1__py3-none-any.whl → 0.27.0__py3-none-any.whl

chgksuite/parser.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import base64
-import codecs
 import datetime
 import hashlib
 import itertools
@@ -18,8 +17,9 @@ import time
 
 import bs4
 import chardet
-import dashtable
 import mammoth
+
+from chgksuite._html2md import html2md
 import pypandoc
 import requests
 import toml
@@ -46,7 +46,7 @@ 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"
+
 SEP = os.linesep
 EDITORS = {
     "win32": "notepad",
@@ -61,7 +61,7 @@ def partition(alist, indices):
 
 
 def load_regexes(regexfile):
-    with codecs.open(regexfile, "r", "utf8") as f:
+    with open(regexfile, "r", encoding="utf-8") as f:
         regexes = json.loads(f.read())
     return {k: re.compile(v) for k, v in regexes.items()}
 
@@ -327,7 +327,7 @@ class ChgkParser:
                     regex,
                     regexes[regex].search(self.remove_formatting(st[i][1])).start(0),
                 )
-                for regex in set(regexes) - {"number", "date2"}
+                for regex in set(regexes) - {"number", "date2", "handout_short"}
                 if regexes[regex].search(self.remove_formatting(st[i][1]))
             }
 
@@ -526,7 +526,7 @@ class ChgkParser:
             )
 
         if debug:
-            with codecs.open("debug_0.txt", "w", "utf8") as f:
+            with open("debug_0.txt", "w", encoding="utf-8") as f:
                 f.write(text)
 
         # 1.
@@ -558,7 +558,7 @@ class ChgkParser:
         i = 0
 
         if debug:
-            with codecs.open("debug_1.json", "w", "utf8") as f:
+            with open("debug_1.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         self.process_single_number_lines()
@@ -566,15 +566,15 @@ class ChgkParser:
         # hack for https://gitlab.com/peczony/chgksuite/-/issues/23; TODO: make less hacky
         for i, element in enumerate(self.structure):
             if (
-                "дуплет." in element[1].lower().split()
-                or "блиц." in element[1].lower().split()
+                "Дуплет." in element[1].split()
+                or "Блиц." in element[1].split()
                 and element[0] != "question"
                 and (i == 0 or self.structure[i - 1][0] != "question")
             ):
                 element[0] = "question"
 
         if debug:
-            with codecs.open("debug_1a.json", "w", "utf8") as f:
+            with open("debug_1a.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 2.
@@ -584,7 +584,7 @@ class ChgkParser:
         self.merge_to_x_until_nextfield("comment")
 
         if debug:
-            with codecs.open("debug_2.json", "w", "utf8") as f:
+            with open("debug_2.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 3.
@@ -647,7 +647,7 @@ class ChgkParser:
         self.merge_to_x_until_nextfield("nezachet")
 
         if debug:
-            with codecs.open("debug_3.json", "w", "utf8") as f:
+            with open("debug_3.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 4.
@@ -660,7 +660,7 @@ class ChgkParser:
             self.merge_to_next(0)
 
         if debug:
-            with codecs.open("debug_3a.json", "w", "utf8") as f:
+            with open("debug_3a.json", "w", encoding="utf-8") as f:
                 f.write(
                     json.dumps(
                         list(enumerate(self.structure)), ensure_ascii=False, indent=4
@@ -688,12 +688,9 @@ class ChgkParser:
                     except Exception as e:
                         num = None
                         sys.stderr.write(
-                            f"exception at setting number: {type(e)} {e}\n"
+                            f"exception at setting number: {type(e)} {e}\nQuestion: {element[1]}\n"
                         )
-                    if (
-                        num is None
-                        or num and not num.group("number")
-                    ) and (
+                    if (num is None or num and not num.group("number")) and (
                         ("нулевой вопрос" in element[1].lower())
                         or ("разминочный вопрос" in element[1].lower())
                     ):
@@ -721,7 +718,7 @@ class ChgkParser:
             idx += 1
 
         if debug:
-            with codecs.open("debug_4.json", "w", "utf8") as f:
+            with open("debug_4.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 5.
@@ -801,7 +798,7 @@ class ChgkParser:
                 )
 
         if debug:
-            with codecs.open("debug_5.json", "w", "utf8") as f:
+            with open("debug_5.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(self.structure, ensure_ascii=False, indent=4))
 
         # 6.
@@ -856,7 +853,7 @@ class ChgkParser:
             final_structure.append(["Question", current_question])
 
         if debug:
-            with codecs.open("debug_6.json", "w", "utf8") as f:
+            with open("debug_6.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(final_structure, ensure_ascii=False, indent=4))
 
         # 7.
@@ -902,7 +899,7 @@ class ChgkParser:
                 element[1] = self._process_images_in_text(element[1])
 
         if debug:
-            with codecs.open("debug_final.json", "w", "utf8") as f:
+            with open("debug_final.json", "w", encoding="utf-8") as f:
                 f.write(json.dumps(final_structure, ensure_ascii=False, indent=4))
         return final_structure
 
@@ -985,8 +982,8 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
             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"
+            with open(
+                os.path.join(target_dir, "debugdebug.pydocx"), "w", encoding="utf-8"
             ) as dbg:
                 dbg.write(html)
         input_docx = (
@@ -997,8 +994,8 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
         bsoup = BeautifulSoup(input_docx, "html.parser")
 
         if args.debug:
-            with codecs.open(
-                os.path.join(target_dir, "debug.pydocx"), "w", "utf8"
+            with open(
+                os.path.join(target_dir, "debug.pydocx"), "w", encoding="utf-8"
             ) as dbg:
                 dbg.write(input_docx)
 
@@ -1068,7 +1065,7 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
             ensure_line_breaks(tag)
         for tag in bsoup.find_all("table"):
             try:
-                table = dashtable.html2md(str(tag))
+                table = html2md(str(tag))
                 tag.insert_before(table)
             except (TypeError, ValueError):
                 logger.error(f"couldn't parse html table: {str(tag)}")
@@ -1099,12 +1096,12 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
                     tag.unwrap()
 
         if args.debug:
-            with codecs.open(
-                os.path.join(target_dir, "debug_raw.html"), "w", "utf8"
+            with open(
+                os.path.join(target_dir, "debug_raw.html"), "w", encoding="utf-8"
             ) as dbg:
                 dbg.write(str(bsoup))
-            with codecs.open(
-                os.path.join(target_dir, "debug.html"), "w", "utf8"
+            with open(
+                os.path.join(target_dir, "debug.html"), "w", encoding="utf-8"
             ) as dbg:
                 dbg.write(bsoup.prettify())
 
@@ -1142,7 +1139,9 @@ def chgk_parse_docx(docxfile, defaultauthor="", args=None, logger=None):
         txt = txt.replace(f"IMGPATH({i})", elem)
 
     if args.debug:
-        with codecs.open(os.path.join(target_dir, "debug.debug"), "w", "utf8") as dbg:
+        with open(
+            os.path.join(target_dir, "debug.debug"), "w", encoding="utf-8"
+        ) as dbg:
             dbg.write(txt)
 
     final_structure = chgk_parse(txt, defaultauthor=defaultauthor, args=args)
@@ -1176,7 +1175,7 @@ def chgk_parse_wrapper(path, args, logger=None):
         sys.exit()
     outfilename = os.path.join(target_dir, make_filename(abspath, "4s", args))
     logger.info("Output: {}".format(os.path.abspath(outfilename)))
-    with codecs.open(outfilename, "w", "utf8") as output_file:
+    with open(outfilename, "w", encoding="utf-8") as output_file:
         output_file.write(compose_4s(final_structure, args=args))
     return outfilename
 

chgksuite/parser_db.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import codecs
 import json
 import os
 import re
@@ -128,7 +127,7 @@ def t_ANSWER(t):
     t.lexer.text = ""
     if t.lexer.question["answer"]:
         logger.warning(
-            "Bad format: several Answer fields. " "Previous Answer was:" " '%s'",
+            "Bad format: several Answer fields. Previous Answer was: '%s'",
             t.lexer.question["answer"],
         )
 
@@ -151,7 +150,7 @@ def t_COMMENT(t):
     t.lexer.text = ""
     if t.lexer.question["comment"]:
         logger.warning(
-            "Bad format: several Comment fields. " "Previous Comment was:" " '%s'",
+            "Bad format: several Comment fields. Previous Comment was: '%s'",
             t.lexer.question["comment"],
         )
 
@@ -162,7 +161,7 @@ def t_SOURCE(t):
     t.lexer.text = ""
     if t.lexer.question["source"]:
         logger.warning(
-            "Bad format: several Source fields. " "Previous Source was:" " '%s'",
+            "Bad format: several Source fields. Previous Source was: '%s'",
             t.lexer.question["source"],
         )
 
@@ -417,7 +416,6 @@ def replace_handouts(match_handout):
 
 
 def chgk_parse_db(text, debug=False, logger=False):
-
     if not logger:
         logger = init_logger("parser_db", debug=debug)
 
@@ -437,7 +435,7 @@ def chgk_parse_db(text, debug=False, logger=False):
     append_question(lexer)
 
     if debug:
-        with codecs.open("debug_final.json", "w", "utf8") as f:
+        with open("debug_final.json", "w", encoding="utf-8") as f:
             f.write(json.dumps(lexer.structure, ensure_ascii=False, indent=4))
 
     return lexer.structure

chgksuite/resources/labels_az.toml

@@ -0,0 +1,22 @@
+[question_labels]
+question = "Sual"
+answer = "Cavab"
+zachet = "Sayılma meyarı"
+nezachet = "Sayılmır"
+comment = "Şərh"
+source = "Mənbə"
+sources = "Mənbələr"
+author = "Müəllif"
+authors = "Müəlliflər"
+handout = "Paylama materialı"
+
+[general]
+section = "Tur"
+editor = "Redaktor"
+date = "Tarix"
+questions_in_comments = "Suallar şərh bölməsindədir."
+general_impressions_caption = "Ümumi təəssüratlar"
+handout_for_question = "Paylama materialı sual {} üçün"
+general_impressions_text = "Paket barədə ümumi təəssüratlar — bu posun altına şərh kimi yazın."
+right_answers_for_stats = "Doğru cavablar"
+cf_image = "Şəklə baxın"

chgksuite/resources/labels_by.toml

@@ -9,7 +9,6 @@ sources = "Крыніцы"
 author = "Аўтар"
 authors = "Аўтары"
 handout = "Раздаткавы матэрыял"
-handout_short = "Раздат"
 
 [general]
 section = "Тур"
@@ -19,4 +18,4 @@ questions_in_comments = "Пытанні ў каментарах."
 handout_for_question = "Раздаткавы матэрыял да пытання {}"
 general_impressions_caption = "Агульныя ўражанні"
 general_impressions_text = "Агульныя ўражанні ад пакета — у каментарах да гэтага паста."
-right_answers_for_stats = "Правільных адказаў"
+right_answers_for_stats = "Правільных адказаў"

chgksuite/resources/labels_by_tar.toml

@@ -9,7 +9,6 @@ sources = "Крыніцы"
 author = "Аўтар"
 authors = "Аўтары"
 handout = "Раздаткавы матэрыял"
-handout_short = "Раздат"
 
 [general]
 section = "Тур"
@@ -19,4 +18,4 @@ questions_in_comments = "Пытаньні ў каментарыях."
 handout_for_question = "Раздатачны матэрыял да пытаньня {}"
 general_impressions_caption = "Агульныя ўражаньні"
 general_impressions_text = "Агульныя ўражаньні ад пакета — у каментарыях да гэтага паста."
-right_answers_for_stats = "Правільных адказаў"
+right_answers_for_stats = "Правільных адказаў"

chgksuite/resources/labels_en.toml

@@ -9,7 +9,6 @@ sources = "Sources"
 author = "Author"
 authors = "Authors"
 handout = "Handout"
-handout_short = "Handout"
 
 [general]
 section = "Block"
@@ -19,4 +18,4 @@ questions_in_comments = "Questions are in the comments."
 handout_for_question = "Handout for question {}"
 general_impressions_caption = "General impression"
 general_impressions_text = "Please share your general impression of the packet in the comments to this post."
-right_answers_for_stats = "Correct answers"
+right_answers_for_stats = "Correct answers"

chgksuite/resources/labels_kz_cyr.toml

@@ -9,7 +9,6 @@ sources = "Дереккөздер"
 author = "Автор"
 authors = "Авторлар"
 handout = "Үлестіру материалы"
-handout_short = "Материал"
 
 [general]
 section = "Тур"
@@ -20,4 +19,4 @@ general_impressions_caption = "Жалпы әсер"
 handout_for_question = "{}-сұрақтың үлестіру материалы"
 general_impressions_text = "Пакеттен алған жалпы әсер — осы пост астындағы комментарийлерде."
 right_answers_for_stats = "Алған сұрақтар"
-cf_image = "суретті қараңыз"
+cf_image = "суретті қараңыз"

chgksuite/resources/labels_ru.toml

@@ -9,7 +9,6 @@ sources = "Источники"
 author = "Автор"
 authors = "Авторы"
 handout = "Раздаточный материал"
-handout_short = "Раздат"
 
 [general]
 section = "Тур"
@@ -20,4 +19,4 @@ general_impressions_caption = "Общие впечатления"
 handout_for_question = "Раздаточный материал к вопросу {}"
 general_impressions_text = "Общее впечатление от пакета — в комментариях к этому посту."
 right_answers_for_stats = "Взятия"
-cf_image = "см. изображение"
+cf_image = "см. изображение"

chgksuite/resources/labels_sr.toml

@@ -9,7 +9,6 @@ sources = "Izvori"
 author = "Autor"
 authors = "Autori"
 handout = "Materijal za deljenje"
-handout_short = "Podeljeno"
 
 [general]
 section = "Runda"
@@ -20,4 +19,4 @@ general_impressions_caption = "Opšti utisci"
 handout_for_question = "Materijal za deljenje uz pitanje {}"
 general_impressions_text = "Opšti utisak od paketa — u komentarima na ovu objavu."
 right_answers_for_stats = "Pogodak"
-cf_image = "vidi sliku"
+cf_image = "vidi sliku"

chgksuite/resources/labels_ua.toml

@@ -9,7 +9,6 @@ sources = "Джерела"
 author = "Автор"
 authors = "Автори"
 handout = "Роздатковий матеріал"
-handout_short = "Роздат"
 
 [general]
 section = "Тур"
@@ -19,4 +18,4 @@ questions_in_comments = "Запитання у коментарях."
 handout_for_question = "Роздатковий матеріал до запитання {}"
 general_impressions_caption = "Загальні враження"
 general_impressions_text = "Загальні враження про пакет — у коментарях до цього посту."
-right_answers_for_stats = "Взяття"
+right_answers_for_stats = "Взяття"

chgksuite/resources/labels_uz.toml

@@ -9,7 +9,6 @@ sources = "Manbalar"
 author = "Muallif"
 authors = "Mualliflar"
 handout = "Tarqatma material"
-handout_short = "Tarqat"
 
 [general]
 section = "Tur"
@@ -20,5 +19,3 @@ handout_for_question = "{} savolga tarqatma material."
 general_impressions_caption = "Umumiy taasurotlar"
 general_impressions_text = "To‘plamdan umumiy taasurotlar — ushbu postning izohlarida."
 right_answers_for_stats = "To‘g‘ri javoblar foizi"
-
-

chgksuite/resources/labels_uz_cyr.toml

@@ -9,7 +9,6 @@ sources = "Манбалар"
 author = "Муаллиф"
 authors = "Муаллифлар"
 handout = "Тарқатма материал"
-handout_short = "Тарқат"
 
 [general]
 section = "Тур"
@@ -19,4 +18,4 @@ questions_in_comments = "Саволлар изоҳларда."
 handout_for_question = "{} саволга тарқатма материал."
 general_impressions_caption = "Умумий таасуротлар"
 general_impressions_text = "Тўпламдан умумий таасуротлар — ушбу постнинг изоҳларида."
-right_answers_for_stats = "Тўғри жавоблар фоизи"
+right_answers_for_stats = "Тўғри жавоблар фоизи"

chgksuite/resources/regexes_az.json

@@ -0,0 +1,17 @@
+{
+    "tour": "^(#\\s+)?T[Uu][Rr]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
+    "tourrev": "^([0-9IVXLCDM]+)\\s[Tt][Uu][Rr]([\\.:])?$",
+    "question": "S[Uu][Aa][Ll]\\s?[№N]?(?P<number>[0-9\\s]*)\\s*([\\.:]|\\n|\\r\\n|$)",
+    "handout": "^P[Aa][Yy][Ll][Aa][Mm][Aa]\\s+[Mm][Aa][Tt][Ee][Rr][İi][Aa][Ll][\\.:]",
+    "answer": "C[Aa][Vv][Aa][Bb]?\\s?[№N]?([0-9]+)?\\s*[\\.:]?",
+    "zachet": "S[Aa][Yy][ıI][Ll][Mm][Aa]\\s+[Mm][Ee][Yy][Aa][Rr][ıI]\\s*[\\.:]?",
+    "nezachet": "S[Aa][Yy][ıI][Ll][Mm][ıI][Rr]\\s*[\\.:]?",
+    "comment": "Ş[Əə][Rr][Hh]\\s?[№N]?([0-9]+)?\\s*[\\.:]?",
+    "author": "M[Üü][Əə][Ll][Ll][İiİı][Ff]\\s*[\\.:]?",
+    "source": "M[Əə][Nn][Bb][Əə]\\s*[\\.:]?",
+    "editor": "R[Ee][Dd][Aa]([Kk][Tt][Oo][Rr]?\\s*(\\s*[\\.:]|\\s*[\\-–—]+\\s)?)",
+    "date": "TT[Aa][Rr][İiİı][Xx]\\s*[\\.:]?",
+    "date2": "(^|\\s)[Yy][Aa][Nn][Vv][Aa][Rr]|[Ff][Ee][Vv][Rr][Aa][Ll]|[Mm][Aa][Rr][Tt]|[Aa][Pp][Rr][Ee][Ll]|[Mm][Aa][Yy]|[İi][Yy][Uu][Nn]|[İi][Yy][Uu][Ll]|[Aa][Vv][Qq][Uu][Ss][Tt]|[Ss][Ee][Nn][Tt][Yy][Aa][Bb][Rr]|[Oo][Kk][Tt][Yy][Aa][Bb][Rr]|[Nn][Oo][Yy][Aa][Bb][Rr]|[Dd][Ee][Kk][Aa][Bb][Rr](\\s|$)",
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "(P[Aa][Yy][Ll]|R[Ee][Kk][Vv][Ii][Zz][Ii][Tt])"
+}

chgksuite/resources/regexes_by.json

@@ -12,5 +12,6 @@
     "editor": "[Рр][Ээ][Дд][Аа][Кк][Тт][Аа][Рр]([Ыы])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
     "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)студзеня|лютага|сакавіка|красавіка|мая|чэрвеня|ліпеня|жніўня|верасня|кастрычніка|лістапада|снежня(\\s|$)",
-    "number": "^[0-9]+[\\.\\)]\\s*"
-}
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "Р[Аа][Зз][Дд][Аа][Тт]"
+}

chgksuite/resources/regexes_by_tar.json

@@ -0,0 +1,17 @@
+{
+    "tour": "^(#\\s+)?Т[Уу][Рр]\\s?№?\\s?([0-9IVXLCDM]*)([\\.:])?$",
+    "tourrev": "^([0-9IVXLCDM]+)\\s[Тт][Уу][Рр]([\\.:])?$",
+    "question": "П[Ыы][Тт][Аа][Нн][Ьь][Нн][Ее]\\s?[№N]?(?P<number>[0-9\\s]*)\\s?([\\.:]|\n|\r\n|$)",
+    "handout": "Р[Аа][Зз][Дд][Аа][Тт][Кк][Аа][Вв][Ыы][\\s\\s][Мм][Аа][Тт][Ээ][Рр][Ыы][Яя][Лл][\\.:]",
+    "answer": "А[Дд][Кк][Аа][Зз][Ыы]?\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "zachet": "З[Аа][Лл][Іі][Кк]\\s?[\\.:]",
+    "nezachet": "Н[Ее][Зз][Аа][Лл][Іі][Кк]\\s?[\\.:]",
+    "comment": "К[Аа][Мм][Ее][Нн][Тт][Аа][Рр][Ыы][Йй]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "А[Ўў][Тт][Аа][Рр](\\(?[Ыы]?\\)?|[Кк][АаИи])?\\s?[\\.:]",
+    "source": "К[Рр][Ыы][Нн][Іі][Цц][АаЫы]\\s?[\\.:]",
+    "editor": "[Рр][Ээ][Дд][Аа][Кк][Тт][Аа][Рр]([Ыы])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
+    "date2": "(^|\\s)студзеня|лютага|сакавіка|красавіка|мая|траўня|чэрвеня|ліпеня|жніўня|верасьня|кастрычніка|лістапада|сьнежня(\\s|$)",
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "Р[Аа][Зз][Дд][Аа][Тт]"
+}

chgksuite/resources/regexes_en.json

@@ -12,5 +12,6 @@
     "editor": "E[Dd][Ii][Tt]([Oo][Rr][Ss]?|[Ee][Dd]\\s[Bb][Yy])\\s?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
     "date": "D[Aa][Tt][Ee]\\s?[\\.:]",
     "date2": "(^|\\s)Jan(uary)?|Feb(ruary)?|Mar(ch)?|Apr(il)?|May|June?|July?|Aug(ust)?|Sep(tember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?(\\s|$)",
-    "number": "^[0-9]+[\\.\\)]\\s*"
-}
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "H[Aa][Nn][Dd][Oo][Uu][Tt]"
+}

chgksuite/resources/regexes_kz_cyr.json

@@ -11,5 +11,6 @@
     "editor": "Р[Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Лл][Аа][Рр])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
     "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)[Яя][Нн][Вв][Аа][Рр][ЬьЯя]|[Фф][Ее][Вв][Рр][Аа][Лл][ЬьЯя]|[Мм][Аа][Рр][Тт][Аа]?|[Аа][Пп][Рр][Ее][Лл][ЬьЯя]|[Мм][Аа][ЙйЯя]|[Ии][Юю][Нн][ЬьЯя]|[Ии][Юю][Лл][ЬьЯя]|[Аа][Вв][Гг][Уу][Сс][Тт][Аа]?|[Сс][Ее][Нн][Тт][Яя][Бб][Рр][ЬьЯя]|[Оо][Кк][Тт][Яя][Бб][Рр][ЬьЯя]|[Нн][Оо][Яя][Бб][Рр][ЬьЯя]|[Дд][Ее][Кк][Аа][Бб][Рр][ЬьЯя](\\s|$)",
-    "number": "^[0-9]+[\\.\\)]\\s*"
-}
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "М[Аа][Тт][Ее][Рр][Ии][Аа][Лл]"
+}

chgksuite/resources/regexes_ru.json

@@ -12,5 +12,6 @@
     "editor": "[Рр][Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Ыы]|[Сс][Кк][Аа][Яя]\\s[Гг][Рр][Уу][Пп][Пп][Аа])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
     "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)[Яя][Нн][Вв][Аа][Рр][ЬьЯя]|[Фф][Ее][Вв][Рр][Аа][Лл][ЬьЯя]|[Мм][Аа][Рр][Тт][Аа]?|[Аа][Пп][Рр][Ее][Лл][ЬьЯя]|[Мм][Аа][ЙйЯя]|[Ии][Юю][Нн][ЬьЯя]|[Ии][Юю][Лл][ЬьЯя]|[Аа][Вв][Гг][Уу][Сс][Тт][Аа]?|[Сс][Ее][Нн][Тт][Яя][Бб][Рр][ЬьЯя]|[Оо][Кк][Тт][Яя][Бб][Рр][ЬьЯя]|[Нн][Оо][Яя][Бб][Рр][ЬьЯя]|[Дд][Ее][Кк][Аа][Бб][Рр][ЬьЯя](\\s|$)",
-    "number": "^[0-9]+[\\.\\)]\\s*"
-}
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "Р[Аа][Зз][Дд][Аа][Тт]"
+}

chgksuite/resources/regexes_sr.json

@@ -12,5 +12,6 @@
     "editor": "U[Rr][Ee][Dd][Nn][Ii][Kk][Ii]?\\s?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
     "date": "D[Aa][Tt][Uu][Mm]\\s?[\\.:]",
     "date2": "WILL_FILL_LATER",
-    "number": "^[0-9]+[\\.\\)]\\s*"
-}
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "P[Oo][Dd][Ee][Ll][Jj][Ee][Nn][Oo]"
+}

chgksuite/resources/regexes_ua.json

@@ -12,5 +12,6 @@
     "editor": "[Рр][Ее][Дд][Аа][Кк][Тт][Оо][Рр]([Ии]|[Сс][Ьь][Кк][Аа]\\s[Гг][Рр][Уу][Пп][Аа])?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
     "date": "Д[Аа][Тт][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)cічня|лютого|березня|квітня|травня|червня|липня|серпня|вересня|жовтня|листопада|грудня(\\s|$)",
-    "number": "^[0-9]+[\\.\\)]\\s*"
-}
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "Р[Оо][Зз][Дд][Аа][Тт]"
+}

chgksuite/resources/regexes_uz.json

@@ -0,0 +1,16 @@
+{
+    "tour": "^(#\\s+)?([0-9]+)\\s?[-–—]\\s?[Tt][Uu][Rr]\\s*$",
+    "question": "(?P<number>[0-9]+)\\s?[-–—]\\s?[Ss][Aa][Vv][Oo][Ll]([\\.:]|\n|\r\n|$)",
+    "answer": "[Jj][Aa][Vv][Oo][Bb]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "handout": "[Tt][Aa][Rr][Qq][Aa][Tt][Mm][Aa][\\s\\s][Mm][Aa][Tt][Ee][Rr][Ii][Aa][Ll][\\.:]",
+    "zachet": "[Qq][Aa][Bb][Uu][Ll]\\s?[\\.:]",
+    "nezachet": "[Qq][Aa][Bb][Uu][Ll]\\s[Ee][Mm][Aa][Ss]?[\\.:]",
+    "comment": "[Ii][Zz][Oo][Hh]\\s?[№N]?([0-9]+)?\\s?[\\.:]",
+    "author": "[Mm][Uu][Aa][Ll][Ll][Ii][Ff]([Ll][Aa][Rr])?\\s?[\\.:]",
+    "source": "[Mm][Aa][Nn][Bb][Aa]([Ll][Aa][Rr])?\\s?[\\.:]",
+    "editor": "(M|Tur\\sm)[Uu][Hh][Aa][Rr][Rr][Ii][Rr]([Ll][Aa][Rr][Ii]?)?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
+    "date": "[Ss][Aa][Nn][Aa]\\s?[\\.:]",
+    "date2": "(^|\\s)[Yy]anvar|[Ff]evral|[Mm]art|[Aa]prel|[Mm]ay|[Ii]yun|[Ii]yul|[Aa]vgust|[Ss]entabr|[Oo]ktabr|[Nn]oyabr|[Dd]ekabr(\\s|$)",
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "T[Aa][Rr][Qq][Aa][Tt]"
+}

chgksuite/resources/regexes_uz_cyr.json

@@ -11,5 +11,6 @@
     "editor": "(М|Тур\\sм)[Уу][Ҳҳ][Аа][Рр][Рр][Ии][Рр]([Лл][Аа][Рр][Ии]?)?(\\s?[\\.:]|\\s[\\-–—]+\\s)",
     "date": "С[Аа][Нн][Аа]\\s?[\\.:]",
     "date2": "(^|\\s)январь|февраль|март|апрель|май|июнь|июль|август|сентябрь|октябрь|ноябрь|декабрь(\\s|$)",
-    "number": "^[0-9]+[\\.\\)]\\s*"
-}
+    "number": "^[0-9]+[\\.\\)]\\s*",
+    "handout_short": "Т[Аа][Рр][Ққ][Аа][Тт]"
+}

chgksuite/trello.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import codecs
 import json
 import os
 import pdb
@@ -52,7 +51,7 @@ def upload_file(filepath, trello, list_name=None):
     assert lid is not None
     print(f"uploading to list '{list_['name']}'")
     content = ""
-    with codecs.open(filepath, "r", "utf8") as f:
+    with open(filepath, "r", encoding="utf-8") as f:
         content = f.read()
     cards = re.split(r"(\r?\n){2,}", content)
     cards = [x for x in cards if x != "" and x != "\n" and x != "\r\n"]
@@ -255,7 +254,7 @@ def gui_trello_download(args):
 
     board_id_path = os.path.join(args.folder, ".board_id")
     if os.path.isfile(board_id_path):
-        with codecs.open(board_id_path, "r", "utf8") as f:
+        with open(board_id_path, "r", encoding="utf-8") as f:
             board_id = f.read().rstrip()
     else:
         board_id = get_board_id(path=args.folder)
@@ -401,14 +400,14 @@ def gui_trello_download(args):
             result.extend(_lists[_list["name"]])
         filename = "singlefile.4s"
         print("outputting {}".format(filename))
-        with codecs.open(filename, "w", "utf8") as f:
+        with open(filename, "w", encoding="utf-8") as f:
             for item in result:
                 f.write("\n" + item + "\n")
     else:
         for _list in _lists:
             filename = "{}.4s".format(_list)
             print("outputting {}".format(filename))
-            with codecs.open(filename, "w", "utf8") as f:
+            with open(filename, "w", encoding="utf-8") as f:
                 for item in _lists[_list]:
                     f.write("\n" + item + "\n")
 
@@ -421,12 +420,12 @@ def get_board_id(path=None):
     print("                     board_id")
     print()
     board_id = input(
-        "Please paste your board_id " "(or the board link, " "we'll parse it): "
+        "Please paste your board_id (or the board link, we'll parse it): "
     ).rstrip()
     if "trello.com" in board_id:
         board_id = re_bi.search(board_id).group(1)
     if path:
-        with codecs.open(os.path.join(path, ".board_id"), "w", "utf8") as f:
+        with open(os.path.join(path, ".board_id"), "w", encoding="utf-8") as f:
             f.write(board_id)
     return board_id
 
@@ -437,7 +436,7 @@ def get_token(tokenpath, args):
     else:
         webbrowser.open(TRELLO_URL)
     token = input("Please paste the obtained token: ").rstrip()
-    with codecs.open(tokenpath, "w", "utf8") as f:
+    with open(tokenpath, "w", encoding="utf-8") as f:
         f.write(token)
     return token
 
@@ -452,7 +451,7 @@ def gui_trello(args):
     if not os.path.isfile(tokenpath):
         token = get_token(tokenpath, args)
     else:
-        with codecs.open(tokenpath, "r", "utf8") as f:
+        with open(tokenpath, "r", encoding="utf-8") as f:
             token = f.read().rstrip()
 
     with open(os.path.join(resourcedir, "trello.json")) as f: