mirror of
https://github.com/denizsafak/abogen.git
synced 2026-07-18 13:40:27 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bcd76de0c2 | ||
|
|
93c556a063 | ||
|
|
343ac29759 | ||
|
|
ce61b2e312 | ||
|
|
3d90bf94ac | ||
|
|
de8cdfa278 | ||
|
|
9e9561988d | ||
|
|
a074b8b0ad | ||
|
|
a2dc28f4d4 | ||
|
|
3b5c2ceb8f | ||
|
|
52a562039e | ||
|
|
6291f89ae9 | ||
|
|
be36796d5d | ||
|
|
219e2fc6ae | ||
|
|
196cd93008 | ||
|
|
4230db4c40 | ||
|
|
6834d223c9 | ||
|
|
67dbb0a8fb |
@@ -1,3 +1,15 @@
|
||||
# 1.1.8
|
||||
- Added `.md` (Markdown) file extension support by @brianxiadong in PR #75
|
||||
- Added new option `Configure silence between chapters` that lets you configure the silence between chapters, mentioned by @lfperez1982 in #79
|
||||
- Better indicators and options while displaying and managing the input and processing files.
|
||||
- Improved the markdown logic to better handle various markdown structures and cases.
|
||||
- Fixed subtitle splitting before commas by combining punctuation with preceding words.
|
||||
- Fixed save options not working correctly in queue mode, mentioned by @jborza in #78
|
||||
- Fixed `No Qt platform plugin could be initialized` error, mentioned by @sunrainxyz in #59
|
||||
- Fixed ordered list numbers not being included in EPUB content conversion. The numbers are now properly included in the converted content, mentioned by @jefro108 in #47
|
||||
- Potentially fixed subtitle generation stucks at 9:59:59, mentioned by @bolaykim in #73
|
||||
- Improvements in code and documentation.
|
||||
|
||||
# 1.1.7
|
||||
- Added MPS GPU acceleration support for Silicon Mac, mentioned in https://github.com/denizsafak/abogen/issues/32#issuecomment-3155902040 by @jefro108. **Please read the [Mac](https://github.com/denizsafak/abogen?tab=readme-ov-file#mac) section in the documentation again, as it requires additional configuration.**
|
||||
- Added word-by-word karaoke highlighting feature by @robmckinnon in PR #65
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
[](https://github.com/psf/black)
|
||||
[](https://opensource.org/licenses/MIT)
|
||||
|
||||
Abogen is a powerful text-to-speech conversion tool that makes it easy to turn ePub, PDF, or text files into high-quality audio with matching subtitles in seconds. Use it for audiobooks, voiceovers for Instagram, YouTube, TikTok, or any project that needs natural-sounding text-to-speech, using [Kokoro-82M](https://huggingface.co/hexgrad/Kokoro-82M).
|
||||
Abogen is a powerful text-to-speech conversion tool that makes it easy to turn ePub, PDF, text or markdown files into high-quality audio with matching subtitles in seconds. Use it for audiobooks, voiceovers for Instagram, YouTube, TikTok, or any project that needs natural-sounding text-to-speech, using [Kokoro-82M](https://huggingface.co/hexgrad/Kokoro-82M).
|
||||
|
||||
<img title="Abogen Main" src='https://raw.githubusercontent.com/denizsafak/abogen/refs/heads/main/demo/abogen.png' width="380"> <img title="Abogen Processing" src='https://raw.githubusercontent.com/denizsafak/abogen/refs/heads/main/demo/abogen2.png' width="380">
|
||||
|
||||
@@ -89,14 +89,12 @@ pip3 install abogen
|
||||
pip3 uninstall torch
|
||||
pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.4
|
||||
```
|
||||
> [!TIP]
|
||||
> If you get `WARNING: The script abogen-cli is installed in '/home/username/.local/bin' which is not on PATH.` error, run the following command to add it to your PATH:
|
||||
>```bash
|
||||
>echo "export PATH=\"/home/$USER/.local/bin:\$PATH\"" >> ~/.bashrc && source ~/.bashrc
|
||||
>```
|
||||
|
||||
> [!TIP]
|
||||
> If you get "No matching distribution found" error, try installing it on supported Python (3.10 to 3.12). You can use [pyenv](https://github.com/pyenv/pyenv) to manage multiple Python versions easily in Linux. Watch this [video](https://www.youtube.com/watch?v=MVyb-nI4KyI) by NetworkChuck for a quick guide.
|
||||
> See [How to fix "WARNING: The script abogen-cli is installed in '/home/username/.local/bin' which is not on PATH" error in Linux?](#path-warning)
|
||||
|
||||
> See [How to fix "No matching distribution found" error?](#no-matching-distribution-found)
|
||||
|
||||
> See [How to fix "CUDA GPU is not available. Using CPU" warning?](#cuda-warning)
|
||||
|
||||
> Special thanks to [@hg000125](https://github.com/hg000125) for his contribution in [#23](https://github.com/denizsafak/abogen/issues/23). AMD GPU support is possible thanks to his work.
|
||||
|
||||
@@ -107,10 +105,10 @@ If you installed using pip, you can simply run the following command to start Ab
|
||||
abogen
|
||||
```
|
||||
> [!TIP]
|
||||
> If you installed using the Windows installer `(WINDOWS_INSTALL.bat)`, It should have created a shortcut in the same folder, or your desktop. You can run it from there. If you lost the shortcut, Abogen is located in `python_embedded/Scripts/abogen.exe`. You can run it from there directly.
|
||||
> If you installed Abogen using the Windows installer `(WINDOWS_INSTALL.bat)`, It should have created a shortcut in the same folder, or your desktop. You can run it from there. If you lost the shortcut, Abogen is located in `python_embedded/Scripts/abogen.exe`. You can run it from there directly.
|
||||
|
||||
## `How to use?`
|
||||
1) Drag and drop any ePub, PDF, or text file (or use the built-in text editor)
|
||||
1) Drag and drop any ePub, PDF, text or markdown file (or use the built-in text editor)
|
||||
2) Configure the settings:
|
||||
- Set speech speed
|
||||
- Select a voice (or create a custom voice using voice mixer)
|
||||
@@ -128,21 +126,24 @@ Here’s Abogen in action: in this demo, it processes ∼3,000 characters of tex
|
||||
|
||||
| Options | Description |
|
||||
|---------|-------------|
|
||||
| **Input Box** | Drag and drop `ePub`, `PDF`, or `.TXT` files (or use built-in text editor) |
|
||||
| **Input Box** | Drag and drop `ePub`, `PDF`, `.TXT` or `.MD` files (or use built-in text editor) |
|
||||
| **Queue options** | Add multiple files to a queue and process them in batch, with individual settings for each file. See [Queue mode](#queue-mode) for more details. |
|
||||
| **Speed** | Adjust speech rate from `0.1x` to `2.0x` |
|
||||
| **Select Voice** | First letter of the language code (e.g., `a` for American English, `b` for British English, etc.), second letter is for `m` for male and `f` for female. |
|
||||
| **Voice mixer** | Create custom voices by mixing different voice models with a profile system. See [Voice Mixer](#voice-mixer) for more details. |
|
||||
| **Voice preview** | Listen to the selected voice before processing. |
|
||||
| **Generate subtitles** | `Disabled`, `Sentence`, `Sentence + Comma`, `Sentence + Highlighting`, `1 word`, `2 words`, `3 words`, etc. (Represents the number of words in each subtitle entry) |
|
||||
| **Output voice format** | `.WAV`, `.FLAC`, `.MP3`, `.OPUS (best compression)` and `M4B (with chapters)` (Special thanks to [@jborza](https://github.com/jborza) for chapter support in PR [#10](https://github.com/denizsafak/abogen/pull/10)) |
|
||||
| **Output voice format** | `.WAV`, `.FLAC`, `.MP3`, `.OPUS (best compression)` and `M4B (with chapters)` |
|
||||
| **Output subtitle format** | Configures the subtitle format as `SRT (standard)`, `ASS (wide)`, `ASS (narrow)`, `ASS (centered wide)`, or `ASS (centered narrow)`. |
|
||||
| **Replace single newlines with spaces** | Replaces single newlines with spaces in the text. This is useful for texts that have imaginary line breaks. |
|
||||
| **Save location** | `Save next to input file`, `Save to desktop`, or `Choose output folder` |
|
||||
|
||||
> Special thanks to [@brianxiadong](https://github.com/brianxiadong) for adding markdown support in PR [#75](https://github.com/denizsafak/abogen/pull/75)
|
||||
> Special thanks to [@jborza](https://github.com/jborza) for chapter support in PR [#10](https://github.com/denizsafak/abogen/pull/10)
|
||||
|
||||
| Book handler options | Description |
|
||||
|---------|-------------|
|
||||
| **Chapter Control** | Select specific `chapters` from ePUBs or `chapters + pages` from PDFs. |
|
||||
| **Chapter Control** | Select specific `chapters` from ePUBs or markdown files or `chapters + pages` from PDFs. |
|
||||
| **Save each chapter separately** | Save each chapter in e-books as a separate audio file. |
|
||||
| **Create a merged version** | Create a single audio file that combines all chapters. (If `Save each chapter separately` is disabled, this option will be the default behavior.) |
|
||||
| **Save in a project folder with metadata** | Save the converted items in a project folder with available metadata files. |
|
||||
@@ -151,6 +152,7 @@ Here’s Abogen in action: in this demo, it processes ∼3,000 characters of tex
|
||||
|---------|-------------|
|
||||
| **Theme** | Change the application's theme using `System`, `Light`, or `Dark` options. |
|
||||
| **Configure max words per subtitle** | Configures the maximum number of words per subtitle entry. |
|
||||
| **Configure silence between chapters** | Configures the duration of silence between chapters (in seconds). |
|
||||
| **Configure max lines in log window** | Configures the maximum number of lines to display in the log window. |
|
||||
| **Separate chapters audio format** | Configures the audio format for separate chapters as `wav`, `flac`, `mp3`, or `opus`. |
|
||||
| **Create desktop shortcut** | Creates a shortcut on your desktop for easy access. |
|
||||
@@ -166,27 +168,30 @@ Here’s Abogen in action: in this demo, it processes ∼3,000 characters of tex
|
||||
## `Voice Mixer`
|
||||
<img title="Abogen Voice Mixer" src='https://raw.githubusercontent.com/denizsafak/abogen/refs/heads/main/demo/voice_mixer.png'>
|
||||
|
||||
With voice mixer, you can create custom voices by mixing different voice models. You can adjust the weight of each voice and save your custom voice as a profile for future use. The voice mixer allows you to create unique and personalized voices. (Huge thanks to [@jborza](https://github.com/jborza) for making this possible through his contributions in [#5](https://github.com/denizsafak/abogen/pull/5))
|
||||
With voice mixer, you can create custom voices by mixing different voice models. You can adjust the weight of each voice and save your custom voice as a profile for future use. The voice mixer allows you to create unique and personalized voices.
|
||||
|
||||
> Special thanks to [@jborza](https://github.com/jborza) for making this possible through his contributions in [#5](https://github.com/denizsafak/abogen/pull/5)
|
||||
|
||||
## `Queue Mode`
|
||||
<img title="Abogen queue mode" src='https://raw.githubusercontent.com/denizsafak/abogen/refs/heads/main/demo/queue.png'>
|
||||
|
||||
Abogen supports **queue mode**, allowing you to add multiple files to a processing queue. This is useful if you want to convert several files in one batch.
|
||||
|
||||
- You can add text files (`.txt`) directly using the **Add files** button in the Queue Manager. To add PDF or EPUB files, use the input box in the main window and click the **Add to Queue** button.
|
||||
- You can add text files (`.txt`) directly using the **Add files** button in the Queue Manager. To add PDF, EPUB, or markdown files, use the input box in the main window and click the **Add to Queue** button.
|
||||
- Each file in the queue keeps the configuration settings that were active when it was added. Changing the main window configuration afterward does **not** affect files already in the queue.
|
||||
- You can view each file's configuration by hovering over them.
|
||||
|
||||
Abogen will process each item in the queue automatically, saving outputs as configured.
|
||||
|
||||
> Special thanks to [@jborza](https://github.com/jborza) for adding queue mode in PR [#35](https://github.com/denizsafak/abogen/pull/35)
|
||||
|
||||
## `About Chapter Markers`
|
||||
When you process ePUB or PDF files, Abogen converts them into text files stored in your cache directory. When you click "Edit," you're actually modifying these converted text files. In these text files, you'll notice tags that look like this:
|
||||
When you process ePUB, PDF or markdown files, Abogen converts them into text files stored in your cache directory. When you click "Edit," you're actually modifying these converted text files. In these text files, you'll notice tags that look like this:
|
||||
|
||||
```
|
||||
<<CHAPTER_MARKER:Chapter Title>>
|
||||
```
|
||||
These are chapter markers. They are automatically added when you process ePUB or PDF files, based on the chapters you select. They serve an important purpose:
|
||||
These are chapter markers. They are automatically added when you process ePUB, PDF or markdown files, based on the chapters you select. They serve an important purpose:
|
||||
- Allow you to split the text into separate audio files for each chapter
|
||||
- Save time by letting you reprocess only specific chapters if errors occur, rather than the entire file
|
||||
|
||||
@@ -204,7 +209,7 @@ When you process the text file, Abogen will detect these markers automatically a
|
||||

|
||||
|
||||
## `About Metadata Tags`
|
||||
Similar to chapter markers, it is possible to add metadata tags for `M4B` files. This is useful for audiobook players that support metadata, allowing you to add information like title, author, year, etc. Abogen automatically adds these tags when you process ePUB or PDF files, but you can also add them manually to your text files. Add metadata tags **at the beginning of your text file** like this:
|
||||
Similar to chapter markers, it is possible to add metadata tags for `M4B` files. This is useful for audiobook players that support metadata, allowing you to add information like title, author, year, etc. Abogen automatically adds these tags when you process ePUB, PDF or markdown files, but you can also add them manually to your text files. Add metadata tags **at the beginning of your text file** like this:
|
||||
```
|
||||
<<METADATA_TITLE:Title>>
|
||||
<<METADATA_ARTIST:Author>>
|
||||
@@ -228,8 +233,7 @@ Similar to chapter markers, it is possible to add metadata tags for `M4B` files.
|
||||
```
|
||||
For a complete list of supported languages and voices, refer to Kokoro's [VOICES.md](https://huggingface.co/hexgrad/Kokoro-82M/blob/main/VOICES.md). To listen to sample audio outputs, see [SAMPLES.md](https://huggingface.co/hexgrad/Kokoro-82M/blob/main/SAMPLES.md).
|
||||
|
||||
> [!NOTE]
|
||||
> Japanese audio may require additional configuration. Please check [#56](https://github.com/denizsafak/abogen/issues/56) for more information.
|
||||
> See [How to fix Japanese audio not working?](#japanese-audio-not-working)
|
||||
|
||||
## `MPV Config`
|
||||
I highly recommend using [MPV](https://mpv.io/installation/) to play your audio files, as it supports displaying subtitles even without a video track. Here's my `mpv.conf`:
|
||||
@@ -277,12 +281,13 @@ Abogen launches automatically inside the container.
|
||||
- You can access it via a web browser at [http://localhost:5800](http://localhost:5800) or connect to it using a VNC client at `localhost:5900`.
|
||||
- You can use `/shared` directory to share files between your host and the container.
|
||||
- For later use, start it with `docker start abogen` and stop it with `docker stop abogen`.
|
||||
- Pass in `-e WEB_AUDIO="1"` for `docker run` to enable audio.
|
||||
|
||||
Known issues:
|
||||
- Audio preview is not working inside container (ALSA error).
|
||||
- Audio preview is not working inside container (ALSA error) if using a VNC client.
|
||||
- `Open cache directory` and `Open configuration directory` options in settings not working. (Tried pcmanfm, did not work with Abogen).
|
||||
|
||||
(Special thanks to [@geo38](https://www.reddit.com/user/geo38/) from Reddit, who provided the Dockerfile and instructions in [this comment](https://www.reddit.com/r/selfhosted/comments/1k8x1yo/comment/mpe0bz8/).)
|
||||
> Special thanks to [@geo38](https://www.reddit.com/user/geo38/) from Reddit, who provided the Dockerfile and instructions in [this comment](https://www.reddit.com/r/selfhosted/comments/1k8x1yo/comment/mpe0bz8/).
|
||||
|
||||
## `Similar Projects`
|
||||
Abogen is a standalone project, but it is inspired by and shares some similarities with other projects. Here are a few:
|
||||
@@ -305,8 +310,59 @@ If you encounter any issues while running Abogen, try launching it from the comm
|
||||
```
|
||||
abogen-cli
|
||||
```
|
||||
|
||||
If you installed using the Windows installer `(WINDOWS_INSTALL.bat)`, go to `python_embedded/Scripts` and run:
|
||||
```
|
||||
abogen-cli.exe
|
||||
```
|
||||
|
||||
This will start Abogen in command-line mode and display detailed error messages. Please open a new issue on the [Issues](https://github.com/denizsafak/abogen/issues) page with the error message and a description of your problem.
|
||||
|
||||
## `Tips and Solutions`
|
||||
|
||||
<details><summary><b>
|
||||
<a name="cuda-warning">How to fix "CUDA GPU is not available. Using CPU" warning?</a>
|
||||
</b></summary>
|
||||
|
||||
> This message means PyTorch couldn't use your GPU. On Windows, Abogen supports NVIDIA GPUs with CUDA. AMD GPUs are supported only on Linux. Abogen will still run on the CPU, but it will be slower.
|
||||
>
|
||||
> If you have a compatible NVIDIA GPU on Windows and still see this warning:
|
||||
> Open your terminal in the Abogen folder (the folder that contains `python_embedded`) and type:
|
||||
> ```bash
|
||||
> python_embedded\python.exe -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu128
|
||||
> ```
|
||||
> If you have an AMD GPU, use Linux and follow the Linux/ROCm [instructions](#how-to-install-). If you want to keep running on CPU, no action is required, but performance will just be reduced. See [#32](https://github.com/denizsafak/abogen/issues/32) for more details.
|
||||
|
||||
</details>
|
||||
|
||||
<details><summary><b>
|
||||
<a name="path-warning">How to fix "WARNING: The script abogen-cli is installed in '/home/username/.local/bin' which is not on PATH" error in Linux?</a>
|
||||
</b></summary>
|
||||
|
||||
> Run the following command to add Abogen to your PATH:
|
||||
> ```bash
|
||||
> echo "export PATH=\"/home/$USER/.local/bin:\$PATH\"" >> ~/.bashrc && source ~/.bashrc
|
||||
> ```
|
||||
|
||||
</details>
|
||||
|
||||
<details><summary><b>
|
||||
<a name="no-matching-distribution-found">How to fix "No matching distribution found" error?<a>
|
||||
</b></summary>
|
||||
|
||||
> Try installing Abogen on supported Python (3.10 to 3.12) versions. You can use [pyenv](https://github.com/pyenv/pyenv) to manage multiple Python versions easily in Linux. Watch this [video](https://www.youtube.com/watch?v=MVyb-nI4KyI) by NetworkChuck for a quick guide.
|
||||
|
||||
</details>
|
||||
|
||||
<details><summary><b>
|
||||
<a name="japanese-audio-not-working">How to fix Japanese audio not working?</a>
|
||||
</b></summary>
|
||||
|
||||
> Japanese audio may require additional configuration.
|
||||
> I'm not sure about the exact solution, but it seems to be related to installing additional dependencies for Japanese support in Kokoro. Please check [#56](https://github.com/denizsafak/abogen/issues/56) for more information.
|
||||
|
||||
</details>
|
||||
|
||||
## `Contributing`
|
||||
I welcome contributions! If you have ideas for new features, improvements, or bug fixes, please fork the repository and submit a pull request.
|
||||
### For developers and contributors
|
||||
@@ -334,4 +390,4 @@ This project is available under the MIT License - see the [LICENSE](https://gith
|
||||
> [!IMPORTANT]
|
||||
> Subtitle generation currently works only for English. This is because Kokoro provides timestamp tokens only for English text. If you want subtitles in other languages, please request this feature in the [Kokoro project](https://github.com/hexgrad/kokoro). For more technical details, see [this line](https://github.com/hexgrad/kokoro/blob/6d87f4ae7abc2d14dbc4b3ef2e5f19852e861ac2/kokoro/pipeline.py#L383) in the Kokoro's code.
|
||||
|
||||
> Tags: audiobook, kokoro, text-to-speech, TTS, audiobook generator, audiobooks, text to speech, audiobook maker, audiobook creator, audiobook generator, voice-synthesis, text to audio, text to audio converter, text to speech converter, text to speech generator, text to speech software, text to speech app, epub to audio, pdf to audio, content-creation, media-generation
|
||||
> Tags: audiobook, kokoro, text-to-speech, TTS, audiobook generator, audiobooks, text to speech, audiobook maker, audiobook creator, audiobook generator, voice-synthesis, text to audio, text to audio converter, text to speech converter, text to speech generator, text to speech software, text to speech app, epub to audio, pdf to audio, markdown to audio, content-creation, media-generation
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
1.1.7
|
||||
1.1.8
|
||||
+345
-73
@@ -22,10 +22,12 @@ from PyQt5.QtWidgets import (
|
||||
QLabel,
|
||||
)
|
||||
from PyQt5.QtCore import Qt
|
||||
from abogen.utils import clean_text, calculate_text_length
|
||||
from abogen.utils import clean_text, calculate_text_length, detect_encoding
|
||||
import os
|
||||
import logging # Add logging
|
||||
import urllib.parse
|
||||
import markdown
|
||||
import textwrap
|
||||
|
||||
# Setup logging
|
||||
logging.basicConfig(
|
||||
@@ -43,18 +45,22 @@ class HandlerDialog(QDialog):
|
||||
super().__init__(parent)
|
||||
|
||||
# Determine file type if not explicitly provided
|
||||
self.file_type = file_type or (
|
||||
"pdf" if book_path.lower().endswith(".pdf") else "epub"
|
||||
)
|
||||
if file_type:
|
||||
self.file_type = file_type
|
||||
elif book_path.lower().endswith(".pdf"):
|
||||
self.file_type = "pdf"
|
||||
elif book_path.lower().endswith((".md", ".markdown")):
|
||||
self.file_type = "markdown"
|
||||
else:
|
||||
self.file_type = "epub"
|
||||
self.book_path = book_path
|
||||
|
||||
# Extract book name from file path
|
||||
book_name = os.path.splitext(os.path.basename(book_path))[0]
|
||||
|
||||
# Set window title based on file type and book name
|
||||
self.setWindowTitle(
|
||||
f'Select {"Chapters" if self.file_type == "epub" else "Pages"} - {book_name}'
|
||||
)
|
||||
item_type = "Chapters" if self.file_type in ["epub", "markdown"] else "Pages"
|
||||
self.setWindowTitle(f'Select {item_type} - {book_name}')
|
||||
self.resize(1200, 900)
|
||||
self._block_signals = False # Flag to prevent recursive signals
|
||||
# Configure window: remove help button and allow resizing
|
||||
@@ -69,7 +75,12 @@ class HandlerDialog(QDialog):
|
||||
|
||||
# Load the book based on file type
|
||||
try:
|
||||
self.book = epub.read_epub(book_path) if self.file_type == "epub" else None
|
||||
if self.file_type == "epub":
|
||||
self.book = epub.read_epub(book_path)
|
||||
elif self.file_type == "markdown":
|
||||
self.book = None # Markdown doesn't use ebooklib
|
||||
else:
|
||||
self.book = None
|
||||
except KeyError as e:
|
||||
logging.error(
|
||||
f"EPUB file is missing a referenced file: {e}. Skipping missing file."
|
||||
@@ -100,6 +111,16 @@ class HandlerDialog(QDialog):
|
||||
logging.error(f"Failed to patch ebooklib for missing files: {patch_e}")
|
||||
raise e
|
||||
self.pdf_doc = fitz.open(book_path) if self.file_type == "pdf" else None
|
||||
self.markdown_text = None
|
||||
if self.file_type == "markdown":
|
||||
try:
|
||||
encoding = detect_encoding(book_path)
|
||||
with open(book_path, "r", encoding=encoding, errors="replace") as f:
|
||||
self.markdown_text = f.read()
|
||||
except Exception as e:
|
||||
logging.error(f"Error reading markdown file: {e}")
|
||||
self.markdown_text = ""
|
||||
self.markdown_toc = [] # For storing parsed markdown TOC
|
||||
|
||||
# Extract book metadata
|
||||
self.book_metadata = self._extract_book_metadata()
|
||||
@@ -178,6 +199,8 @@ class HandlerDialog(QDialog):
|
||||
)
|
||||
# Fallback to a simpler spine-based processing if nav fails
|
||||
self._process_epub_content_spine_fallback()
|
||||
elif self.file_type == "markdown":
|
||||
self._preprocess_markdown_content()
|
||||
else:
|
||||
self._preprocess_pdf_content()
|
||||
|
||||
@@ -199,10 +222,73 @@ class HandlerDialog(QDialog):
|
||||
# (common in headers/footers like "- 42 -")
|
||||
text = re.sub(r"\s+[-–—]\s*\d+\s*[-–—]?\s*$", "", text, flags=re.MULTILINE)
|
||||
|
||||
page_id = f"page_{page_num+1}"
|
||||
page_id = f"page_{page_num + 1}"
|
||||
self.content_texts[page_id] = text
|
||||
self.content_lengths[page_id] = calculate_text_length(text)
|
||||
|
||||
|
||||
def _preprocess_markdown_content(self):
|
||||
if not self.markdown_text:
|
||||
return
|
||||
|
||||
text = clean_text(self.markdown_text)
|
||||
text = textwrap.dedent(text)
|
||||
md = markdown.Markdown(extensions=['toc', 'fenced_code'])
|
||||
html = md.convert(text)
|
||||
self.markdown_toc = md.toc_tokens
|
||||
|
||||
soup = BeautifulSoup(html, 'html.parser')
|
||||
self.content_texts = {}
|
||||
self.content_lengths = {}
|
||||
|
||||
if not self.markdown_toc:
|
||||
chapter_id = "markdown_content"
|
||||
self.content_texts[chapter_id] = text
|
||||
self.content_lengths[chapter_id] = calculate_text_length(text)
|
||||
return
|
||||
|
||||
all_headers = []
|
||||
def flatten_toc(toc_list):
|
||||
for header in toc_list:
|
||||
all_headers.append(header)
|
||||
if header.get('children'):
|
||||
flatten_toc(header['children'])
|
||||
flatten_toc(self.markdown_toc)
|
||||
|
||||
header_positions = []
|
||||
for header in all_headers:
|
||||
header_id = header['id']
|
||||
id_pattern = f'id="{header_id}"'
|
||||
pos = html.find(id_pattern)
|
||||
if pos != -1:
|
||||
tag_start = html.rfind('<', 0, pos)
|
||||
header_positions.append({
|
||||
'id': header_id,
|
||||
'start': tag_start,
|
||||
'name': header['name']
|
||||
})
|
||||
header_positions.sort(key=lambda x: x['start'])
|
||||
|
||||
for i, header_pos in enumerate(header_positions):
|
||||
header_id = header_pos['id']
|
||||
header_name = header_pos['name']
|
||||
content_start = header_pos['start']
|
||||
content_end = header_positions[i + 1]['start'] if i + 1 < len(header_positions) else len(html)
|
||||
section_html = html[content_start:content_end]
|
||||
section_soup = BeautifulSoup(section_html, 'html.parser')
|
||||
header_tag = section_soup.find(attrs={'id': header_id})
|
||||
if header_tag:
|
||||
header_tag.decompose()
|
||||
section_text = clean_text(section_soup.get_text()).strip()
|
||||
chapter_id = header_id
|
||||
if section_text:
|
||||
full_content = f"{header_name}\n\n{section_text}"
|
||||
self.content_texts[chapter_id] = full_content
|
||||
self.content_lengths[chapter_id] = calculate_text_length(full_content)
|
||||
else:
|
||||
self.content_texts[chapter_id] = header_name
|
||||
self.content_lengths[chapter_id] = calculate_text_length(header_name)
|
||||
|
||||
def _process_epub_content_spine_fallback(self):
|
||||
"""Fallback EPUB processing based purely on spine order."""
|
||||
logging.info("Using spine fallback for EPUB processing.")
|
||||
@@ -235,9 +321,23 @@ class HandlerDialog(QDialog):
|
||||
html_content = self.doc_content.get(doc_href, "")
|
||||
if html_content:
|
||||
soup = BeautifulSoup(html_content, "html.parser")
|
||||
|
||||
# Handle ordered lists by prepending numbers to list items
|
||||
for ol in soup.find_all("ol"):
|
||||
# Get start attribute or default to 1
|
||||
start = int(ol.get("start", 1))
|
||||
for i, li in enumerate(ol.find_all("li", recursive=False)):
|
||||
# Insert the number at the beginning of the list item
|
||||
number_text = f"{start + i}) "
|
||||
if li.string:
|
||||
li.string.replace_with(number_text + li.string)
|
||||
else:
|
||||
li.insert(0, NavigableString(number_text))
|
||||
|
||||
# Remove sup and sub tags
|
||||
for tag in soup.find_all(["sup", "sub"]):
|
||||
tag.decompose()
|
||||
|
||||
text = clean_text(soup.get_text()).strip()
|
||||
if text:
|
||||
self.content_texts[doc_href] = text
|
||||
@@ -250,14 +350,14 @@ class HandlerDialog(QDialog):
|
||||
title = h1.get_text(strip=True)
|
||||
|
||||
if not title:
|
||||
title = f"Untitled Chapter {i+1}"
|
||||
title = f"Untitled Chapter {i + 1}"
|
||||
synthetic_toc.append(
|
||||
(epub.Link(doc_href, title, doc_href), [])
|
||||
) # Wrap in tuple and empty list for compatibility
|
||||
|
||||
# Replace book.toc with the synthetic one if it was empty or fallback was triggered
|
||||
if not self.book.toc or not hasattr(
|
||||
self, "processed_nav_structure"
|
||||
self, "processed_nav_structure"
|
||||
): # Check if nav processing failed
|
||||
self.book.toc = synthetic_toc
|
||||
logging.info(f"Generated synthetic TOC with {len(synthetic_toc)} entries.")
|
||||
@@ -282,7 +382,7 @@ class HandlerDialog(QDialog):
|
||||
item
|
||||
for item in nav_items
|
||||
if "nav" in item.get_name().lower()
|
||||
and item.get_name().lower().endswith((".xhtml", ".html"))
|
||||
and item.get_name().lower().endswith((".xhtml", ".html"))
|
||||
),
|
||||
None,
|
||||
)
|
||||
@@ -395,8 +495,8 @@ class HandlerDialog(QDialog):
|
||||
for item in self.book.get_items_of_type(ebooklib.ITEM_DOCUMENT):
|
||||
href = item.get_name()
|
||||
if href in doc_order or any(
|
||||
href in nav_point.get("src", "")
|
||||
for nav_point in nav_soup.find_all(["content", "a"])
|
||||
href in nav_point.get("src", "")
|
||||
for nav_point in nav_soup.find_all(["content", "a"])
|
||||
):
|
||||
try:
|
||||
html_content = item.get_content().decode("utf-8", errors="ignore")
|
||||
@@ -541,10 +641,26 @@ class HandlerDialog(QDialog):
|
||||
slice_html = current_doc_html
|
||||
if slice_html.strip():
|
||||
slice_soup = BeautifulSoup(slice_html, "html.parser")
|
||||
# Add line breaks after paragraphs and divs
|
||||
for tag in slice_soup.find_all(["p", "div"]):
|
||||
tag.append("\n\n")
|
||||
|
||||
# Handle ordered lists by prepending numbers to list items
|
||||
for ol in slice_soup.find_all("ol"):
|
||||
# Get start attribute or default to 1
|
||||
start = int(ol.get("start", 1))
|
||||
for i, li in enumerate(ol.find_all("li", recursive=False)):
|
||||
# Insert the number at the beginning of the list item
|
||||
number_text = f"{start + i}) "
|
||||
if li.string:
|
||||
li.string.replace_with(number_text + li.string)
|
||||
else:
|
||||
li.insert(0, NavigableString(number_text))
|
||||
|
||||
# Remove sup and sub tags that might contain footnotes
|
||||
for tag in slice_soup.find_all(["sup", "sub"]):
|
||||
tag.decompose()
|
||||
|
||||
text = clean_text(slice_soup.get_text()).strip()
|
||||
if text:
|
||||
self.content_texts[current_src] = text
|
||||
@@ -620,13 +736,13 @@ class HandlerDialog(QDialog):
|
||||
return None, None
|
||||
|
||||
def _parse_ncx_navpoint(
|
||||
self,
|
||||
nav_point,
|
||||
ordered_entries,
|
||||
doc_order,
|
||||
doc_order_decoded,
|
||||
tree_structure_list,
|
||||
find_position_func,
|
||||
self,
|
||||
nav_point,
|
||||
ordered_entries,
|
||||
doc_order,
|
||||
doc_order_decoded,
|
||||
tree_structure_list,
|
||||
find_position_func,
|
||||
):
|
||||
nav_label = nav_point.find("navLabel")
|
||||
content = nav_point.find("content")
|
||||
@@ -678,19 +794,19 @@ class HandlerDialog(QDialog):
|
||||
)
|
||||
|
||||
if title and (
|
||||
current_entry_node.get("has_content", False)
|
||||
or current_entry_node["children"]
|
||||
current_entry_node.get("has_content", False)
|
||||
or current_entry_node["children"]
|
||||
):
|
||||
tree_structure_list.append(current_entry_node)
|
||||
|
||||
def _parse_html_nav_li(
|
||||
self,
|
||||
li_element,
|
||||
ordered_entries,
|
||||
doc_order,
|
||||
doc_order_decoded,
|
||||
tree_structure_list,
|
||||
find_position_func,
|
||||
self,
|
||||
li_element,
|
||||
ordered_entries,
|
||||
doc_order,
|
||||
doc_order_decoded,
|
||||
tree_structure_list,
|
||||
find_position_func,
|
||||
):
|
||||
link = li_element.find("a", recursive=False)
|
||||
span_text = li_element.find("span", recursive=False)
|
||||
@@ -838,8 +954,8 @@ class HandlerDialog(QDialog):
|
||||
|
||||
if self.file_type == "epub":
|
||||
if (
|
||||
hasattr(self, "processed_nav_structure")
|
||||
and self.processed_nav_structure
|
||||
hasattr(self, "processed_nav_structure")
|
||||
and self.processed_nav_structure
|
||||
):
|
||||
self._build_epub_tree_from_nav(
|
||||
self.processed_nav_structure, self.treeWidget
|
||||
@@ -847,6 +963,8 @@ class HandlerDialog(QDialog):
|
||||
else:
|
||||
logging.warning("Building EPUB tree using fallback book.toc.")
|
||||
self._build_epub_tree_fallback(self.book.toc, self.treeWidget)
|
||||
elif self.file_type == "markdown":
|
||||
self._build_markdown_tree()
|
||||
else:
|
||||
self._build_pdf_tree()
|
||||
|
||||
@@ -865,7 +983,7 @@ class HandlerDialog(QDialog):
|
||||
self._update_item_checkbox_state(item)
|
||||
|
||||
def _build_epub_tree_from_nav(
|
||||
self, nav_nodes, parent_item, seen_content_hashes=None
|
||||
self, nav_nodes, parent_item, seen_content_hashes=None
|
||||
):
|
||||
if seen_content_hashes is None:
|
||||
seen_content_hashes = set()
|
||||
@@ -878,9 +996,9 @@ class HandlerDialog(QDialog):
|
||||
item.setData(0, Qt.UserRole, src)
|
||||
|
||||
is_empty = (
|
||||
src
|
||||
and (src in self.content_texts)
|
||||
and (not self.content_texts[src].strip())
|
||||
src
|
||||
and (src in self.content_texts)
|
||||
and (not self.content_texts[src].strip())
|
||||
)
|
||||
is_duplicate = False
|
||||
if src and src in self.content_texts and self.content_texts[src].strip():
|
||||
@@ -935,7 +1053,7 @@ class HandlerDialog(QDialog):
|
||||
item.setData(0, Qt.UserRole, href)
|
||||
|
||||
has_content = (
|
||||
href and href in self.content_texts and self.content_texts[href].strip()
|
||||
href and href in self.content_texts and self.content_texts[href].strip()
|
||||
)
|
||||
|
||||
if has_content or children:
|
||||
@@ -993,7 +1111,7 @@ class HandlerDialog(QDialog):
|
||||
if isinstance(page, int)
|
||||
else self.pdf_doc.resolve_link(page)[0]
|
||||
)
|
||||
page_id = f"page_{page_num+1}"
|
||||
page_id = f"page_{page_num + 1}"
|
||||
# attach chapters on same page under original
|
||||
if page_num in self.bookmark_items_map:
|
||||
orig = self.bookmark_items_map[page_num]
|
||||
@@ -1028,13 +1146,13 @@ class HandlerDialog(QDialog):
|
||||
next_page = next_page_boundaries.get(page_num, len(self.pdf_doc))
|
||||
for sub_page_num in range(page_num + 1, next_page):
|
||||
if (
|
||||
sub_page_num in page_to_bookmark
|
||||
or sub_page_num in added_pages
|
||||
sub_page_num in page_to_bookmark
|
||||
or sub_page_num in added_pages
|
||||
):
|
||||
continue
|
||||
|
||||
page_id = f"page_{sub_page_num+1}"
|
||||
page_title = f"Page {sub_page_num+1}"
|
||||
page_id = f"page_{sub_page_num + 1}"
|
||||
page_title = f"Page {sub_page_num + 1}"
|
||||
|
||||
page_text = self.content_texts.get(page_id, "").strip()
|
||||
if page_text:
|
||||
@@ -1077,8 +1195,8 @@ class HandlerDialog(QDialog):
|
||||
parent_item = (
|
||||
self.bookmark_items_map[prev_nums[-1]] if prev_nums else self.treeWidget
|
||||
)
|
||||
page_id = f"page_{page_num+1}"
|
||||
title = f"Page {page_num+1}"
|
||||
page_id = f"page_{page_num + 1}"
|
||||
title = f"Page {page_num + 1}"
|
||||
text = self.content_texts.get(page_id, "").strip()
|
||||
if text:
|
||||
first = text.split("\n", 1)[0].strip()
|
||||
@@ -1095,6 +1213,49 @@ class HandlerDialog(QDialog):
|
||||
else:
|
||||
page_item.setFlags(page_item.flags() & ~Qt.ItemIsUserCheckable)
|
||||
|
||||
def _build_markdown_tree(self):
|
||||
"""Build tree structure for markdown file based on parsed TOC."""
|
||||
if not self.markdown_text:
|
||||
return
|
||||
|
||||
if not self.markdown_toc:
|
||||
# Handle case with no headers (single content block)
|
||||
if self.content_texts:
|
||||
chapter_id = list(self.content_texts.keys())[0]
|
||||
title = "Content"
|
||||
item = QTreeWidgetItem(self.treeWidget, [title])
|
||||
item.setData(0, Qt.UserRole, chapter_id)
|
||||
if self.content_lengths.get(chapter_id, 0) > 0:
|
||||
item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
|
||||
is_checked = chapter_id in self.checked_chapters
|
||||
item.setCheckState(0, Qt.Checked if is_checked else Qt.Unchecked)
|
||||
else:
|
||||
item.setFlags(item.flags() & ~Qt.ItemIsUserCheckable)
|
||||
return
|
||||
|
||||
def build_from_toc(toc_list, parent_item):
|
||||
for header in toc_list:
|
||||
title = header['name']
|
||||
chapter_id = header['id']
|
||||
|
||||
item = QTreeWidgetItem(parent_item, [title])
|
||||
item.setData(0, Qt.UserRole, chapter_id)
|
||||
|
||||
has_content = self.content_lengths.get(chapter_id, 0) > 0
|
||||
has_children = bool(header.get('children'))
|
||||
|
||||
if has_content or has_children:
|
||||
item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
|
||||
is_checked = chapter_id in self.checked_chapters
|
||||
item.setCheckState(0, Qt.Checked if is_checked else Qt.Unchecked)
|
||||
else:
|
||||
item.setFlags(item.flags() & ~Qt.ItemIsUserCheckable)
|
||||
|
||||
if has_children:
|
||||
build_from_toc(header['children'], item)
|
||||
|
||||
build_from_toc(self.markdown_toc, self.treeWidget)
|
||||
|
||||
def _build_pdf_pages_tree(self):
|
||||
pages_item = QTreeWidgetItem(self.treeWidget, ["Pages"])
|
||||
pages_item.setFlags(pages_item.flags() & ~Qt.ItemIsUserCheckable)
|
||||
@@ -1103,8 +1264,8 @@ class HandlerDialog(QDialog):
|
||||
pages_item.setFont(0, font)
|
||||
|
||||
for page_num in range(len(self.pdf_doc)):
|
||||
page_id = f"page_{page_num+1}"
|
||||
page_title = f"Page {page_num+1}"
|
||||
page_id = f"page_{page_num + 1}"
|
||||
page_title = f"Page {page_num + 1}"
|
||||
|
||||
page_text = self.content_texts.get(page_id, "").strip()
|
||||
if page_text:
|
||||
@@ -1166,7 +1327,7 @@ class HandlerDialog(QDialog):
|
||||
buttons.accepted.connect(self.accept)
|
||||
buttons.rejected.connect(self.reject)
|
||||
|
||||
item_type = "chapters" if self.file_type == "epub" else "pages"
|
||||
item_type = "chapters" if self.file_type in ["epub", "markdown"] else "pages"
|
||||
|
||||
self.auto_select_btn = QPushButton(f"Auto-select {item_type}", self)
|
||||
self.auto_select_btn.clicked.connect(self.auto_select_chapters)
|
||||
@@ -1214,7 +1375,7 @@ class HandlerDialog(QDialog):
|
||||
|
||||
checkbox_text = (
|
||||
"Save each chapter separately"
|
||||
if self.file_type == "epub"
|
||||
if self.file_type in ["epub", "markdown"]
|
||||
else "Save each page separately"
|
||||
)
|
||||
self.save_chapters_checkbox = QCheckBox(checkbox_text, self)
|
||||
@@ -1259,15 +1420,15 @@ class HandlerDialog(QDialog):
|
||||
|
||||
def _update_checkbox_states(self):
|
||||
if (
|
||||
not hasattr(self, "save_chapters_checkbox")
|
||||
or not self.save_chapters_checkbox
|
||||
not hasattr(self, "save_chapters_checkbox")
|
||||
or not self.save_chapters_checkbox
|
||||
):
|
||||
return
|
||||
|
||||
if (
|
||||
self.file_type == "pdf"
|
||||
and hasattr(self, "has_pdf_bookmarks")
|
||||
and not self.has_pdf_bookmarks
|
||||
self.file_type == "pdf"
|
||||
and hasattr(self, "has_pdf_bookmarks")
|
||||
and not self.has_pdf_bookmarks
|
||||
):
|
||||
self.save_chapters_checkbox.setEnabled(False)
|
||||
self.merge_chapters_checkbox.setEnabled(False)
|
||||
@@ -1275,13 +1436,13 @@ class HandlerDialog(QDialog):
|
||||
|
||||
checked_count = 0
|
||||
|
||||
if self.file_type == "epub":
|
||||
if self.file_type in ["epub", "markdown"]:
|
||||
iterator = QTreeWidgetItemIterator(self.treeWidget)
|
||||
while iterator.value():
|
||||
item = iterator.value()
|
||||
if (
|
||||
item.flags() & Qt.ItemIsUserCheckable
|
||||
and item.checkState(0) == Qt.Checked
|
||||
item.flags() & Qt.ItemIsUserCheckable
|
||||
and item.checkState(0) == Qt.Checked
|
||||
):
|
||||
checked_count += 1
|
||||
if checked_count >= 2:
|
||||
@@ -1295,8 +1456,8 @@ class HandlerDialog(QDialog):
|
||||
while iterator.value():
|
||||
item = iterator.value()
|
||||
if (
|
||||
item.flags() & Qt.ItemIsUserCheckable
|
||||
and item.checkState(0) == Qt.Checked
|
||||
item.flags() & Qt.ItemIsUserCheckable
|
||||
and item.checkState(0) == Qt.Checked
|
||||
):
|
||||
parent = item.parent()
|
||||
if parent and parent != self.treeWidget.invisibleRootItem():
|
||||
@@ -1367,6 +1528,8 @@ class HandlerDialog(QDialog):
|
||||
|
||||
if self.file_type == "epub":
|
||||
self._run_epub_auto_check()
|
||||
elif self.file_type == "markdown":
|
||||
self._run_markdown_auto_check()
|
||||
else:
|
||||
self._run_pdf_auto_check()
|
||||
|
||||
@@ -1394,7 +1557,41 @@ class HandlerDialog(QDialog):
|
||||
if child.flags() & Qt.ItemIsUserCheckable:
|
||||
child_src = child.data(0, Qt.UserRole)
|
||||
child_has_content = (
|
||||
child_src and self.content_lengths.get(child_src, 0) > 0
|
||||
child_src and self.content_lengths.get(child_src, 0) > 0
|
||||
)
|
||||
child_is_parent = child.childCount() > 0
|
||||
if child_has_content or child_is_parent:
|
||||
child.setCheckState(0, Qt.Checked)
|
||||
else:
|
||||
item.setCheckState(0, Qt.Unchecked)
|
||||
|
||||
iterator += 1
|
||||
|
||||
def _run_markdown_auto_check(self):
|
||||
"""Auto-select markdown chapters with significant content"""
|
||||
iterator = QTreeWidgetItemIterator(self.treeWidget)
|
||||
while iterator.value():
|
||||
item = iterator.value()
|
||||
if not (item.flags() & Qt.ItemIsUserCheckable):
|
||||
iterator += 1
|
||||
continue
|
||||
|
||||
identifier = item.data(0, Qt.UserRole)
|
||||
|
||||
# Select chapters with content > 500 characters or parent items
|
||||
has_significant_content = identifier and self.content_lengths.get(identifier, 0) > 500
|
||||
is_parent = item.childCount() > 0
|
||||
|
||||
if has_significant_content or is_parent:
|
||||
item.setCheckState(0, Qt.Checked)
|
||||
# Also check children if this is a parent
|
||||
if is_parent:
|
||||
for i in range(item.childCount()):
|
||||
child = item.child(i)
|
||||
if child.flags() & Qt.ItemIsUserCheckable:
|
||||
child_identifier = child.data(0, Qt.UserRole)
|
||||
child_has_content = (
|
||||
child_identifier and self.content_lengths.get(child_identifier, 0) > 0
|
||||
)
|
||||
child_is_parent = child.childCount() > 0
|
||||
if child_has_content or child_is_parent:
|
||||
@@ -1428,8 +1625,8 @@ class HandlerDialog(QDialog):
|
||||
continue
|
||||
|
||||
if (
|
||||
not identifier.startswith("page_")
|
||||
or self.content_lengths.get(identifier, 0) > 0
|
||||
not identifier.startswith("page_")
|
||||
or self.content_lengths.get(identifier, 0) > 0
|
||||
):
|
||||
item.setCheckState(0, Qt.Checked)
|
||||
|
||||
@@ -1540,7 +1737,7 @@ class HandlerDialog(QDialog):
|
||||
html_content += f"<p style='text-align: center; font-style: italic;'>By {authors_text}</p>"
|
||||
|
||||
if self.book_metadata["publisher"] or self.book_metadata.get(
|
||||
"publication_year"
|
||||
"publication_year"
|
||||
):
|
||||
pub_info = []
|
||||
if self.book_metadata["publisher"]:
|
||||
@@ -1626,6 +1823,42 @@ class HandlerDialog(QDialog):
|
||||
if "cover" in item.get_name().lower():
|
||||
metadata["cover_image"] = item.get_content()
|
||||
break
|
||||
elif self.file_type == "markdown":
|
||||
# Extract metadata from markdown frontmatter or first heading
|
||||
if self.markdown_text:
|
||||
# Try to extract YAML frontmatter
|
||||
frontmatter_match = re.match(r'^---\s*\n(.*?)\n---\s*\n', self.markdown_text, re.DOTALL)
|
||||
if frontmatter_match:
|
||||
try:
|
||||
frontmatter = frontmatter_match.group(1)
|
||||
# Simple YAML-like parsing for common fields
|
||||
title_match = re.search(r'^title:\s*(.+)$', frontmatter, re.MULTILINE | re.IGNORECASE)
|
||||
if title_match:
|
||||
metadata["title"] = title_match.group(1).strip().strip('"\'')
|
||||
|
||||
author_match = re.search(r'^author:\s*(.+)$', frontmatter, re.MULTILINE | re.IGNORECASE)
|
||||
if author_match:
|
||||
metadata["authors"] = [author_match.group(1).strip().strip('"\'')]
|
||||
|
||||
desc_match = re.search(r'^description:\s*(.+)$', frontmatter, re.MULTILINE | re.IGNORECASE)
|
||||
if desc_match:
|
||||
metadata["description"] = desc_match.group(1).strip().strip('"\'')
|
||||
|
||||
date_match = re.search(r'^date:\s*(.+)$', frontmatter, re.MULTILINE | re.IGNORECASE)
|
||||
if date_match:
|
||||
date_str = date_match.group(1).strip().strip('"\'')
|
||||
year_match = re.search(r'\b(19|20)\d{2}\b', date_str)
|
||||
if year_match:
|
||||
metadata["publication_year"] = year_match.group(0)
|
||||
except Exception as e:
|
||||
logging.warning(f"Error parsing markdown frontmatter: {e}")
|
||||
|
||||
# Fallback: use first H1 header as title if no frontmatter title
|
||||
if not metadata["title"] and self.markdown_toc:
|
||||
# Find the first level 1 header
|
||||
first_h1 = next((h for h in self.markdown_toc if h['level'] == 1), None)
|
||||
if first_h1:
|
||||
metadata["title"] = first_h1['name']
|
||||
else:
|
||||
pdf_info = self.pdf_doc.metadata
|
||||
if pdf_info:
|
||||
@@ -1670,6 +1903,8 @@ class HandlerDialog(QDialog):
|
||||
def get_selected_text(self):
|
||||
if self.file_type == "epub":
|
||||
return self._get_epub_selected_text()
|
||||
elif self.file_type == "markdown":
|
||||
return self._get_markdown_selected_text()
|
||||
else:
|
||||
return self._get_pdf_selected_text()
|
||||
|
||||
@@ -1687,7 +1922,7 @@ class HandlerDialog(QDialog):
|
||||
authors_text = ", ".join(authors)
|
||||
album_artist = authors_text or "Unknown"
|
||||
year = (
|
||||
metadata.get("publication_year") or current_year
|
||||
metadata.get("publication_year") or current_year
|
||||
) # Use publication year if available
|
||||
|
||||
# Count chapters/pages
|
||||
@@ -1709,6 +1944,43 @@ class HandlerDialog(QDialog):
|
||||
|
||||
return "\n".join(metadata_tags)
|
||||
|
||||
def _get_markdown_selected_text(self):
|
||||
"""Get selected text from markdown chapters"""
|
||||
all_checked_identifiers = set()
|
||||
chapter_texts = []
|
||||
|
||||
# Add metadata tags at the beginning
|
||||
metadata_tags = self._format_metadata_tags()
|
||||
|
||||
item_order_counter = 0
|
||||
ordered_checked_items = []
|
||||
|
||||
iterator = QTreeWidgetItemIterator(self.treeWidget)
|
||||
while iterator.value():
|
||||
item = iterator.value()
|
||||
item_order_counter += 1
|
||||
if item.checkState(0) == Qt.Checked:
|
||||
identifier = item.data(0, Qt.UserRole)
|
||||
|
||||
if identifier and identifier != "info:bookinfo":
|
||||
all_checked_identifiers.add(identifier)
|
||||
ordered_checked_items.append((item_order_counter, item, identifier))
|
||||
iterator += 1
|
||||
|
||||
ordered_checked_items.sort(key=lambda x: x[0])
|
||||
|
||||
for order, item, identifier in ordered_checked_items:
|
||||
text = self.content_texts.get(identifier)
|
||||
if text and text.strip():
|
||||
title = item.text(0)
|
||||
# Remove leading dashes from title
|
||||
title = re.sub(r"^\s*[-–—]\s*", "", title).strip()
|
||||
marker = f"<<CHAPTER_MARKER:{title}>>"
|
||||
chapter_texts.append(marker + "\n" + text)
|
||||
|
||||
full_text = metadata_tags + "\n\n" + "\n\n".join(chapter_texts)
|
||||
return full_text, all_checked_identifiers
|
||||
|
||||
def _get_epub_selected_text(self):
|
||||
all_checked_identifiers = set()
|
||||
chapter_texts = []
|
||||
@@ -1753,7 +2025,7 @@ class HandlerDialog(QDialog):
|
||||
metadata_tags = self._format_metadata_tags()
|
||||
|
||||
pdf_has_no_bookmarks = (
|
||||
hasattr(self, "has_pdf_bookmarks") and not self.has_pdf_bookmarks
|
||||
hasattr(self, "has_pdf_bookmarks") and not self.has_pdf_bookmarks
|
||||
)
|
||||
|
||||
iterator = QTreeWidgetItemIterator(self.treeWidget)
|
||||
@@ -1793,9 +2065,9 @@ class HandlerDialog(QDialog):
|
||||
child = item.child(i)
|
||||
child_id = child.data(0, Qt.UserRole)
|
||||
if (
|
||||
child.checkState(0) == Qt.Checked
|
||||
and child_id
|
||||
and child_id not in included_text_ids
|
||||
child.checkState(0) == Qt.Checked
|
||||
and child_id
|
||||
and child_id not in included_text_ids
|
||||
):
|
||||
checked_children.append((child, child_id))
|
||||
if parent_checked and parent_id and parent_id not in included_text_ids:
|
||||
@@ -1824,9 +2096,9 @@ class HandlerDialog(QDialog):
|
||||
elif item.flags() & Qt.ItemIsUserCheckable:
|
||||
identifier = item.data(0, Qt.UserRole)
|
||||
if (
|
||||
identifier
|
||||
and identifier not in included_text_ids
|
||||
and item.checkState(0) == Qt.Checked
|
||||
identifier
|
||||
and identifier not in included_text_ids
|
||||
and item.checkState(0) == Qt.Checked
|
||||
):
|
||||
text = self.content_texts.get(identifier, "")
|
||||
if text:
|
||||
@@ -1896,9 +2168,9 @@ class HandlerDialog(QDialog):
|
||||
return
|
||||
|
||||
if (
|
||||
not item
|
||||
or item.childCount() == 0
|
||||
or not (item.flags() & Qt.ItemIsUserCheckable)
|
||||
not item
|
||||
or item.childCount() == 0
|
||||
or not (item.flags() & Qt.ItemIsUserCheckable)
|
||||
):
|
||||
return
|
||||
|
||||
|
||||
+82
-67
@@ -1,14 +1,12 @@
|
||||
import os
|
||||
import re
|
||||
import time
|
||||
import chardet
|
||||
import charset_normalizer
|
||||
import hashlib # For generating unique cache filenames
|
||||
from platformdirs import user_desktop_dir
|
||||
from PyQt5.QtCore import QThread, pyqtSignal, Qt, QTimer
|
||||
from PyQt5.QtWidgets import QCheckBox, QVBoxLayout, QDialog, QLabel, QDialogButtonBox
|
||||
import soundfile as sf
|
||||
from abogen.utils import clean_text, create_process, get_user_cache_path
|
||||
from abogen.utils import clean_text, create_process, get_user_cache_path, detect_encoding
|
||||
from abogen.constants import (
|
||||
LANGUAGE_DESCRIPTIONS,
|
||||
SAMPLE_VOICE_TEXTS,
|
||||
@@ -30,22 +28,6 @@ def get_sample_voice_text(lang_code):
|
||||
return SAMPLE_VOICE_TEXTS.get(lang_code, SAMPLE_VOICE_TEXTS["a"])
|
||||
|
||||
|
||||
def detect_encoding(file_path):
|
||||
with open(file_path, "rb") as f:
|
||||
raw_data = f.read()
|
||||
detected_encoding = None
|
||||
for detectors in (charset_normalizer, chardet):
|
||||
try:
|
||||
result = detectors.detect(raw_data)["encoding"]
|
||||
except Exception:
|
||||
continue
|
||||
if result is not None:
|
||||
detected_encoding = result
|
||||
break
|
||||
encoding = detected_encoding if detected_encoding else "utf-8"
|
||||
return encoding.lower()
|
||||
|
||||
|
||||
class ChapterOptionsDialog(QDialog):
|
||||
def __init__(self, chapter_count, parent=None):
|
||||
super().__init__(parent)
|
||||
@@ -166,6 +148,7 @@ class ConversionThread(QThread):
|
||||
total_char_count,
|
||||
use_gpu=True,
|
||||
from_queue=False,
|
||||
save_base_path=None,
|
||||
): # Add use_gpu parameter
|
||||
super().__init__()
|
||||
self._chapter_options_event = threading.Event()
|
||||
@@ -187,6 +170,7 @@ class ConversionThread(QThread):
|
||||
self.total_char_count = total_char_count # Use passed total character count
|
||||
self.processed_char_count = 0 # Initialize processed character count
|
||||
self.display_path = None # Add variable for display path
|
||||
self.save_base_path = save_base_path # Store the save base path
|
||||
self.is_direct_text = (
|
||||
False # Flag to indicate if input is from textbox rather than file
|
||||
)
|
||||
@@ -194,6 +178,7 @@ class ConversionThread(QThread):
|
||||
self.waiting_for_user_input = False
|
||||
self.use_gpu = use_gpu # Store the GPU setting
|
||||
self.max_subtitle_words = 50 # Default value, will be overridden from GUI
|
||||
self.silence_duration = 2.0 # Default value, will be overridden from GUI
|
||||
|
||||
def _stream_audio_in_chunks(
|
||||
self, segments, process_func, progress_prefix="Processing"
|
||||
@@ -255,15 +240,23 @@ class ConversionThread(QThread):
|
||||
# Show configuration
|
||||
self.log_updated.emit("Configuration:")
|
||||
|
||||
# Determine input file and processing file
|
||||
if getattr(self, "from_queue", False):
|
||||
input_file = self.save_base_path or self.file_name
|
||||
processing_file = self.file_name
|
||||
else:
|
||||
input_file = self.display_path if self.display_path else self.file_name
|
||||
processing_file = self.file_name
|
||||
|
||||
self.log_updated.emit(f"- Input File: {input_file}")
|
||||
if input_file != processing_file:
|
||||
self.log_updated.emit(f"- Processing File: {processing_file}")
|
||||
|
||||
# Use file_name for logs if from_queue, otherwise use display_path if available
|
||||
if getattr(self, "from_queue", False):
|
||||
display_file = self.file_name
|
||||
base_path = self.save_base_path or self.file_name # Use save_base_path if available
|
||||
else:
|
||||
display_file = (
|
||||
self.display_path if self.display_path else self.file_name
|
||||
)
|
||||
|
||||
self.log_updated.emit(f"- Input File: {display_file}")
|
||||
base_path = self.display_path if self.display_path else self.file_name
|
||||
|
||||
# Use file size string passed from GUI
|
||||
if hasattr(self, "file_size_str"):
|
||||
@@ -304,6 +297,12 @@ class ConversionThread(QThread):
|
||||
f"- Separate chapters format: {separate_format}"
|
||||
)
|
||||
|
||||
# If merge_at_end is True, display the silence duration
|
||||
if getattr(self, "merge_chapters_at_end", True):
|
||||
self.log_updated.emit(
|
||||
f"- Silence between chapters: {self.silence_duration} seconds"
|
||||
)
|
||||
|
||||
if self.save_option == "Choose output folder":
|
||||
self.log_updated.emit(
|
||||
f"- Output folder: {self.output_folder or os.getcwd()}"
|
||||
@@ -413,7 +412,7 @@ class ConversionThread(QThread):
|
||||
|
||||
# Use file_name for logs if from_queue, otherwise use display_path if available
|
||||
if getattr(self, "from_queue", False):
|
||||
base_path = self.file_name
|
||||
base_path = self.save_base_path or self.file_name # Use save_base_path if available
|
||||
else:
|
||||
base_path = self.display_path if self.display_path else self.file_name
|
||||
|
||||
@@ -618,6 +617,10 @@ class ConversionThread(QThread):
|
||||
# Instead of processing the whole text, process by chapter
|
||||
for chapter_idx, (chapter_name, chapter_text) in enumerate(chapters, 1):
|
||||
chapter_out_path = None
|
||||
chapter_out_file = None
|
||||
chapter_ffmpeg_proc = None
|
||||
chapter_subtitle_file = None
|
||||
chapter_subtitle_path = None
|
||||
if total_chapters > 1:
|
||||
self.log_updated.emit(
|
||||
(
|
||||
@@ -731,27 +734,21 @@ class ConversionThread(QThread):
|
||||
is_narrow = subtitle_format in (
|
||||
"ass_narrow",
|
||||
"ass_centered_narrow",
|
||||
)
|
||||
chapter_subtitle_margin = "90" if is_narrow else ""
|
||||
chapter_subtitle_alignment_tag = (
|
||||
f"{{\\an5}}" if is_centered else ""
|
||||
)
|
||||
else:
|
||||
chapter_subtitle_file = open(
|
||||
chapter_subtitle_path,
|
||||
"w",
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
)
|
||||
chapter_subtitle_margin = "90" if is_narrow else ""
|
||||
chapter_subtitle_alignment_tag = (
|
||||
f"{{\\an5}}" if is_centered else ""
|
||||
)
|
||||
else:
|
||||
chapter_subtitle_path = None
|
||||
chapter_subtitle_file = None
|
||||
chapter_subtitle_file = open(
|
||||
chapter_subtitle_path,
|
||||
"w",
|
||||
encoding="utf-8",
|
||||
errors="replace",
|
||||
)
|
||||
else:
|
||||
chapter_out_file = None
|
||||
chapter_out_path = None
|
||||
chapter_ffmpeg_proc = None
|
||||
chapter_subtitle_file = None
|
||||
chapter_subtitle_path = None
|
||||
chapter_subtitle_file = None
|
||||
for result in tts(
|
||||
chapter_text,
|
||||
voice=loaded_voice,
|
||||
@@ -917,6 +914,22 @@ class ConversionThread(QThread):
|
||||
# Update progress more frequently (after each result)
|
||||
self.progress_updated.emit(percent, etr_str)
|
||||
|
||||
# Add silence between chapters for merged output (except after the last chapter)
|
||||
if merge_chapters_at_end and chapter_idx < total_chapters:
|
||||
silence_samples = int(self.silence_duration * 24000) # Silence duration at 24,000 Hz
|
||||
silence_audio = self.np.zeros(silence_samples, dtype="float32")
|
||||
silence_bytes = silence_audio.tobytes()
|
||||
|
||||
if merged_out_file:
|
||||
merged_out_file.write(silence_audio)
|
||||
elif ffmpeg_proc:
|
||||
ffmpeg_proc.stdin.write(silence_bytes)
|
||||
|
||||
# Update timing for the silence
|
||||
current_time += self.silence_duration
|
||||
if chapter_out_file or chapter_ffmpeg_proc:
|
||||
chapter_current_time += self.silence_duration
|
||||
|
||||
# Set chapter end time after processing
|
||||
if merge_chapters_at_end:
|
||||
chapter_time["end"] = current_time
|
||||
@@ -1155,7 +1168,7 @@ class ConversionThread(QThread):
|
||||
m = int((t % 3600) // 60)
|
||||
s = int(t % 60)
|
||||
ms = int((t - int(t)) * 1000)
|
||||
return f"{h:02}:{m:02}:{s:02},{ms:03}"
|
||||
return f"{h:02d}:{m:02d}:{s:02d},{ms:03d}"
|
||||
|
||||
def _ass_time(self, t):
|
||||
"""Helper function to format time for ASS files"""
|
||||
@@ -1163,7 +1176,7 @@ class ConversionThread(QThread):
|
||||
m = int((t % 3600) // 60)
|
||||
s = int(t % 60)
|
||||
cs = int((t - int(t)) * 100) # Centiseconds for ASS format
|
||||
return f"{h}:{m:02}:{s:02}.{cs:02}"
|
||||
return f"{h:01d}:{m:02d}:{s:02d}.{cs:02d}"
|
||||
|
||||
def _process_subtitle_tokens(
|
||||
self,
|
||||
@@ -1176,13 +1189,32 @@ class ConversionThread(QThread):
|
||||
if not tokens_with_timestamps:
|
||||
return
|
||||
|
||||
# Always combine punctuation with preceding words for consistent handling across modes
|
||||
processed_tokens = []
|
||||
i = 0
|
||||
while i < len(tokens_with_timestamps):
|
||||
token = tokens_with_timestamps[i].copy()
|
||||
|
||||
# Look ahead for punctuation
|
||||
while i + 1 < len(tokens_with_timestamps) and re.match(
|
||||
r"^[^\w\s]+$", tokens_with_timestamps[i + 1]["text"]
|
||||
):
|
||||
token["text"] += tokens_with_timestamps[i + 1]["text"]
|
||||
token["end"] = tokens_with_timestamps[i + 1]["end"]
|
||||
token["whitespace"] = tokens_with_timestamps[i + 1]["whitespace"]
|
||||
i += 1
|
||||
|
||||
processed_tokens.append(token)
|
||||
i += 1
|
||||
|
||||
# Use processed_tokens instead of tokens_with_timestamps for the rest of the method
|
||||
if self.subtitle_mode == "Sentence + Highlighting":
|
||||
# Sentence-based processing with karaoke highlighting
|
||||
separator = r"[.!?]"
|
||||
current_sentence = []
|
||||
word_count = 0
|
||||
|
||||
for token in tokens_with_timestamps:
|
||||
for token in processed_tokens: # Updated to use processed_tokens
|
||||
current_sentence.append(token)
|
||||
word_count += 1
|
||||
|
||||
@@ -1236,7 +1268,7 @@ class ConversionThread(QThread):
|
||||
current_sentence = []
|
||||
word_count = 0
|
||||
|
||||
for token in tokens_with_timestamps:
|
||||
for token in processed_tokens: # Updated to use processed_tokens
|
||||
current_sentence.append(token)
|
||||
word_count += 1
|
||||
|
||||
@@ -1286,25 +1318,7 @@ class ConversionThread(QThread):
|
||||
except (ValueError, IndexError):
|
||||
word_count = 1
|
||||
|
||||
# Combine punctuation with preceding words
|
||||
processed_tokens = []
|
||||
i = 0
|
||||
while i < len(tokens_with_timestamps):
|
||||
token = tokens_with_timestamps[i].copy()
|
||||
|
||||
# Look ahead for punctuation
|
||||
while i + 1 < len(tokens_with_timestamps) and re.match(
|
||||
r"^[^\w\s]+$", tokens_with_timestamps[i + 1]["text"]
|
||||
):
|
||||
token["text"] += tokens_with_timestamps[i + 1]["text"]
|
||||
token["end"] = tokens_with_timestamps[i + 1]["end"]
|
||||
token["whitespace"] = tokens_with_timestamps[i + 1]["whitespace"]
|
||||
i += 1
|
||||
|
||||
processed_tokens.append(token)
|
||||
i += 1
|
||||
|
||||
# Group words into subtitle entries
|
||||
# Group words into subtitle entries (processed_tokens already has punctuation combined)
|
||||
for i in range(0, len(processed_tokens), word_count):
|
||||
group = processed_tokens[i : i + word_count]
|
||||
if group:
|
||||
@@ -1321,6 +1335,7 @@ class ConversionThread(QThread):
|
||||
if end is None or end <= start or end <= 0:
|
||||
subtitle_entries[-1] = (start, fallback_end_time, text)
|
||||
|
||||
|
||||
def cancel(self):
|
||||
self.cancel_requested = True
|
||||
self.should_cancel = True
|
||||
|
||||
+231
-93
@@ -158,7 +158,7 @@ class InputBox(QLabel):
|
||||
self.setAlignment(Qt.AlignCenter)
|
||||
self.setAcceptDrops(True)
|
||||
self.setText(
|
||||
"Drag and drop your file here or click to browse.\n(.txt, .epub, .pdf)"
|
||||
"Drag and drop your file here or click to browse.\n(.txt, .epub, .pdf, .md)"
|
||||
)
|
||||
self.setStyleSheet(
|
||||
f"QLabel {{ {self.STYLE_DEFAULT} }} QLabel:hover {{ {self.STYLE_DEFAULT_HOVER} }}"
|
||||
@@ -251,9 +251,11 @@ class InputBox(QLabel):
|
||||
return str(n)
|
||||
|
||||
if (
|
||||
file_path.lower().endswith(".epub") or file_path.lower().endswith(".pdf")
|
||||
file_path.lower().endswith(".epub")
|
||||
or file_path.lower().endswith(".pdf")
|
||||
or file_path.lower().endswith((".md", ".markdown"))
|
||||
) and hasattr(self.window(), "selected_chapters"):
|
||||
# EPUB or PDF: sum character counts for selected chapters
|
||||
# EPUB, PDF, or Markdown: sum character counts for selected chapters
|
||||
try:
|
||||
|
||||
book_path = file_path
|
||||
@@ -292,13 +294,13 @@ class InputBox(QLabel):
|
||||
f"QLabel {{ {self.STYLE_ACTIVE} }} QLabel:hover {{ {self.STYLE_ACTIVE_HOVER} }}"
|
||||
)
|
||||
self.clear_btn.show()
|
||||
is_document = self.window().selected_file_type in ["epub", "pdf"]
|
||||
is_document = self.window().selected_file_type in ["epub", "pdf", "md", "markdown"]
|
||||
self.chapters_btn.setVisible(is_document)
|
||||
if is_document:
|
||||
chapter_count = len(self.window().selected_chapters)
|
||||
file_type = self.window().selected_file_type
|
||||
# Adjust button text based on file type
|
||||
if file_type == "epub":
|
||||
if file_type == "epub" or file_type == "md" or file_type == "markdown":
|
||||
self.chapters_btn.setText(f"Chapters ({chapter_count})")
|
||||
else: # PDF - always use Pages
|
||||
self.chapters_btn.setText(f"Pages ({chapter_count})")
|
||||
@@ -311,8 +313,8 @@ class InputBox(QLabel):
|
||||
|
||||
# For epub/pdf files, show edit if we have a selected_file (temp txt)
|
||||
if (
|
||||
self.window().selected_file_type in ["epub", "pdf"]
|
||||
and self.window().selected_file
|
||||
self.window().selected_file_type in ["epub", "pdf", "md", "markdown", "md", "markdown"]
|
||||
and self.window().selected_file
|
||||
):
|
||||
should_show_edit = True
|
||||
|
||||
@@ -345,7 +347,7 @@ class InputBox(QLabel):
|
||||
None # Reset the displayed file path when clearing input
|
||||
)
|
||||
self.setText(
|
||||
"Drag and drop your file here or click to browse.\n(.txt, .epub, .pdf)"
|
||||
"Drag and drop your file here or click to browse.\n(.txt, .epub, .pdf, .md)"
|
||||
)
|
||||
self.setStyleSheet(
|
||||
f"QLabel {{ {self.STYLE_DEFAULT} }} QLabel:hover {{ {self.STYLE_DEFAULT_HOVER} }}"
|
||||
@@ -381,9 +383,10 @@ class InputBox(QLabel):
|
||||
if urls:
|
||||
ext = urls[0].toLocalFile().lower()
|
||||
if (
|
||||
ext.endswith(".txt")
|
||||
or ext.endswith(".epub")
|
||||
or ext.endswith(".pdf")
|
||||
ext.endswith(".txt")
|
||||
or ext.endswith(".epub")
|
||||
or ext.endswith(".pdf")
|
||||
or ext.endswith((".md", ".markdown"))
|
||||
):
|
||||
event.acceptProposedAction()
|
||||
# Set hover style based on current state
|
||||
@@ -433,27 +436,33 @@ class InputBox(QLabel):
|
||||
)
|
||||
self.set_file_info(file_path)
|
||||
event.acceptProposedAction()
|
||||
elif file_path.lower().endswith(".epub") or file_path.lower().endswith(
|
||||
".pdf"
|
||||
):
|
||||
elif (file_path.lower().endswith(".epub")
|
||||
or file_path.lower().endswith(".pdf")
|
||||
or file_path.lower().endswith((".md", ".markdown"))):
|
||||
# Determine file type
|
||||
if file_path.lower().endswith(".epub"):
|
||||
file_type = "epub"
|
||||
elif file_path.lower().endswith(".pdf"):
|
||||
file_type = "pdf"
|
||||
else:
|
||||
file_type = "markdown"
|
||||
|
||||
# Just store the file path but don't set the file info yet
|
||||
win.selected_file_type = (
|
||||
"epub" if file_path.lower().endswith(".epub") else "pdf"
|
||||
)
|
||||
win.selected_file_type = file_type
|
||||
win.selected_book_path = file_path
|
||||
win.open_book_file(
|
||||
file_path # This will handle the dialog and setting file info
|
||||
)
|
||||
event.acceptProposedAction()
|
||||
else:
|
||||
self.set_error("Please drop a .txt, .epub, or .pdf file.")
|
||||
self.set_error("Please drop a .txt, .epub, .pdf, or .md file.")
|
||||
event.ignore()
|
||||
else:
|
||||
event.ignore()
|
||||
|
||||
def on_chapters_clicked(self):
|
||||
win = self.window()
|
||||
if win.selected_file_type in ["epub", "pdf"] and win.selected_book_path:
|
||||
if win.selected_file_type in ["epub", "pdf", "md", "markdown"] and win.selected_book_path:
|
||||
# Call open_book_file which shows the dialog and updates selected_chapters
|
||||
if win.open_book_file(win.selected_book_path):
|
||||
# Refresh the info label and button text after dialog closes
|
||||
@@ -465,7 +474,7 @@ class InputBox(QLabel):
|
||||
def on_edit_clicked(self):
|
||||
win = self.window()
|
||||
# For PDFs and EPUBs, use the temporary text file
|
||||
if win.selected_file_type in ["epub", "pdf"] and win.selected_file:
|
||||
if win.selected_file_type in ["epub", "pdf", "md", "markdown"] and win.selected_file:
|
||||
# Use the temporary .txt file that was generated
|
||||
win.open_textbox_dialog(win.selected_file)
|
||||
else:
|
||||
@@ -477,15 +486,63 @@ class InputBox(QLabel):
|
||||
# win.selected_file holds the path to the text that is converted.
|
||||
file_to_check = win.selected_file
|
||||
|
||||
# If this is a converted document (epub/pdf/markdown) that was written to the
|
||||
# user's cache directory, show a menu letting the user jump to either the
|
||||
# processed (cached .txt) file or the original input file (epub/pdf/md).
|
||||
try:
|
||||
cache_dir = get_user_cache_path()
|
||||
except Exception:
|
||||
cache_dir = None
|
||||
|
||||
is_cached_doc = False
|
||||
if (
|
||||
file_to_check
|
||||
and os.path.exists(file_to_check)
|
||||
and os.path.isfile(file_to_check)
|
||||
file_to_check
|
||||
and os.path.exists(file_to_check)
|
||||
and os.path.isfile(file_to_check)
|
||||
and cache_dir
|
||||
):
|
||||
folder_path = os.path.dirname(file_to_check)
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(folder_path))
|
||||
# Consider it cached when the file is under the cache directory and is a .txt
|
||||
if file_to_check.endswith('.txt') and os.path.commonpath([os.path.abspath(file_to_check), os.path.abspath(cache_dir)]) == os.path.abspath(cache_dir):
|
||||
# Only treat as document-cache when original type was a document
|
||||
if getattr(win, 'selected_file_type', None) in ['epub', 'pdf', 'md', 'markdown']:
|
||||
is_cached_doc = True
|
||||
|
||||
if is_cached_doc:
|
||||
menu = QMenu(self)
|
||||
act_processed = QAction("Go to processed file", self)
|
||||
|
||||
def open_processed():
|
||||
folder_path = os.path.dirname(file_to_check)
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(folder_path))
|
||||
|
||||
act_processed.triggered.connect(open_processed)
|
||||
menu.addAction(act_processed)
|
||||
|
||||
act_input = QAction("Go to input file", self)
|
||||
# Prefer displayed_file_path (original input path) then selected_book_path
|
||||
input_path = getattr(win, 'displayed_file_path', None) or getattr(win, 'selected_book_path', None)
|
||||
if input_path and os.path.exists(input_path):
|
||||
def open_input():
|
||||
folder_path = os.path.dirname(input_path)
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(folder_path))
|
||||
|
||||
act_input.triggered.connect(open_input)
|
||||
else:
|
||||
act_input.setEnabled(False)
|
||||
|
||||
menu.addAction(act_input)
|
||||
# Show the menu anchored to the button
|
||||
menu.exec_(self.go_to_folder_btn.mapToGlobal(QPoint(0, self.go_to_folder_btn.height())))
|
||||
else:
|
||||
QMessageBox.warning(win, "Error", "Converted file not found.")
|
||||
if (
|
||||
file_to_check
|
||||
and os.path.exists(file_to_check)
|
||||
and os.path.isfile(file_to_check)
|
||||
):
|
||||
folder_path = os.path.dirname(file_to_check)
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(folder_path))
|
||||
else:
|
||||
QMessageBox.warning(win, "Error", "Converted file not found.")
|
||||
|
||||
|
||||
class TextboxDialog(QDialog):
|
||||
@@ -599,10 +656,10 @@ class TextboxDialog(QDialog):
|
||||
# This gives a better filename instead of the cache file path
|
||||
main_window = self.parent()
|
||||
if (
|
||||
hasattr(main_window, "displayed_file_path")
|
||||
and main_window.displayed_file_path
|
||||
hasattr(main_window, "displayed_file_path")
|
||||
and main_window.displayed_file_path
|
||||
):
|
||||
if main_window.selected_file_type in ["epub", "pdf"]:
|
||||
if main_window.selected_file_type in ["epub", "pdf", "md", "markdown"]:
|
||||
# Use the base name of the displayed file but change extension to .txt
|
||||
base_name = os.path.splitext(main_window.displayed_file_path)[0]
|
||||
initial_path = base_name + ".txt"
|
||||
@@ -680,6 +737,9 @@ class abogen(QWidget):
|
||||
self.max_subtitle_words = self.config.get(
|
||||
"max_subtitle_words", 50
|
||||
) # Default max words per subtitle
|
||||
self.silence_duration = self.config.get(
|
||||
"silence_duration", 2.0
|
||||
) # Default silence duration
|
||||
self.selected_format = self.config.get("selected_format", "wav")
|
||||
self.separate_chapters_format = self.config.get(
|
||||
"separate_chapters_format", "wav"
|
||||
@@ -1155,16 +1215,21 @@ class abogen(QWidget):
|
||||
return
|
||||
try:
|
||||
file_path, _ = QFileDialog.getOpenFileName(
|
||||
self, "Select File", "", "Supported Files (*.txt *.epub *.pdf)"
|
||||
self, "Select File", "", "Supported Files (*.txt *.epub *.pdf *.md)"
|
||||
)
|
||||
if not file_path:
|
||||
return
|
||||
if file_path.lower().endswith(".epub") or file_path.lower().endswith(
|
||||
".pdf"
|
||||
):
|
||||
self.selected_file_type = (
|
||||
"epub" if file_path.lower().endswith(".epub") else "pdf"
|
||||
)
|
||||
if (file_path.lower().endswith(".epub")
|
||||
or file_path.lower().endswith(".pdf")
|
||||
or file_path.lower().endswith((".md", ".markdown"))):
|
||||
# Determine file type
|
||||
if file_path.lower().endswith(".epub"):
|
||||
self.selected_file_type = "epub"
|
||||
elif file_path.lower().endswith(".pdf"):
|
||||
self.selected_file_type = "pdf"
|
||||
else:
|
||||
self.selected_file_type = "markdown"
|
||||
|
||||
self.selected_book_path = file_path
|
||||
# Don't set file info immediately, open_book_file will handle it after dialog is accepted
|
||||
if not self.open_book_file(file_path):
|
||||
@@ -1183,14 +1248,17 @@ class abogen(QWidget):
|
||||
def open_book_file(self, book_path):
|
||||
# Clear selected chapters if this is a different book than the last one
|
||||
if (
|
||||
not hasattr(self, "last_opened_book_path")
|
||||
or self.last_opened_book_path != book_path
|
||||
not hasattr(self, "last_opened_book_path")
|
||||
or self.last_opened_book_path != book_path
|
||||
):
|
||||
self.selected_chapters = set()
|
||||
self.last_opened_book_path = book_path
|
||||
|
||||
dialog = HandlerDialog(
|
||||
book_path, checked_chapters=self.selected_chapters, parent=self
|
||||
book_path,
|
||||
file_type=getattr(self, 'selected_file_type', None),
|
||||
checked_chapters=self.selected_chapters,
|
||||
parent=self
|
||||
)
|
||||
dialog.setWindowModality(Qt.NonModal)
|
||||
dialog.setModal(False)
|
||||
@@ -1201,10 +1269,18 @@ class abogen(QWidget):
|
||||
return False
|
||||
chapters_text, all_checked_hrefs = dialog.get_selected_text()
|
||||
if not all_checked_hrefs:
|
||||
file_type = "pdf" if book_path.lower().endswith(".pdf") else "epub"
|
||||
error_msg = (
|
||||
f"No {'pages' if file_type == 'pdf' else 'chapters'} selected."
|
||||
)
|
||||
# Determine file type for error message
|
||||
if book_path.lower().endswith(".pdf"):
|
||||
file_type = "pdf"
|
||||
item_type = "pages"
|
||||
elif book_path.lower().endswith((".md", ".markdown")):
|
||||
file_type = "markdown"
|
||||
item_type = "chapters"
|
||||
else:
|
||||
file_type = "epub"
|
||||
item_type = "chapters"
|
||||
|
||||
error_msg = f"No {item_type} selected."
|
||||
self._show_error_message_box(f"{file_type.upper()} Error", error_msg)
|
||||
return False
|
||||
self.selected_chapters = all_checked_hrefs
|
||||
@@ -1322,9 +1398,9 @@ class abogen(QWidget):
|
||||
is_cache_file = get_user_cache_path() in file_path
|
||||
# Otherwise use selected_file if it's a txt file
|
||||
elif (
|
||||
self.selected_file_type == "txt"
|
||||
and self.selected_file
|
||||
and os.path.exists(self.selected_file)
|
||||
self.selected_file_type == "txt"
|
||||
and self.selected_file
|
||||
and os.path.exists(self.selected_file)
|
||||
):
|
||||
editing = True
|
||||
edit_file = self.selected_file
|
||||
@@ -1535,9 +1611,9 @@ class abogen(QWidget):
|
||||
def _get_queue_progress_format(self, value=None):
|
||||
"""Return the progress bar format string for queue mode."""
|
||||
if (
|
||||
hasattr(self, "queued_items")
|
||||
and self.queued_items
|
||||
and hasattr(self, "current_queue_index")
|
||||
hasattr(self, "queued_items")
|
||||
and self.queued_items
|
||||
and hasattr(self, "current_queue_index")
|
||||
):
|
||||
N = self.current_queue_index + 1
|
||||
M = len(self.queued_items)
|
||||
@@ -1554,9 +1630,9 @@ class abogen(QWidget):
|
||||
self.progress_bar.setValue(value)
|
||||
# Show queue progress if in queue mode
|
||||
if (
|
||||
hasattr(self, "queued_items")
|
||||
and self.queued_items
|
||||
and hasattr(self, "current_queue_index")
|
||||
hasattr(self, "queued_items")
|
||||
and self.queued_items
|
||||
and hasattr(self, "current_queue_index")
|
||||
):
|
||||
N = self.current_queue_index + 1
|
||||
M = len(self.queued_items)
|
||||
@@ -1614,14 +1690,17 @@ class abogen(QWidget):
|
||||
|
||||
def add_to_queue(self):
|
||||
# For epub/pdf, always use the converted txt file (selected_file)
|
||||
if self.selected_file_type in ["epub", "pdf"]:
|
||||
if self.selected_file_type in ["epub", "pdf", "md", "markdown"]:
|
||||
file_to_queue = self.selected_file
|
||||
# Use the original file path for save location
|
||||
save_base_path = self.displayed_file_path if self.displayed_file_path else file_to_queue
|
||||
else:
|
||||
file_to_queue = (
|
||||
self.displayed_file_path
|
||||
if self.displayed_file_path
|
||||
else self.selected_file
|
||||
)
|
||||
save_base_path = file_to_queue # For non-EPUB, it's the same
|
||||
|
||||
if not file_to_queue:
|
||||
self.input_box.set_error("Please add a file.")
|
||||
@@ -1641,21 +1720,24 @@ class abogen(QWidget):
|
||||
output_format=self.selected_format,
|
||||
total_char_count=self.char_count,
|
||||
replace_single_newlines=self.replace_single_newlines,
|
||||
save_base_path=save_base_path,
|
||||
)
|
||||
|
||||
# Prevent adding duplicate items to the queue
|
||||
for queued_item in self.queued_items:
|
||||
if (
|
||||
queued_item.file_name == item_queue.file_name
|
||||
and queued_item.lang_code == item_queue.lang_code
|
||||
and queued_item.speed == item_queue.speed
|
||||
and queued_item.voice == item_queue.voice
|
||||
and queued_item.save_option == item_queue.save_option
|
||||
and queued_item.output_folder == item_queue.output_folder
|
||||
and queued_item.subtitle_mode == item_queue.subtitle_mode
|
||||
and queued_item.output_format == item_queue.output_format
|
||||
and getattr(queued_item, "replace_single_newlines", False)
|
||||
== item_queue.replace_single_newlines
|
||||
queued_item.file_name == item_queue.file_name
|
||||
and queued_item.lang_code == item_queue.lang_code
|
||||
and queued_item.speed == item_queue.speed
|
||||
and queued_item.voice == item_queue.voice
|
||||
and queued_item.save_option == item_queue.save_option
|
||||
and queued_item.output_folder == item_queue.output_folder
|
||||
and queued_item.subtitle_mode == item_queue.subtitle_mode
|
||||
and queued_item.output_format == item_queue.output_format
|
||||
and getattr(queued_item, "replace_single_newlines", False)
|
||||
== item_queue.replace_single_newlines
|
||||
and getattr(queued_item, "save_base_path", None)
|
||||
== item_queue.save_base_path
|
||||
):
|
||||
QMessageBox.warning(
|
||||
self, "Duplicate Item", "This item is already in the queue."
|
||||
@@ -1715,6 +1797,8 @@ class abogen(QWidget):
|
||||
self.replace_single_newlines = getattr(
|
||||
queued_item, "replace_single_newlines", False
|
||||
)
|
||||
# Restore the original file path for save location
|
||||
self.displayed_file_path = queued_item.save_base_path or queued_item.file_name
|
||||
self.start_conversion(from_queue=True)
|
||||
else:
|
||||
# Queue finished, reset index
|
||||
@@ -1758,16 +1842,28 @@ class abogen(QWidget):
|
||||
if not self.selected_file:
|
||||
self.input_box.set_error("Please add a file.")
|
||||
return
|
||||
|
||||
# Ensure we honor the currently selected save option when not running from queue
|
||||
if not from_queue:
|
||||
current_option = self.save_combo.currentText()
|
||||
self.save_option = current_option
|
||||
self.config["save_option"] = current_option
|
||||
# If user is not choosing a specific folder, clear any residual folder
|
||||
if current_option != "Choose output folder":
|
||||
self.selected_output_folder = None
|
||||
self.config["selected_output_folder"] = None
|
||||
save_config(self.config)
|
||||
|
||||
prevent_sleep_start()
|
||||
self.is_converting = True
|
||||
self.convert_input_box_to_log()
|
||||
self.progress_bar.setValue(0)
|
||||
# Show queue progress if in queue mode
|
||||
if (
|
||||
from_queue
|
||||
and hasattr(self, "queued_items")
|
||||
and self.queued_items
|
||||
and hasattr(self, "current_queue_index")
|
||||
from_queue
|
||||
and hasattr(self, "queued_items")
|
||||
and self.queued_items
|
||||
and hasattr(self, "current_queue_index")
|
||||
):
|
||||
N = self.current_queue_index + 1
|
||||
M = len(self.queued_items)
|
||||
@@ -1830,6 +1926,7 @@ class abogen(QWidget):
|
||||
total_char_count=self.char_count,
|
||||
use_gpu=self.gpu_ok,
|
||||
from_queue=from_queue,
|
||||
save_base_path=self.displayed_file_path, # Pass the save base path (original file for EPUB)
|
||||
) # Use gpu_ok status
|
||||
# Pass the displayed file path to the log_updated signal handler in ConversionThread
|
||||
self.conversion_thread.display_path = display_path
|
||||
@@ -1837,6 +1934,8 @@ class abogen(QWidget):
|
||||
self.conversion_thread.file_size_str = file_size_str
|
||||
# Pass max_subtitle_words from config
|
||||
self.conversion_thread.max_subtitle_words = self.max_subtitle_words
|
||||
# Pass silence_duration from config
|
||||
self.conversion_thread.silence_duration = self.silence_duration
|
||||
# Pass replace_single_newlines setting
|
||||
self.conversion_thread.replace_single_newlines = (
|
||||
self.replace_single_newlines
|
||||
@@ -1850,8 +1949,8 @@ class abogen(QWidget):
|
||||
"subtitle_format", "ass_centered_narrow"
|
||||
)
|
||||
# Pass chapter count for EPUB or PDF files
|
||||
if self.selected_file_type in ["epub", "pdf"] and hasattr(
|
||||
self, "selected_chapters"
|
||||
if self.selected_file_type in ["epub", "pdf", "md", "markdown"] and hasattr(
|
||||
self, "selected_chapters"
|
||||
):
|
||||
self.conversion_thread.chapter_count = len(self.selected_chapters)
|
||||
# Pass save_chapters_separately flag if available
|
||||
@@ -1994,8 +2093,8 @@ class abogen(QWidget):
|
||||
|
||||
# Only show finish_widget if queue is done
|
||||
if (
|
||||
self.current_queue_index + 1 >= len(self.queued_items)
|
||||
or not self.queued_items
|
||||
self.current_queue_index + 1 >= len(self.queued_items)
|
||||
or not self.queued_items
|
||||
):
|
||||
# Queue finished, show finish screen
|
||||
self.controls_widget.hide()
|
||||
@@ -2360,14 +2459,14 @@ class abogen(QWidget):
|
||||
def cleanup():
|
||||
# Only remove if not from cache AND it's a temp file from VoicePreviewThread
|
||||
if (
|
||||
not from_cache
|
||||
and hasattr(self, "preview_thread")
|
||||
and hasattr(self.preview_thread, "temp_wav")
|
||||
and self.preview_thread.temp_wav == temp_wav
|
||||
not from_cache
|
||||
and hasattr(self, "preview_thread")
|
||||
and hasattr(self.preview_thread, "temp_wav")
|
||||
and self.preview_thread.temp_wav == temp_wav
|
||||
):
|
||||
try:
|
||||
if os.path.exists(
|
||||
temp_wav
|
||||
temp_wav
|
||||
): # Ensure it exists before trying to remove
|
||||
os.remove(temp_wav)
|
||||
except Exception:
|
||||
@@ -2441,8 +2540,8 @@ class abogen(QWidget):
|
||||
return
|
||||
try:
|
||||
if (
|
||||
hasattr(self, "conversion_thread")
|
||||
and self.conversion_thread.isRunning()
|
||||
hasattr(self, "conversion_thread")
|
||||
and self.conversion_thread.isRunning()
|
||||
):
|
||||
if not hasattr(self, "_conversion_lock"):
|
||||
self._conversion_lock = threading.Lock()
|
||||
@@ -2529,9 +2628,9 @@ class abogen(QWidget):
|
||||
def cleanup_conversion_thread(self):
|
||||
# Stop conversion thread
|
||||
if (
|
||||
hasattr(self, "conversion_thread")
|
||||
and self.conversion_thread is not None
|
||||
and self.conversion_thread.isRunning()
|
||||
hasattr(self, "conversion_thread")
|
||||
and self.conversion_thread is not None
|
||||
and self.conversion_thread.isRunning()
|
||||
):
|
||||
self.conversion_thread.cancel()
|
||||
self.conversion_thread.wait()
|
||||
@@ -2566,8 +2665,8 @@ class abogen(QWidget):
|
||||
if dialog.exec_() == QDialog.Accepted:
|
||||
options = dialog.get_options()
|
||||
if (
|
||||
hasattr(self, "conversion_thread")
|
||||
and self.conversion_thread.isRunning()
|
||||
hasattr(self, "conversion_thread")
|
||||
and self.conversion_thread.isRunning()
|
||||
):
|
||||
self.conversion_thread.set_chapter_options(options)
|
||||
else:
|
||||
@@ -2587,8 +2686,8 @@ class abogen(QWidget):
|
||||
import winreg
|
||||
|
||||
with winreg.OpenKey(
|
||||
winreg.HKEY_CURRENT_USER,
|
||||
r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
|
||||
winreg.HKEY_CURRENT_USER,
|
||||
r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
|
||||
) as key:
|
||||
value, _ = winreg.QueryValueEx(key, "AppsUseLightTheme")
|
||||
return value == 0
|
||||
@@ -2684,7 +2783,7 @@ class abogen(QWidget):
|
||||
|
||||
# Main logic
|
||||
dark_mode = theme == "dark" or (
|
||||
theme == "system" and is_windows and is_windows_dark_mode()
|
||||
theme == "system" and is_windows and is_windows_dark_mode()
|
||||
)
|
||||
if dark_mode:
|
||||
app.setStyle("Fusion")
|
||||
@@ -2720,7 +2819,7 @@ class abogen(QWidget):
|
||||
|
||||
def get_dark_mode():
|
||||
return theme == "dark" or (
|
||||
theme == "system" and is_windows and is_windows_dark_mode()
|
||||
theme == "system" and is_windows and is_windows_dark_mode()
|
||||
)
|
||||
|
||||
app._dark_titlebar_event_filter = DarkTitleBarEventFilter(
|
||||
@@ -2790,6 +2889,11 @@ class abogen(QWidget):
|
||||
max_words_action.triggered.connect(self.set_max_subtitle_words)
|
||||
menu.addAction(max_words_action)
|
||||
|
||||
# Add silence between chapters option
|
||||
silence_action = QAction("Configure silence between chapters", self)
|
||||
silence_action.triggered.connect(self.set_silence_between_chapters)
|
||||
menu.addAction(silence_action)
|
||||
|
||||
max_lines_action = QAction("Configure max lines in log window", self)
|
||||
max_lines_action.triggered.connect(self.set_max_log_lines)
|
||||
menu.addAction(max_lines_action)
|
||||
@@ -2946,7 +3050,7 @@ class abogen(QWidget):
|
||||
def open_cache_directory(self):
|
||||
"""Open the cache directory used by the program."""
|
||||
try:
|
||||
# Get the cache directory path
|
||||
# Get the abogen cache directory
|
||||
cache_dir = get_user_cache_path()
|
||||
|
||||
# Create the directory if it doesn't exist
|
||||
@@ -3255,8 +3359,8 @@ Categories=AudioVideo;Audio;Utility;
|
||||
|
||||
# Reset flag to track if we should show "no updates" message
|
||||
show_result = (
|
||||
hasattr(self, "_show_update_check_result")
|
||||
and self._show_update_check_result
|
||||
hasattr(self, "_show_update_check_result")
|
||||
and self._show_update_check_result
|
||||
)
|
||||
self._show_update_check_result = False
|
||||
|
||||
@@ -3383,9 +3487,9 @@ Categories=AudioVideo;Audio;Utility;
|
||||
|
||||
# If currently selected file is in the cache directory, clear the UI
|
||||
if (
|
||||
self.selected_file
|
||||
and os.path.dirname(self.selected_file) == cache_dir
|
||||
and self.selected_file.endswith(".txt")
|
||||
self.selected_file
|
||||
and os.path.dirname(self.selected_file) == cache_dir
|
||||
and self.selected_file.endswith(".txt")
|
||||
):
|
||||
self.input_box.clear_input()
|
||||
|
||||
@@ -3446,6 +3550,40 @@ Categories=AudioVideo;Audio;Utility;
|
||||
f"Maximum words per subtitle set to {value}.",
|
||||
)
|
||||
|
||||
def set_silence_between_chapters(self):
|
||||
"""Open a dialog to set the silence duration between chapters"""
|
||||
from PyQt5.QtWidgets import QInputDialog, QDialog
|
||||
|
||||
current_value = self.config.get("silence_duration", 2.0)
|
||||
|
||||
dlg = QInputDialog(self)
|
||||
dlg.setWindowTitle("Silence Duration (seconds)")
|
||||
dlg.setLabelText(
|
||||
"Enter the duration of silence\nbetween chapters (in seconds):"
|
||||
)
|
||||
dlg.setInputMode(QInputDialog.DoubleInput)
|
||||
dlg.setDoubleDecimals(1)
|
||||
dlg.setDoubleMinimum(0.0)
|
||||
dlg.setDoubleMaximum(60.0)
|
||||
dlg.setDoubleValue(current_value)
|
||||
dlg.setDoubleStep(0.1) # <-- set step to 0.1
|
||||
|
||||
if dlg.exec_() == QDialog.Accepted:
|
||||
value = dlg.doubleValue()
|
||||
# Round to one decimal to avoid floating-point representation noise
|
||||
value = round(value, 1)
|
||||
|
||||
# Save the new value
|
||||
self.silence_duration = value
|
||||
self.config["silence_duration"] = value
|
||||
save_config(self.config)
|
||||
|
||||
# Show confirmation (format with one decimal)
|
||||
QMessageBox.information(
|
||||
self,
|
||||
"Setting Saved",
|
||||
f"Silence duration between chapters set to {value:.1f} seconds.",
|
||||
)
|
||||
def set_separate_chapters_format(self, fmt):
|
||||
"""Set the format for separate chapters audio files."""
|
||||
self.separate_chapters_format = fmt
|
||||
|
||||
@@ -4,6 +4,20 @@ import sys
|
||||
import platform
|
||||
import atexit
|
||||
import signal
|
||||
|
||||
# Qt platform plugin detection (fixes #59)
|
||||
try:
|
||||
from PyQt5.QtCore import QLibraryInfo
|
||||
plugins = QLibraryInfo.location(QLibraryInfo.PluginsPath)
|
||||
platform_dir = os.path.join(plugins, "platforms")
|
||||
if os.path.isdir(platform_dir):
|
||||
os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = platform_dir
|
||||
print("QT_QPA_PLATFORM_PLUGIN_PATH set to:", platform_dir)
|
||||
else:
|
||||
print("PyQt5 platform plugins not found at", platform_dir)
|
||||
except ImportError:
|
||||
print("PyQt5 not installed.")
|
||||
|
||||
from PyQt5.QtWidgets import QApplication
|
||||
from PyQt5.QtGui import QIcon
|
||||
from PyQt5.QtCore import qInstallMessageHandler, QtMsgType
|
||||
|
||||
+125
-30
@@ -217,20 +217,33 @@ class QueueManager(QDialog):
|
||||
self.empty_overlay.hide()
|
||||
icon_provider = QFileIconProvider()
|
||||
for item in self.queue:
|
||||
# Determine display file path (prefer save_base_path for original file)
|
||||
display_file_path = getattr(item, "save_base_path", None) or item.file_name
|
||||
processing_file_path = item.file_name
|
||||
|
||||
# Only show the file name, not the full path
|
||||
file_name = item.file_name
|
||||
display_name = file_name
|
||||
display_name = display_file_path
|
||||
import os
|
||||
|
||||
if os.path.sep in file_name:
|
||||
display_name = os.path.basename(file_name)
|
||||
# Get icon for the file
|
||||
icon = icon_provider.icon(QFileInfo(file_name))
|
||||
if os.path.sep in display_file_path:
|
||||
display_name = os.path.basename(display_file_path)
|
||||
# Get icon for the display file
|
||||
icon = icon_provider.icon(QFileInfo(display_file_path))
|
||||
list_item = QListWidgetItem()
|
||||
# Set tooltip with detailed info
|
||||
output_folder = getattr(item, "output_folder", "")
|
||||
tooltip = (
|
||||
f"<b>Path:</b> {file_name}<br>"
|
||||
# For plain .txt inputs we don't need to show a separate processing file
|
||||
show_processing = True
|
||||
try:
|
||||
if isinstance(display_file_path, str) and display_file_path.lower().endswith('.txt'):
|
||||
show_processing = False
|
||||
except Exception:
|
||||
show_processing = True
|
||||
|
||||
tooltip = f"<b>Input File:</b> {display_file_path}<br>"
|
||||
if show_processing and processing_file_path and processing_file_path != display_file_path:
|
||||
tooltip += f"<b>Processing File:</b> {processing_file_path}<br>"
|
||||
tooltip += (
|
||||
f"<b>Language:</b> {getattr(item, 'lang_code', '')}<br>"
|
||||
f"<b>Speed:</b> {getattr(item, 'speed', '')}<br>"
|
||||
f"<b>Voice:</b> {getattr(item, 'voice', '')}<br>"
|
||||
@@ -246,10 +259,14 @@ class QueueManager(QDialog):
|
||||
)
|
||||
list_item.setToolTip(tooltip)
|
||||
list_item.setIcon(icon)
|
||||
list_item.setData(Qt.UserRole, file_name)
|
||||
# Store both paths for context menu
|
||||
list_item.setData(Qt.UserRole, {
|
||||
'display_path': display_file_path,
|
||||
'processing_path': processing_file_path
|
||||
})
|
||||
# Use custom widget for display
|
||||
char_count = getattr(item, "total_char_count", 0)
|
||||
widget = QueueListItemWidget(file_name, char_count)
|
||||
widget = QueueListItemWidget(display_file_path, char_count)
|
||||
self.listwidget.addItem(list_item)
|
||||
self.listwidget.setItemWidget(list_item, widget)
|
||||
self.update_button_states()
|
||||
@@ -372,6 +389,7 @@ class QueueManager(QDialog):
|
||||
|
||||
item = QueueItem()
|
||||
item.file_name = file_path
|
||||
item.save_base_path = file_path # For .txt files, processing and save paths are the same
|
||||
for attr, value in current_attrs.items():
|
||||
setattr(item, attr, value)
|
||||
# Read file content and calculate total_char_count using calculate_text_length
|
||||
@@ -405,6 +423,8 @@ class QueueManager(QDialog):
|
||||
== getattr(item, "total_char_count", None)
|
||||
and getattr(queued_item, "replace_single_newlines", False)
|
||||
== getattr(item, "replace_single_newlines", False)
|
||||
and getattr(queued_item, "save_base_path", None)
|
||||
== getattr(item, "save_base_path", None)
|
||||
):
|
||||
is_duplicate = True
|
||||
break
|
||||
@@ -473,42 +493,117 @@ class QueueManager(QDialog):
|
||||
from PyQt5.QtWidgets import QMessageBox
|
||||
|
||||
item = selected_items[0]
|
||||
file_path = item.data(Qt.UserRole)
|
||||
paths = item.data(Qt.UserRole)
|
||||
if isinstance(paths, dict):
|
||||
file_path = paths.get('display_path', paths.get('processing_path', ''))
|
||||
else:
|
||||
file_path = paths # Fallback for old format
|
||||
|
||||
# Find the queue item
|
||||
for q in self.queue:
|
||||
if q.file_name == file_path:
|
||||
if not os.path.exists(q.file_name):
|
||||
if (getattr(q, "save_base_path", None) == file_path or
|
||||
q.file_name == file_path):
|
||||
target_path = getattr(q, "save_base_path", None) or q.file_name
|
||||
if not os.path.exists(target_path):
|
||||
QMessageBox.warning(
|
||||
self, "File Not Found", f"The file does not exist."
|
||||
)
|
||||
return
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(q.file_name))
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(target_path))
|
||||
break
|
||||
|
||||
open_file_action.triggered.connect(open_file)
|
||||
menu.addAction(open_file_action)
|
||||
|
||||
# Add Go to folder action
|
||||
go_to_folder_action = QAction("Go to folder", self)
|
||||
# If the queued item represents a converted document (markdown, pdf, epub)
|
||||
# show two actions: Go to processed file (the cached .txt) and Go to input file (original source)
|
||||
item = selected_items[0]
|
||||
paths = item.data(Qt.UserRole)
|
||||
if isinstance(paths, dict):
|
||||
display_path = paths.get('display_path', '')
|
||||
processing_path = paths.get('processing_path', '')
|
||||
else:
|
||||
display_path = paths
|
||||
processing_path = paths
|
||||
|
||||
def go_to_folder():
|
||||
from PyQt5.QtWidgets import QMessageBox
|
||||
doc_exts = ('.md', '.markdown', '.pdf', '.epub')
|
||||
is_document_input = (
|
||||
isinstance(display_path, str) and display_path.lower().endswith(doc_exts)
|
||||
) or (
|
||||
isinstance(processing_path, str) and processing_path.lower().endswith(doc_exts)
|
||||
)
|
||||
|
||||
item = selected_items[0]
|
||||
file_path = item.data(Qt.UserRole)
|
||||
from PyQt5.QtWidgets import QMessageBox
|
||||
|
||||
def open_folder_for(path_label: str):
|
||||
# path_label should be either 'display' or 'processing'
|
||||
p = display_path if path_label == 'display' else processing_path
|
||||
if not p:
|
||||
QMessageBox.warning(self, "File Not Found", "Path is not available.")
|
||||
return
|
||||
# If the stored path is the display path (original) but the actual file may be
|
||||
# stored on the queue object differently, try to resolve via the queue entry.
|
||||
target_path = None
|
||||
for q in self.queue:
|
||||
if q.file_name == file_path:
|
||||
if not os.path.exists(q.file_name):
|
||||
QMessageBox.warning(
|
||||
self, "File Not Found", f"The file does not exist."
|
||||
)
|
||||
return
|
||||
folder = os.path.dirname(q.file_name)
|
||||
if os.path.exists(folder):
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(folder))
|
||||
if getattr(q, 'save_base_path', None) == display_path or q.file_name == display_path:
|
||||
if path_label == 'display':
|
||||
target_path = getattr(q, 'save_base_path', None) or q.file_name
|
||||
else:
|
||||
target_path = q.file_name
|
||||
break
|
||||
if getattr(q, 'save_base_path', None) == processing_path or q.file_name == processing_path:
|
||||
if path_label == 'display':
|
||||
target_path = getattr(q, 'save_base_path', None) or q.file_name
|
||||
else:
|
||||
target_path = q.file_name
|
||||
break
|
||||
# Fallback to the raw path if resolution failed
|
||||
if not target_path:
|
||||
target_path = p
|
||||
|
||||
go_to_folder_action.triggered.connect(go_to_folder)
|
||||
menu.addAction(go_to_folder_action)
|
||||
if not os.path.exists(target_path):
|
||||
QMessageBox.warning(self, "File Not Found", f"The file does not exist: {target_path}")
|
||||
return
|
||||
folder = os.path.dirname(target_path)
|
||||
if os.path.exists(folder):
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(folder))
|
||||
|
||||
if is_document_input:
|
||||
processed_action = QAction("Go to processed file", self)
|
||||
processed_action.triggered.connect(lambda: open_folder_for('processing'))
|
||||
menu.addAction(processed_action)
|
||||
|
||||
input_action = QAction("Go to input file", self)
|
||||
input_action.triggered.connect(lambda: open_folder_for('display'))
|
||||
menu.addAction(input_action)
|
||||
else:
|
||||
# Default behavior for non-document inputs: single "Go to folder" action
|
||||
go_to_folder_action = QAction("Go to folder", self)
|
||||
|
||||
def go_to_folder():
|
||||
item = selected_items[0]
|
||||
paths = item.data(Qt.UserRole)
|
||||
if isinstance(paths, dict):
|
||||
file_path = paths.get('display_path', paths.get('processing_path', ''))
|
||||
else:
|
||||
file_path = paths # Fallback for old format
|
||||
# Find the queue item
|
||||
for q in self.queue:
|
||||
if (getattr(q, "save_base_path", None) == file_path or q.file_name == file_path):
|
||||
target_path = getattr(q, "save_base_path", None) or q.file_name
|
||||
if not os.path.exists(target_path):
|
||||
QMessageBox.warning(
|
||||
self, "File Not Found", f"The file does not exist."
|
||||
)
|
||||
return
|
||||
folder = os.path.dirname(target_path)
|
||||
if os.path.exists(folder):
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(folder))
|
||||
break
|
||||
|
||||
go_to_folder_action.triggered.connect(go_to_folder)
|
||||
menu.addAction(go_to_folder_action)
|
||||
|
||||
elif len(selected_items) > 1:
|
||||
remove_action = QAction(f"Remove selected ({len(selected_items)})", self)
|
||||
|
||||
@@ -14,3 +14,4 @@ class QueuedItem:
|
||||
output_format: str
|
||||
total_char_count: int
|
||||
replace_single_newlines: bool = False
|
||||
save_base_path: str = None
|
||||
|
||||
@@ -11,6 +11,23 @@ from threading import Thread
|
||||
warnings.filterwarnings("ignore")
|
||||
|
||||
|
||||
def detect_encoding(file_path):
|
||||
import chardet
|
||||
import charset_normalizer
|
||||
with open(file_path, "rb") as f:
|
||||
raw_data = f.read()
|
||||
detected_encoding = None
|
||||
for detectors in (charset_normalizer, chardet):
|
||||
try:
|
||||
result = detectors.detect(raw_data)["encoding"]
|
||||
except Exception:
|
||||
continue
|
||||
if result is not None:
|
||||
detected_encoding = result
|
||||
break
|
||||
encoding = detected_encoding if detected_encoding else "utf-8"
|
||||
return encoding.lower()
|
||||
|
||||
def get_resource_path(package, resource):
|
||||
"""
|
||||
Get the path to a resource file, with fallback to local file system.
|
||||
|
||||
+2
-1
@@ -24,7 +24,8 @@ dependencies = [
|
||||
"pygame>=2.6.1",
|
||||
"charset_normalizer>=3.4.1",
|
||||
"chardet>=5.2.0",
|
||||
"static_ffmpeg>=2.13"
|
||||
"static_ffmpeg>=2.13",
|
||||
"Markdown>=3.9"
|
||||
]
|
||||
|
||||
classifiers = [
|
||||
|
||||
Reference in New Issue
Block a user