phundrak/pumopm
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Better declaration of PumoPM’s arguments, add verbosity parameter

Browse Source
This commit is contained in:
Lucien Cartier-Tilet
2020-08-10 19:57:40 +02:00
parent a49c88a7c6
commit 5065c61e92
4 changed files with 231 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/battery_state.rs
View File

@@ -1,27 +1,38 @@
use notify_rust::{Hint, Notification, Urgency};
pub enum VerbosityLevel {
None = 0,
Some = 1,
Lots = 2,
}
pub struct BatteryState {
manager: battery::Manager,
battery: battery::Battery,
refresh_rate: u64,
low_level: f32,
very_low_level: f32,
critical_level: f32,
refresh_rate: u8,
pub is_triggered_low: bool,
pub is_triggered_very_low: bool,
is_triggered_low: bool,
is_triggered_very_low: bool,
verbosity: VerbosityLevel,
}
pub const DEFAULT_LOW: f32 = 25_f32;
pub const DEFAULT_VERY_LOW: f32 = 15_f32;
pub const DEFAULT_CRITICAL: f32 = 10_f32;
pub const DEFAULT_REFRESH: u8 = 5_u8;
pub const DEFAULT_REFRESH: u64 = 5;
impl BatteryState {
pub fn new(
low_level: f32,
very_low_level: f32,
critical_level: f32,
refresh_rate: u8,
refresh_rate: u64,
verbosity: VerbosityLevel,
) -> battery::Result<Self> {
let manager = battery::Manager::new().unwrap();
let battery = match manager.batteries().unwrap().next() {
@@ -40,12 +51,16 @@ impl BatteryState {
Ok(Self {
manager,
battery,
refresh_rate,
low_level,
very_low_level,
critical_level,
refresh_rate,
is_triggered_low: false,
is_triggered_very_low: false,
verbosity,
})
}
@@ -111,6 +126,9 @@ impl BatteryState {
},
_ => self.reset_levels(),
}
use std::{thread, time::Duration};
thread::sleep(Duration::from_secs(self.refresh_rate));
}
}
@@ -121,6 +139,7 @@ impl Default for BatteryState {
DEFAULT_VERY_LOW,
DEFAULT_CRITICAL,
DEFAULT_REFRESH,
VerbosityLevel::None,
)
.unwrap()
}

110
src/main.rs
View File

@@ -1,82 +1,56 @@
mod battery_state;
const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION");
const AUTHORS: Option<&'static str> = option_env!("CARGO_PKG_AUTHORS");
// use battery_state::*;
use battery_state::{BatteryState, VerbosityLevel};
use clap::Clap;
use clap::{App, Arg};
use std::{thread, time::Duration};
#[derive(Clap)]
#[clap(
version = "0.1.0",
author = "Lucien Cartier-Tilet <lucien@phundrak.com>"
)]
struct Opts {
#[clap(short, long, default_value = "25")]
low: f32,
macro_rules! get_arg_value {
($args:ident, $arg:literal, $type:ty, $default:ident) => {
match $args.value_of($arg) {
Some(value) => match value.parse::<$type>() {
Ok(ret) => ret,
Err(e) => {
eprintln!(
"Error parsing {}, using default. Error: {}",
value, e
);
$default
}
},
None => $default,
}
};
#[clap(short = "L", long, default_value = "15")]
very_low: f32,
#[clap(short, long, default_value = "10")]
critical: f32,
#[clap(short, long = "refresh-rate", default_value = "5")]
refresh_rate: u64,
#[clap(short, long, parse(from_occurrences))]
verbose: i32,
}
fn main() {
let arguments = App::new("PumoPM")
.version(VERSION.unwrap_or("unknown"))
.author(AUTHORS.unwrap_or("Lucien Cartier-Tilet <lucien@phundrak.com>"))
.about("Tiny custom power manager")
.arg(Arg::with_name("low-battery")
.short("l")
.long("low")
.value_name("LOW")
.help("Level at which the battery’s level is considered low")
.takes_value(true))
.arg(Arg::with_name("very-low-battery")
.short("L")
.long("very-low")
.value_name("VERY LOW")
.help("Level at which the battery’s level is considered very low")
.takes_value(true))
.arg(Arg::with_name("critical-battery")
.short("c")
.long("critical")
.value_name("CRITICAL")
.help("Level at which the battery’s level is considered critical")
.takes_value(true))
.arg(Arg::with_name("refresh-rate")
.short("r")
.long("refresh-rate")
.value_name("REFRESH RATE")
.help("How often should the battery’s levels be read (in seconds)")
.takes_value(true))
.get_matches();
let opts: Opts = Opts::parse();
println!("Low battery: {}%", opts.low);
println!("Very low battery: {}%", opts.very_low);
println!("Critical battery: {}%", opts.critical);
println!("Refresh rate: {}s", opts.refresh_rate);
match opts.verbose {
0 => println!("No verbose info"),
1 => println!("Some verbose info"),
_ => println!("Lots of verbose info"),
}
use battery_state::{
DEFAULT_CRITICAL, DEFAULT_LOW, DEFAULT_REFRESH, DEFAULT_VERY_LOW,
};
let low_battery =
get_arg_value!(arguments, "low-battery", f32, DEFAULT_LOW);
let very_low_battery =
get_arg_value!(arguments, "very-low-battery", f32, DEFAULT_VERY_LOW);
let critical_battery =
get_arg_value!(arguments, "critical-battery", f32, DEFAULT_CRITICAL);
let refresh_rate =
get_arg_value!(arguments, "refresh-rate", u8, DEFAULT_REFRESH);
// let mut battery = battery_state::BatteryState::new(low_battery);
let mut battery = battery_state::BatteryState::new(
low_battery,
very_low_battery,
critical_battery,
refresh_rate,
let mut battery = BatteryState::new(
opts.low,
opts.very_low,
opts.critical,
opts.refresh_rate,
match opts.verbose {
0 => VerbosityLevel::None,
1 => VerbosityLevel::Some,
_ => VerbosityLevel::Lots,
},
)
.unwrap();
loop {
thread::sleep(Duration::from_secs(5));
battery.update();
}
}