Merge branch 'allow-multiple-keywords-in-search' of https://github.com/pwoolcoc/crates.io into pwoolcoc-allow-multiple-keywords-in-search

Author: sgrif

Cargo.lock

@@ -59,6 +59,7 @@ scheduled-thread-pool = "0.2.0"
 derive_deref = "1.0.0"
 reqwest = "0.9.1"
 tempdir = "0.3.7"
+collecting-hashmap = "0.2"
 parking_lot = "0.7.1"
 jemallocator = { version = "0.1.8", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
 jemalloc-ctl = "0.2.0"

Cargo.toml

@@ -11,6 +11,7 @@ mod prelude {
     pub use crate::middleware::app::RequestApp;
     pub use crate::middleware::current_user::RequestUser;
 
+    use collecting_hashmap::CollectingHashMap;
     use std::collections::HashMap;
     use std::io;
 
@@ -21,7 +22,7 @@ mod prelude {
         fn redirect(&self, url: String) -> Response;
 
         fn json<T: Serialize>(&self, t: &T) -> Response;
-        fn query(&self) -> HashMap<String, String>;
+        fn query(&self) -> CollectingHashMap<String, String>;
         fn wants_json(&self) -> bool;
         fn pagination(&self, default: usize, max: usize) -> CargoResult<(i64, i64)>;
     }
@@ -31,7 +32,7 @@ mod prelude {
             crate::util::json_response(t)
         }
 
-        fn query(&self) -> HashMap<String, String> {
+        fn query(&self) -> CollectingHashMap<String, String> {
             url::form_urlencoded::parse(self.query_string().unwrap_or("").as_bytes())
                 .map(|(a, b)| (a.into_owned(), b.into_owned()))
                 .collect()

src/controllers.rs

@@ -99,14 +99,16 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
         );
     }
 
-    if let Some(kw) = params.get("keyword") {
+    if let Some(kws) = params.get_all("keyword") {
         has_filter = true;
+        use diesel::dsl::any;
+        let names: Vec<_> = kws.iter().map(|name| name.to_lowercase()).collect();
         query = query.filter(
             crates::id.eq_any(
                 crates_keywords::table
                     .select(crates_keywords::crate_id)
                     .inner_join(keywords::table)
-                    .filter(crate::lower(keywords::keyword).eq(crate::lower(kw))),
+                    .filter(crate::lower(keywords::keyword).eq(any(names))),
             ),
         );
     } else if let Some(letter) = params.get("letter") {

src/controllers/krate/search.rs

@@ -117,28 +117,34 @@ fn index_queries() {
         CrateBuilder::new("foo", user.id)
             .keyword("kw3")
             .expect_build(conn);
+
+        CrateBuilder::new("two-keywords", user.id)
+            .keyword("kw1")
+            .keyword("kw3")
+            .expect_build(conn);
         (krate, krate2)
     });
 
     assert_eq!(anon.search("q=baz").meta.total, 0);
 
     // All of these fields should be indexed/searched by the queries
     assert_eq!(anon.search("q=foo").meta.total, 2);
-    assert_eq!(anon.search("q=kw1").meta.total, 2);
+    assert_eq!(anon.search("q=kw1").meta.total, 3);
     assert_eq!(anon.search("q=readme").meta.total, 1);
     assert_eq!(anon.search("q=description").meta.total, 1);
 
-    assert_eq!(anon.search_by_user_id(user.id).crates.len(), 3);
+    assert_eq!(anon.search_by_user_id(user.id).crates.len(), 4);
     assert_eq!(anon.search_by_user_id(0).crates.len(), 0);
 
     assert_eq!(anon.search("letter=F").crates.len(), 2);
     assert_eq!(anon.search("letter=B").crates.len(), 1);
     assert_eq!(anon.search("letter=b").crates.len(), 1);
     assert_eq!(anon.search("letter=c").crates.len(), 0);
 
-    assert_eq!(anon.search("keyword=kw1").crates.len(), 2);
-    assert_eq!(anon.search("keyword=KW1").crates.len(), 2);
+    assert_eq!(anon.search("keyword=kw1").crates.len(), 3);
+    assert_eq!(anon.search("keyword=KW1").crates.len(), 3);
     assert_eq!(anon.search("keyword=kw2").crates.len(), 0);
+    assert_eq!(anon.search("keyword=kw1&keyword=kw3").crates.len(), 1);
 
     assert_eq!(anon.search("q=foo&keyword=kw1").crates.len(), 1);
     assert_eq!(anon.search("q=foo2&keyword=kw1").crates.len(), 0);