snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Update cli to latest indicatif crate version

Browse Source
This commit is contained in:
Loïc Lecrenier 2022-10-04 13:00:39 +02:00 committed by Loïc Lecrenier
parent 4c481a8947
commit c2ca259f48
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cli/src/main.rs
View File

@ -3,7 +3,7 @@ use std::fs::File;
use std::io::{stdin, BufRead, BufReader, Cursor, Read, Write}; use std::io::{stdin, BufRead, BufReader, Cursor, Read, Write};
use std::path::PathBuf; use std::path::PathBuf;
use std::str::FromStr; use std::str::FromStr;
use std::time::Instant; use std::time::{Duration, Instant};
use byte_unit::Byte; use byte_unit::Byte;
use eyre::Result; use eyre::Result;
@ -267,10 +267,6 @@ impl Performer for DocumentAddition {
return Err(error.into()); return Err(error.into());
} }
std::thread::spawn(move || {
progesses.join().unwrap();
});
let result = addition.execute()?; let result = addition.execute()?;
txn.commit()?; txn.commit()?;
@ -287,18 +283,19 @@ fn indexing_callback(step: milli::update::UpdateIndexingStep, bars: &[ProgressBa
let prev = &bars[step_index - 1]; let prev = &bars[step_index - 1];
if !prev.is_finished() { if !prev.is_finished() {
prev.disable_steady_tick(); prev.disable_steady_tick();
prev.finish_at_current_pos(); prev.finish();
} }
} }
let style = ProgressStyle::default_bar() let style = ProgressStyle::default_bar()
.progress_chars("##-")
.template("[eta: {eta_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7} {msg}") .template("[eta: {eta_precise}] {bar:40.cyan/blue} {pos:>7}/{len:7} {msg}")
.progress_chars("##-"); .unwrap();
match step { match step {
RemapDocumentAddition { documents_seen } => { RemapDocumentAddition { documents_seen } => {
bar.set_style(ProgressStyle::default_spinner()); bar.set_style(ProgressStyle::default_spinner());
bar.set_message(format!("remaped {} documents so far.", documents_seen)); bar.set_message(format!("remapped {} documents so far.", documents_seen));
} }
ComputeIdsAndMergeDocuments { documents_seen, total_documents } => { ComputeIdsAndMergeDocuments { documents_seen, total_documents } => {
bar.set_style(style); bar.set_style(style);
@ -319,7 +316,7 @@ fn indexing_callback(step: milli::update::UpdateIndexingStep, bars: &[ProgressBa
bar.set_position(databases_seen as u64); bar.set_position(databases_seen as u64);
} }
} }
bar.enable_steady_tick(200); bar.enable_steady_tick(Duration::from_millis(200));
} }
fn documents_from_jsonl(reader: impl Read) -> Result<Vec<u8>> { fn documents_from_jsonl(reader: impl Read) -> Result<Vec<u8>> {
@ -520,10 +517,6 @@ impl Performer for SettingsUpdate {
bars.push(bar); bars.push(bar);
} }
std::thread::spawn(move || {
progesses.join().unwrap();
});
update.execute(|step| indexing_callback(step, &bars))?; update.execute(|step| indexing_callback(step, &bars))?;
txn.commit()?; txn.commit()?;