Database loading and better calculations

Cargo.toml

@@ -12,6 +12,7 @@ arboard = "3.6.1"
 block2 = "0.6.2"
 crossbeam-channel = "0.5.15"
 emojis = "0.8.0"
+evalexpr = "13.1.0"
 global-hotkey = "0.7.0"
 hex = "0.4.3"
 iced = { version = "0.14.0", features = ["image", "tokio"] }

src/app.rs

@@ -169,6 +169,7 @@ pub enum Message {
     SimulatePaste(i32),
     OpenSettingsWindow,
     SettingsWindowOpened(window::Id),
+    LoadClipboardData(u32),
 }
 
 #[derive(Debug, Clone)]

src/app/pages/clipboard.rs

@@ -78,6 +78,11 @@ pub fn clipboard_view(
                         .map(|(i, content)| {
                             content.render_row(i == focussed_id as usize, &row_render_theme)
                         }),
+                ).push(
+                    Button::new("Load 100 more items")
+                        .width(Length::Fill)
+                        .on_press(Message::LoadClipboardData(clipboard_content.len() as u32 + 100))
+                        .style(open_button_style)
                 )
                 .width((WINDOW_WIDTH + 50.) / 3.),
                 Direction::Vertical(Scrollbar::hidden()),

src/app/tile/elm.rs

@@ -81,8 +81,6 @@ pub fn new(hotkeys: Hotkeys, config: &Config) -> (Tile, Task<Message>) {
 
     let conn = database::initialise_database();
 
-    let clipboard_content = load_clipboard(&conn);
-
     (
         Tile {
             update_available: false,
@@ -101,7 +99,7 @@ pub fn new(hotkeys: Hotkeys, config: &Config) -> (Tile, Task<Message>) {
             config: config.clone(),
             ranking,
             theme: config.theme.to_owned().clone().into(),
-            clipboard_content,
+            clipboard_content: vec![],
             tray_icon: None,
             sender: None,
             page: Page::Main,
@@ -114,7 +112,10 @@ pub fn new(hotkeys: Hotkeys, config: &Config) -> (Tile, Task<Message>) {
             previous_input_source: None,
             conn,
         },
-        Task::batch([open.map(|_| Message::OpenWindow)]),
+        Task::batch([
+            open.map(|_| Message::OpenWindow),
+            Task::done(Message::LoadClipboardData(300)),
+        ]),
     )
 }
 

src/app/tile/update.rs

@@ -38,12 +38,14 @@ use crate::app::settings_window_settings;
 use crate::app::tile::AppIndex;
 use crate::app::{Message, Page, tile::Tile};
 use crate::autoupdate::download_latest_app;
-use crate::calculator::Expr;
+
+use crate::clipboard::ClipBoardContentType;
 use crate::commands::Function;
 use crate::config::Config;
 use crate::config::MainPage;
 use crate::config::Position;
 use crate::config::ThemeMode;
+use crate::database::load_clipboard;
 use crate::database::store_clipboard_content;
 use crate::debounce::DebouncePolicy;
 use crate::platform::macos::events::Event;
@@ -69,7 +71,7 @@ fn extract_target(url: &Url) -> Option<String> {
 enum QueryAction {
     OpenWebsite(String),
     UnitConversions(Vec<unit_conversion::ConversionResult>),
-    Calculation(Expr),
+    Calculation(String),
     GoogleSearch(String),
     ShellCommand(String),
     ShowFavourites,
@@ -94,8 +96,8 @@ fn classify_query_action(page: &Page, query: &str, query_lc: &str) -> Option<Que
         Some(QueryAction::OpenWebsite(query.to_string()))
     } else if let Some(conversions) = unit_conversion::convert_query(query) {
         Some(QueryAction::UnitConversions(conversions))
-    } else if let Ok(expr) = Expr::from_str(query) {
-        Some(QueryAction::Calculation(expr))
+    } else if let Ok(expr) = evalexpr::eval(query) {
+        Some(QueryAction::Calculation(expr.to_string()))
     } else if query.ends_with('?') || query.split_whitespace().nth(2).is_some() {
         Some(QueryAction::GoogleSearch(query.to_string()))
     } else {
@@ -146,6 +148,13 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             tile.events = Event::get_events(tile.config.event_duration);
             Task::none()
         }
+
+        Message::LoadClipboardData(limit) => {
+            info!("Loading {} clipboard items.", limit);
+            tile.clipboard_content = load_clipboard(&tile.conn, limit);
+            Task::none()
+        }
+
         Message::UriReceived(uri) => {
             let Ok(url) = Url::parse(&uri) else {
                 return Task::none();
@@ -659,14 +668,10 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             }
             match action {
                 Editable::Create(content) => {
-                    if tile.clipboard_content.len() >= 300 {
-                        //  hard limit of 300 items at once
-                        tile.clipboard_content.pop();
-                    }
-
                     if !tile.clipboard_content.contains(&content) {
                         store_clipboard_content(&tile.conn, &content);
                         tile.clipboard_content.insert(0, content);
+                        tile.clipboard_content.truncate(300);
                         return Task::none();
                     }
 
@@ -684,6 +689,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
 
                     tile.clipboard_content = new_content_vec;
                     tile.clipboard_content.insert(0, content);
+                    tile.clipboard_content.truncate(300);
                 }
                 Editable::Delete(content) => {
                     tile.clipboard_content = tile
@@ -1372,13 +1378,15 @@ fn execute_query(tile: &mut Tile, id: Id) -> Task<Message> {
             .map(|conversion| conversion.to_app())
             .collect();
         return resize_task(id, tile.results.len() as u32);
-    } else if let Ok(res) = Expr::from_str(&tile.query) {
+    } else if let Ok(res) = evalexpr::eval(&tile.query) {
         tile.results.push(App {
             ranking: 0,
-            open_command: AppCommand::Function(Function::Calculate(res.clone())),
+            open_command: AppCommand::Function(Function::CopyToClipboard(
+                ClipBoardContentType::Text(res.to_string()),
+            )),
             desc: RUSTCAST_DESC_NAME.to_string(),
             icons: AppIcon::None,
-            display_name: res.eval().map(|x| x.to_string()).unwrap_or("".to_string()),
+            display_name: res.to_string(),
             search_name: "".to_string(),
         });
         return single_item_resize_task(id);