Update CLI help

This commit is contained in:
Tim Visée
2017-12-31 20:25:31 +01:00
parent 4776ca83b4
commit 316fb11b4c
6 changed files with 40 additions and 27 deletions

View File

@@ -24,49 +24,59 @@ impl<'a: 'b, 'b> ArgHandler<'a> {
.help("The host to pwn \"host:port\"")
.required(true)
.index(1))
.arg(Arg::with_name("count")
.short("c")
.long("count")
.value_name("COUNT")
.help("Number of simultanious threads (def: 4)")
.takes_value(true))
.arg(Arg::with_name("image")
.short("i")
.long("images")
.long("image")
.alias("images")
.value_name("PATH")
.help("Paths of the images to print")
.help("Image paths")
.required(true)
.multiple(true)
.display_order(1)
.takes_value(true))
.arg(Arg::with_name("width")
.short("w")
.long("width")
.value_name("PIXELS")
.help("Drawing width in pixels (def: 1920)")
.help("Draw width ((def: 1920)")
.display_order(2)
.takes_value(true))
.arg(Arg::with_name("height")
.short("h")
.long("height")
.value_name("PIXELS")
.help("Drawing height in pixels (def: 1080)")
.help("Draw height (def: 1080)")
.display_order(3)
.takes_value(true))
.arg(Arg::with_name("x")
.short("x")
.long("x")
.value_name("PIXELS")
.help("Drawing X offset in pixels (def: 0)")
.help("Draw X offset(def: 0)")
.display_order(4)
.takes_value(true))
.arg(Arg::with_name("y")
.short("y")
.long("y")
.value_name("PIXELS")
.help("Drawing Y offset in pixels (def: 0)")
.help("Draw Y offset (def: 0)")
.display_order(5)
.takes_value(true))
.arg(Arg::with_name("count")
.short("c")
.long("count")
.alias("thread")
.alias("threads")
.value_name("COUNT")
.help("Number of concurrent threads (def: 4)")
.display_order(6)
.takes_value(true))
.arg(Arg::with_name("fps")
.short("r")
.long("fps")
.value_name("RATE")
.help("Frames per second with multiple images (def: 1)")
.display_order(7)
.takes_value(true))
.get_matches();

View File

@@ -12,7 +12,7 @@ impl Color {
/// Constructor.
///
/// The Red, Green and Blue values must be between 0 and 255.
/// The color channels must be between 0 and 255.
pub fn from(r: u8, g: u8, b: u8) -> Color {
Color {
r,

View File

@@ -39,13 +39,15 @@ impl ImageManager {
.collect()
);
// TODO: process the image slices
// We succeeded
println!("All images have been loaded successfully");
image_manager
}
/// Tick the image
/// Tick the image
pub fn tick(&mut self, canvas: &mut Canvas) {
// Get the image index bound
let bound = self.images.len();

View File

@@ -57,10 +57,10 @@ impl Painter {
// Define the color
let color = Color::from(
channels[0],
channels[1],
channels[2],
);
channels[0],
channels[1],
channels[2],
);
// Set the pixel
self.client.write_pixel(