txt2ebook 0.1.162__py3-none-any.whl → 0.1.163__py3-none-any.whl

txt2ebook/{zh_utils.py → languages/zh_base.py}

@@ -158,4 +158,4 @@ __all__ = [
     "zh_halfwidth_to_fullwidth",
     "zh_numeric",
     "zh_words_to_numbers",
-]
+]

txt2ebook/parser.py

@@ -20,13 +20,16 @@ import logging
 from collections import Counter
 from dataclasses import dataclass
 from types import ModuleType
-from typing import List, Tuple
+from typing import List, Tuple, Union
 
 import regex as re
 
 from txt2ebook.models import Book, Chapter, Volume
 from txt2ebook.tokenizer import Token, Tokenizer
-from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth, zh_words_to_numbers
+from txt2ebook.languages.zh_base import (
+    zh_halfwidth_to_fullwidth,
+    zh_words_to_numbers,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -290,13 +293,13 @@ class Parser:
                 self._process_paragraph_token(token, toc)
 
         # Use authors if set explicitly from command line.
-        if hasattr(self.config, "author") and self.config.author:
+        if getattr(self.config, "author", None):
             book_data["authors"] = self.config.author
 
-        if hasattr(self.config, "title") and self.config.title:
+        if getattr(self.config, "title", None):
             book_data["book_title"] = self.config.title
 
-        if hasattr(self.config, "translator") and self.config.translator:
+        if getattr(self.config, "translator", None):
             book_data["translators"] = self.config.translator
 
         logger.info("Found or set book title: %s", book_data["book_title"])
@@ -307,10 +310,7 @@ class Parser:
         logger.info("Found or set tags: %s", repr(book_data["tags"]))
         logger.info("Found or set index: %s", repr(book_data["index"]))
 
-        if (
-            hasattr(self.config, "sort_volume_and_chapter")
-            and self.config.sort_volume_and_chapter
-        ):
+        if getattr(self.config, "sort_volume_and_chapter", False):
             self.sort_volume_and_chapter(toc)
 
         return (
@@ -322,11 +322,11 @@ class Parser:
             toc,
         )
 
-    def sort_volume_and_chapter(self, toc: List) -> None:
+    def sort_volume_and_chapter(self, toc: List[Union[Volume, Chapter]]) -> None:
         """Sort by title of volumes and its chapters.
 
         Args:
-            toc(List): The parsed table of content
+            toc(List[Union[Volume, Chapter]]): The parsed table of content
 
         Returns:
             str: The formatted book content

txt2ebook/subcommands/massage.py

@@ -31,7 +31,7 @@ from txt2ebook.exceptions import EmptyFileError
 from txt2ebook.formats.txt import TxtWriter
 from txt2ebook.models.book import Book
 from txt2ebook.parser import Parser
-from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth, zh_words_to_numbers
+from txt2ebook.languages.zh_base import zh_halfwidth_to_fullwidth, zh_words_to_numbers
 
 logger = logging.getLogger(__name__)
 

{txt2ebook-0.1.162.dist-info → txt2ebook-0.1.163.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.162
+Version: 0.1.163
 Summary: CLI tool to convert txt file to ebook format
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later

{txt2ebook-0.1.162.dist-info → txt2ebook-0.1.163.dist-info}/RECORD

@@ -2,9 +2,8 @@ txt2ebook/__init__.py,sha256=KWWLxYHPy59AKS4tUen_9OLb7YhqYDUJP21nvh-knBc,3106
 txt2ebook/__main__.py,sha256=L29rlfPSx9XMnVaHBYP2dyYgDmutJvONR3yUejjYwRY,855
 txt2ebook/cli.py,sha256=cB9j6ZS0QugOHYH982QuJuJvNkOKpFR0r-tXFkWJqSQ,4607
 txt2ebook/exceptions.py,sha256=Rowz2jLhopDIV8M0Wma-lojppPjgbvPvBkxSXtLldGQ,944
-txt2ebook/parser.py,sha256=DGxyhuzHJhyHkipoApc-J29H1zoRLYKl2v0EWx8G_q8,11634
+txt2ebook/parser.py,sha256=ERPCz_WF842Kr8MwTco0aAZY51x7IzSeRgiKyktEugc,11588
 txt2ebook/tokenizer.py,sha256=rIRljJYiiBd0Mi1-aCAL88P658a60mdVGluvE9OluGo,10312
-txt2ebook/zh_utils.py,sha256=0Yq9r-JL4HntW68vFR6TBP9yQim1a07mfsh_sp-XmaE,4887
 txt2ebook/formats/__init__.py,sha256=_fW9UuoOTFxCKlej6t-PsFzJOqDFLzVatCci9tcPQeE,1645
 txt2ebook/formats/base.py,sha256=aMD_a3_dv7k07j5EWREkBZdRQJE3mZ1lfpnxJk0UE28,9683
 txt2ebook/formats/epub.py,sha256=tac53gqc4YKdIy9SlxzcY3LaLgSJ_XGFs9GGcPaycco,6911
@@ -19,6 +18,7 @@ txt2ebook/formats/templates/epub/__init__.py,sha256=-XVLvnknTJTmQZY9UTH705vMcHgy
 txt2ebook/helpers/__init__.py,sha256=TltRlsKOaB3FdXqVBKVmsnSFidBCOhRMVx4HjPR2bm0,1313
 txt2ebook/languages/__init__.py,sha256=1AfDn-D0q-dvODGP-9KxPHY_Wtk-ifZdN1FutZMT9-Q,763
 txt2ebook/languages/en.py,sha256=8qsmbKB69M3SD9nBnSX8rP8hAL_RFkhB-zyH93INgaQ,999
+txt2ebook/languages/zh_base.py,sha256=IuqgXB31VQoMzQp1qY3702-XxAW3b34yWtmJiLVcd0w,4886
 txt2ebook/languages/zh_cn.py,sha256=ryKMeaNgX2J6BGrHl7KZL9S6HwIlTyLk75z3lvVQIi4,1960
 txt2ebook/languages/zh_tw.py,sha256=_fdXOOSLK0nTMuBe1Om2qjb4zr2PVd6N4xi2rrYkNTI,1515
 txt2ebook/models/__init__.py,sha256=Z3zClWLj08Q8HgaWV1RRgIKatEhIUfYBAVWm-j4m05w,930
@@ -29,15 +29,15 @@ txt2ebook/subcommands/__init__.py,sha256=ldhzvsrMsR8lZmhZef77JFz0jValpV3pytFfwJS
 txt2ebook/subcommands/env.py,sha256=gEzra4b6guy7pRZUTCWX1_eiR7JmrtR1Z-J-vxljvMY,1549
 txt2ebook/subcommands/epub.py,sha256=T-Uex74HYU1BWfuAcnnoXO0wHoVYVorsXLGfPotCTrc,4951
 txt2ebook/subcommands/gmi.py,sha256=pvp_bQLSttPo5HVcZJxABdPwBf3LBtoGOYy_yEu5Z4A,4698
-txt2ebook/subcommands/massage.py,sha256=f_moVt19n60QH2T2J_EwZnCv1JNFrqLGu5j2VZfp_Lk,15793
+txt2ebook/subcommands/massage.py,sha256=THdHEsnm10v6d4yNgkTM8TQXF2jbVjK7OZ89Dhk3jG0,15802
 txt2ebook/subcommands/md.py,sha256=MvGwzOtYA8c96jw3leDnXspY2s6WRY2BZNTZkvcFtUY,4709
 txt2ebook/subcommands/parse.py,sha256=Qwca1Nha5vrkfnsXoo9qbHL7SWAXFkfaVfkFcgDFs6E,3103
 txt2ebook/subcommands/pdf.py,sha256=lg4da1XhDOywuxB5fjvtf9JmmJGbpCQdUarY5IFS3V4,4360
 txt2ebook/subcommands/tex.py,sha256=szEVokaWfP4QnKBtmknIqTtS39xSc1JLWwt_q-a0PFk,4496
 txt2ebook/subcommands/typ.py,sha256=jKcL52vTw7_9FxlrtdGrD5JDHPvz5Q6x0jWISVWyTVw,4948
-txt2ebook-0.1.162.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.162.dist-info/METADATA,sha256=JpZ7-SScM4OCD0JOm8q6t_5kEAWHcUlDRRMZuFFFXKM,5297
-txt2ebook-0.1.162.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-txt2ebook-0.1.162.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
-txt2ebook-0.1.162.dist-info/top_level.txt,sha256=pesdk4CJRlfhUXVD9vH3Dd_F8ATlLQoqlUsUnU8SJMw,10
-txt2ebook-0.1.162.dist-info/RECORD,,
+txt2ebook-0.1.163.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.163.dist-info/METADATA,sha256=zwTX8RXqJbF8caawiSe7ze5KdyKnpY2O-XU1jH2rss8,5297
+txt2ebook-0.1.163.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+txt2ebook-0.1.163.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
+txt2ebook-0.1.163.dist-info/top_level.txt,sha256=pesdk4CJRlfhUXVD9vH3Dd_F8ATlLQoqlUsUnU8SJMw,10
+txt2ebook-0.1.163.dist-info/RECORD,,