Merge pull request #29 from Guanran928/staging

Staging

Author: Guanran928

Cargo.lock

@@ -1,15 +1,17 @@
 { lib, rustPlatform }:
+let
+  cargoHash = "sha256-kTmN33oFodggtIwZo1Ex4slRSfYoYVOl7JVWxouVNOI=";
+in
 rec {
   default = rdict;
   rdict = rustPlatform.buildRustPackage {
+    inherit cargoHash;
+
     pname = "rdict";
     version = "0.1.0";
 
     src = lib.cleanSource ./.;
 
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-Oi1N29W7PzO4qucJ9ggTH/tLT6Tvd5Yx5+P1UwaIN4w=";
-
     buildAndTestSubdir = "./rdict-cli";
 
     preCheck = ''
@@ -23,14 +25,13 @@ rec {
   };
 
   rdict-telegram = rustPlatform.buildRustPackage {
+    inherit cargoHash;
+
     pname = "rdict-telegram";
     version = "0.1.0";
 
     src = lib.cleanSource ./.;
 
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-Oi1N29W7PzO4qucJ9ggTH/tLT6Tvd5Yx5+P1UwaIN4w=";
-
     buildAndTestSubdir = "./rdict-telegram";
 
     preCheck = ''

flake.lock

@@ -172,10 +172,10 @@ impl App {
                 let indented_output = format!("\n{indented_output}\n");
 
                 // If window is too small, output the result in a pager
-                let size =
-                    crossterm::terminal::window_size().context("Failed to get terminal size")?;
+                let (_, height) =
+                    crossterm::terminal::size().context("Failed to get terminal size")?;
                 // NOTE: Removed 4 lines for shell prompt.
-                if size.rows - 4 < indented_output.lines().count() as u16 {
+                if height - 4 < indented_output.lines().count() as u16 {
                     let mut terminal = ratatui::init();
                     (pager::Pager {
                         text: indented_output,

package.nix

@@ -23,6 +23,7 @@ serde_json = "1.0.140"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio"] }
 log = "0.4.27"
+once_cell = "1.21.3"
 
 [dev-dependencies]
 assert_cmd = "2.0.17"

rdict-cli/src/main.rs

@@ -1,4 +1,5 @@
 use anyhow::{Result, ensure};
+use once_cell::sync::Lazy;
 use scraper::{Html, Selector};
 use serde::{Deserialize, Serialize};
 
@@ -45,6 +46,26 @@ pub enum TranslationData {
     ToEnglish(ToEnglish),
 }
 
+macro_rules! selector {
+    ($css:expr) => {
+        Lazy::new(|| Selector::parse($css).expect(concat!("Invalid selector: ", $css)))
+    };
+}
+
+#[rustfmt::skip]
+mod selectors {
+    use super::*;
+
+    pub static PRONUNCIATION_SELECTOR:          Lazy<Selector> = selector!(".phone_con .per-phone .phonetic");
+    pub static MEANINGS_SELECTOR:               Lazy<Selector> = selector!(".trans-container .basic .word-exp");
+    pub static DEFINITIONS_SELECTOR:            Lazy<Selector> = selector!(".trans");
+    pub static PART_OF_SPEECH_SELECTOR:         Lazy<Selector> = selector!(".pos");
+    pub static EXAMPLE_SELECTOR:                Lazy<Selector> = selector!(".trans-container .mcols-layout .col2");
+    pub static EN_SELECTOR:                     Lazy<Selector> = selector!(".sen-eng");
+    pub static ZH_SELECTOR:                     Lazy<Selector> = selector!(".sen-ch");
+    pub static TO_ENGLISH_TRANSLATION_SELECTOR: Lazy<Selector> = selector!(".trans-container .basic .col2 .point");
+}
+
 /// Parses English, returns Chinese
 ///
 /// # Errors
@@ -59,11 +80,11 @@ pub fn to_chinese(input_text: &str, html: &str) -> Result<ToChinese> {
         ..Default::default()
     };
 
-    // Pronunciation
-    let pronunciation_selector = Selector::parse(".phone_con .per-phone .phonetic")
-        .map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-
-    for (i, element) in document.select(&pronunciation_selector).take(2).enumerate() {
+    for (i, element) in document
+        .select(&selectors::PRONUNCIATION_SELECTOR)
+        .take(2)
+        .enumerate()
+    {
         let text = element
             .text()
             .collect::<String>()
@@ -80,22 +101,14 @@ pub fn to_chinese(input_text: &str, html: &str) -> Result<ToChinese> {
         }
     }
 
-    // Translations
-    let meanings_selector = Selector::parse(".trans-container .basic .word-exp")
-        .map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-    let definitions_selector =
-        Selector::parse(".trans").map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-    let part_of_speech_selector =
-        Selector::parse(".pos").map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-
-    for element in document.select(&meanings_selector) {
+    for element in document.select(&selectors::MEANINGS_SELECTOR) {
         let part_of_speech = element
-            .select(&part_of_speech_selector)
+            .select(&selectors::PART_OF_SPEECH_SELECTOR)
             .next()
             .map(|e| e.text().collect::<String>().trim().to_owned());
 
         let definitions: Vec<String> = element
-            .select(&definitions_selector)
+            .select(&selectors::DEFINITIONS_SELECTOR)
             .next()
             .map(|e| {
                 e.text()
@@ -116,22 +129,15 @@ pub fn to_chinese(input_text: &str, html: &str) -> Result<ToChinese> {
     }
 
     // Example sentences
-    let example_selector = Selector::parse(".trans-container .mcols-layout .col2")
-        .map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-    let en_selector =
-        Selector::parse(".sen-eng").map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-    let zh_selector =
-        Selector::parse(".sen-ch").map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-
-    for element in document.select(&example_selector) {
+    for element in document.select(&selectors::EXAMPLE_SELECTOR) {
         let en = element
-            .select(&en_selector)
+            .select(&selectors::EN_SELECTOR)
             .next()
             .map(|e| e.text().collect::<String>().trim().to_owned())
             .unwrap_or_default();
 
         let zh = element
-            .select(&zh_selector)
+            .select(&selectors::ZH_SELECTOR)
             .next()
             .map(|e| e.text().collect::<String>().trim().to_owned())
             .unwrap_or_default();
@@ -167,32 +173,24 @@ pub fn to_english(input_text: &str, html: &str) -> Result<ToEnglish> {
     };
 
     // Meanings
-    let translation_selector = Selector::parse(".trans-container .basic .col2 .point")
-        .map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-    for element in document.select(&translation_selector) {
+    for element in document.select(&selectors::TO_ENGLISH_TRANSLATION_SELECTOR) {
         let text = element.text().collect::<String>().trim().to_owned();
         if !text.is_empty() {
             result.meanings.push(text);
         }
     }
 
     // Example sentences
-    let example_selector = Selector::parse(".trans-container .mcols-layout .col2")
-        .map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-    let en_selector =
-        Selector::parse(".sen-eng").map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-    let zh_selector =
-        Selector::parse(".sen-ch").map_err(|e| anyhow::anyhow!("Selector parse error: {}", e))?;
-
-    for element in document.select(&example_selector) {
+
+    for element in document.select(&selectors::EXAMPLE_SELECTOR) {
         let en = element
-            .select(&en_selector)
+            .select(&selectors::EN_SELECTOR)
             .next()
             .map(|el| el.text().collect::<String>().trim().to_owned())
             .unwrap_or_default();
 
         let zh = element
-            .select(&zh_selector)
+            .select(&selectors::ZH_SELECTOR)
             .next()
             .map(|el| el.text().collect::<String>().trim().to_owned())
             .unwrap_or_default();

rdict-core/Cargo.toml

@@ -83,10 +83,10 @@ async fn handle_command(bot: Bot, msg: Message, cmd: Command, client: Arc<Rdict>
 
     // TODO: Use `Dispatcher`'s `handle_error`.
     if let Err(e) = res {
-        log::error!("{e:?}");
+        log::error!("{e}");
         bot.send_message(
             msg.chat.id,
-            format!("❌ An error occurred. Please try again later.\n\nErr: {e}"),
+            format!("❌ An error occurred. Please try again later.\n\n{e:?}"),
         )
         .await
         .ok();