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

Clearer code

This commit is contained in:
Lucien Cartier-Tilet 2020-08-12 23:19:37 +02:00
parent 96db20aebc
commit 76764a88ce
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@ -1,6 +1,6 @@
# Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com> # Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
pkgname=pumopm pkgname=pumopm
pkgver=0.1.0 pkgver=0.1.1
pkgrel=1 pkgrel=1
pkgdesc="A tiny power manager written in Rust" pkgdesc="A tiny power manager written in Rust"
arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')

60
src/battery_state.rs
View File

@ -37,10 +37,13 @@ macro_rules! trigger_warning {
} }
$trigger = true; $trigger = true;
let level = ($battery.state_of_charge().value * 100_f32) as u8; let level = ($battery.state_of_charge().value * 100_f32) as u8;
let message = format!($message, $self.remaining_time($self.battery.time_to_full()), level); let message = format!(
match $verbosity { $message,
VerbosityLevel::None => {} $self.remaining_time($self.battery.time_to_full()),
_ => println!("{}", message), level
);
if $verbosity >= VerbosityLevel::Some {
println!("{}", message);
} }
Notification::new() Notification::new()
.summary("Low battery") .summary("Low battery")
@ -61,8 +64,8 @@ impl BatteryState {
refresh_rate: u64, refresh_rate: u64,
verbosity: VerbosityLevel, verbosity: VerbosityLevel,
) -> battery::Result<Self> { ) -> battery::Result<Self> {
let manager = battery::Manager::new().unwrap(); let manager = battery::Manager::new()?;
let battery = match manager.batteries().unwrap().next() { let battery = match manager.batteries()?.next() {
Some(Ok(battery)) => battery, Some(Ok(battery)) => battery,
Some(Err(e)) => { Some(Err(e)) => {
eprintln!("An error occured: {}", e); eprintln!("An error occured: {}", e);
@ -84,18 +87,17 @@ impl BatteryState {
critical_level = u8::max(very_low_level - 1_u8, 5_u8) critical_level = u8::max(very_low_level - 1_u8, 5_u8)
}; };
match verbosity { if verbosity == VerbosityLevel::Some {
VerbosityLevel::None => {} println!("Some verbose info");
_ => { }
println!("Low battery: {}%", low_level); if verbosity >= VerbosityLevel::Some {
println!("Very low battery: {}%", very_low_level); println!("Low battery: {}%", low_level);
println!("Critical battery: {}%", critical_level); println!("Very low battery: {}%", very_low_level);
println!("Refresh rate: {}s", refresh_rate); println!("Critical battery: {}%", critical_level);
match verbosity { println!("Refresh rate: {}s", refresh_rate);
VerbosityLevel::Some => println!("Some verbose info"), }
_ => println!("Lots of verbose info"), if verbosity >= VerbosityLevel::Lots {
} println!("Lots of verbose info")
}
} }
Ok(Self { Ok(Self {
@ -126,18 +128,14 @@ impl BatteryState {
} }
pub fn remaining_time(&self, time: Option<battery::units::Time>) -> String { pub fn remaining_time(&self, time: Option<battery::units::Time>) -> String {
match time { if let Some(e) = time {
Some(e) => { let time = e.value as u64;
let time = e.value as u64; let hours = time / 3600;
let hours = time / 3600; let minutes = (time % 3600) / 60;
let minutes = (time % 3600) / 60; let seconds = time % 60;
let seconds = time % 60; format!("{:01}:{:02}:{:02}", hours, minutes, seconds)
format!("{:01}:{:02}:{:02}", hours, minutes, seconds) } else {
} "unknown remaining time".to_owned()
None => {
eprintln!("Couldn’t read remaining time");
String::from("unknown remaining time")
}
} }
} }
@ -216,7 +214,7 @@ impl BatteryState {
_ => eprintln!("Error: unknown battery state"), _ => eprintln!("Error: unknown battery state"),
} }
} }
if self.verbosity == VerbosityLevel::Lots { if self.verbosity >= VerbosityLevel::Lots {
eprintln!("====\nDebug self:\n{:?}\n====", self); eprintln!("====\nDebug self:\n{:?}\n====", self);
} }