Reformat using cargofmt
This commit is contained in:
@@ -1,19 +1,16 @@
|
||||
extern crate clap;
|
||||
extern crate num_cpus;
|
||||
|
||||
use clap::{Arg, ArgMatches, App};
|
||||
use clap::{App, Arg, ArgMatches};
|
||||
|
||||
use app::*;
|
||||
|
||||
|
||||
|
||||
/// CLI argument handler.
|
||||
pub struct ArgHandler<'a> {
|
||||
matches: ArgMatches<'a>,
|
||||
}
|
||||
|
||||
impl<'a: 'b, 'b> ArgHandler<'a> {
|
||||
|
||||
/// Parse CLI arguments.
|
||||
pub fn parse() -> ArgHandler<'a> {
|
||||
// Handle/parse arguments
|
||||
@@ -21,88 +18,95 @@ impl<'a: 'b, 'b> ArgHandler<'a> {
|
||||
.version(APP_VERSION)
|
||||
.author(APP_AUTHOR)
|
||||
.about(APP_ABOUT)
|
||||
.arg(Arg::with_name("HOST")
|
||||
.help("The host to pwn \"host:port\"")
|
||||
.required(true)
|
||||
.index(1))
|
||||
.arg(Arg::with_name("image")
|
||||
.short("i")
|
||||
.long("image")
|
||||
.alias("images")
|
||||
.value_name("PATH")
|
||||
.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("Draw width (def: screen width)")
|
||||
.display_order(2)
|
||||
.takes_value(true))
|
||||
.arg(Arg::with_name("height")
|
||||
.short("h")
|
||||
.long("height")
|
||||
.value_name("PIXELS")
|
||||
.help("Draw height (def: screen height)")
|
||||
.display_order(3)
|
||||
.takes_value(true))
|
||||
.arg(Arg::with_name("x")
|
||||
.short("x")
|
||||
.value_name("PIXELS")
|
||||
.help("Draw X offset (def: 0)")
|
||||
.display_order(4)
|
||||
.takes_value(true))
|
||||
.arg(Arg::with_name("y")
|
||||
.short("y")
|
||||
.value_name("PIXELS")
|
||||
.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: CPUs)")
|
||||
.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();
|
||||
.arg(
|
||||
Arg::with_name("HOST")
|
||||
.help("The host to pwn \"host:port\"")
|
||||
.required(true)
|
||||
.index(1),
|
||||
).arg(
|
||||
Arg::with_name("image")
|
||||
.short("i")
|
||||
.long("image")
|
||||
.alias("images")
|
||||
.value_name("PATH")
|
||||
.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("Draw width (def: screen width)")
|
||||
.display_order(2)
|
||||
.takes_value(true),
|
||||
).arg(
|
||||
Arg::with_name("height")
|
||||
.short("h")
|
||||
.long("height")
|
||||
.value_name("PIXELS")
|
||||
.help("Draw height (def: screen height)")
|
||||
.display_order(3)
|
||||
.takes_value(true),
|
||||
).arg(
|
||||
Arg::with_name("x")
|
||||
.short("x")
|
||||
.value_name("PIXELS")
|
||||
.help("Draw X offset (def: 0)")
|
||||
.display_order(4)
|
||||
.takes_value(true),
|
||||
).arg(
|
||||
Arg::with_name("y")
|
||||
.short("y")
|
||||
.value_name("PIXELS")
|
||||
.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: CPUs)")
|
||||
.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();
|
||||
|
||||
// Instantiate
|
||||
ArgHandler {
|
||||
matches,
|
||||
}
|
||||
ArgHandler { matches }
|
||||
}
|
||||
|
||||
/// Get the host property.
|
||||
pub fn host(&'a self) -> &'b str {
|
||||
self.matches.value_of("HOST")
|
||||
self.matches
|
||||
.value_of("HOST")
|
||||
.expect("Please specify a host")
|
||||
}
|
||||
|
||||
/// Get the thread count.
|
||||
pub fn count(&self) -> usize {
|
||||
self.matches.value_of("count")
|
||||
.map(|count| count.parse::<usize>()
|
||||
.expect("Invalid count specified")
|
||||
)
|
||||
self.matches
|
||||
.value_of("count")
|
||||
.map(|count| count.parse::<usize>().expect("Invalid count specified"))
|
||||
.unwrap_or(num_cpus::get())
|
||||
}
|
||||
|
||||
/// Get the image paths.
|
||||
pub fn image_paths(&'a self) -> Vec<&'b str> {
|
||||
self.matches.values_of("image")
|
||||
self.matches
|
||||
.values_of("image")
|
||||
.expect("Please specify an image paths")
|
||||
.collect()
|
||||
}
|
||||
@@ -111,45 +115,36 @@ impl<'a: 'b, 'b> ArgHandler<'a> {
|
||||
/// Use the given default value if not set.
|
||||
pub fn size(&self, def: Option<(u32, u32)>) -> (u32, u32) {
|
||||
(
|
||||
self.matches.value_of("width")
|
||||
.map(|width| width.parse()
|
||||
.expect("Invalid image width")
|
||||
)
|
||||
.unwrap_or(
|
||||
def.expect("No screen width set or known").0
|
||||
),
|
||||
self.matches.value_of("height")
|
||||
.map(|height| height.parse()
|
||||
.expect("Invalid image height")
|
||||
)
|
||||
.unwrap_or(
|
||||
def.expect("No screen height set or known").1
|
||||
),
|
||||
self.matches
|
||||
.value_of("width")
|
||||
.map(|width| width.parse().expect("Invalid image width"))
|
||||
.unwrap_or(def.expect("No screen width set or known").0),
|
||||
self.matches
|
||||
.value_of("height")
|
||||
.map(|height| height.parse().expect("Invalid image height"))
|
||||
.unwrap_or(def.expect("No screen height set or known").1),
|
||||
)
|
||||
}
|
||||
|
||||
/// Get the image offset.
|
||||
pub fn offset(&self) -> (u32, u32) {
|
||||
(
|
||||
self.matches.value_of("x")
|
||||
.map(|x| x.parse::<u32>()
|
||||
.expect("Invalid X offset")
|
||||
)
|
||||
self.matches
|
||||
.value_of("x")
|
||||
.map(|x| x.parse::<u32>().expect("Invalid X offset"))
|
||||
.unwrap_or(0),
|
||||
self.matches.value_of("y")
|
||||
.map(|y| y.parse::<u32>()
|
||||
.expect("Invalid Y offset")
|
||||
)
|
||||
self.matches
|
||||
.value_of("y")
|
||||
.map(|y| y.parse::<u32>().expect("Invalid Y offset"))
|
||||
.unwrap_or(0),
|
||||
)
|
||||
}
|
||||
|
||||
/// Get the FPS.
|
||||
pub fn fps(&self) -> u32 {
|
||||
self.matches.value_of("fps")
|
||||
.map(|fps| fps.parse::<u32>()
|
||||
.expect("Invalid frames per second rate")
|
||||
)
|
||||
self.matches
|
||||
.value_of("fps")
|
||||
.map(|fps| fps.parse::<u32>().expect("Invalid frames per second rate"))
|
||||
.unwrap_or(DEFAULT_IMAGE_FPS)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user