arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Add warning to vpv if no input is given

Browse Source
This commit is contained in:
Alexandre Bury 2019-05-15 12:18:26 -07:00
parent 859c12320f
commit 5ee7e11619
2 changed files with 97 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -76,6 +76,7 @@ signal-hook = "0.1.8"
[dev-dependencies] [dev-dependencies]
rand = "0.6.5" rand = "0.6.5"
pretty-bytes = "0.2.2" pretty-bytes = "0.2.2"
atty = "0.2.11"
[features] [features]
blt-backend = ["bear-lib-terminal"] blt-backend = ["bear-lib-terminal"]

181
examples/vpv.rs
View File

@ -1,6 +1,3 @@
extern crate cursive;
extern crate pretty_bytes;
use std::io; use std::io;
use cursive::traits::{Boxable, With}; use cursive::traits::{Boxable, With};
@ -25,7 +22,7 @@ fn main() {
let start = time::Instant::now(); let start = time::Instant::now();
// If an argument is given, it is the file we'll read from. // If an argument is given, it is the file we'll read from.
// Else, read from stdin. // Otherwise, read from stdin.
let (source, len) = match std::env::args().nth(1) { let (source, len) = match std::env::args().nth(1) {
Some(source) => { Some(source) => {
let meta = std::fs::metadata(&source).unwrap(); let meta = std::fs::metadata(&source).unwrap();
@ -36,99 +33,113 @@ fn main() {
None => (None, None), None => (None, None),
}; };
// Start the copy in a separate thread
thread::spawn(move || {
// Copy to stdout - lock it for better performance.
let stdout = io::stdout();
let mut stdout = stdout.lock();
match source {
None => {
// Copy from stdin - lock it for better performance.
let stdin = io::stdin();
let stdin = stdin.lock();
let mut reader =
utils::ProgressReader::new(counter_copy, stdin);
// And copy!
io::copy(&mut reader, &mut stdout).unwrap();
}
Some(source) => {
// Copy from stdin - lock it for better performance.
let input = std::fs::File::open(source).unwrap();
let mut reader =
utils::ProgressReader::new(counter_copy, input);
// And copy!
io::copy(&mut reader, &mut stdout).unwrap();
}
}
// When we're done, shut down the application
cb_sink.send(Box::new(|s: &mut Cursive| s.quit())).unwrap();
});
// Add a single view: progress status // Add a single view: progress status
siv.add_layer( siv.add_layer(
Dialog::new().title("Copying...").content( Dialog::new()
LinearLayout::vertical() .title("Copying...")
.child( .content(
Canvas::new(counter.clone()) LinearLayout::vertical()
.with_draw(move |c, printer| { .child(
let ticks = c.get() as f64; Canvas::new(counter.clone())
let now = time::Instant::now(); .with_draw(move |c, printer| {
let duration = now - start; let ticks = c.get() as f64;
let now = time::Instant::now();
let duration = now - start;
let seconds = duration.as_secs() as f64 let seconds = duration.as_secs() as f64
+ duration.subsec_nanos() as f64 * 1e-9; + duration.subsec_nanos() as f64 * 1e-9;
let speed = ticks / seconds; let speed = ticks / seconds;
// Print ETA if we have a file size // Print ETA if we have a file size
// Otherwise prints elapsed time. // Otherwise prints elapsed time.
if let Some(len) = len { if let Some(len) = len {
let remaining = (len as f64 - ticks) / speed; let remaining =
(len as f64 - ticks) / speed;
printer.print(
(0, 0),
&format!(
"ETA: {:.1} seconds",
remaining
),
);
} else {
printer.print(
(0, 0),
&format!(
"Elapsed: {:.1} seconds",
seconds
),
);
}
printer.print( printer.print(
(0, 0), (0, 1),
&format!( &format!("Copied: {}", convert(ticks)),
"ETA: {:.1} seconds",
remaining
),
); );
} else {
printer.print( printer.print(
(0, 0), (0, 2),
&format!( &format!("Speed: {}/s", convert(speed)),
"Elapsed: {:.1} seconds",
seconds
),
); );
} })
printer.print( .fixed_size((25, 3)),
(0, 1), )
&format!("Copied: {}", convert(ticks)), .with(|l| {
// If we have a file length, add a progress bar
if let Some(len) = len {
l.add_child(
ProgressBar::new()
.max(len as usize)
.with_value(counter.clone()),
); );
printer.print( }
(0, 2), }),
&format!("Speed: {}/s", convert(speed)), )
); .button("Abort", Cursive::quit),
})
.fixed_size((25, 3)),
)
.with(|l| {
// If we have a file length, add a progress bar
if let Some(len) = len {
l.add_child(
ProgressBar::new()
.max(len as usize)
.with_value(counter.clone()),
);
}
}),
),
); );
siv.set_autorefresh(true); if source.is_none() && atty::is(atty::Stream::Stdin) {
siv.add_layer(
Dialog::text(
"Please specify an input file or redirect a file to stdin.
cargo run --example vpv </dev/zero >/dev/null",
)
.button("Quit", Cursive::quit),
);
} else {
// Start the copy in a separate thread
thread::spawn(move || {
// Copy to stdout - lock it for better performance.
let stdout = io::stdout();
let mut stdout = stdout.lock();
match source {
None => {
// Copy from stdin - lock it for better performance.
let stdin = io::stdin();
let stdin = stdin.lock();
let mut reader =
utils::ProgressReader::new(counter_copy, stdin);
// And copy!
io::copy(&mut reader, &mut stdout).unwrap();
}
Some(source) => {
// Copy from stdin - lock it for better performance.
let input = std::fs::File::open(source).unwrap();
let mut reader =
utils::ProgressReader::new(counter_copy, input);
// And copy!
io::copy(&mut reader, &mut stdout).unwrap();
}
}
// When we're done, shut down the application
cb_sink.send(Box::new(|s: &mut Cursive| s.quit())).unwrap();
});
siv.set_autorefresh(true);
}
siv.run(); siv.run();
} }