txt2ebook 0.1.24__py3-none-any.whl → 0.1.26__py3-none-any.whl

CHANGELOG.md

@@ -7,6 +7,35 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.1.26 - 2023-03-12
+
+### Changed
+
+- Rename epub template names, `clean_no_indent` to `noindent`, and
+  `clean_no_paragraph_space` to `condense`
+- Raise warnings for invalid prepend length for `zh_words_to_numbers` function
+
+### Fixed
+
+- Fix missing translations
+- Fix missing EPUB template names not showing in help message
+
+## v0.1.25 - 2023-03-05
+
+### Added
+
+- Add new EPUB templates, `clean_no_indent` and `clean_no_paragraph_space`
+
+### Fixed
+
+- Add missing `zh-*` character for `zh_numeric`
+- Remove unused import
+- Fix incorrect dep added to wrong environment
+
+### Changed
+
+- Refactor ebook extensions variable into package
+
 ## v0.1.24 - 2023-02-26
 
 ### Changed

CONTRIBUTING.md

@@ -53,11 +53,17 @@ tox -e py37,py38,py39,py310,py311 -- tests/test_tokenizer.py
 For code lint, we're using `pre-commit`:
 
 ```bash
-pre-commit install
+pre-commit install # run once
 pre-commit clean
 pre-commit run --all-files
 ```
 
+Or specific hook:
+
+```bash
+pre-commit run pylint -a
+```
+
 We're using zero-based versioning.
 
 For patches or bug fixes:

txt2ebook/__init__.py

@@ -21,7 +21,7 @@ import sys
 
 logger = logging.getLogger(__name__)
 
-__version__ = "0.1.24"
+__version__ = "0.1.26"
 
 
 def setup_logger(config: argparse.Namespace) -> None:

txt2ebook/formats/__init__.py

@@ -19,11 +19,14 @@ import argparse
 from typing import Union
 
 import txt2ebook.models.book
+from txt2ebook.formats.epub import TEMPLATES as EPUB_TEMPLATES
 from txt2ebook.formats.epub import EpubWriter
 from txt2ebook.formats.txt import TxtWriter
 from txt2ebook.helpers import load_class, to_classname
 from txt2ebook.models import Book
 
+EBOOK_FORMATS = ["epub", "txt"]
+
 
 def create_format(
     book: txt2ebook.models.book.Book,
@@ -49,6 +52,8 @@ def create_format(
 
 __all__ = [
     "Book",
+    "EBOOK_FORMATS",
+    "EPUB_TEMPLATES",
     "EpubWriter",
     "TxtWriter",
 ]

txt2ebook/formats/epub.py

@@ -19,7 +19,7 @@ import gettext
 import io
 import logging
 import uuid
-from importlib.resources import read_text
+from importlib.resources import contents, read_text
 from pathlib import Path
 from typing import Optional, Union
 
@@ -32,6 +32,12 @@ logger = logging.getLogger(__name__)
 
 SPACE = "\u0020"
 
+TEMPLATES = [
+    Path(file).stem
+    for file in list(contents(template_epub))
+    if Path(file).suffix == ".css"
+]
+
 
 class EpubWriter:
     """Module for writing ebook in epub format."""

txt2ebook/formats/templates/epub/condense.css

@@ -0,0 +1,42 @@
+/* cover page */
+div#cover {
+  text-align: center;
+  width: 100%;
+}
+
+/* navigation page - toc */
+ol {
+  list-style-type: none;
+  padding-left: 0;
+}
+
+ol li {
+  padding-top: 0.2em;
+}
+
+ol li ol li:last-of-type {
+  padding-bottom: 1em;
+}
+
+ol li a {
+  text-decoration: none;
+}
+
+/* chapters & section */
+div.volume {
+  display: table;
+  width: 100%;
+  height: 100%;
+}
+
+h1.volume {
+  display: table-cell;
+  text-align: center;
+  vertical-align: middle;
+}
+
+h2 {
+}
+p {
+  margin: 0em;
+}

txt2ebook/formats/templates/epub/noindent.css

@@ -0,0 +1,42 @@
+/* cover page */
+div#cover {
+  text-align: center;
+  width: 100%;
+}
+
+/* navigation page - toc */
+ol {
+  list-style-type: none;
+  padding-left: 0;
+}
+
+ol li {
+  padding-top: 0.2em;
+}
+
+ol li ol li:last-of-type {
+  padding-bottom: 1em;
+}
+
+ol li a {
+  text-decoration: none;
+}
+
+/* chapters & section */
+div.volume {
+  display: table;
+  width: 100%;
+  height: 100%;
+}
+
+h1.volume {
+  display: table-cell;
+  text-align: center;
+  vertical-align: middle;
+}
+
+h2 {
+}
+p {
+  text-indent: -2em;
+}

txt2ebook/locales/en/LC_MESSAGES/txt2ebook.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-02-04 22:03+0800\n"
+"POT-Creation-Date: 2023-03-06 04:02+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: src/txt2ebook/formats/epub.py:193
+#: src/txt2ebook/formats/epub.py:199
 msgid "cover"
 msgstr "Cover"
 
-#: src/txt2ebook/formats/txt.py:88
+#: src/txt2ebook/formats/txt.py:84
 msgid "metadata"
 msgstr "metadata"
 
-#: src/txt2ebook/formats/txt.py:158
+#: src/txt2ebook/formats/txt.py:154
 msgid "title:"
 msgstr "Title:"
 
-#: src/txt2ebook/formats/txt.py:159
+#: src/txt2ebook/formats/txt.py:155
 msgid "author:"
 msgstr "Author:"
 
-#: src/txt2ebook/formats/txt.py:160
+#: src/txt2ebook/formats/txt.py:156
 msgid "tag:"
 msgstr "Tag:"

txt2ebook/locales/txt2ebook.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-02-05 10:12+0800\n"
+"POT-Creation-Date: 2023-03-06 04:02+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,23 +15,23 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: src/txt2ebook/formats/epub.py:193
+#: src/txt2ebook/formats/epub.py:199
 msgid "cover"
 msgstr ""
 
-#: src/txt2ebook/formats/txt.py:88
+#: src/txt2ebook/formats/txt.py:84
 msgid "metadata"
 msgstr ""
 
-#: src/txt2ebook/formats/txt.py:158
+#: src/txt2ebook/formats/txt.py:154
 msgid "title:"
 msgstr ""
 
-#: src/txt2ebook/formats/txt.py:159
+#: src/txt2ebook/formats/txt.py:155
 msgid "author:"
 msgstr ""
 
-#: src/txt2ebook/formats/txt.py:160
+#: src/txt2ebook/formats/txt.py:156
 msgid "tag:"
 msgstr ""
 

txt2ebook/locales/zh-cn/LC_MESSAGES/txt2ebook.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2023-02-04 22:03+0800\n"
+"POT-Creation-Date: 2023-03-06 04:02+0800\n"
 "PO-Revision-Date: 2023-01-14 18:07+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,22 +16,22 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 3.1.1\n"
 
-#: src/txt2ebook/formats/epub.py:193
+#: src/txt2ebook/formats/epub.py:199
 msgid "cover"
 msgstr "封面"
 
-#: src/txt2ebook/formats/txt.py:88
+#: src/txt2ebook/formats/txt.py:84
 msgid "metadata"
 msgstr "元数据"
 
-#: src/txt2ebook/formats/txt.py:158
+#: src/txt2ebook/formats/txt.py:154
 msgid "title:"
 msgstr "书名："
 
-#: src/txt2ebook/formats/txt.py:159
+#: src/txt2ebook/formats/txt.py:155
 msgid "author:"
 msgstr "作者："
 
-#: src/txt2ebook/formats/txt.py:160
+#: src/txt2ebook/formats/txt.py:156
 msgid "tag:"
 msgstr "票签："

txt2ebook/parser.py

@@ -26,7 +26,7 @@ import regex as re
 
 from txt2ebook.models import Book, Chapter, Volume
 from txt2ebook.tokenizer import Tokenizer
-from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth, zh_numeric, zh_words_to_numbers
+from txt2ebook.zh_utils import zh_halfwidth_to_fullwidth, zh_words_to_numbers
 
 logger = logging.getLogger(__name__)
 
@@ -135,7 +135,6 @@ class Parser:
         )
         return replaced_words
 
-
     def parse_tokens(self, tokenizer: Tokenizer) -> Tuple:
         """Parse the tokens and organize into book structure."""
         toc: List[Union[Volume, Chapter]] = []

txt2ebook/txt2ebook.py

@@ -26,11 +26,9 @@ from langdetect import detect
 
 from txt2ebook import __version__, setup_logger
 from txt2ebook.exceptions import EmptyFileError
-from txt2ebook.formats import create_format
+from txt2ebook.formats import EBOOK_FORMATS, EPUB_TEMPLATES, create_format
 from txt2ebook.parser import Parser
 
-EBOOK_EXTS = ["epub", "txt"]
-
 logger = logging.getLogger(__name__)
 
 
@@ -104,7 +102,7 @@ def build_parser(
         default=None,
         help=(
             "converted ebook filename "
-            "(default: 'TXT_FILENAME.{" + ",".join(EBOOK_EXTS) + "}')"
+            "(default: 'TXT_FILENAME.{" + ",".join(EBOOK_FORMATS) + "}')"
         ),
         metavar="EBOOK_FILENAME",
     )
@@ -114,7 +112,7 @@ def build_parser(
         "--format",
         dest="format",
         default=["epub", "txt"],
-        choices=EBOOK_EXTS,
+        choices=EBOOK_FORMATS,
         action="append",
         help="ebook format (default: '%(default)s')",
     )
@@ -264,9 +262,9 @@ def build_parser(
         "-et",
         "--epub-template",
         default="clean",
+        choices=EPUB_TEMPLATES,
         dest="epub_template",
         help="CSS template for epub ebook (default: '%(default)s')",
-        metavar="TEMPLATE",
     )
 
     parser.add_argument(

txt2ebook/zh_utils.py

@@ -16,10 +16,12 @@
 """String helper functions for handling zh related text."""
 
 import re
+import warnings
 from typing import Any
 from unicodedata import numeric
 
 WORD_NUMERIC_MAP = {
+    "两": 2.0,
     "圩": 50.0,
     "圓": 60.0,
     "進": 70.0,
@@ -130,9 +132,18 @@ def zh_words_to_numbers(words: str, length: int = 0) -> str:
             header_nums += int(zh_numeric(word_grp))
 
     padded_header_nums = str(header_nums)
-    # todo: padded_header_nums length must smaller than length
+
     if length > 0:
-        padded_header_nums = padded_header_nums.rjust(length, "0")
+        word_length = len(padded_header_nums)
+        if word_length < length:
+            padded_header_nums = padded_header_nums.rjust(length, "0")
+        else:
+            warnings.warn(
+                (
+                    "prepend zero length less than word length, "
+                    f"word length: {word_length}, prepend length: {length}"
+                )
+            )
 
     replaced_words = words.replace(header_words, padded_header_nums)
     return replaced_words

{txt2ebook-0.1.24.dist-info → txt2ebook-0.1.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: txt2ebook
-Version: 0.1.24
+Version: 0.1.26
 Summary: CLI tool to convert txt file to ebook format
 Home-page: https://github.com/kianmeng/txt2ebook
 License: AGPL-3.0-or-later
@@ -31,7 +31,6 @@ Requires-Dist: CJKwrap (>=2.2,<3.0)
 Requires-Dist: EbookLib (>=0.17.1,<0.18.0)
 Requires-Dist: bs4 (>=0.0.1,<0.0.2)
 Requires-Dist: langdetect (>=1.0.9,<2.0.0)
-Requires-Dist: pytest-xdist (>=3.1.0,<4.0.0)
 Requires-Dist: regex (>=2021.11.10,<2022.0.0)
 Requires-Dist: tox-pyenv (>=1.1.0,<2.0.0)
 Project-URL: Repository, https://github.com/kianmeng/txt2ebook
@@ -67,8 +66,9 @@ txt2ebook --help
 usage: txt2ebook [-f {epub,txt}] [-t TITLE] [-l LANGUAGE] [-a AUTHOR]
                  [-c IMAGE_FILENAME] [-w WIDTH] [-ps SEPARATOR] [-rd REGEX]
                  [-rvc REGEX] [-rv REGEX] [-rc REGEX] [-rt REGEX] [-ra REGEX]
-                 [-rl REGEX] [-rr REGEX REGEX] [-et TEMPLATE] [-vp] [-tp]
-                 [-sp] [-hn] [-fw] [-rw] [-ob] [-ow] [-v] [-d] [-h] [-V]
+                 [-rl REGEX] [-rr REGEX REGEX] [-et {clean,noindent,condense}]
+                 [-vp] [-tp] [-sp] [-hn] [-fw] [-rw] [-ob] [-ow] [-v] [-d]
+                 [-h] [-V]
                  TXT_FILENAME [EBOOK_FILENAME]
 
 txt2ebook/tte is a cli tool to convert txt file to ebook format.
@@ -112,7 +112,7 @@ optional arguments:
       regex to delete whole line (default: '[]')
   -rr REGEX REGEX, --regex-replace REGEX REGEX
       regex to search and replace (default: '[]')
-  -et TEMPLATE, --epub-template TEMPLATE
+  -et {clean,noindent,condense}, --epub-template {clean,noindent,condense}
       CSS template for epub ebook (default: 'clean')
   -vp, --volume-page
       generate each volume as separate page (only 'epub' format)

{txt2ebook-0.1.24.dist-info → txt2ebook-0.1.26.dist-info}/RECORD

@@ -1,14 +1,16 @@
-CHANGELOG.md,sha256=d7BnpXWCTddGKR9p43Fpzg_QgdAiqFmyDBT-Fdhha4w,12799
-CONTRIBUTING.md,sha256=x8rkYB5kVWhAQ7h1vPTYSOCOmjaQPFZMyjVHUsVn6_0,1340
+CHANGELOG.md,sha256=LaLINjcPErTzsFwx4fZrHrO4oQYV7RyJ1B_EnwPf-A8,13434
+CONTRIBUTING.md,sha256=DZ3pLVwymnPhcMNY6F2lIPmOnHsNFItOHy7zWlhp2n0,1408
 LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook/__init__.py,sha256=674VD-ydCC6izd_1zLqwPEQXybUgfhvrJanIirh8rRw,1646
+txt2ebook/__init__.py,sha256=CYBYlRWiEeUCAWfrP4gaWtk5eDG9yfkJp3-BFgkrNfA,1646
 txt2ebook/__main__.py,sha256=69yaheH-Fv2VIPS0T9kiVmiMluSgLGvwo1fa7badX2I,845
 txt2ebook/exceptions.py,sha256=Y6rqjXhiKIxNeKWVqvAqsUAOaBFKxlUE5Tm5EBcoi9w,837
-txt2ebook/formats/__init__.py,sha256=12RaD1orhQrlDw4991kGqjbquAlDQ-bFtp_nxH1qfcg,1758
-txt2ebook/formats/epub.py,sha256=HvWgmdeOoqVofirVChRWudXxr4LaOoe31ruU_krKD_4,8374
+txt2ebook/formats/__init__.py,sha256=z24b6RWphrEVGC-ISw3KHxgkh7ZTsHEQRP_s86kvh4c,1897
+txt2ebook/formats/epub.py,sha256=iXhq3EWT0NxMTiZJuZs2UbYAJBftUXK75f5DlLsq6mY,8502
 txt2ebook/formats/templates/__init__.py,sha256=0Hhm7Dayb7eB9h2cFo2103H4Tr6ie0ySMZ5gR01q6ag,750
 txt2ebook/formats/templates/epub/__init__.py,sha256=O2sdWRhkuamReBR20WedGWosLp8Dt8NZ33aXzyNQuLQ,756
 txt2ebook/formats/templates/epub/clean.css,sha256=AnEwMckzUSKcjKsDiWtJW1oaceuklt2tyuS1VbpVK1s,462
+txt2ebook/formats/templates/epub/condense.css,sha256=Fz80ZqkPsFRmGdURduAxqMV8drD0CCUlrv41P8rUsm8,477
+txt2ebook/formats/templates/epub/noindent.css,sha256=_O5Tv90TKyyPBRdgjuNKFwtKFbdheh2V9PtDhgRUg3U,483
 txt2ebook/formats/txt.py,sha256=Efb_zU3oMJ4OyVOTrmwMEnmFH8INZxiM3adzAqVH6Vo,6844
 txt2ebook/helpers/__init__.py,sha256=UNFxeTg1tZ81DMk7_JsfhtW0zDsQH29hkYkqKrsYUQ0,1722
 txt2ebook/languages/__init__.py,sha256=-c9-YQEkXnb9LKLoi7EtNlQLAw2SqDKVw2UXlWt9Dl0,753
@@ -16,20 +18,20 @@ txt2ebook/languages/en.py,sha256=xCIhL431eUgoGwci4LCBkso8bR2LBhxKqWCPczKKoJQ,915
 txt2ebook/languages/zh_cn.py,sha256=UVTkxNmhZL5d6Ui53UfJ0jgwtnZmfjwbN4axLQZXkMY,1699
 txt2ebook/languages/zh_tw.py,sha256=D_YVDNj4uik8rAkgtiEashaONRjLqAkBh6kvAqozttk,1227
 txt2ebook/locales/en/LC_MESSAGES/txt2ebook.mo,sha256=rMcL7tj29bvbTMqDJOuw27U8TmTlX1FP4GVNmec36SU,527
-txt2ebook/locales/en/LC_MESSAGES/txt2ebook.po,sha256=6Mcb5KNcRFABjImqmbXvBKSPdAioNAkOBNgTQqq43kk,827
-txt2ebook/locales/txt2ebook.pot,sha256=yQkvUSLUc_r5WfqvGe58sxCGdeIaJNfIqo5FCc4WpVU,784
+txt2ebook/locales/en/LC_MESSAGES/txt2ebook.po,sha256=8naBQ3LMFfziTOdLvZfKk0066HuRCu20aUC4lqhJoFQ,827
+txt2ebook/locales/txt2ebook.pot,sha256=uTzyQa-N4kdng9DHXkcMXmr4Mf5S1CC4T9PbwNxltDc,784
 txt2ebook/locales/zh-cn/LC_MESSAGES/txt2ebook.mo,sha256=OkYKLhkYjqfdt2DbF3-TaCodD8BDh3hmOZuEn0FLja0,507
-txt2ebook/locales/zh-cn/LC_MESSAGES/txt2ebook.po,sha256=WOtsOhKbOaLPteYUu41YEV_SSOOmCig8jZ5iHt1L8LY,811
+txt2ebook/locales/zh-cn/LC_MESSAGES/txt2ebook.po,sha256=9V5RBklXlDpn_wxZUm1eVeEGGpKnewjWzESoxjeO5No,811
 txt2ebook/models/__init__.py,sha256=oHf4YvkEV7qKHhHiGxl4m95DSJ3zSIW2uJQec-BwXrc,920
 txt2ebook/models/book.py,sha256=hDOtA2ppBPIQqMrlQdmx55CE7eKP_e0JthpfUxaWdew,2216
 txt2ebook/models/chapter.py,sha256=PhPHraG3QNgY4C-USAzTDpDPVNsvTL8yC3r2iTW42KU,1676
 txt2ebook/models/volume.py,sha256=4n6a9cF69NTcOmWTxT1sVm-Bjvf-fagJ2E8thVX4uzg,1587
-txt2ebook/parser.py,sha256=0l8Fu2ZZREW5532Epe0SedPW2wTwgpOuMDvOM2FDN60,11935
+txt2ebook/parser.py,sha256=a7b7uB7zC5lFgTihz07qNWMyOU-_0ZL1tpfaf_IQFDE,11922
 txt2ebook/tokenizer.py,sha256=lsgGZSVpKl5fC6eEf8eIrGKZIVQnLqKM1Kenn4xJ-u4,9263
-txt2ebook/txt2ebook.py,sha256=_G9QNOoOQ-2apppFvv4fByxVy4zQlOZMkDaheFjA9p4,10693
-txt2ebook/zh_utils.py,sha256=jbkZR2psionQWRUQAtHlw1_t0P7Cj0SoZjYtMTFhpQI,4302
-txt2ebook-0.1.24.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
-txt2ebook-0.1.24.dist-info/entry_points.txt,sha256=IQHyIIhd0MHjSSRVC1a6tMeIoLus8D06KHL_cumvEbg,83
-txt2ebook-0.1.24.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-txt2ebook-0.1.24.dist-info/METADATA,sha256=pRHhdi9x8yM61B8AukfkwsUe4c_WzQs0kg_Po7rv9_A,6000
-txt2ebook-0.1.24.dist-info/RECORD,,
+txt2ebook/txt2ebook.py,sha256=LJD-7mmnonSVo4yZXJFda3mnrY95zpk5onO8_34wQkQ,10704
+txt2ebook/zh_utils.py,sha256=AAkvL2O8WRpm6ftZuZZ5nyWCn3h4kjImJouJFEig_C0,4588
+txt2ebook-0.1.26.dist-info/LICENSE.md,sha256=tGtFDwxWTjuR9syrJoSv1Hiffd2u8Tu8cYClfrXS_YU,31956
+txt2ebook-0.1.26.dist-info/entry_points.txt,sha256=IQHyIIhd0MHjSSRVC1a6tMeIoLus8D06KHL_cumvEbg,83
+txt2ebook-0.1.26.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+txt2ebook-0.1.26.dist-info/METADATA,sha256=ZDlrXQPVHgGjvHNXhi2RlVUG17UmNj8x5SY8sc94WNg,6023
+txt2ebook-0.1.26.dist-info/RECORD,,