txt2ebook 0.1.117__tar.gz → 0.1.119__tar.gz

{txt2ebook-0.1.117 → txt2ebook-0.1.119}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "txt2ebook"
-version = "0.1.117"
+version = "0.1.119"
 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.117 → txt2ebook-0.1.119}/src/txt2ebook/__init__.py

@@ -24,29 +24,30 @@ import langdetect
 
 logger = logging.getLogger(__name__)
 
-__version__ = "0.1.117"
+__version__ = "0.1.119"
 
 
 def setup_logger(config: argparse.Namespace) -> None:
-    """Configure the global logger.
+    """Sets up logging configuration based on command-line arguments.
 
     Args:
-        config(argparse.Namespace): Config that contains arguments
+        config (argparse.Namespace): Namespace containing parsed arguments.
     """
     if config.quiet:
         logging.disable(logging.NOTSET)
-    else:
-        logformat = {
-            True: "%(levelname)5s: %(message)s",
-            False: "%(message)s",
-        }
-
-        logging.basicConfig(
-            level=config.debug and logging.DEBUG or logging.INFO,
-            stream=sys.stdout,
-            format=logformat[config.debug],
-            datefmt="%Y-%m-%d %H:%M:%S",
-        )
+        return
+
+    level = logging.DEBUG if config.debug else logging.INFO
+    format_string = (
+        "%(levelname)5s: %(message)s" if config.debug else "%(message)s"
+    )
+
+    logging.basicConfig(
+        level=level,
+        format=format_string,
+        stream=sys.stdout,
+        datefmt="%Y-%m-%d %H:%M:%S",
+    )
 
 
 def log_or_raise_on_warning(msg: str, raise_on_warning: bool = False) -> None:

{txt2ebook-0.1.117 → txt2ebook-0.1.119}/src/txt2ebook/cli.py

@@ -21,9 +21,7 @@
 """
 
 import argparse
-import importlib
 import logging
-import pkgutil
 import sys
 from typing import Optional, Sequence
 
@@ -94,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",
@@ -141,21 +130,6 @@ def build_parser(
         metavar="SEPARATOR",
     )
 
-    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(
         "-rw",
         "--raise-on-warning",
@@ -208,17 +182,7 @@ def build_parser(
     )
 
     subparsers = parser.add_subparsers(help="sub-command help")
-
-    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)
+    txt2ebook.subcommands.build_subparser(subparsers)
 
     return parser
 

{txt2ebook-0.1.117 → txt2ebook-0.1.119}/src/txt2ebook/parser.py

@@ -65,7 +65,7 @@ class Parser:
             translators=translators,
             tags=tags,
             index=index,
-            cover=self.config.cover,
+            cover=getattr(self.config, "cover", ""),
             raw_content=self.raw_content,
             toc=toc,
         )
@@ -231,7 +231,10 @@ class Parser:
         logger.info("Found or set tags: %s", repr(tags))
         logger.info("Found or set index: %s", repr(index))
 
-        if hasattr(self.config, "sort_volume_and_chapter") and 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.119/src/txt2ebook/subcommands/__init__.py

@@ -0,0 +1,32 @@
+# 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.117 → txt2ebook-0.1.119}/src/txt2ebook/subcommands/env.py

@@ -44,9 +44,9 @@ def run(_args: argparse.Namespace) -> None:
         None
     """
     sys_version = sys.version.replace("\n", "")
-    print(
+    env = [
         f"txt2ebook: {__version__}",
         f"python: {sys_version}",
         f"platform: {platform.platform()}",
-        sep="\n",
-    )
+    ]
+    print(*env, sep="\n")

{txt2ebook-0.1.117 → txt2ebook-0.1.119}/src/txt2ebook/subcommands/epub.py

@@ -88,6 +88,21 @@ def build_subparser(subparsers) -> None:
         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.117 → txt2ebook-0.1.119}/src/txt2ebook/subcommands/gmi.py

@@ -80,6 +80,21 @@ def build_subparser(subparsers) -> None:
         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.117 → txt2ebook-0.1.119}/src/txt2ebook/subcommands/massage.py

@@ -18,6 +18,7 @@
 import argparse
 import logging
 import sys
+from importlib import import_module
 
 import cjkwrap
 import regex as re
@@ -26,8 +27,9 @@ from bs4 import UnicodeDammit
 from txt2ebook import detect_and_expect_language
 from txt2ebook.exceptions import EmptyFileError
 from txt2ebook.formats.txt import TxtWriter
+from txt2ebook.models.book import Book
 from txt2ebook.parser import Parser
-from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth
+from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth, zh_words_to_numbers
 
 logger = logging.getLogger(__name__)
 
@@ -55,6 +57,15 @@ def build_subparser(subparsers) -> None:
         metavar="EBOOK_FILENAME",
     )
 
+    massage_parser.add_argument(
+        "-hn",
+        "--header-number",
+        default=False,
+        action="store_true",
+        dest="header_number",
+        help="convert section header from words to numbers",
+    )
+
     massage_parser.add_argument(
         "-sp",
         "--split-volume-and-chapter",
@@ -126,6 +137,29 @@ def build_subparser(subparsers) -> None:
         help="short volume and chapter",
     )
 
+    massage_parser.add_argument(
+        "-op",
+        "--open",
+        default=False,
+        action="store_true",
+        dest="open",
+        help="open the generated file using default program",
+    )
+
+    massage_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"
+        ),
+    )
+
     massage_parser.set_defaults(func=run)
 
 
@@ -147,10 +181,75 @@ def run(args: argparse.Namespace) -> None:
     if args.debug:
         book.debug(args.verbose)
 
+    if args.header_number:
+        book = header_number(args, book)
+
     writer = TxtWriter(book, args)
     writer.write()
 
 
+def header_number(args: argparse.Namespace, book: Book) -> Book:
+    """Convert header number from words to numbers."""
+    stats = book.stats()
+
+    seq_lengths = {
+        "Volume": len(str(stats.get("Volume", 2))),
+        "Chapter": len(str(stats.get("Chapter", 2))),
+    }
+
+    for toc_item in book.toc:
+        toc_type = type(toc_item).__name__
+        if toc_type in seq_lengths:
+            toc_item.title = words_to_nums(
+                args, toc_item.title, seq_lengths[toc_type]
+            )
+
+    return book
+
+
+def words_to_nums(args: argparse.Namespace, words: str, length: int) -> str:
+    """Convert header from words to numbers.
+
+    For example, `第一百零八章` becomes `第108章`.
+
+    Args:
+        words(str): The line that contains section header in words.
+        length(int): The number of left zero-padding to prepend.
+
+    Returns:
+        str: The formatted section header.
+    """
+    config_lang = args.language.replace("-", "_")
+    langconf = import_module(f"txt2ebook.languages.{config_lang}")
+
+    if args.language not in ("zh-cn", "zh-tw"):
+        return words
+
+    # left pad the section number if found as halfwidth integer
+    match = re.match(rf"第([{langconf.HALFWIDTH_NUMS}]*)", words)
+    if match and match.group(1) != "":
+        header_nums = match.group(1)
+        return words.replace(header_nums, str(header_nums).rjust(length, "0"))
+
+    # left pad the section number if found as fullwidth integer
+    match = re.match(rf"第([{langconf.FULLWIDTH_NUMS}]*)", words)
+    if match and match.group(1) != "":
+        header_nums = match.group(1)
+        return words.replace(header_nums, str(header_nums).rjust(length, "０"))
+
+    replaced_words = zh_words_to_numbers(words, length=length)
+
+    if args.fullwidth:
+        replaced_words = zh_halfwidth_to_fullwidth(replaced_words)
+
+    logger.debug(
+        "Convert header to numbers: %s -> %s",
+        words[:10],
+        replaced_words[:10],
+    )
+    return replaced_words
+
+
 def massage_txt(args: argparse.Namespace) -> str:
     """Massage the text file."""
     logger.info("Parsing txt file: %s", args.input_file.name)
@@ -160,9 +259,7 @@ def massage_txt(args: argparse.Namespace) -> str:
 
     content = unicode.unicode_markup
     if not content:
-        raise EmptyFileError(
-            f"Empty file content in {args.input_file.name}"
-        )
+        raise EmptyFileError(f"Empty file content in {args.input_file.name}")
 
     content = to_unix_newline(content)
 

{txt2ebook-0.1.117 → txt2ebook-0.1.119}/src/txt2ebook/subcommands/md.py

@@ -80,6 +80,21 @@ def build_subparser(subparsers) -> None:
         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.117 → txt2ebook-0.1.119}/src/txt2ebook/subcommands/parse.py

@@ -64,9 +64,7 @@ def run(args: argparse.Namespace) -> Book:
 
     content = unicode.unicode_markup
     if not content:
-        raise EmptyFileError(
-            f"Empty file content in {args.input_file.name}"
-        )
+        raise EmptyFileError(f"Empty file content in {args.input_file.name}")
 
     args_language = args.language
     detect_language = detect(content)

{txt2ebook-0.1.117 → txt2ebook-0.1.119}/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",
@@ -71,6 +80,21 @@ def build_subparser(subparsers) -> None:
         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.117 → txt2ebook-0.1.119}/src/txt2ebook/subcommands/tex.py

@@ -68,6 +68,15 @@ 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",
@@ -77,6 +86,21 @@ def build_subparser(subparsers) -> None:
         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.117 → txt2ebook-0.1.119}/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",
@@ -88,6 +97,21 @@ def build_subparser(subparsers) -> None:
         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.117 → txt2ebook-0.1.119}/src/txt2ebook/tokenizer.py

@@ -205,7 +205,10 @@ class Tokenizer:
             rf"^{self.langconf.DEFAULT_RE_VOLUME}\s*"
             rf"{self.langconf.DEFAULT_RE_CHAPTER}"
         )
-        if hasattr(self.config, "re_volume_chapter") and 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)

{txt2ebook-0.1.117 → txt2ebook-0.1.119}/src/txt2ebook/txt2ebook.py

@@ -30,7 +30,12 @@ from typing import Optional, Sequence
 
 from bs4 import UnicodeDammit
 
-from txt2ebook import __version__, print_env, setup_logger, detect_and_expect_language
+from txt2ebook import (
+    __version__,
+    print_env,
+    setup_logger,
+    detect_and_expect_language,
+)
 from txt2ebook.exceptions import EmptyFileError
 from txt2ebook.formats import (
     EBOOK_FORMATS,