searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-23 05:14:27 +01:00
Code Issues Releases Wiki Activity

Merge pull request #388 from meilisearch/remove-synonyms-unwraps

Browse Source 
Remove unsound unwraps from the synonym routes
This commit is contained in:
Clément Renault 2019-12-09 17:06:02 +01:00 committed by GitHub
commit ee4e9dcc74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meilisearch-http/src/routes/synonym.rs
View File

@ -40,7 +40,7 @@ pub async fn list(ctx: Context<Data>) -> SResult<Response> {
.map_err(ResponseError::internal)?; .map_err(ResponseError::internal)?;
let synonyms_fst = synonyms_fst.unwrap_or_default(); let synonyms_fst = synonyms_fst.unwrap_or_default();
let synonyms_list = synonyms_fst.stream().into_strs().unwrap(); let synonyms_list = synonyms_fst.stream().into_strs().map_err(ResponseError::internal)?;
let mut response = HashMap::new(); let mut response = HashMap::new();
@ -49,12 +49,12 @@ pub async fn list(ctx: Context<Data>) -> SResult<Response> {
for synonym in synonyms_list { for synonym in synonyms_list {
let alternative_list = index_synonyms let alternative_list = index_synonyms
.synonyms(&reader, synonym.as_bytes()) .synonyms(&reader, synonym.as_bytes())
.unwrap() .map_err(ResponseError::internal)?;
.unwrap()
.stream() if let Some(list) = alternative_list {
.into_strs() let list = list.stream().into_strs().map_err(ResponseError::internal)?;
.unwrap(); response.insert(synonym, list);
response.insert(synonym, alternative_list); }
} }
Ok(tide::response::json(response)) Ok(tide::response::json(response))
@ -71,13 +71,14 @@ pub async fn get(ctx: Context<Data>) -> SResult<Response> {
let synonym_list = index let synonym_list = index
.synonyms .synonyms
.synonyms(&reader, synonym.as_bytes()) .synonyms(&reader, synonym.as_bytes())
.unwrap() .map_err(ResponseError::internal)?;
.unwrap()
.stream()
.into_strs()
.unwrap();
Ok(tide::response::json(synonym_list)) let list = match synonym_list {
Some(list) => list.stream().into_strs().map_err(ResponseError::internal)?,
None => Vec::new(),
};
Ok(tide::response::json(list))
} }
pub async fn create(mut ctx: Context<Data>) -> SResult<Response> { pub async fn create(mut ctx: Context<Data>) -> SResult<Response> {
@ -217,7 +218,7 @@ pub async fn clear(ctx: Context<Data>) -> SResult<Response> {
.map_err(ResponseError::internal)?; .map_err(ResponseError::internal)?;
let synonyms_fst = synonyms_fst.unwrap_or_default(); let synonyms_fst = synonyms_fst.unwrap_or_default();
let synonyms_list = synonyms_fst.stream().into_strs().unwrap(); let synonyms_list = synonyms_fst.stream().into_strs().map_err(ResponseError::internal)?;
let mut synonyms_deletion = index.synonyms_deletion(); let mut synonyms_deletion = index.synonyms_deletion();
for synonym in synonyms_list { for synonym in synonyms_list {