From 25860caa84368165ab5ba0542325368f73a508ca Mon Sep 17 00:00:00 2001 From: mnussbaum Date: Thu, 5 Sep 2019 17:28:50 -0700 Subject: [PATCH] Apply suggested formatting from rustfmt --- src/main.rs | 147 +++++++++++++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 77 deletions(-) diff --git a/src/main.rs b/src/main.rs index 23fd6cc..a07e689 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,11 +1,11 @@ -extern crate glob; extern crate clap; -use clap::{Arg, App}; +extern crate glob; +use clap::{App, Arg}; +use glob::glob; use std::fs; +use std::process::Command; use std::thread; use std::time::Duration; -use std::process::Command; -use glob::glob; fn main() { let mut mode = ""; @@ -13,68 +13,67 @@ fn main() { let mut new_state: &str; let mut path_x: String = "".to_string(); let mut path_y: String = "".to_string(); - let mut matrix: [&str;9]; + let mut matrix: [&str; 9]; let mut x_state: &str; - let sway_pid = String::from_utf8(Command::new("pidof") - .arg("sway") - .output() - .unwrap() - .stdout).unwrap(); + let sway_pid = + String::from_utf8(Command::new("pidof").arg("sway").output().unwrap().stdout).unwrap(); - let x_pid = String::from_utf8(Command::new("pidof") - .arg("x") - .output() - .unwrap() - .stdout).unwrap(); + let x_pid = String::from_utf8(Command::new("pidof").arg("x").output().unwrap().stdout).unwrap(); - if sway_pid.len() >= 1 { + if sway_pid.len() >= 1 { mode = "sway"; } - if x_pid.len() >= 1 { + if x_pid.len() >= 1 { mode = "x"; } let matches = App::new("rot8") - .version("0.1.1") - .arg(Arg::with_name("sleep") - .default_value("500") - .long("sleep") - .value_name("SLEEP") - .help("Set sleep millis") - .takes_value(true)) - .arg(Arg::with_name("display") - .default_value("eDP-1") - .long("display") - .value_name("DISPLAY") - .help("Set Display Device") - .takes_value(true)) - .arg(Arg::with_name("touchscreen") - .default_value("ELAN0732:00 04F3:22E1") - .long("touchscreen") - .value_name("TOUCHSCREEN") - .help("Set Touchscreen Device (X11)") - .takes_value(true)) - .get_matches(); + .version("0.1.1") + .arg( + Arg::with_name("sleep") + .default_value("500") + .long("sleep") + .value_name("SLEEP") + .help("Set sleep millis") + .takes_value(true), + ) + .arg( + Arg::with_name("display") + .default_value("eDP-1") + .long("display") + .value_name("DISPLAY") + .help("Set Display Device") + .takes_value(true), + ) + .arg( + Arg::with_name("touchscreen") + .default_value("ELAN0732:00 04F3:22E1") + .long("touchscreen") + .value_name("TOUCHSCREEN") + .help("Set Touchscreen Device (X11)") + .takes_value(true), + ) + .get_matches(); let sleep = matches.value_of("sleep").unwrap_or("default.conf"); let display = matches.value_of("display").unwrap_or("default.conf"); - let touchscreen = matches.value_of("touchscreen").unwrap_or("default.conf"); + let touchscreen = matches.value_of("touchscreen").unwrap_or("default.conf"); - for entry in glob("/sys/bus/iio/devices/iio:device*/in_accel_*_raw").unwrap(){ - match entry { + for entry in glob("/sys/bus/iio/devices/iio:device*/in_accel_*_raw").unwrap() { + match entry { Ok(path) => { - if path.to_str().unwrap().contains("x_raw"){ + if path.to_str().unwrap().contains("x_raw") { path_x = path.to_str().unwrap().to_owned(); - } else if path.to_str().unwrap().contains("y_raw"){ + } else if path.to_str().unwrap().contains("y_raw") { path_y = path.to_str().unwrap().to_owned(); - } else if path.to_str().unwrap().contains("z_raw"){ + } else if path.to_str().unwrap().contains("z_raw") { continue; } else { println!("{:?}", path); panic!(); } - }, - Err(e) => println!("{:?}",e) + } + Err(e) => println!("{:?}", e), } } @@ -89,20 +88,17 @@ fn main() { new_state = "180"; x_state = "normal"; matrix = ["-1", "0", "1", "0", "-1", "1", "0", "0", "1"]; - } - else { - - new_state = "90"; - x_state = "left"; - matrix = ["0", "-1", "1", "1", "0", "0", "0", "0", "1"]; + } else { + new_state = "90"; + x_state = "left"; + matrix = ["0", "-1", "1", "1", "0", "0", "0", "0", "1"]; } } else if x > 500000 { if y > 500000 { new_state = "180"; x_state = "inverted"; matrix = ["-1", "0", "1", "0", "-1", "1", "0", "0", "1"]; - } - else { + } else { new_state = "270"; x_state = "right"; matrix = ["0", "1", "0", "-1", "0", "1", "0", "0", "1"]; @@ -112,8 +108,7 @@ fn main() { new_state = "180"; x_state = "inverted"; matrix = ["-1", "0", "1", "0", "-1", "1", "0", "0", "1"]; - } - else { + } else { new_state = "normal"; x_state = "normal"; matrix = ["1", "0", "0", "0", "1", "0", "0", "0", "1"]; @@ -121,33 +116,33 @@ fn main() { } if new_state != old_state { - if mode == "sway" { + if mode == "sway" { Command::new("swaymsg") - .arg("output") - .arg(display) - .arg("transform") - .arg(new_state) - .spawn() - .expect("rotate command failed to start"); + .arg("output") + .arg(display) + .arg("transform") + .arg(new_state) + .spawn() + .expect("rotate command failed to start"); old_state = new_state; } - if mode == "x" { + if mode == "x" { Command::new("xrandr") - .arg("-o") - .arg(x_state) - .spawn() - .expect("rotate command failed to start"); + .arg("-o") + .arg(x_state) + .spawn() + .expect("rotate command failed to start"); Command::new("xinput") - .arg("set-prop") - .arg(touchscreen) - .arg("Coordinate") - .arg("Transformation") - .arg("Matrix") - .args(&matrix) - .spawn() - .expect("rotate command failed to start"); + .arg("set-prop") + .arg(touchscreen) + .arg("Coordinate") + .arg("Transformation") + .arg("Matrix") + .args(&matrix) + .spawn() + .expect("rotate command failed to start"); old_state = new_state; } @@ -155,5 +150,3 @@ fn main() { thread::sleep(Duration::from_millis(sleep.parse::().unwrap_or(0))); } } - -