txt2ebook 0.1.138__py3-none-any.whl → 0.1.140__py3-none-any.whl

txt2ebook/__init__.py

@@ -18,7 +18,6 @@
 import argparse
 import logging
 import platform
-from typing import Optional
 import sys
 
 import langdetect
@@ -51,7 +50,9 @@ def setup_logger(config: argparse.Namespace) -> None:
     )
 
 
-def log_or_raise_on_warning(message: str, raise_on_warning: bool = False) -> None:
+def log_or_raise_on_warning(
+    message: str, raise_on_warning: bool = False
+) -> None:
     """Logs a warning message or raises an exception.
 
     Args:
@@ -87,7 +88,7 @@ def detect_and_expect_language(content: str, config_language: str) -> str:
     Returns:
         The configured language, or the detected language if none is
         configured.
-"""
+    """
     detect_language = langdetect.detect(content)
     config_language = config_language or detect_language
     logger.info("Config language: %s", config_language)

txt2ebook/cli.py

@@ -15,9 +15,9 @@
 
 """txt2ebook/tte is a cli tool to convert txt file to ebook format.
 
-  website: https://github.com/kianmeng/txt2ebook
-  changelog: https://github.com/kianmeng/txt2ebook/blob/master/CHANGELOG.md
-  issues: https://github.com/kianmeng/txt2ebook/issues
+website: https://github.com/kianmeng/txt2ebook
+changelog: https://github.com/kianmeng/txt2ebook/blob/master/CHANGELOG.md
+issues: https://github.com/kianmeng/txt2ebook/issues
 """
 
 import argparse
@@ -150,7 +150,7 @@ def main(args: Optional[Sequence[str]] = None):
             else:
                 logger.error(
                     "subcommand '%s' is missing its execution function.",
-                    parsed_args.command
+                    parsed_args.command,
                 )
                 parser.print_help(sys.stderr)
 

txt2ebook/formats/__init__.py

@@ -15,10 +15,7 @@
 
 """Packpage of different e-book formats."""
 
-import argparse
-from typing import Union
 
-import txt2ebook.models.book
 from txt2ebook.formats.epub import TEMPLATES as EPUB_TEMPLATES
 from txt2ebook.formats.epub import EpubWriter
 from txt2ebook.formats.gmi import GmiWriter

txt2ebook/formats/typ.py

@@ -113,8 +113,11 @@ class TypWriter(BaseWriter):
         ]
 
         #set par(
-          first-line-indent: 2em,
-          justify: true
+          first-line-indent: (
+            amount: 2em,
+            all:true,
+          ),
+          justify: true,
         )
 
         #set text(

txt2ebook/helpers/__init__.py

@@ -17,9 +17,6 @@
 
 import logging
 import re
-import sys
-from importlib import import_module
-from typing import Any
 
 logger = logging.getLogger(__name__)
 
@@ -42,4 +39,4 @@ def lower_underscore(string: str) -> str:
         >>> lower_underscore("Hello\tWorld")
         'hello_world'
     """
-    return re.sub(r'\s+', '_', string.lower().strip())
+    return re.sub(r"\s+", "_", string.lower().strip())

txt2ebook/models/book.py

@@ -40,9 +40,7 @@ class Book:
     language: str = field(default="")
     cover: str = field(default="", repr=False)
     raw_content: str = field(default="", repr=False)
-    toc: List[Union[Volume, Chapter]] = field(
-        default_factory=list, repr=False
-    )
+    toc: List[Union[Volume, Chapter]] = field(default_factory=list, repr=False)
 
     def stats(self) -> Counter:
         """Returns the statistics count for the parsed tokens.
@@ -61,12 +59,14 @@ class Book:
         authors = ", ".join(self.authors)
         format_options = {
             1: f"{self.title}_{authors}",
-            2: f"{authors}_{self.title}"
+            2: f"{authors}_{self.title}",
         }
         try:
             return format_options[filename_format]
         except KeyError:
-            raise AttributeError(f"Invalid filename format: '{filename_format}'!")
+            raise AttributeError(
+                f"Invalid filename format: '{filename_format}'!"
+            )
 
     def debug(self, verbosity: int = 1) -> None:
         """Dump debug log of sections in self.toc."""

txt2ebook/parser.py

@@ -17,11 +17,10 @@
 
 import argparse
 import logging
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from importlib import import_module
 from typing import List, Tuple, Union
 
-import cjkwrap
 import regex as re
 
 from txt2ebook.models import Book, Chapter, Volume
@@ -35,8 +34,8 @@ logger = logging.getLogger(__name__)
 class Parser:
     """Parser class to massage and parse a text content."""
 
-    raw_content: str = field()
-    config: argparse.Namespace = field()
+    raw_content: str
+    config: argparse.Namespace
 
     def __init__(self, raw_content: str, config: argparse.Namespace) -> None:
         """Set the constructor for the Parser."""
@@ -88,7 +87,9 @@ class Parser:
         Returns:
             str: The formatted section header.
         """
-        if not getattr(self.config, "header_number", False) or self.config.language not in (
+        if not getattr(
+            self.config, "header_number", False
+        ) or self.config.language not in (
             "zh-cn",
             "zh-tw",
         ):

txt2ebook/subcommands/epub.py

@@ -19,10 +19,9 @@ import argparse
 import logging
 import sys
 
-from txt2ebook.subcommands.parse import run as parse_txt
-from txt2ebook.formats.epub import EpubWriter
 from txt2ebook.formats import EPUB_TEMPLATES
-
+from txt2ebook.formats.epub import EpubWriter
+from txt2ebook.subcommands.parse import run as parse_txt
 
 logger = logging.getLogger(__name__)
 
@@ -30,8 +29,9 @@ logger = logging.getLogger(__name__)
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
     epub_parser = subparsers.add_parser(
-        "epub", help="generate ebook in EPUB format",
-        formatter_class=argparse.RawTextHelpFormatter
+        "epub",
+        help="generate ebook in EPUB format",
+        formatter_class=argparse.RawTextHelpFormatter,
     )
 
     epub_parser.set_defaults(func=run)

txt2ebook/subcommands/gmi.py

@@ -19,9 +19,8 @@ import argparse
 import logging
 import sys
 
-from txt2ebook.subcommands.parse import run as parse_txt
 from txt2ebook.formats.gmi import GmiWriter
-
+from txt2ebook.subcommands.parse import run as parse_txt
 
 logger = logging.getLogger(__name__)
 

txt2ebook/subcommands/md.py

@@ -19,9 +19,8 @@ import argparse
 import logging
 import sys
 
-from txt2ebook.subcommands.parse import run as parse_txt
 from txt2ebook.formats.md import MdWriter as MarkdownWriter
-
+from txt2ebook.subcommands.parse import run as parse_txt
 
 logger = logging.getLogger(__name__)
 

txt2ebook/subcommands/pdf.py

@@ -19,10 +19,9 @@ import argparse
 import logging
 import sys
 
-from txt2ebook.subcommands.parse import run as parse_txt
-from txt2ebook.formats.pdf import PdfWriter
 from txt2ebook.formats import PAGE_SIZES
-
+from txt2ebook.formats.pdf import PdfWriter
+from txt2ebook.subcommands.parse import run as parse_txt
 
 logger = logging.getLogger(__name__)
 

txt2ebook/subcommands/tex.py

@@ -19,8 +19,8 @@ import argparse
 import logging
 import sys
 
-from txt2ebook.subcommands.parse import run as parse_txt
 from txt2ebook.formats.tex import TexWriter
+from txt2ebook.subcommands.parse import run as parse_txt
 
 logger = logging.getLogger(__name__)
 

txt2ebook/subcommands/typ.py

@@ -19,10 +19,9 @@ import argparse
 import logging
 import sys
 
-from txt2ebook.subcommands.parse import run as parse_txt
-from txt2ebook.formats.typ import TypWriter
 from txt2ebook.formats import PAGE_SIZES
-
+from txt2ebook.formats.typ import TypWriter
+from txt2ebook.subcommands.parse import run as parse_txt
 
 logger = logging.getLogger(__name__)
 

txt2ebook/tokenizer.py

@@ -169,14 +169,28 @@ 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)
+        # Determine the actual content part, after any metadata block
+        metadata_block_re = (
+            rf"^(?:{self.metadata_marker})\n(.*)\n(?:{self.metadata_marker})$"
+        )
+        match = re.search(
+            metadata_block_re, self.raw_content, re.MULTILINE | re.DOTALL
+        )
 
-        if len(lines) <= 1:
+        if match:
+            # Content starts after the matched metadata block
+            content_str = self.raw_content[match.end(0) :]
+        else:
+            # No metadata block found according to the pattern,
+            # so assume all raw_content is the actual content.
+            # _extract_metadata would have already logged/warned if metadata was expected.
+            content_str = self.raw_content
+
+        content_str = content_str.strip(self.config.paragraph_separator)
+        lines = content_str.split(self.config.paragraph_separator)
+
+        if len(lines) <= 1 and content_str:  # Avoid warning for empty content
             msg = (
                 "Cannot split content by "
                 f"{repr(self.config.paragraph_separator)}. "

{txt2ebook-0.1.138.dist-info → txt2ebook-0.1.140.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.138
+Version: 0.1.140
 Summary: CLI tool to convert txt file to ebook format
 Project-URL: Homepage, https://github.com/kianmeng/txt2ebook
 Project-URL: Repository, https://github.com/kianmeng/txt2ebook
@@ -38,7 +38,7 @@ Requires-Dist: pypandoc~=1.11
 Requires-Dist: regex<2022,>=2021.11.10
 Requires-Dist: reportlab<5,>=4.0.0
 Requires-Dist: typing-extensions<5,>=4.5.0
-Requires-Dist: typst<0.13,>=0.12.0
+Requires-Dist: typst>=0.13.0
 Description-Content-Type: text/markdown
 
 # txt2ebook

{txt2ebook-0.1.138.dist-info → txt2ebook-0.1.140.dist-info}/RECORD

@@ -1,11 +1,11 @@
-txt2ebook/__init__.py,sha256=wnrJownTB3sKXv3BpcXn4exkpWRSCXhKYWKJib5APNI,3073
+txt2ebook/__init__.py,sha256=Oq0Yor9IB6LPfAsVVTl-wbh-EFVy8T309BR1UVMC0kw,3055
 txt2ebook/__main__.py,sha256=L29rlfPSx9XMnVaHBYP2dyYgDmutJvONR3yUejjYwRY,855
-txt2ebook/cli.py,sha256=X91GnzdSTZI4Cl2ttskMmQpBy6QuyENuX_VnwOHtA7Q,4423
+txt2ebook/cli.py,sha256=i8NrYJyC9ckMC5opCGkIcs42p4AFzhE0lTGKSU-S8Zw,4418
 txt2ebook/exceptions.py,sha256=PT3m85PE5QopHHUfRwEQzp0kJ4AA9yjLO6V6lYC8WhQ,858
-txt2ebook/parser.py,sha256=IOSTbkvLQ9Uvo1hUBDTKozMQagA547N3qr-xU8aE0RI,9009
-txt2ebook/tokenizer.py,sha256=H9AaZVmNP43L3ONvj58u_5weZAjFG9SzQSeS9upGN1U,9642
+txt2ebook/parser.py,sha256=rf_iS73yW4FFVzHFupCUPJbypmWrqN6yuYwjLTZ08KQ,8989
+txt2ebook/tokenizer.py,sha256=UGyOBGxlKOXJtvP2UFp38EgFym8-PAU3A7Jl9RF3w6Y,10299
 txt2ebook/zh_utils.py,sha256=0Yq9r-JL4HntW68vFR6TBP9yQim1a07mfsh_sp-XmaE,4887
-txt2ebook/formats/__init__.py,sha256=yNF426_jHKNCKenKj1JTbOs22vEBuGScEk6TKhFaZUk,1716
+txt2ebook/formats/__init__.py,sha256=CBZSA9zbLL4-4VYH7Xp76HK4kHTyISoNs7gMs7lBIzY,1646
 txt2ebook/formats/base.py,sha256=ODguJ7OBPXfRQLLeoL-G66NZihroXb4kG5-56ZrlygI,5819
 txt2ebook/formats/epub.py,sha256=IVz-FmYQlcChOw38YqfKy46bPVSIrHyxA_94iz06N3Y,6941
 txt2ebook/formats/gmi.py,sha256=kKyYzqS4NkucyhdBmT8cPEu6DGnNf95vVvXYdFnC6-s,6791
@@ -13,13 +13,13 @@ txt2ebook/formats/md.py,sha256=9RWv_7cfXfAGC1MdYm0WTkjpgtXKQJTQjYOf0MqQmsc,6537
 txt2ebook/formats/pdf.py,sha256=tr_ozVlL976yo7Ggny71zjOwzSd6tSnHTl7mcsLII_g,7263
 txt2ebook/formats/tex.py,sha256=V5B1nPR-WzGc4jqWu-BqxfQhtQsUTKM_sZZJsCcDBAk,5897
 txt2ebook/formats/txt.py,sha256=j5RWF41WQfLdm-APwi8u-OE8snenDEJLzxHD_i9mxeg,7541
-txt2ebook/formats/typ.py,sha256=_a3PKFh5jlHvaqRes6XvtPoDJI_HJaH7pCBbBRFeYyM,6647
+txt2ebook/formats/typ.py,sha256=MNclD5RdCnYAmPRzAaI6ZE6NnI8GdHKJla54wyfTUdc,6705
 txt2ebook/formats/templates/__init__.py,sha256=f3K7pJByNmmvu-wvziks6qb2QnnLmkDjUACXyw2s60E,760
 txt2ebook/formats/templates/epub/__init__.py,sha256=-XVLvnknTJTmQZY9UTH705vMcHgy56rQVRTusYawEZ4,766
 txt2ebook/formats/templates/epub/clean.css,sha256=AnEwMckzUSKcjKsDiWtJW1oaceuklt2tyuS1VbpVK1s,462
 txt2ebook/formats/templates/epub/condense.css,sha256=Fz80ZqkPsFRmGdURduAxqMV8drD0CCUlrv41P8rUsm8,477
 txt2ebook/formats/templates/epub/noindent.css,sha256=_O5Tv90TKyyPBRdgjuNKFwtKFbdheh2V9PtDhgRUg3U,483
-txt2ebook/helpers/__init__.py,sha256=-Awv2qDnsDHnku_XunOCsn-HDLvkBDpI0b24WFs0H74,1379
+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=e5VzZwfrO2kABMwEB0l--eo4XbOre6f6uJ-ySU3ORT8,960
 txt2ebook/languages/zh_cn.py,sha256=lcbgPFO4Uaog8sKHKF5fQtvRwkKiQ3v5wMvYNEvNk9k,1943
@@ -32,21 +32,21 @@ txt2ebook/locales/zh-cn/LC_MESSAGES/txt2ebook.po,sha256=zVvD8AEL6gcxg4QPfc_NnDy2
 txt2ebook/locales/zh-tw/LC_MESSAGES/txt2ebook.mo,sha256=1GIuOcO_bISiFcfhFez-A7mSi11Mo-x3PBobBENgMEc,675
 txt2ebook/locales/zh-tw/LC_MESSAGES/txt2ebook.po,sha256=Y-oJYvufQKqiUmAJR6RAB9DZdsu2hChUUtkEApu7byI,698
 txt2ebook/models/__init__.py,sha256=Z3zClWLj08Q8HgaWV1RRgIKatEhIUfYBAVWm-j4m05w,930
-txt2ebook/models/book.py,sha256=OkYg9ogOyH6mizP4qACTBTq4x6OAfY01gmaEzlerhLw,2788
+txt2ebook/models/book.py,sha256=8KE90TOLVdmEOxJACKuy9isj42axtVNj-q46Bjr7yPw,2805
 txt2ebook/models/chapter.py,sha256=6YvUDHzR6amGMZgkQl_xHWrYZUmlfpF7mnDLilG2BpA,1686
 txt2ebook/models/volume.py,sha256=koz1KfWjvGWLFbmGEQlZ23frsP93cDsuBMySYBHiXm8,1597
 txt2ebook/subcommands/__init__.py,sha256=ldhzvsrMsR8lZmhZef77JFz0jValpV3pytFfwJSkjls,1146
 txt2ebook/subcommands/env.py,sha256=gEzra4b6guy7pRZUTCWX1_eiR7JmrtR1Z-J-vxljvMY,1549
-txt2ebook/subcommands/epub.py,sha256=WiCah28BV3iS-MjgS7wLWvrInTrglTVcLpRK8mFxfLs,3562
-txt2ebook/subcommands/gmi.py,sha256=IE6NsQJz7Rz8mXmYgJJXuaaPP7gznf0ZNhxhWFxjjm0,3319
+txt2ebook/subcommands/epub.py,sha256=_obM1_fvVBPHOBXBOCYK8nyJadBX3_gOn9kaXA5HipA,3570
+txt2ebook/subcommands/gmi.py,sha256=ANnPg-RFsylTo44fUzFOSHN1fC3Ce82gBzrv-sBv5fU,3318
 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/md.py,sha256=PmIqrqrnzLywvN4qTkle0V9N3FTIJGRWpC0Xbk76B5o,3329
 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-0.1.138.dist-info/METADATA,sha256=G7pFnLaDciAOsy4QaboVHeT6_MGWvIwvEWnLBviBt-A,4873
-txt2ebook-0.1.138.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-txt2ebook-0.1.138.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
-txt2ebook-0.1.138.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.138.dist-info/RECORD,,
+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.140.dist-info/METADATA,sha256=_nJDfV9pCfmUWs5OGwLB3LUvLpxf7CUE0tvF3aZj5Q0,4867
+txt2ebook-0.1.140.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+txt2ebook-0.1.140.dist-info/entry_points.txt,sha256=3jm5vpUsDRgoM6S3CQVMMiP7tJQqfq1vfV0sh_KaK9s,74
+txt2ebook-0.1.140.dist-info/licenses/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.140.dist-info/RECORD,,