RGBCube/superfreq
1
Fork 0
mirror of https://github.com/RGBCube/superfreq synced 2025-07-27 17:07:44 +00:00
Code Issues Activity

power_supply&cpu: somewhat improve error messages

Browse source
This commit is contained in:
RGBCube 2025-05-19 21:44:27 +03:00
parent ca4b1dbc92
commit b6d4e09c7f
Signed by: RGBCube
SSH key fingerprint: SHA256:CzqbPcfwt+GxFYNnFVCqoN5Itn4YFrshg1TrnACpA5M
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config.rs
View file

@ -60,7 +60,7 @@ impl CpuDelta {
cpus cpus
} }
None => cpu::Cpu::all()?, None => cpu::Cpu::all().context("failed to get all CPUs and their information")?,
}; };
for cpu in cpus { for cpu in cpus {

11
src/cpu.rs
View file

@ -92,10 +92,13 @@ impl Cpu {
/// Rescan CPU, tuning local copy of settings. /// Rescan CPU, tuning local copy of settings.
pub fn rescan(&mut self) -> anyhow::Result<()> { pub fn rescan(&mut self) -> anyhow::Result<()> {
let has_cpufreq = exists(format!( let Self { number, .. } = self;
"/sys/devices/system/cpu/cpu{number}/cpufreq",
number = self.number, if !exists(format!("/sys/devices/system/cpu/cpu{number}")) {
)); bail!("{self} does not exist");
}
let has_cpufreq = exists(format!("/sys/devices/system/cpu/cpu{number}/cpufreq"));
self.has_cpufreq = has_cpufreq; self.has_cpufreq = has_cpufreq;

11
src/power_supply.rs
View file

@ -62,12 +62,7 @@ pub struct PowerSupply {
impl fmt::Display for PowerSupply { impl fmt::Display for PowerSupply {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!( write!(f, "power supply '{name}'", name = &self.name)?;
f,
"power supply '{name}' at '{path}'",
name = &self.name,
path = self.path.display(),
)?;
if let Some(config) = self.threshold_config.as_ref() { if let Some(config) = self.threshold_config.as_ref() {
write!( write!(
@ -147,6 +142,10 @@ impl PowerSupply {
} }
pub fn rescan(&mut self) -> anyhow::Result<()> { pub fn rescan(&mut self) -> anyhow::Result<()> {
if !self.path.exists() {
bail!("{self} does not exist");
}
let threshold_config = self let threshold_config = self
.get_type() .get_type()
.with_context(|| format!("failed to determine what type of power supply '{self}' is"))? .with_context(|| format!("failed to determine what type of power supply '{self}' is"))?