txt2ebook 0.1.161__tar.gz → 0.1.163__tar.gz

{txt2ebook-0.1.161/src/txt2ebook.egg-info → txt2ebook-0.1.163}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.161
+Version: 0.1.163
 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.161 → txt2ebook-0.1.163}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "txt2ebook"
-version = "0.1.161"
+version = "0.1.163"
 description = "CLI tool to convert txt file to ebook format"
 authors = [{ name = "Kian-Meng Ang", email = "kianmeng@cpan.org" }]
 requires-python = ">=3.10"

{txt2ebook-0.1.161 → txt2ebook-0.1.163}/src/txt2ebook/cli.py

@@ -71,6 +71,15 @@ def build_parser() -> argparse.ArgumentParser:
         ),
     )
 
+    parser.add_argument(
+        "-y",
+        "--yes",
+        default=False,
+        action="store_true",
+        dest="yes",
+        help="assume yes to all prompts (default: '%(default)s')",
+    )
+
     parser.add_argument(
         "-l",
         "--language",

{txt2ebook-0.1.161 → txt2ebook-0.1.163}/src/txt2ebook/formats/base.py

@@ -150,18 +150,18 @@ class BaseWriter(ABC):
     def _get_file_extension_for_split(self) -> str:
         raise NotImplementedError
 
-    def _export_multiple_files(self) -> None:
+    def _export_multiple_files(self) -> Path:
         logger.info("Split multiple files")
 
         extension = self._get_file_extension_for_split()
         txt_filename = Path(self.config.input_file.name)
 
-        export_filename = self._get_metadata_filename_for_split(
+        metadata_filename = self._get_metadata_filename_for_split(
             txt_filename, extension
         )
-        export_filename.parent.mkdir(parents=True, exist_ok=True)
-        logger.info("Creating %s", export_filename)
-        with open(export_filename, "w", encoding="utf8") as file:
+        metadata_filename.parent.mkdir(parents=True, exist_ok=True)
+        logger.info("Creating %s", metadata_filename)
+        with open(metadata_filename, "w", encoding="utf8") as file:
             file.write(self._to_metadata_txt())
 
         sc_seq = 1
@@ -213,6 +213,8 @@ class BaseWriter(ABC):
 
             sc_seq = sc_seq + 1
 
+        return metadata_filename
+
     def _get_metadata_filename_for_split(
         self, txt_filename: Path, extension: str
     ) -> Path:

{txt2ebook-0.1.161 → txt2ebook-0.1.163}/src/txt2ebook/formats/txt.py

@@ -39,7 +39,9 @@ class TxtWriter(BaseWriter):
         if self.config.input_file.name == "<stdin>":
             logger.info("Skip backup source text file as content from stdin")
         elif self.config.split_volume_and_chapter:
-            self._export_multiple_files()
+            metadata_filename = self._export_multiple_files()
+            if self.config.open:
+                self._open_file(metadata_filename)
         else:
             output_filename = self._output_filename(".txt")
             output_filename.parent.mkdir(parents=True, exist_ok=True)
@@ -72,118 +74,19 @@ class TxtWriter(BaseWriter):
             if self.config.open:
                 self._open_file(output_filename)
 
-    def _get_metadata_filename_for_split(
-        self, txt_filename: Path, extension: str
-    ) -> Path:
-        return Path(
-            txt_filename.resolve().parent.joinpath(
-                self.config.output_folder,
-                f"00_{txt_filename.stem}_" + self._("metadata") + extension,
-            )
-        )
-
-    def _get_toc_filename_for_split(
-        self, txt_filename: Path, extension: str
-    ) -> Path:
-        return Path(
-            txt_filename.resolve().parent.joinpath(
-                self.config.output_folder,
-                f"01_{txt_filename.stem}_" + self._("toc") + extension,
-            )
-        )
+    def _get_toc_content_for_split(self) -> str:
+        return self._to_toc("-")
 
-    def _get_volume_chapter_filename_for_split(
-        self,
-        txt_filename: Path,
-        section_seq: str,
-        chapter_seq: str,
-        volume: Volume,
-        chapter: Chapter,
-        extension: str,
-    ) -> Path:
-        return Path(
-            txt_filename.resolve().parent.joinpath(
-                self.config.output_folder,
-                (
-                    f"{section_seq}"
-                    f"_{chapter_seq}"
-                    f"_{txt_filename.stem}"
-                    f"_{volume.title}"
-                    f"_{chapter.title}"
-                    f"{extension}"
-                ),
-            )
-        )
-
-    def _get_chapter_filename_for_split(
-        self,
-        txt_filename: Path,
-        section_seq: str,
-        chapter: Chapter,
-        extension: str,
-    ) -> Path:
-        return Path(
-            txt_filename.resolve().parent.joinpath(
-                self.config.output_folder,
-                (
-                    f"{section_seq}_{txt_filename.stem}_{chapter.title}{extension}"
-                ),
-            )
-        )
+    def _get_volume_chapter_content_for_split(
+        self, volume: Volume, chapter: Chapter
+    ) -> str:
+        return self._to_volume_chapter_txt(volume, chapter)
 
-    def _export_multiple_files(self) -> None:
-        """Export multiple files based on volume and chapter."""
-        txt_filename = Path(self.config.input_file.name)
-        txt_filename.parent.joinpath(self.config.output_folder).mkdir(
-            parents=True, exist_ok=True
-        )
-
-        # 1. Write metadata file
-        metadata_filename = self._get_metadata_filename_for_split(
-            txt_filename, ".txt"
-        )
-        with open(metadata_filename, "w", encoding="utf8") as file:
-            logger.info("Creating %s", metadata_filename.resolve())
-            file.write(self._to_metadata_txt())
-
-        # 2. Write volume/chapter files
-        section_seq = 0
-        chapter_seq = 0
-        for section in self.book.toc:
-            if isinstance(section, Volume):
-                section_seq += 1
-                chapter_seq = 0
-                for chapter in section.chapters:
-                    chapter_seq += 1
-                    output_filename = (
-                        self._get_volume_chapter_filename_for_split(
-                            txt_filename,
-                            str(section_seq).rjust(2, "0"),
-                            str(chapter_seq).rjust(2, "0"),
-                            section,
-                            chapter,
-                            ".txt",
-                        )
-                    )
-                    with open(output_filename, "w", encoding="utf8") as file:
-                        logger.info("Creating %s", output_filename.resolve())
-                        file.write(
-                            self._to_volume_chapter_txt(section, chapter)
-                        )
-            elif isinstance(section, Chapter):
-                section_seq += 1
-                output_filename = self._get_chapter_filename_for_split(
-                    txt_filename,
-                    str(section_seq).rjust(2, "0"),
-                    section,
-                    ".txt",
-                )
-                with open(output_filename, "w", encoding="utf8") as file:
-                    logger.info("Creating %s", output_filename.resolve())
-                    file.write(self._to_chapter_txt(section))
+    def _get_chapter_content_for_split(self, chapter: Chapter) -> str:
+        return self._to_chapter_txt(chapter)
 
-        if self.config.open:
-            self._open_file(metadata_filename)
+    def _get_file_extension_for_split(self) -> str:
+        return ".txt"
 
     def _to_txt(self) -> str:
         toc = self._to_toc("-") if self.config.with_toc else ""

txt2ebook-0.1.161/src/txt2ebook/zh_utils.py → txt2ebook-0.1.163/src/txt2ebook/languages/zh_base.py

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

{txt2ebook-0.1.161 → txt2ebook-0.1.163}/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.161 → txt2ebook-0.1.163}/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.161 → txt2ebook-0.1.163/src/txt2ebook.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: txt2ebook
-Version: 0.1.161
+Version: 0.1.163
 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.161 → txt2ebook-0.1.163}/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