txt2ebook 0.1.116__tar.gz → 0.1.118__tar.gz

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: txt2ebook
-Version: 0.1.116
+Version: 0.1.118
 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 → txt2ebook-0.1.118}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "txt2ebook"
-version = "0.1.116"
+version = "0.1.118"
 description = "CLI tool to convert txt file to ebook format"
 authors = ["Kian-Meng Ang <kianmeng@cpan.org>"]
 license = "AGPL-3.0-or-later"

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/__init__.py

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

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/cli.py

@@ -25,15 +25,7 @@ import logging
 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__)
@@ -100,15 +92,6 @@ def build_parser(
         metavar="AUTHOR",
     )
 
-    parser.add_argument(
-        "-c",
-        "--cover",
-        dest="cover",
-        default=None,
-        help="cover of the ebook",
-        metavar="IMAGE_FILENAME",
-    )
-
     parser.add_argument(
         "-tr",
         "--translator",
@@ -128,50 +111,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,49 +130,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",
-        dest="filename_format",
-        type=int,
-        default=None,
-        help=(
-            "the output filename format "
-            "(default: TXT_FILENAME [EBOOK_FILENAME])\n"
-            "1 - title_authors.EBOOK_EXTENSION\n"
-            "2 - authors_title.EBOOK_EXTENSION"
-        ),
-        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 +182,7 @@ 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)
+    txt2ebook.subcommands.build_subparser(subparsers)
 
     return parser
 

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/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-0.1.118/src/txt2ebook/subcommands/__init__.py

@@ -0,0 +1,33 @@
+# Copyright (C) 2021,2022,2023,2024 Kian-Meng Ang
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+"""Common utils for subcommand."""
+
+import importlib
+import pkgutil
+
+
+def build_subparser(subparsers):
+    """Build subparser for each subcommands."""
+    iter_namespace = pkgutil.iter_modules(__path__, __name__ + ".")
+
+    subcommands = {
+        name: importlib.import_module(name)
+        for finder, name, ispkg
+        in iter_namespace
+    }
+
+    for subcommand in subcommands.values():
+        subcommand.build_subparser(subparsers)

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/subcommands/epub.py

@@ -79,6 +79,30 @@ 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",
+    )
+
+    epub_parser.add_argument(
+        "-ff",
+        "--filename-format",
+        dest="filename_format",
+        type=int,
+        default=None,
+        help=(
+            "the output filename format "
+            "(default: TXT_FILENAME [EBOOK_FILENAME])\n"
+            "1 - title_authors.EBOOK_EXTENSION\n"
+            "2 - authors_title.EBOOK_EXTENSION"
+        ),
+        metavar="FILENAME_FORMAT",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run epub subcommand.

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/subcommands/gmi.py

@@ -71,6 +71,30 @@ 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",
+    )
+
+    gmi_parser.add_argument(
+        "-ff",
+        "--filename-format",
+        dest="filename_format",
+        type=int,
+        default=None,
+        help=(
+            "the output filename format "
+            "(default: TXT_FILENAME [EBOOK_FILENAME])\n"
+            "1 - title_authors.EBOOK_EXTENSION\n"
+            "2 - authors_title.EBOOK_EXTENSION"
+        ),
+        metavar="FILENAME_FORMAT",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run md subcommand.

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/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-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/subcommands/md.py

@@ -71,6 +71,30 @@ 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",
+    )
+
+    md_parser.add_argument(
+        "-ff",
+        "--filename-format",
+        dest="filename_format",
+        type=int,
+        default=None,
+        help=(
+            "the output filename format "
+            "(default: TXT_FILENAME [EBOOK_FILENAME])\n"
+            "1 - title_authors.EBOOK_EXTENSION\n"
+            "2 - authors_title.EBOOK_EXTENSION"
+        ),
+        metavar="FILENAME_FORMAT",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run md subcommand.

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/subcommands/pdf.py

@@ -52,6 +52,15 @@ def build_subparser(subparsers) -> None:
         metavar="EBOOK_FILENAME",
     )
 
+    pdf_parser.add_argument(
+        "-c",
+        "--cover",
+        dest="cover",
+        default=None,
+        help="cover of the ebook",
+        metavar="IMAGE_FILENAME",
+    )
+
     pdf_parser.add_argument(
         "-pz",
         "--page-size",
@@ -62,6 +71,30 @@ 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",
+    )
+
+    pdf_parser.add_argument(
+        "-ff",
+        "--filename-format",
+        dest="filename_format",
+        type=int,
+        default=None,
+        help=(
+            "the output filename format "
+            "(default: TXT_FILENAME [EBOOK_FILENAME])\n"
+            "1 - title_authors.EBOOK_EXTENSION\n"
+            "2 - authors_title.EBOOK_EXTENSION"
+        ),
+        metavar="FILENAME_FORMAT",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run pdf subcommand.

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/subcommands/tex.py

@@ -68,6 +68,39 @@ def build_subparser(subparsers) -> None:
 
     tex_parser.set_defaults(func=run)
 
+    tex_parser.add_argument(
+        "-c",
+        "--cover",
+        dest="cover",
+        default=None,
+        help="cover of the ebook",
+        metavar="IMAGE_FILENAME",
+    )
+
+    tex_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
+    tex_parser.add_argument(
+        "-ff",
+        "--filename-format",
+        dest="filename_format",
+        type=int,
+        default=None,
+        help=(
+            "the output filename format "
+            "(default: TXT_FILENAME [EBOOK_FILENAME])\n"
+            "1 - title_authors.EBOOK_EXTENSION\n"
+            "2 - authors_title.EBOOK_EXTENSION"
+        ),
+        metavar="FILENAME_FORMAT",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run tex subcommand.

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/txt2ebook/subcommands/typ.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/>.
 
-"""md subcommand."""
+"""typ subcommand."""
 
 import argparse
 import logging
@@ -52,6 +52,15 @@ def build_subparser(subparsers) -> None:
         metavar="EBOOK_FILENAME",
     )
 
+    typ_parser.add_argument(
+        "-c",
+        "--cover",
+        dest="cover",
+        default=None,
+        help="cover of the ebook",
+        metavar="IMAGE_FILENAME",
+    )
+
     typ_parser.add_argument(
         "-pz",
         "--page-size",
@@ -79,6 +88,30 @@ 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",
+    )
+
+    typ_parser.add_argument(
+        "-ff",
+        "--filename-format",
+        dest="filename_format",
+        type=int,
+        default=None,
+        help=(
+            "the output filename format "
+            "(default: TXT_FILENAME [EBOOK_FILENAME])\n"
+            "1 - title_authors.EBOOK_EXTENSION\n"
+            "2 - authors_title.EBOOK_EXTENSION"
+        ),
+        metavar="FILENAME_FORMAT",
+    )
+
 
 def run(args: argparse.Namespace) -> None:
     """Run typ subcommand.

{txt2ebook-0.1.116 → txt2ebook-0.1.118}/src/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)