1
0
Mirror von https://github.com/Chaoscaot/schemsearch synchronisiert 2024-11-19 10:20:08 +01:00

Slowdown ProgressBar and add Stderr as output

Dieser Commit ist enthalten in:
Chaoscaot 2023-04-01 11:02:49 +02:00
Ursprung 818de6be47
Commit c477a52f92
2 geänderte Dateien mit 13 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -94,7 +94,7 @@ fn main() {
) )
.arg( .arg(
Arg::new("output") Arg::new("output")
.help("The output format and path [Format:Path] available formats: text, json, csv; available paths: std, (file path)") .help("The output format and path [Format:Path] available formats: text, json, csv; available paths: std, err, (file path)")
.short('o') .short('o')
.long("output") .long("output")
.action(ArgAction::Append) .action(ArgAction::Append)
@ -246,7 +246,11 @@ fn main() {
ThreadPoolBuilder::new().num_threads(*matches.get_one::<usize>("threads").expect("Could not get threads")).build_global().unwrap(); ThreadPoolBuilder::new().num_threads(*matches.get_one::<usize>("threads").expect("Could not get threads")).build_global().unwrap();
let matches: Vec<SearchResult> = schematics.par_iter().progress_with_style(ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}").unwrap()).map(|schem| { let bar = ProgressBar::new(schematics.len() as u64);
bar.set_style(ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}").unwrap());
bar.set_draw_target(ProgressDrawTarget::stderr_with_hz(5));
let matches: Vec<SearchResult> = schematics.par_iter().progress_with(bar).map(|schem| {
match schem { match schem {
SchematicSupplierType::PATH(schem) => { SchematicSupplierType::PATH(schem) => {
let schematic = match load_schem(&schem.path) { let schematic = match load_schem(&schem.path) {
@ -271,7 +275,7 @@ fn main() {
} }
} }
Err(e) => { Err(e) => {
println!("Error while loading schematic ({}): {}", schem.get_name(), e.to_string()); eprintln!("Error while loading schematic ({}): {}", schem.get_name(), e.to_string());
SearchResult { SearchResult {
name: schem.get_name(), name: schem.get_name(),
matches: Vec::default() matches: Vec::default()

Datei anzeigen

@ -2,12 +2,15 @@ use std::fs::File;
use std::io::BufWriter; use std::io::BufWriter;
use std::str::FromStr; use std::str::FromStr;
use std::io::Write; use std::io::Write;
use std::time::Duration;
use indicatif::HumanDuration;
use schemsearch_lib::{Match, SearchBehavior}; use schemsearch_lib::{Match, SearchBehavior};
use crate::json_output::{EndEvent, FoundEvent, InitEvent, JsonEvent}; use crate::json_output::{EndEvent, FoundEvent, InitEvent, JsonEvent};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum OutputSink { pub enum OutputSink {
Stdout, Stdout,
Stderr,
File(String), File(String),
} }
@ -37,6 +40,7 @@ impl FromStr for OutputSink {
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
match s { match s {
"std" => Ok(OutputSink::Stdout), "std" => Ok(OutputSink::Stdout),
"err" => OK(OutputSink::Stderr),
_ => Ok(OutputSink::File(s.to_string())) _ => Ok(OutputSink::File(s.to_string()))
} }
} }
@ -46,6 +50,7 @@ impl OutputSink {
pub fn output(&self) -> Box<dyn Write> { pub fn output(&self) -> Box<dyn Write> {
match self { match self {
OutputSink::Stdout => Box::new(std::io::stdout().lock()), OutputSink::Stdout => Box::new(std::io::stdout().lock()),
OutputSink::Stderr => Box::new(std::io::stderr().lock()),
OutputSink::File(path) => Box::new(BufWriter::new(File::create(path).unwrap())) OutputSink::File(path) => Box::new(BufWriter::new(File::create(path).unwrap()))
} }
} }
@ -77,7 +82,7 @@ impl OutputFormat {
pub fn end(&self, end_time: u128) -> String { pub fn end(&self, end_time: u128) -> String {
match self { match self {
OutputFormat::Text => format!("Search complete in {}s\n", end_time / 1000), OutputFormat::Text => format!("Search complete in {}\n", HumanDuration(Duration::from_millis(end_time as u64))),
OutputFormat::CSV => format!("{}\n", end_time), OutputFormat::CSV => format!("{}\n", end_time),
OutputFormat::JSON => format!("{}\n", serde_json::to_string(&JsonEvent::End(EndEvent{ end_time })).unwrap()) OutputFormat::JSON => format!("{}\n", serde_json::to_string(&JsonEvent::End(EndEvent{ end_time })).unwrap())
} }