From dfe95e2a89b26a9ecc5dc44ef9d0370516a2d29b Mon Sep 17 00:00:00 2001 From: andromeda Date: Wed, 15 Apr 2026 11:30:12 +0200 Subject: [PATCH] use nanohtml2text fork instead of html2text --- Cargo.lock | 167 ++-------------------------------------------------- Cargo.toml | 6 +- src/main.rs | 26 ++++---- 3 files changed, 18 insertions(+), 181 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a3a612..274a996 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.1.0" dependencies = [ "anki_bridge", "crossterm", - "html2text", + "nanohtml2text", ] [[package]] @@ -149,12 +149,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "fastrand" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -170,29 +164,6 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" -[[package]] -name = "html2text" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d23156ea4dbe6b37ad48fab2da56ff27b0f6192fb5db210c44eb07bfe6e787" -dependencies = [ - "html5ever", - "nom", - "tendril", - "thiserror", - "unicode-width", -] - -[[package]] -name = "html5ever" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2" -dependencies = [ - "log", - "markup5ever", -] - [[package]] name = "http" version = "1.4.0" @@ -367,17 +338,6 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" -[[package]] -name = "markup5ever" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862" -dependencies = [ - "log", - "tendril", - "web_atoms", -] - [[package]] name = "maybe-async" version = "0.2.10" @@ -408,19 +368,9 @@ dependencies = [ ] [[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nom" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" -dependencies = [ - "memchr", -] +name = "nanohtml2text" +version = "0.2.1" +source = "git+https://git.mtgmonkey.net/Andromeda/nanohtml2text.git#113b87c8c8d5a51c113b92aa2d8ea1a28080cec9" [[package]] name = "num-conv" @@ -457,45 +407,6 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "phf" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" -dependencies = [ - "phf_shared", - "serde", -] - -[[package]] -name = "phf_codegen" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" -dependencies = [ - "fastrand", - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" -dependencies = [ - "siphasher", -] - [[package]] name = "potential_utf" version = "0.1.5" @@ -511,12 +422,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - [[package]] name = "proc-macro2" version = "1.0.106" @@ -658,12 +563,6 @@ dependencies = [ "libc", ] -[[package]] -name = "siphasher" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" - [[package]] name = "smallvec" version = "1.15.1" @@ -676,30 +575,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "string_cache" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901" -dependencies = [ - "new_debug_unreachable", - "parking_lot", - "phf_shared", - "precomputed-hash", -] - -[[package]] -name = "string_cache_codegen" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", -] - [[package]] name = "syn" version = "2.0.117" @@ -722,16 +597,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tendril" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4790fc369d5a530f4b544b094e31388b9b3a37c0f4652ade4505945f5660d24" -dependencies = [ - "new_debug_unreachable", - "utf-8", -] - [[package]] name = "thiserror" version = "2.0.18" @@ -799,12 +664,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unicode-width" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" - [[package]] name = "ureq" version = "3.3.0" @@ -845,12 +704,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf8-zero" version = "0.8.1" @@ -875,18 +728,6 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "web_atoms" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a9779e9f04d2ac1ce317aee707aa2f6b773afba7b931222bff6983843b1576" -dependencies = [ - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", -] - [[package]] name = "windows-link" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 65bd6f9..5b829f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2024" [dependencies] -[dependencies.html2text] -version = "0.16.7" -features = ["css"] +[dependencies.nanohtml2text] +git = "https://git.mtgmonkey.net/Andromeda/nanohtml2text.git" +version = "0.2.1" [dependencies.crossterm] version = "0.29.0" default-features = false diff --git a/src/main.rs b/src/main.rs index 9a95134..3eb93b8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,6 +6,7 @@ use crossterm::{ style::*, terminal::*, }; +use nanohtml2text::html2text; use std::io::stdout; const GOOD: char = '3'; @@ -39,7 +40,7 @@ fn init(anki: &AnkiClient) { fn prompt(anki: &AnkiClient) { let card = anki.request(GuiCurrentCardRequest {}).unwrap(); clear_screen(); - display_question(&card); + display_html(&card.question); loop { match event::read().unwrap() { Event::Key(e) => match e.code { @@ -51,7 +52,11 @@ fn prompt(anki: &AnkiClient) { } anki.request(GuiShowAnswerRequest {}).unwrap(); clear_screen(); - display_answer(&card); + { + let length = html2text(&card.question).len(); + let text = &html2text(&card.answer)[(2 + length)..]; + display_text(&text); + } display_prompt_text(":"); let ease = loop { let ease = match event::read().unwrap() { @@ -80,21 +85,12 @@ fn display_prompt_text(text: &str) { ); } -fn display_question(card: &GuiCurrentCardResponse) { - let text = html2text::from_read(card.question.as_bytes(), 80).unwrap(); - execute!( - stdout(), - SetForegroundColor(Color::DarkYellow), - Print(text), - ResetColor - ); +fn display_html(html: &str) { + let text = html2text(html); + display_text(&text); } -fn display_answer(card: &GuiCurrentCardResponse) { - let length = html2text::from_read(card.question.as_bytes(), 80) - .unwrap() - .len(); - let text = &html2text::from_read(card.answer.as_bytes(), 80).unwrap()[length..]; +fn display_text(text: &str) { execute!( stdout(), SetForegroundColor(Color::DarkYellow),