fix multi search bug; iced updates; speed up gui; speed up error list…

…; update depends
griccardos · Nov 25, 2023 · 216f085 · 216f085
1 parent 8a60d0b
commit 216f085
Show file tree

Hide file tree

Showing 23 changed files with 1,663 additions and 961 deletions.
diff --git a/dioxus/Cargo.lock b/dioxus/Cargo.lock
diff --git a/dioxus/Cargo.toml b/dioxus/Cargo.toml
@@ -8,11 +8,11 @@ build = "build.rs"
 
 [dependencies]
 librusl = {path="../librusl"}
-dioxus = "0.4.0"
-tokio = "1.32.0" #for dioxus
-futures-channel = "0.3.28" #for dioxus
-dioxus-desktop = "0.4.0"
-image = "0.24.7"
+dioxus = "0.4"
+tokio = "1.32" #for dioxus
+futures-channel = "0.3" #for dioxus
+dioxus-desktop = "0.4"
+image = "0.24"
 
 
 [build-dependencies]

diff --git a/dioxus/src/main.rs b/dioxus/src/main.rs
@@ -70,6 +70,7 @@ fn app(cx: Scope<()>) -> Element {
                                         name: "".to_string(),
                                         is_folder: false,
                                         plugin: None,
+                                        ranges: vec![],
                                     });
                                 };
                                 message.set(format!("Found {} in {:.2}s", found_count, fe.duration.as_secs_f32()));
@@ -93,10 +94,12 @@ fn app(cx: Scope<()>) -> Element {
                                         name: "".to_string(),
                                         is_folder: false,
                                         plugin: None,
+                                        ranges: vec![],
                                     });
                                 }
                             }
                             librusl::manager::SearchResult::SearchErrors(_) => { /*todo show errors*/ }
+                            librusl::manager::SearchResult::SearchCount(_) => {}
                         }
                     }
 
@@ -160,12 +163,14 @@ fn app(cx: Scope<()>) -> Element {
                             } else {
                                 message.set("Searching".to_string());
                                 man.with_mut(|x| {
-                                    x.search(Search {
-                                        name_text: text_name.to_string(),
-                                        contents_text: text_contents.to_string(),
-                                        dir: text_dir.to_string(),
-                                        ..Default::default()
-                                    })
+                                    x.search(
+                                        &Search {
+                                            name_text: text_name.to_string(),
+                                            contents_text: text_contents.to_string(),
+                                            dir: text_dir.to_string(),
+                                            ..Default::default()
+                                        },
+                                    )
                                 });
                             }
                         },

diff --git a/druid/Cargo.lock b/druid/Cargo.lock
diff --git a/druid/Cargo.toml b/druid/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rusl"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 build = "build.rs"
 description = "search gui"
@@ -9,7 +9,7 @@ description = "search gui"
 librusl = { path="../librusl"}
 rfd = "0.11" #for selecting directory for gui
 druid  ={ version = "0.8.3", features = ["im", "raw-win-handle"] } #GUI
-regex = "1.9"
+regex = "1.9" 
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["windef"] } #for icon in windows