Merge pull request #98 from bugzmanov/pre_038

Pre 038

Author: bugzmanov

.gitignore

@@ -20,3 +20,4 @@ flamegraph.svg
 .claude/
 .agentastic/
 result/
+*.djvu

Cargo.toml

@@ -55,7 +55,7 @@ textwrap = "0.16"
 better-panic = "0.3"
 human-panic = "2.0"
 libc = "0.2"
-pprof = { version = "0.15", features = ["flamegraph", "protobuf-codec"] }
+pprof = { version = "0.15", features = ["flamegraph", "protobuf-codec"], optional = true }
 arboard = { version = "3.4", features = ["wayland-data-control"] }
 zip = { version = "0.6", default-features = false, features = ["deflate"] }
 tempfile = "3.8"
@@ -120,6 +120,7 @@ default = ["pdf"]
 test-utils = []
 serde = []
 pdf = ["mupdf", "flume", "wide", "lru", "rayon", "base64", "rdjvu"]
+profile = ["dep:pprof"]
 svg = ["resvg"]
 image-bmp = ["image/bmp"]
 image-tiff = ["image/tiff"]

README.md

@@ -74,6 +74,11 @@ xcode-select --install
 **Windows:**
 Install [Visual Studio Build Tools](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022) with the \"Desktop development with C++\" workload.
 
+> **Windows notes:**
+> - PDF/DJVU might not work in Windows PowerShell.
+> - For full Kitty graphics protocol support, consider using WSL with [Ghostty](https://ghostty.org/) or [Kitty](https://sw.kovidgoyal.net/kitty/).
+> - If MuPDF fails to build, disable PDF/DJVU support: `cargo install bookokrat --no-default-features`
+
 </details>
 
 ```bash

docs/index.html

@@ -810,6 +810,9 @@ <h2 class="section-title">Install</h2>
                                     <li>Windows: Visual Studio Build Tools with C++ workload.</li>
                                     <li>PDF/DJVU builds on Linux: <code>pkg-config</code>, <code>libfontconfig1-dev</code>, <code>clang</code>, <code>libclang-dev</code>.</li>
                                     <li>Without PDF/DJVU: <code>cargo install bookokrat --no-default-features</code>.</li>
+                                    <li>Windows: PDF/DJVU might not work in PowerShell. Consider using <a href="https://wezfurlong.org/wezterm/" style="color:var(--accent)">WezTerm</a> for image support.</li>
+                                    <li>Windows: for full Kitty protocol support, consider WSL with <a href="https://ghostty.org/" style="color:var(--accent)">Ghostty</a> or <a href="https://sw.kovidgoyal.net/kitty/" style="color:var(--accent)">Kitty</a>.</li>
+                                    <li>Windows: if MuPDF fails to build, disable PDF/DJVU: <code>cargo install bookokrat --no-default-features</code>.</li>
                                 </ul>
                             </div>
                         </details>
@@ -841,6 +844,9 @@ <h2 class="section-title">FAQ</h2>
                             <summary>Does it work on Windows?</summary>
                             <p class="section-desc" style="margin-top: 0.75rem;">
                                 Yes, via Cargo. Install the Visual Studio Build Tools with C++ workload.
+                                PDF/DJVU might not work in PowerShell.
+                                For full Kitty protocol support, consider WSL with Ghostty or Kitty.
+                                If MuPDF fails to build, use <code>--no-default-features</code> to disable PDF/DJVU.
                             </p>
                         </details>
                     </div>

readme.txt

@@ -38,7 +38,7 @@
     ▸ Reader normal mode with motions, counts, visual selection, and yanks
     ▸ Full keyboard and mouse control
     ▸ External EPUB reader integration
-    ▸ Performance profiling overlay
+    ▸ Performance profiling overlay (optional `profile` feature)
     ▸ Book statistics popup
     ▸ Settings popup for PDF support and render mode (Space+s / Ctrl+s)
     ▸ Multiple built-in color themes (Oceanic Next, Catppuccin, Kanagawa)
@@ -142,7 +142,7 @@
 │  d             Delete comment under cursor                                  │
 │  ss            Toggle raw HTML view (EPUB/HTML only)                        │
 │  Enter         Open image popup (when cursor on image)                      │
-│  p             Toggle performance profiler overlay                          │
+│  p             Toggle performance profiler overlay (`profile` builds)       │
 └─────────────────────────────────────────────────────────────────────────────┘
 
 ┌─────────────────────────────────────────────────────────────────────────────┐
@@ -271,7 +271,7 @@ PDF annotations require a graphics-capable terminal.
       • Windows: Calibre
 
   [PERFORMANCE PROFILING]
-    Press 'p' to toggle the performance profiler overlay:
+    Press 'p' to toggle the performance profiler overlay in `profile` builds:
       • FPS (frames per second)
       • Frame timing statistics
       • Rendering performance metrics

src/book_manager.rs

@@ -1,3 +1,4 @@
+use crate::parsing::html_to_markdown::{HtmlTitlePreference, extract_html_title};
 #[cfg(feature = "pdf")]
 use crate::settings::is_pdf_enabled;
 use crate::settings::{BookSortOrder, get_book_sort_order};
@@ -434,8 +435,7 @@ impl BookManager {
             .and_then(|name| name.to_str())
             .unwrap_or("HTML Document");
 
-        let title = self
-            .extract_html_title(html_content)
+        let title = extract_html_title(html_content, HtmlTitlePreference::TitleThenH1)
             .unwrap_or_else(|| filename.to_string());
 
         let temp_file =
@@ -560,30 +560,6 @@ impl BookManager {
         }
     }
 
-    fn extract_html_title(&self, content: &str) -> Option<String> {
-        // Try to extract title from <title> tag or <h1> tag
-        if let Some(start) = content.find("<title>") {
-            if let Some(end) = content[start + 7..].find("</title>") {
-                let title = &content[start + 7..start + 7 + end];
-                return Some(title.trim().to_string());
-            }
-        }
-
-        if let Some(start) = content.find("<h1") {
-            if let Some(tag_end) = content[start..].find('>') {
-                let content_start = start + tag_end + 1;
-                if let Some(end) = content[content_start..].find("</h1>") {
-                    let title = &content[content_start..content_start + end];
-                    // Remove any HTML tags from the title
-                    let clean_title = title.replace(['<', '>'], "");
-                    return Some(clean_title.trim().to_string());
-                }
-            }
-        }
-
-        None
-    }
-
     pub fn refresh_books(&mut self) {
         self.books = match self.library_mode {
             LibraryMode::Calibre => Self::discover_books_in_calibre_library(&self.scan_directory),

src/main_app.rs

@@ -12,7 +12,7 @@ use crate::jump_list::{JumpList, JumpLocation};
 use crate::markdown_text_reader::MarkdownTextReader;
 use crate::navigation_panel::{CurrentBookInfo, NavigationPanel, TableOfContents};
 use crate::notification::NotificationManager;
-use crate::parsing::text_generator::TextGenerator;
+use crate::parsing::html_to_markdown::extract_chapter_title;
 use crate::parsing::toc_parser::TocParser;
 use crate::reading_history::ReadingHistory;
 use crate::search::{SearchMode, SearchablePanel};
@@ -54,12 +54,13 @@ use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
 use anyhow::Result;
-use crossterm::event::{Event, KeyModifiers, MouseButton, MouseEvent, MouseEventKind};
+use crossterm::event::{
+    Event, KeyEventKind, KeyModifiers, MouseButton, MouseEvent, MouseEventKind,
+};
 use crossterm::execute;
 use crossterm::terminal::{EndSynchronizedUpdate, SetTitle};
 use epub::doc::EpubDoc;
 use log::{debug, error, info};
-use pprof::ProfilerGuard;
 use ratatui::{
     Terminal,
     layout::{Alignment, Constraint, Direction, Layout, Rect},
@@ -68,6 +69,11 @@ use ratatui::{
     widgets::{Block, Borders, Paragraph},
 };
 
+#[cfg(feature = "profile")]
+type ProfilerSlot = pprof::ProfilerGuard<'static>;
+#[cfg(not(feature = "profile"))]
+type ProfilerSlot = ();
+
 struct EpubBook {
     file: String,
     epub: EpubDoc<BufReader<std::fs::File>>,
@@ -139,7 +145,7 @@ pub struct App {
     reading_history: Option<ReadingHistory>,
     image_popup: Option<ImagePopup>,
     terminal_size: Rect,
-    profiler: Arc<Mutex<Option<ProfilerGuard<'static>>>>,
+    profiler: Arc<Mutex<Option<ProfilerSlot>>>,
     book_stat: BookStat,
     jump_list: JumpList,
     book_search: Option<BookSearch>,
@@ -528,7 +534,7 @@ impl App {
             last_terminal_title: None,
         };
 
-        // Fix incompatible PDF settings (e.g., Scroll mode in non-Kitty terminal)
+        // Fix incompatible PDF settings (e.g., Scroll mode without Kitty protocol)
         crate::settings::fix_incompatible_pdf_settings();
 
         let is_first_time_user = app.bookmarks.get_most_recent().is_none();
@@ -651,24 +657,33 @@ impl App {
         self.profiler.lock().unwrap().is_some()
     }
 
-    fn toggle_profiling(&self) {
-        let mut profiler_lock = self.profiler.lock().unwrap();
+    fn toggle_profiling(&mut self) {
+        #[cfg(feature = "profile")]
+        {
+            let mut profiler_lock = self.profiler.lock().unwrap();
 
-        if profiler_lock.is_none() {
-            debug!("Profiling started");
-            *profiler_lock = Some(pprof::ProfilerGuard::new(1000).unwrap());
-        } else {
-            debug!("Profiling stopped and saved");
+            if profiler_lock.is_none() {
+                debug!("Profiling started");
+                *profiler_lock = Some(pprof::ProfilerGuard::new(1000).unwrap());
+            } else {
+                debug!("Profiling stopped and saved");
 
-            if let Some(guard) = profiler_lock.take() {
-                if let Ok(report) = guard.report().build() {
-                    let file = std::fs::File::create("flamegraph.svg").unwrap();
-                    report.flamegraph(file).unwrap();
-                } else {
-                    debug!("Could not build profile report");
+                if let Some(guard) = profiler_lock.take() {
+                    if let Ok(report) = guard.report().build() {
+                        let file = std::fs::File::create("flamegraph.svg").unwrap();
+                        report.flamegraph(file).unwrap();
+                    } else {
+                        debug!("Could not build profile report");
+                    }
                 }
             }
         }
+
+        #[cfg(not(feature = "profile"))]
+        {
+            self.notifications
+                .warn("Profiling requires a build with the `profile` feature");
+        }
     }
 
     // =============================================================================
@@ -1542,7 +1557,7 @@ impl App {
         if let Some(book) = &mut self.current_book {
             let (content, title) = match book.epub.get_current_str() {
                 Some((raw_html, _mime)) => {
-                    let title = TextGenerator::extract_chapter_title(&raw_html);
+                    let title = extract_chapter_title(&raw_html);
                     (raw_html, title)
                 }
                 None => {
@@ -5210,7 +5225,7 @@ impl App {
         for chapter_index in 0..doc.get_num_chapters() {
             if doc.set_current_chapter(chapter_index) {
                 if let Some((raw_html, _mime)) = doc.get_current_str() {
-                    let title = TextGenerator::extract_chapter_title(&raw_html)
+                    let title = extract_chapter_title(&raw_html)
                         .unwrap_or_else(|| format!("Chapter {}", chapter_index + 1));
 
                     let markdown_doc = converter.convert(&raw_html);
@@ -5918,6 +5933,12 @@ where
             let event = event_source.read()?;
             events_processed += 1;
 
+            // On Windows, crossterm emits both Press and Release key events.
+            // Ignore Release (and Repeat) to prevent double-processing.
+            if matches!(&event, Event::Key(k) if k.kind != KeyEventKind::Press) {
+                continue;
+            }
+
             // Route events to PDF handler when in PDF mode AND (focused on PDF content OR popup is active)
             #[cfg(feature = "pdf")]
             if app.is_pdf_mode()