snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 16:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestion

Browse Source 
- remove the payload_error_handler in favor of a PayloadError::from

- merge the two match branch into one

- makes the accepted content type a const instead of recalculating it for every error
This commit is contained in:
Tamo
2021-10-06 11:49:34 +02:00
parent 37b267ffb3
commit 9a1e44dc78
3 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
meilisearch-http/src/routes/indexes/documents.rs
View File

@ -6,6 +6,7 @@ use log::debug;
use meilisearch_lib::index_controller::{DocumentAdditionFormat, Update};
use meilisearch_lib::milli::update::IndexDocumentsMethod;
use meilisearch_lib::MeiliSearch;
use once_cell::sync::Lazy;
use serde::Deserialize;
use serde_json::Value;
use tokio::sync::mpsc;
@ -176,6 +177,13 @@ async fn document_addition(
body: Payload,
method: IndexDocumentsMethod,
) -> Result<HttpResponse, ResponseError> {
const ACCEPTED_CONTENT_TYPE: Lazy<Vec<String>> = Lazy::new(|| {
vec![
"application/json".to_string(),
"application/x-ndjson".to_string(),
"application/csv".to_string(),
]
});
let format = match content_type {
Some("application/json") => DocumentAdditionFormat::Json,
Some("application/x-ndjson") => DocumentAdditionFormat::Ndjson,
@ -183,21 +191,14 @@ async fn document_addition(
Some(other) => {
return Err(MeilisearchHttpError::InvalidContentType(
other.to_string(),
vec![
"application/json".to_string(),
"application/x-ndjson".to_string(),
"application/csv".to_string(),
],
ACCEPTED_CONTENT_TYPE.clone(),
)
.into())
}
None => {
return Err(MeilisearchHttpError::MissingContentType(vec![
"application/json".to_string(),
"application/x-ndjson".to_string(),
"application/csv".to_string(),
])
.into())
return Err(
MeilisearchHttpError::MissingContentType(ACCEPTED_CONTENT_TYPE.clone()).into(),
)
}
};