txt2ebook 0.1.116__py3-none-any.whl → 0.1.117__py3-none-any.whl

txt2ebook/__init__.py

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

txt2ebook/cli.py

@@ -21,19 +21,13 @@
 """
 
 import argparse
+import importlib
 import logging
+import pkgutil
 import sys
 from typing import Optional, Sequence
 
-import txt2ebook.subcommands.env
-import txt2ebook.subcommands.epub
-import txt2ebook.subcommands.gmi
-import txt2ebook.subcommands.massage
-import txt2ebook.subcommands.md
-import txt2ebook.subcommands.parse
-import txt2ebook.subcommands.pdf
-import txt2ebook.subcommands.tex
-import txt2ebook.subcommands.typ
+import txt2ebook.subcommands
 from txt2ebook import __version__, setup_logger
 
 logger = logging.getLogger(__name__)
@@ -128,50 +122,6 @@ def build_parser(
         help="convert ASCII character from halfwidth to fullwidth",
     )
 
-
-    parser.add_argument(
-        "-ra",
-        "--regex-author",
-        dest="re_author",
-        default=[],
-        action="append",
-        help="regex to parse author of the book (default: by LANGUAGE)",
-        metavar="REGEX",
-    )
-
-    parser.add_argument(
-        "-rc",
-        "--regex-chapter",
-        dest="re_chapter",
-        default=[],
-        action="append",
-        help="regex to parse chapter header (default: by LANGUAGE)",
-        metavar="REGEX",
-    )
-
-    parser.add_argument(
-        "-rvc",
-        "--regex-volume-chapter",
-        dest="re_volume_chapter",
-        default=[],
-        action="append",
-        help=(
-            "regex to parse volume and chapter header "
-            "(default: by LANGUAGE)"
-        ),
-        metavar="REGEX",
-    )
-
-    parser.add_argument(
-        "-rv",
-        "--regex-volume",
-        dest="re_volume",
-        default=[],
-        action="append",
-        help="regex to parse volume header (default: by LANGUAGE)",
-        metavar="REGEX",
-    )
-
     parser.add_argument(
         "-hn",
         "--header-number",
@@ -191,16 +141,6 @@ def build_parser(
         metavar="SEPARATOR",
     )
 
-    parser.add_argument(
-        "-rt",
-        "--regex-title",
-        dest="re_title",
-        default=[],
-        action="append",
-        help="regex to parse title of the book (default: by LANGUAGE)",
-        metavar="REGEX",
-    )
-
     parser.add_argument(
         "-ff",
         "--filename-format",
@@ -216,24 +156,6 @@ def build_parser(
         metavar="FILENAME_FORMAT",
     )
 
-    parser.add_argument(
-        "-op",
-        "--open",
-        default=False,
-        action="store_true",
-        dest="open",
-        help="open the generated file using default program",
-    )
-
-    parser.add_argument(
-        "-ss",
-        "--sort-volume-and-chapter",
-        default=False,
-        action="store_true",
-        dest="sort_volume_and_chapter",
-        help="short volume and chapter",
-    )
-
     parser.add_argument(
         "-rw",
         "--raise-on-warning",
@@ -286,15 +208,17 @@ def build_parser(
     )
 
     subparsers = parser.add_subparsers(help="sub-command help")
-    txt2ebook.subcommands.parse.build_subparser(subparsers)
-    txt2ebook.subcommands.massage.build_subparser(subparsers)
-    txt2ebook.subcommands.epub.build_subparser(subparsers)
-    txt2ebook.subcommands.tex.build_subparser(subparsers)
-    txt2ebook.subcommands.pdf.build_subparser(subparsers)
-    txt2ebook.subcommands.typ.build_subparser(subparsers)
-    txt2ebook.subcommands.md.build_subparser(subparsers)
-    txt2ebook.subcommands.gmi.build_subparser(subparsers)
-    txt2ebook.subcommands.env.build_subparser(subparsers)
+
+    iter_namespace = pkgutil.iter_modules(
+        txt2ebook.subcommands.__path__, txt2ebook.subcommands.__name__ + "."
+    )
+    subcommands = {
+        name: importlib.import_module(name)
+        for finder, name, ispkg
+        in iter_namespace
+    }
+    for subcommand in subcommands.values():
+        subcommand.build_subparser(subparsers)
 
     return parser
 

txt2ebook/parser.py

@@ -231,7 +231,7 @@ class Parser:
         logger.info("Found or set tags: %s", repr(tags))
         logger.info("Found or set index: %s", repr(index))
 
-        if self.config.sort_volume_and_chapter:
+        if hasattr(self.config, "sort_volume_and_chapter") and self.config.sort_volume_and_chapter:
             self.sort_volume_and_chapter(toc)
 
         return (book_title, authors, translators, tags, index, toc)

txt2ebook/subcommands/epub.py

@@ -79,6 +79,15 @@ def build_subparser(subparsers) -> None:
         help="generate each volume as separate page",
     )
 
+    epub_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run epub subcommand.

txt2ebook/subcommands/gmi.py

@@ -71,6 +71,15 @@ def build_subparser(subparsers) -> None:
         help="add table of content",
     )
 
+    gmi_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run md subcommand.

txt2ebook/subcommands/massage.py

@@ -117,6 +117,15 @@ def build_subparser(subparsers) -> None:
         metavar="WIDTH",
     )
 
+    massage_parser.add_argument(
+        "-ss",
+        "--sort-volume-and-chapter",
+        default=False,
+        action="store_true",
+        dest="sort_volume_and_chapter",
+        help="short volume and chapter",
+    )
+
     massage_parser.set_defaults(func=run)
 
 

txt2ebook/subcommands/md.py

@@ -71,6 +71,15 @@ def build_subparser(subparsers) -> None:
         help="add table of content",
     )
 
+    md_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run md subcommand.

txt2ebook/subcommands/pdf.py

@@ -62,6 +62,15 @@ def build_subparser(subparsers) -> None:
         metavar="PAGE_SIZE",
     )
 
+    pdf_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run pdf subcommand.

txt2ebook/subcommands/tex.py

@@ -68,6 +68,15 @@ def build_subparser(subparsers) -> None:
 
     tex_parser.set_defaults(func=run)
 
+    tex_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run tex subcommand.

txt2ebook/subcommands/typ.py

@@ -79,6 +79,15 @@ def build_subparser(subparsers) -> None:
         help="keyword to index (default: '%(default)s')",
     )
 
+    typ_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run typ subcommand.

txt2ebook/tokenizer.py

@@ -114,11 +114,11 @@ class Tokenizer:
         """Tokenize the metadata of the book."""
         for line in self._extract_metadata():
             re_title = f"^{self.langconf.DEFAULT_RE_TITLE}"
-            if self.config.re_title:
+            if hasattr(self.config, "re_title") and self.config.re_title:
                 re_title = self.config.re_title[0]
 
             re_author = f"{self.langconf.DEFAULT_RE_AUTHOR}"
-            if self.config.re_author:
+            if hasattr(self.config, "re_author") and self.config.re_author:
                 re_author = self.config.re_author[0]
 
             token_type_regex_map = [
@@ -205,7 +205,7 @@ class Tokenizer:
             rf"^{self.langconf.DEFAULT_RE_VOLUME}\s*"
             rf"{self.langconf.DEFAULT_RE_CHAPTER}"
         )
-        if self.config.re_volume_chapter:
+        if hasattr(self.config, "re_volume_chapter") and self.config.re_volume_chapter:
             re_volume_chapter = self.config.re_volume_chapter[0]
 
         match = re.search(re_volume_chapter, line)
@@ -228,7 +228,7 @@ class Tokenizer:
         token = None
 
         re_volume = rf"^{self.langconf.DEFAULT_RE_VOLUME}$"
-        if self.config.re_volume:
+        if hasattr(self.config, "re_volume") and self.config.re_volume:
             re_volume = "(" + "|".join(self.config.re_volume) + ")"
 
         match = re.search(re_volume, line)
@@ -244,7 +244,7 @@ class Tokenizer:
         token = None
 
         re_chapter = rf"^{self.langconf.DEFAULT_RE_CHAPTER}$"
-        if self.config.re_chapter:
+        if hasattr(self.config, "re_chapter") and self.config.re_chapter:
             re_chapter = "(" + "|".join(self.config.re_chapter) + ")"
 
         match = re.search(re_chapter, line)

{txt2ebook-0.1.116.dist-info → txt2ebook-0.1.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: txt2ebook
-Version: 0.1.116
+Version: 0.1.117
 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.116.dist-info → txt2ebook-0.1.117.dist-info}/RECORD

@@ -1,6 +1,6 @@
-txt2ebook/__init__.py,sha256=mqoJYQLqh4r5pT6QaOaqXwul_MnsSTQbhXpt84LyF00,2681
+txt2ebook/__init__.py,sha256=BMEbrj7B5ltQJ8tMBXRt7CJtaH518F5Ripn4vXVsSeE,2681
 txt2ebook/__main__.py,sha256=gMLvgpqc_BL4cBqNe0vqErRF5dlJPAbvqu1zndcAHYI,850
-txt2ebook/cli.py,sha256=qdQQ9r134Lbs58NwzJ1wKDF1EO6blWLBzqjqA_tpZIc,8635
+txt2ebook/cli.py,sha256=QvojARWAJxgpu9AJBVP1bGEHJg6vfJrpGKjHMA-1T_A,6530
 txt2ebook/exceptions.py,sha256=b2HDsXdqweLJbvSJEGt48nxvGkZq20SfYezSjwp77JU,842
 txt2ebook/formats/__init__.py,sha256=WhiRWGvbUjc8QZfhAIkKCg6GL8vNNlEF73meZSzYhDA,2463
 txt2ebook/formats/base.py,sha256=SMt6Op88-HoIxRA-tgPBNSlrt7-KZ-m5-BytAEJT4m0,5814
@@ -32,21 +32,21 @@ txt2ebook/models/__init__.py,sha256=8_k1oI_PnPMekhdZCXiTtg5WghdR6fugQEHJHsy1-Ds,
 txt2ebook/models/book.py,sha256=Q4EzFFAGigz4MPSM9Vu_F-JxNOWjm82469Vy8-vq-pw,2758
 txt2ebook/models/chapter.py,sha256=buECAklNQgM3tDehzyVO9YfA_F0iXyLq2PaMZGV_Zaw,1681
 txt2ebook/models/volume.py,sha256=HyT4XO9yZ8d0PgZVfMMyAYUDFv58RrUmsSFNNmU-sHY,1592
-txt2ebook/parser.py,sha256=2Dk1n51Czb3Tn_a1tgSSx5A-XNETVyuX4gJ9nQ-fPlQ,8707
+txt2ebook/parser.py,sha256=mrkpwyPwnFjrJUCQ7ghTgWmVJ0Q4m9R93MIM-tcqm08,8759
 txt2ebook/subcommands/env.py,sha256=26wcAhEbjKfWYeNiIsjm9TTaBUyNDYx1MYUtV2ZFkmg,1481
-txt2ebook/subcommands/epub.py,sha256=evZgvi1cHe3uCHgAwteJ2FlXFk3YOUekYNghVk7ySgE,2578
-txt2ebook/subcommands/gmi.py,sha256=Y-ao6LUtn7FGKZcay7esrVHTZl0PoZBgJdaWtOktPMg,2394
-txt2ebook/subcommands/massage.py,sha256=wsSFVdheYgCn9NsISsgHVyoRj0D73GfP3NIrTYI13iA,7024
-txt2ebook/subcommands/md.py,sha256=IMEqmbISis0FDz2rPzUDU3zuiSUW-9928UrkNZyvyTk,2407
+txt2ebook/subcommands/epub.py,sha256=2zUL5wbp8Bv7OdwJPCuXV1rpjNkgnCTR4W2rKNVdMXo,2783
+txt2ebook/subcommands/gmi.py,sha256=mO0OFNcO89fx5ny3m646v9HxsfA7m3V1cirXJ4WYByY,2598
+txt2ebook/subcommands/massage.py,sha256=NkXW95MkwVyKPm1NMV8cekPAQ9NJQx3DGAGgpsRj5MY,7249
+txt2ebook/subcommands/md.py,sha256=Dd8qQTLyasfBGpB00pJ5mDwlyLNaFrWZvFwI7XtkkHY,2610
 txt2ebook/subcommands/parse.py,sha256=BpEHs-gFYbJK1-50FPUX_3INfuxkgL5Glgpd3IBdJfs,2730
-txt2ebook/subcommands/pdf.py,sha256=V2dwrzdqHMKvM8zcPNdGa4F5zehzru9utOUGgAXisEU,2180
-txt2ebook/subcommands/tex.py,sha256=O2Sl-v8tTU_bMFDDukFYEyXBTecGzp3Ll8Gqom63Clk,2330
-txt2ebook/subcommands/typ.py,sha256=BrXVCiViFvL0TAsKQPza9QP0rS4vq2euhhEgfmteLwg,2573
-txt2ebook/tokenizer.py,sha256=zdZwiDreL1QVHdWm4YGPqG8-HzcjPI6wS9vggBlNEkg,9356
+txt2ebook/subcommands/pdf.py,sha256=WAhf4BPYW_ejm1M4-_vPVkANTmDQtgXbNkNMwBm5_LI,2384
+txt2ebook/subcommands/tex.py,sha256=nQ3OK5oZGNh3H9Y_Pz40q9eKIS_s-p5GYqRI59EgPiE,2534
+txt2ebook/subcommands/typ.py,sha256=JPnDqrxAHdQGcP4MBKHNoBaTiQRrUp1rNx3TOQmVLow,2777
+txt2ebook/tokenizer.py,sha256=785qIUg1WybCUtNG7r_m3zZv0P0DlSQhlH_TEVyrdbo,9554
 txt2ebook/txt2ebook.py,sha256=ZP-5RxZcKasoowjuJjUR1yEBzHqekOBPruGvyj47sKg,13539
 txt2ebook/zh_utils.py,sha256=EgKVbwqYGaTGswQUGcOCeSfRelzwkAb9WWY9TrsX1x4,4882
-txt2ebook-0.1.116.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.116.dist-info/METADATA,sha256=-_-giEu537B1P4bg7-EfteT3K4DjnAuh_DE9Y0MZ5-0,7845
-txt2ebook-0.1.116.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-txt2ebook-0.1.116.dist-info/entry_points.txt,sha256=JLW3Iv7eUyABlQeUFiUWQhLKfRdnB9o5SIcNlneGR0Q,77
-txt2ebook-0.1.116.dist-info/RECORD,,
+txt2ebook-0.1.117.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.117.dist-info/METADATA,sha256=7cyip_mosrVqWfLFSjmPnvoPH2mYJS8NhhF4F1J_3o8,7845
+txt2ebook-0.1.117.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+txt2ebook-0.1.117.dist-info/entry_points.txt,sha256=JLW3Iv7eUyABlQeUFiUWQhLKfRdnB9o5SIcNlneGR0Q,77
+txt2ebook-0.1.117.dist-info/RECORD,,