txt2ebook 0.1.162__tar.gz → 0.1.164__tar.gz

{txt2ebook-0.1.162/src/txt2ebook.egg-info → txt2ebook-0.1.164}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.162
+Version: 0.1.164
 Summary: CLI tool to convert txt file to ebook format
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later

{txt2ebook-0.1.162 → txt2ebook-0.1.164}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "txt2ebook"
-version = "0.1.162"
+version = "0.1.164"
 description = "CLI tool to convert txt file to ebook format"
 authors = [{ name = "Kian-Meng Ang", email = "kianmeng@cpan.org" }]
 requires-python = ">=3.10"
@@ -104,5 +104,8 @@ extend-select = [
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 
+[tool.pytest.ini_options]
+pythonpath = ["src"]
+
 [tool.setuptools.packages.find]
 where = ["src"]

txt2ebook-0.1.162/src/txt2ebook/zh_utils.py → txt2ebook-0.1.164/src/txt2ebook/languages/zh_base.py

@@ -158,4 +158,4 @@ __all__ = [
     "zh_halfwidth_to_fullwidth",
     "zh_numeric",
     "zh_words_to_numbers",
-]
+]

{txt2ebook-0.1.162 → txt2ebook-0.1.164}/src/txt2ebook/parser.py

@@ -20,13 +20,16 @@ import logging
 from collections import Counter
 from dataclasses import dataclass
 from types import ModuleType
-from typing import List, Tuple
+from typing import List, Tuple, Union
 
 import regex as re
 
 from txt2ebook.models import Book, Chapter, Volume
 from txt2ebook.tokenizer import Token, Tokenizer
-from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth, zh_words_to_numbers
+from txt2ebook.languages.zh_base import (
+    zh_halfwidth_to_fullwidth,
+    zh_words_to_numbers,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -290,13 +293,13 @@ class Parser:
                 self._process_paragraph_token(token, toc)
 
         # Use authors if set explicitly from command line.
-        if hasattr(self.config, "author") and self.config.author:
+        if getattr(self.config, "author", None):
             book_data["authors"] = self.config.author
 
-        if hasattr(self.config, "title") and self.config.title:
+        if getattr(self.config, "title", None):
             book_data["book_title"] = self.config.title
 
-        if hasattr(self.config, "translator") and self.config.translator:
+        if getattr(self.config, "translator", None):
             book_data["translators"] = self.config.translator
 
         logger.info("Found or set book title: %s", book_data["book_title"])
@@ -307,10 +310,7 @@ class Parser:
         logger.info("Found or set tags: %s", repr(book_data["tags"]))
         logger.info("Found or set index: %s", repr(book_data["index"]))
 
-        if (
-            hasattr(self.config, "sort_volume_and_chapter")
-            and self.config.sort_volume_and_chapter
-        ):
+        if getattr(self.config, "sort_volume_and_chapter", False):
             self.sort_volume_and_chapter(toc)
 
         return (
@@ -322,11 +322,11 @@ class Parser:
             toc,
         )
 
-    def sort_volume_and_chapter(self, toc: List) -> None:
+    def sort_volume_and_chapter(self, toc: List[Union[Volume, Chapter]]) -> None:
         """Sort by title of volumes and its chapters.
 
         Args:
-            toc(List): The parsed table of content
+            toc(List[Union[Volume, Chapter]]): The parsed table of content
 
         Returns:
             str: The formatted book content

{txt2ebook-0.1.162 → txt2ebook-0.1.164}/src/txt2ebook/subcommands/massage.py

@@ -31,7 +31,7 @@ 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, zh_words_to_numbers
+from txt2ebook.languages.zh_base import zh_halfwidth_to_fullwidth, zh_words_to_numbers
 
 logger = logging.getLogger(__name__)
 

{txt2ebook-0.1.162 → txt2ebook-0.1.164}/src/txt2ebook/subcommands/tex.py

@@ -40,6 +40,14 @@ def build_subparser(subparsers) -> None:
         metavar="TXT_FILENAMES",
     )
 
+    tex_parser.add_argument(
+        "output_file",
+        nargs="?",
+        default=None,
+        help="converted ebook filename (default: 'TXT_FILENAME.tex')",
+        metavar="EBOOK_FILENAME",
+    )
+
     tex_parser.add_argument(
         "-ik",
         "--index-keyword",
@@ -115,12 +123,12 @@ def run(args: argparse.Namespace) -> None:
     """
     input_sources = []
 
-    if not sys.stdin.isatty():
-        # piped input, use stdin as the single input source
-        input_sources.append(sys.stdin)
-    elif args.input_file:
+    if args.input_file:
         # multiple file(s)
         input_sources.extend(args.input_file)
+    elif not sys.stdin.isatty():
+        # piped input, use stdin as the single input source
+        input_sources.append(sys.stdin)
     else:
         logger.error("No input files provided.")
         raise InputError("No input files provided.")

{txt2ebook-0.1.162 → txt2ebook-0.1.164/src/txt2ebook.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.162
+Version: 0.1.164
 Summary: CLI tool to convert txt file to ebook format
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later

{txt2ebook-0.1.162 → txt2ebook-0.1.164}/src/txt2ebook.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ src/txt2ebook/cli.py
 src/txt2ebook/exceptions.py
 src/txt2ebook/parser.py
 src/txt2ebook/tokenizer.py
-src/txt2ebook/zh_utils.py
 src/txt2ebook.egg-info/PKG-INFO
 src/txt2ebook.egg-info/SOURCES.txt
 src/txt2ebook.egg-info/dependency_links.txt
@@ -28,6 +27,7 @@ src/txt2ebook/formats/templates/epub/__init__.py
 src/txt2ebook/helpers/__init__.py
 src/txt2ebook/languages/__init__.py
 src/txt2ebook/languages/en.py
+src/txt2ebook/languages/zh_base.py
 src/txt2ebook/languages/zh_cn.py
 src/txt2ebook/languages/zh_tw.py
 src/txt2ebook/models/__init__.py

{txt2ebook-0.1.162 → txt2ebook-0.1.164}/tests/test_tokenizer.py

@@ -17,6 +17,7 @@ import argparse
 import pytest
 
 from txt2ebook.tokenizer import Token, Tokenizer
+from txt2ebook.languages import zh_cn as lang_zh_cn
 
 
 @pytest.fixture(name="config")
@@ -64,7 +65,7 @@ def test_parse(config):
 
 果珍李柰，菜重芥姜。
 """
-    tokenizer = Tokenizer(content, config)
+    tokenizer = Tokenizer(content, config, lang_zh_cn)
 
     assert tokenizer.tokens == [
         Token(type="TITLE", line_no=0, value="天地玄黄"),
@@ -109,7 +110,7 @@ def test_parse_with_extra_newline_before_chapter_header(config):
 
 天地玄黄。
 """
-    tokenizer = Tokenizer(content, config)
+    tokenizer = Tokenizer(content, config, lang_zh_cn)
     assert tokenizer.tokens == [
         Token(type="TITLE", line_no=0, value="天地玄黄"),
         Token(type="AUTHOR", line_no=0, value="果珍李柰"),