txt2ebook 0.1.124__py3-none-any.whl → 0.1.125__py3-none-any.whl

txt2ebook/__init__.py

@@ -24,7 +24,7 @@ import langdetect
 
 logger = logging.getLogger(__name__)
 
-__version__ = "0.1.124"
+__version__ = "0.1.125"
 
 
 def setup_logger(config: argparse.Namespace) -> None:

txt2ebook/subcommands/massage.py

@@ -66,6 +66,25 @@ def build_subparser(subparsers) -> None:
         help="convert section header from words to numbers",
     )
 
+    massage_parser.add_argument(
+        "-fw",
+        "--fullwidth",
+        default=False,
+        action="store_true",
+        dest="fullwidth",
+        help="use fullwidth character (only for zh-cn and zh-tw)",
+    )
+
+    massage_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",
+    )
+
     massage_parser.add_argument(
         "-sp",
         "--split-volume-and-chapter",
@@ -137,6 +156,15 @@ def build_subparser(subparsers) -> None:
         help="short volume and chapter",
     )
 
+    massage_parser.add_argument(
+        "-sn",
+        "--single-newline",
+        default=False,
+        action="store_true",
+        dest="single_newline",
+        help="format paragraph by single newline",
+    )
+
     massage_parser.add_argument(
         "-op",
         "--open",
@@ -263,23 +291,28 @@ def massage_txt(args: argparse.Namespace) -> str:
 
     content = to_unix_newline(content)
 
+    (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")
-        content = zh_halfwidth_to_fullwidth(content)
+        body = zh_halfwidth_to_fullwidth(body)
 
     if args.re_delete:
-        content = do_delete_regex(args, content)
+        body = do_delete_regex(args, body)
 
     if args.re_replace:
-        content = do_replace_regex(args, content)
+        body = do_replace_regex(args, body)
 
     if args.re_delete_line:
-        content = do_delete_line_regex(args, content)
+        body = do_delete_line_regex(args, body)
+
+    if args.single_newline:
+        body = do_single_newline(args, body)
 
     if args.width:
-        content = do_wrapping(args, content)
+        body = do_wrapping(args, body)
 
-    return content
+    return f"{metadata}\n\n{body}"
 
 
 def to_unix_newline(content: str) -> str:
@@ -349,6 +382,38 @@ def do_delete_line_regex(args, content: str) -> str:
     return content
 
 
+def extract_metadata_and_body(_args, content: str) -> tuple:
+    """Extract the metadata and body.
+
+    Args:
+        content (str): The formatted book content.
+
+    Returns:
+        tuple: The metadata and body content.
+    """
+    metadata = ""
+    body = ""
+    match = re.search(r"---(.*?)---", content, re.DOTALL)
+    if match:
+        metadata = match.group(0).strip()
+        body = content.replace(metadata, "", 1)
+
+    return (metadata, body)
+
+
+def do_single_newline(args, content: str) -> str:
+    """Set single newline.
+
+    Args:
+        content (str): The formatted book content.
+
+    Returns:
+        str: The formatted book content.
+    """
+    modified_content = re.sub(r"\n+", "\n\n", content)
+    return modified_content
+
+
 def do_wrapping(args, content: str) -> str:
     """Wrap or fill CJK text.
 

txt2ebook/tokenizer.py

@@ -169,7 +169,9 @@ class Tokenizer:
 
         return metadata
 
+
     def _tokenize_content(self) -> None:
+        # TODO: split by metadata and content
         content = self.raw_content.split(f"{self.metadata_marker}\n\n")[1]
         content = content.strip(self.config.paragraph_separator)
         lines = content.split(self.config.paragraph_separator)

{txt2ebook-0.1.124.dist-info → txt2ebook-0.1.125.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: txt2ebook
-Version: 0.1.124
+Version: 0.1.125
 Summary: CLI tool to convert txt file to ebook format
 Home-page: https://github.com/kianmeng/txt2ebook
 License: AGPL-3.0-or-later

{txt2ebook-0.1.124.dist-info → txt2ebook-0.1.125.dist-info}/RECORD

@@ -1,4 +1,4 @@
-txt2ebook/__init__.py,sha256=rv8ytj0BlpH7UWiP00HLyCeEcaha-ESEwa6PxGRrw-I,2706
+txt2ebook/__init__.py,sha256=G_p-8TBwpVBfi-gEVDNwuhkFMbIM9p1g5bTUr8DXTvQ,2706
 txt2ebook/__main__.py,sha256=L29rlfPSx9XMnVaHBYP2dyYgDmutJvONR3yUejjYwRY,855
 txt2ebook/cli.py,sha256=D0jseJLlFDjLfX-yiGCC0e98a5IJ1IbRFx_mVGyYIxc,4241
 txt2ebook/exceptions.py,sha256=oVtVMCqrxWq-CZ5GQYOBioil9i2kJ2mqD08IQ9A636Q,847
@@ -37,16 +37,16 @@ txt2ebook/subcommands/__init__.py,sha256=ldhzvsrMsR8lZmhZef77JFz0jValpV3pytFfwJS
 txt2ebook/subcommands/env.py,sha256=Fx2IXNmmlW-6jlMjRPI-nYp90Sbi77Z2SeL4q3cGg2w,1495
 txt2ebook/subcommands/epub.py,sha256=JDDucrRiiQW1B7ycKz5zS1X5SMQZ82GBtlE2_SBYIdw,3507
 txt2ebook/subcommands/gmi.py,sha256=zVvP2ZjLtDdqew4Vlab2_R3H2OmQkpMKdfND6qgppiU,3320
-txt2ebook/subcommands/massage.py,sha256=ZDb0pBlOOmsVWWNaokPr9FOpOPcKmjKszlE-mLAiNxE,10192
+txt2ebook/subcommands/massage.py,sha256=EuC-C03NMJk9V1_PEUOa-n4SmQCRpj1TJ_GwSJE8_Ss,11809
 txt2ebook/subcommands/md.py,sha256=P-oFtb2u-v2F_KU8t249-f5Ihjb_TCT_NWMlOYoq5p4,3330
 txt2ebook/subcommands/parse.py,sha256=FaYTWa2yqkowwPAmHWJC7iCii2Rnus3SUHG10GjjJp4,3022
 txt2ebook/subcommands/pdf.py,sha256=KS3rzxPJG6ovt8GPJj8u1Bum5ye3zrEI0LPz21EMLZo,2981
 txt2ebook/subcommands/tex.py,sha256=X6ZBfuAs_mcJe8PNjzoW339ecPynZduVbcCq0henjiA,3131
 txt2ebook/subcommands/typ.py,sha256=r4Xf7xSINbYfaIKkVzdyQDlUMWPvOIcbvOwC71spu6w,3682
-txt2ebook/tokenizer.py,sha256=_Y34FEQghaqD-6OLuMJ1amCuF_beGb0SAO24CzsJ4qE,9595
+txt2ebook/tokenizer.py,sha256=H9AaZVmNP43L3ONvj58u_5weZAjFG9SzQSeS9upGN1U,9642
 txt2ebook/zh_utils.py,sha256=0Yq9r-JL4HntW68vFR6TBP9yQim1a07mfsh_sp-XmaE,4887
-txt2ebook-0.1.124.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.124.dist-info/METADATA,sha256=LxwGLFJaWhdvCFrRUego71wFUXiJ-OcOiuIBmoCUYCQ,4969
-txt2ebook-0.1.124.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-txt2ebook-0.1.124.dist-info/entry_points.txt,sha256=q4krNWsYNu4Rcf72nFc66JeR0J9BiFA6-NVEJKBZ_F4,71
-txt2ebook-0.1.124.dist-info/RECORD,,
+txt2ebook-0.1.125.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.125.dist-info/METADATA,sha256=E8RlY3BV0QFaeYdHbBOlbjA9ebxT_w3RlhIc8KIFgtI,4969
+txt2ebook-0.1.125.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+txt2ebook-0.1.125.dist-info/entry_points.txt,sha256=q4krNWsYNu4Rcf72nFc66JeR0J9BiFA6-NVEJKBZ_F4,71
+txt2ebook-0.1.125.dist-info/RECORD,,