moparisthebest/rusty-keys
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Panic cleanup part 3

Browse Source
This commit is contained in:
Travis Burtrum 2017-11-15 01:42:54 -05:00
parent 49fd65a4b0
commit 5bfc286d19
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.rs
View File

@ -97,7 +97,7 @@ fn do_map(device_file: &str, config_file: &str) -> Result<()> {
fn parse_args() -> Config { fn parse_args() -> Config {
fn print_usage(program: &str, opts: Options) { fn print_usage(program: &str, opts: Options) {
let brief = format!("Usage: {} [options]", program); let brief = format!("Usage: {} [options] [device_files...]", program);
println!("{}", opts.usage(&brief)); println!("{}", opts.usage(&brief));
} }
@ -107,9 +107,13 @@ fn parse_args() -> Config {
opts.optflag("h", "help", "prints this help message"); opts.optflag("h", "help", "prints this help message");
opts.optflag("v", "version", "prints the version"); opts.optflag("v", "version", "prints the version");
opts.optopt("c", "config", "specify the keymap config file to use", "FILE"); opts.optopt("c", "config", "specify the keymap config file to use", "FILE");
opts.optmulti("d", "device", "specify the keyboard input device file", "DEVICE");
let matches = opts.parse(&args[1..]).unwrap_or_else(|e| panic!("{}", e)); let matches = opts.parse(&args[1..]);
if matches.is_err() {
print_usage(&args[0], opts);
exit(0);
}
let matches = matches.unwrap();
if matches.opt_present("h") { if matches.opt_present("h") {
print_usage(&args[0], opts); print_usage(&args[0], opts);
exit(0); exit(0);
@ -120,12 +124,13 @@ fn parse_args() -> Config {
exit(0); exit(0);
} }
let mut device_files = matches.opt_strs("d"); let config_file = matches.opt_str("c").unwrap_or("keymap.toml".to_owned());
let mut device_files = matches.free;
if device_files.len() == 0 { if device_files.len() == 0 {
device_files = get_keyboard_device_filenames(); device_files = get_keyboard_device_filenames();
} }
println!("Detected devices: {:?}", device_files); println!("Detected devices: {:?}", device_files);
let config_file = matches.opt_str("c").unwrap_or("keymap.toml".to_owned());
Config::new(device_files, config_file) Config::new(device_files, config_file)
} }
@ -135,10 +140,12 @@ fn parse_args() -> Config {
// the keyboard device file should always have an EV of 120013 // the keyboard device file should always have an EV of 120013
fn get_keyboard_device_filenames() -> Vec<String> { fn get_keyboard_device_filenames() -> Vec<String> {
let command_str = "grep -E 'Handlers|EV' /proc/bus/input/devices | grep -B1 120013 | grep -Eo event[0-9]+".to_string(); let command_str = "grep -E 'Handlers|EV' /proc/bus/input/devices | grep -B1 120013 | grep -Eo event[0-9]+".to_string();
let res = Command::new("sh").arg("-c").arg(command_str).output().unwrap_or_else(|e| { let res = Command::new("sh").arg("-c").arg(command_str).output();
panic!("{}", e); if res.is_err() {
}); return Vec::new();
let res_str = std::str::from_utf8(&res.stdout).unwrap(); }
let res = res.unwrap();
let res_str = std::str::from_utf8(&res.stdout).unwrap_or("");
let mut filenames = Vec::new(); let mut filenames = Vec::new();
for file in res_str.trim().split('\n') { for file in res_str.trim().split('\n') {