From fbecddcfdcfd40149582ea5469a697f0cd3d70dd Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Thu, 22 Apr 2021 16:35:33 +0200
Subject: [PATCH] Fix regular search not being sorted

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 Cargo.toml    |  2 +-
 src/search.rs | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2f75d25..e9e8f3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xkcd-search"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["trivernis <trivernis@protonmail.com>"]
 edition = "2018"
 readme = "README.md"
diff --git a/src/search.rs b/src/search.rs
index 0ca19a1..c8f980c 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -10,17 +10,27 @@ pub async fn search(query: &str) -> XKCDResult<Vec<(String, u32)>> {
         .into_iter()
         .map(|s| s.to_lowercase())
         .collect();
-    let entries = archive
+    let mut entries: Vec<(usize, String, u32)> = archive
         .into_iter()
-        .filter(|(key, _)| {
-            words
+        .filter_map(|(key, id)| {
+            let score = words
                 .iter()
-                .find(|w| key.to_lowercase().contains(*w))
-                .is_some()
+                .filter(|w| key.to_lowercase().contains(*w))
+                .count();
+            if score <= 0 {
+                None
+            } else {
+                Some((score, key, id))
+            }
         })
         .collect();
+    entries.sort_by_key(|(s, _, _)| *s);
+    entries.reverse();
 
-    Ok(entries)
+    Ok(entries
+        .into_iter()
+        .map(|(_, title, id)| (title, id))
+        .collect())
 }
 
 /// Searches for a comic with a fuzzy compare function that assigns a score