Move item scoring logic into its own module

Author: Kn4ughty

src/apps/mod.rs

@@ -14,6 +14,7 @@ pub mod mac_apps;
 use crate::constants;
 use crate::module::{Module, ModuleMessage};
 use crate::serworse;
+use crate::sorting;
 use crate::util;
 use crate::widglets;
 
@@ -206,12 +207,10 @@ impl AppModule {
         let start = std::time::Instant::now();
         // Cached_key seems to be much faster which is interesting since text_value is
         // always changing
-        let input = &input.to_lowercase();
+        // let input = &input.to_lowercase();
         self.app_list.sort_by_cached_key(|app| {
-            let mut score = util::longest_common_substr(&app.name.to_lowercase(), input);
-            if app.name.to_lowercase().starts_with(input) {
-                score += 2;
-            }
+            let mut score = sorting::score_element(&input, &app.name);
+
             if let Some(raw_freq) = self.app_frequencies.get(&app.name) {
                 // Preview: https://www.desmos.com/calculator/vyac5ua1as
                 score += (*raw_freq as f32).ln().mul(0.75).max(0.0).floor() as i32;

src/drun/mod.rs

@@ -3,7 +3,7 @@ use std::io::Write;
 
 use crate::{
     module::{Module, ModuleMessage},
-    util, widglets,
+    sorting, widglets,
 };
 
 pub struct Drun {
@@ -40,16 +40,8 @@ impl Module for Drun {
     fn update(&mut self, msg: ModuleMessage) -> iced::Task<ModuleMessage> {
         match msg {
             ModuleMessage::TextChanged(input) => {
-                self.text_input = input.clone();
-                let input = &input.to_lowercase();
-                self.options.sort_by_cached_key(|opt| {
-                    // Not a fan of this duplicated logic from app/mod.rs
-                    let mut score = util::longest_common_substr(opt, input);
-                    if opt.to_lowercase().starts_with(input) {
-                        score += 2;
-                    }
-                    -score
-                });
+                self.options
+                    .sort_by_cached_key(|opt| -sorting::score_element(&input, opt));
                 Task::none()
             }
             ModuleMessage::ActivatedIndex(i) => {

src/lib.rs

@@ -9,4 +9,5 @@ pub mod widglets;
 
 mod constants;
 mod message;
+mod sorting;
 mod util;

src/main.rs

@@ -21,6 +21,7 @@ use drun::Drun;
 mod constants;
 mod module;
 mod serworse;
+mod sorting;
 mod util;
 mod widglets;
 use module::{Module, ModuleMessage};

src/sorting.rs

@@ -0,0 +1,49 @@
+/// Returns positive score, required to negate for use
+pub fn score_element(user_input: &str, element_text: &str) -> i32 {
+    let input = user_input.to_lowercase();
+    let mut score = longest_common_substr(element_text, &input);
+    if element_text.to_lowercase().starts_with(&input) {
+        score += 2;
+    }
+    score
+}
+
+// https://www.geeksforgeeks.org/dsa/longest-common-substring-dp-29/
+fn longest_common_substr(s1: &str, s2: &str) -> i32 {
+    // Stringslice?
+
+    let s1: Vec<char> = s1.chars().collect();
+    let s2: Vec<char> = s2.chars().collect();
+
+    let m = s1.len();
+    let n = s2.len();
+
+    let mut prev = vec![0; n + 1];
+
+    let mut res: i32 = 0;
+
+    for i in 1..m + 1 {
+        let mut curr = vec![0; n + 1];
+        for j in 1..n + 1 {
+            if s1[i - 1] == s2[j - 1] {
+                curr[j] = prev[j - 1] + 1;
+                res = res.max(curr[j]);
+            } else {
+                curr[j] = 0;
+            }
+        }
+        prev = curr;
+    }
+
+    res
+}
+
+#[test]
+fn longest_common_substr_correct() {
+    assert_eq!(longest_common_substr("hello world", "world"), 5);
+    assert_eq!(
+        longest_common_substr("geeksforgeeks", "ggeegeeksquizpractice"),
+        5
+    );
+    assert_eq!(longest_common_substr("", ""), 0);
+}

src/util.rs

@@ -3,46 +3,6 @@ use std::ffi::OsStr;
 use std::io;
 use std::process;
 
-// https://www.geeksforgeeks.org/dsa/longest-common-substring-dp-29/
-pub fn longest_common_substr(s1: &str, s2: &str) -> i32 {
-    // Stringslice?
-
-    let s1: Vec<char> = s1.chars().collect();
-    let s2: Vec<char> = s2.chars().collect();
-
-    let m = s1.len();
-    let n = s2.len();
-
-    let mut prev = vec![0; n + 1];
-
-    let mut res: i32 = 0;
-
-    for i in 1..m + 1 {
-        let mut curr = vec![0; n + 1];
-        for j in 1..n + 1 {
-            if s1[i - 1] == s2[j - 1] {
-                curr[j] = prev[j - 1] + 1;
-                res = res.max(curr[j]);
-            } else {
-                curr[j] = 0;
-            }
-        }
-        prev = curr;
-    }
-
-    res
-}
-
-#[test]
-fn longest_common_substr_correct() {
-    assert_eq!(longest_common_substr("hello world", "world"), 5);
-    assert_eq!(
-        longest_common_substr("geeksforgeeks", "ggeegeeksquizpractice"),
-        5
-    );
-    assert_eq!(longest_common_substr("", ""), 0);
-}
-
 #[cfg(unix)]
 pub fn execute_command_detached<S, I>(
     cmd: S,