txt2ebook 0.1.150__py3-none-any.whl → 0.1.152__py3-none-any.whl

txt2ebook/languages/zh_cn.py

@@ -45,6 +45,7 @@ RE_CHAPTERS = [
     "作者[介绍自介].*",
     "正文",
     "人物谱",
+    "作者按",
 ]
 
 DEFAULT_RE_AUTHOR = r"作者：(.*)"

txt2ebook/subcommands/massage.py

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-"""Env subcommand."""
+"""Massage subcommand."""
 
 import argparse
 import logging
@@ -22,9 +22,11 @@ from importlib import import_module
 from pathlib import Path
 
 import cjkwrap
+import jieba.analyse
 import regex as re
 from bs4 import UnicodeDammit
 
+from txt2ebook import detect_and_expect_language
 from txt2ebook.exceptions import EmptyFileError
 from txt2ebook.models.book import Book
 from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth, zh_words_to_numbers
@@ -70,7 +72,22 @@ def build_subparser(subparsers) -> None:
         default=False,
         action="store_true",
         dest="fullwidth",
-        help="use fullwidth character (only for zh-cn and zh-tw)",
+        help=(
+            "use fullwidth character (only for zh-cn and zh-tw) "
+            "(default: %(default)r)"
+        ),
+    )
+
+    massage_parser.add_argument(
+        "-ri",
+        "--reindent",
+        default=False,
+        action="store_true",
+        dest="reindent",
+        help=(
+            "reindent each paragraph (only for zh-cn and zh-tw) "
+            "(default: %(default)r)"
+        ),
     )
 
     massage_parser.add_argument(
@@ -318,12 +335,18 @@ def massage_txt(args: argparse.Namespace) -> str:
 
     content = to_unix_newline(content)
 
+    args.language = detect_and_expect_language(content, args.language)
+
     (metadata, body) = extract_metadata_and_body(args, content)
 
     if args.fullwidth and args.language in ("zh-cn", "zh-tw"):
         logger.info("Convert halfwidth ASCII characters to fullwidth")
         body = zh_halfwidth_to_fullwidth(body)
 
+    if args.reindent and args.language in ("zh-cn", "zh-tw"):
+        logger.info("Reindent paragraph")
+        body = do_reindent_paragraph(args, body)
+
     if args.re_delete:
         body = do_delete_regex(args, body)
 
@@ -339,7 +362,7 @@ def massage_txt(args: argparse.Namespace) -> str:
     if args.width:
         body = do_wrapping(args, body)
 
-    return f"{metadata}\n\n{body}"
+    return f"{metadata}{body}"
 
 
 def to_unix_newline(content: str) -> str:
@@ -353,6 +376,30 @@ def to_unix_newline(content: str) -> str:
     """
     return content.replace("\r\n", "\n").replace("\r", "\n")
 
+def do_reindent_paragraph(args, content: str) -> str:
+    """Reindent each paragraph.
+
+    Args:
+        content(str): The formatted book content.
+
+    Returns:
+        str: The formatted book content.
+    """
+    paragraphs = re.split(r'\n\s*\n+', content)
+    reindented_paragraphs = []
+    for paragraph in paragraphs:
+        lines = paragraph.split('\n')
+        reindented_lines = []
+        for line in lines:
+            stripped_line = line.strip()
+            reindented_lines.append(stripped_line)
+
+        reindented_paragraph = '\n'.join(reindented_lines)
+        reindented_paragraph = "　　" + reindented_paragraph
+        reindented_paragraphs.append(reindented_paragraph)
+
+    return args.paragraph_separator.join(reindented_paragraphs)
+
 
 def do_delete_regex(args, content: str) -> str:
     """Remove words/phrases based on regex.
@@ -425,7 +472,24 @@ def extract_metadata_and_body(_args, content: str) -> tuple:
         metadata = match.group(0).strip()
         body = content.replace(metadata, "", 1)
 
-    return (metadata, body)
+
+    metadata_block = metadata.split("---")[1]
+
+    metadata_dict = {}
+    for line in metadata_block.strip().splitlines():
+        key, value = line.split("：", 1)
+        metadata_dict[key.strip()] = value.strip()
+
+    tags = jieba.analyse.extract_tags(content, topK=100)
+    metadata_tags = " ".join(tags)
+    logger.info("tags: %s", metadata_tags)
+    metadata_dict["索引"] = metadata_tags
+
+    meta_lines = [f"{key}：{value}" for key, value in metadata_dict.items()]
+    meta_body = "\n".join(meta_lines)
+    meta_str = f"---\n{meta_body}\n---"
+
+    return (meta_str, body)
 
 
 def do_single_newline(args, content: str) -> str:

txt2ebook/subcommands/parse.py

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-"""Env subcommand."""
+"""Parse subcommand."""
 
 import argparse
 import logging

txt2ebook/subcommands/tex.py

@@ -101,6 +101,16 @@ def build_subparser(subparsers) -> None:
         metavar="FILENAME_FORMAT",
     )
 
+    tex_parser.add_argument(
+        "-ps",
+        "--paragraph_separator",
+        dest="paragraph_separator",
+        type=lambda value: value.encode("utf-8").decode("unicode_escape"),
+        default="\n\n",
+        help="paragraph separator (default: %(default)r)",
+        metavar="SEPARATOR",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run tex subcommand.

txt2ebook/subcommands/typ.py

@@ -72,7 +72,7 @@ def build_subparser(subparsers) -> None:
 
     typ_parser.add_argument(
         "--toc",
-        default=False,
+        default=True,
         action=argparse.BooleanOptionalAction,
         dest="with_toc",
         help="add table of content",

{txt2ebook-0.1.150.dist-info → txt2ebook-0.1.152.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.150
+Version: 0.1.152
 Summary: CLI tool to convert txt file to ebook format
 Keywords: cjk,ebook,epub,gmi,latex,md,pdf,txt,typst
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>

{txt2ebook-0.1.150.dist-info → txt2ebook-0.1.152.dist-info}/RECORD

@@ -22,7 +22,7 @@ txt2ebook/formats/templates/epub/noindent.css,sha256=_O5Tv90TKyyPBRdgjuNKFwtKFbd
 txt2ebook/helpers/__init__.py,sha256=c2EItHvPABDORfgfjArfa5XR--43es4D1tKWqaPcBxY,1309
 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_cn.py,sha256=lcbgPFO4Uaog8sKHKF5fQtvRwkKiQ3v5wMvYNEvNk9k,1943
+txt2ebook/languages/zh_cn.py,sha256=ryKMeaNgX2J6BGrHl7KZL9S6HwIlTyLk75z3lvVQIi4,1960
 txt2ebook/languages/zh_tw.py,sha256=_fdXOOSLK0nTMuBe1Om2qjb4zr2PVd6N4xi2rrYkNTI,1515
 txt2ebook/locales/txt2ebook.pot,sha256=VoXU9LrDzZApUVCCcKZC5Fu5QLx1fwd1lYEkbIdCEgc,641
 txt2ebook/locales/en/LC_MESSAGES/txt2ebook.mo,sha256=Ym6soeijV3zsv9FUPWlJnu18-CNb5tcOTN5JsMOfV9c,672
@@ -39,14 +39,14 @@ txt2ebook/subcommands/__init__.py,sha256=ldhzvsrMsR8lZmhZef77JFz0jValpV3pytFfwJS
 txt2ebook/subcommands/env.py,sha256=gEzra4b6guy7pRZUTCWX1_eiR7JmrtR1Z-J-vxljvMY,1549
 txt2ebook/subcommands/epub.py,sha256=_obM1_fvVBPHOBXBOCYK8nyJadBX3_gOn9kaXA5HipA,3570
 txt2ebook/subcommands/gmi.py,sha256=ANnPg-RFsylTo44fUzFOSHN1fC3Ce82gBzrv-sBv5fU,3318
-txt2ebook/subcommands/massage.py,sha256=xaDLI6NMz_InaeNf3M-Uk8qmjU6h5jnAg39tQiwt-P4,12690
+txt2ebook/subcommands/massage.py,sha256=cjeee4wJJ6xPV76efnlWRVdeVkEtJYIBDaKhFMPjKTg,14643
 txt2ebook/subcommands/md.py,sha256=PmIqrqrnzLywvN4qTkle0V9N3FTIJGRWpC0Xbk76B5o,3329
-txt2ebook/subcommands/parse.py,sha256=gZTN0_Bp-5Y-wyVCYJ6KcE9MFtnO-Oh3_g8NZ1onoJU,2936
+txt2ebook/subcommands/parse.py,sha256=xjhW8I9zS5DL3n3m04RyFofgci-6-_L6aF3d4N7c7M4,2938
 txt2ebook/subcommands/pdf.py,sha256=1JQtpugzAIaho6G3CK1rGYk74hotAexXZxPH9PHpRps,2980
-txt2ebook/subcommands/tex.py,sha256=ToYdFXnFLwsXxTsZzCRsURo7TCeOIFJtp5sFJDt0R-E,3131
-txt2ebook/subcommands/typ.py,sha256=qXpHMmtu_1nAMs264oKUSolWAUBjZpTziTSBcTe2JgA,3681
-txt2ebook-0.1.150.dist-info/entry_points.txt,sha256=AFikuCV6fqf8_GHwsvWuo9jTGNrCkWY1TJWk5GfMWSk,71
-txt2ebook-0.1.150.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.150.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-txt2ebook-0.1.150.dist-info/METADATA,sha256=i-o9VQh5MRKo43DqSqobnGqgilsjQfYIEu1IjenZ32o,4700
-txt2ebook-0.1.150.dist-info/RECORD,,
+txt2ebook/subcommands/tex.py,sha256=59Bzl67VSHMZS9BtU9zZDmKwsd6cQGoFfuGftAz9efc,3438
+txt2ebook/subcommands/typ.py,sha256=PoyozIueAvNL3yHHpS9NnMTMVV4ppUBX37SWGXd5Zhg,3680
+txt2ebook-0.1.152.dist-info/entry_points.txt,sha256=AFikuCV6fqf8_GHwsvWuo9jTGNrCkWY1TJWk5GfMWSk,71
+txt2ebook-0.1.152.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.152.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+txt2ebook-0.1.152.dist-info/METADATA,sha256=g1mosIFpVi2Ljm--4t32Q4bdBBlW7EfCJZl4wzOT0NQ,4700
+txt2ebook-0.1.152.dist-info/RECORD,,