aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace PlumeRocket.conn with DbConn

Browse Source
This commit is contained in:
Kitaiti Makoto
2021-01-30 21:44:29 +09:00
parent 78be49d57d
commit ad285898f6
20 changed files with 496 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/search.rs
+4 -5
View File
@@ -3,7 +3,7 @@ use rocket::request::Form;
use crate::routes::Page;
use crate::template_utils::{IntoContext, Ructe};
use plume_models::{search::Query, PlumeRocket};
use plume_models::{db_conn::DbConn, search::Query, PlumeRocket};
use std::str::FromStr;
#[derive(Default, FromForm)]
@@ -50,8 +50,7 @@ macro_rules! param_to_query {
}
#[get("/search?<query..>")]
pub fn search(query: Option<Form<SearchQuery>>, rockets: PlumeRocket) -> Ructe {
let conn = &*rockets.conn;
pub fn search(query: Option<Form<SearchQuery>>, conn: DbConn, rockets: PlumeRocket) -> Ructe {
let query = query.map(Form::into_inner).unwrap_or_default();
let page = query.page.unwrap_or_default();
let mut parsed_query =
@@ -65,7 +64,7 @@ pub fn search(query: Option<Form<SearchQuery>>, rockets: PlumeRocket) -> Ructe {
if str_query.is_empty() {
render!(search::index(
&rockets.to_context(),
&(&conn, &rockets).to_context(),
&format!("{}", Utc::today().format("%Y-%m-d"))
))
} else {
@@ -74,7 +73,7 @@ pub fn search(query: Option<Form<SearchQuery>>, rockets: PlumeRocket) -> Ructe {
.search_document(&conn, parsed_query, page.limits());
let next_page = if res.is_empty() { 0 } else { page.0 + 1 };
render!(search::result(
&rockets.to_context(),
&(&conn, &rockets).to_context(),
&str_query,
res,
page.0,