fixes

ClementTsang · Dec 23, 2024 · 5b32afa · 5b32afa
1 parent f4769a0
commit 5b32afa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/src/canvas/widgets/battery_display.rs b/src/canvas/widgets/battery_display.rs
@@ -165,30 +165,28 @@ impl Painter {
                 {
                     let style = self.styles.text_style;
                     match &battery_details.state {
-                        BatteryState::Charging { time_to_full } => {
-                            if let Some(secs) = time_to_full {
-                                time = long_time(*secs);
-
-                                if full_width as usize > time.len() {
-                                    battery_rows
-                                        .push(Row::new(["Time to empty", &time]).style(style));
-                                } else {
-                                    time = short_time(*secs);
-                                    battery_rows.push(Row::new(["To empty", &time]).style(style));
-                                }
+                        BatteryState::Charging {
+                            time_to_full: Some(secs),
+                        } => {
+                            time = long_time(*secs);
+
+                            if full_width as usize > time.len() {
+                                battery_rows.push(Row::new(["Time to full", &time]).style(style));
+                            } else {
+                                time = short_time(*secs);
+                                battery_rows.push(Row::new(["To full", &time]).style(style));
                             }
                         }
-                        BatteryState::Discharging { time_to_empty } => {
-                            if let Some(secs) = time_to_empty {
-                                time = long_time(*secs);
-
-                                if full_width as usize > time.len() {
-                                    battery_rows
-                                        .push(Row::new(["Time to full", &time]).style(style));
-                                } else {
-                                    time = short_time(*secs);
-                                    battery_rows.push(Row::new(["To full", &time]).style(style));
-                                }
+                        BatteryState::Discharging {
+                            time_to_empty: Some(secs),
+                        } => {
+                            time = long_time(*secs);
+
+                            if full_width as usize > time.len() {
+                                battery_rows.push(Row::new(["Time to empty", &time]).style(style));
+                            } else {
+                                time = short_time(*secs);
+                                battery_rows.push(Row::new(["To empty", &time]).style(style));
                             }
                         }
                         _ => {}

diff --git a/src/data_collection.rs b/src/data_collection.rs
@@ -6,9 +6,7 @@ pub mod nvidia;
 #[cfg(all(target_os = "linux", feature = "gpu"))]
 pub mod amd;
 
-#[cfg(feature = "battery")]
 pub mod batteries;
-
 pub mod cpu;
 pub mod disks;
 pub mod error;

diff --git a/src/data_collection/batteries/battery.rs b/src/data_collection/batteries/battery.rs
@@ -9,6 +9,7 @@
 //!
 //! For more information, refer to the [starship_battery](https://github.com/starship/rust-battery) repo/docs.
 
+#[cfg(feature = "battery")]
 use starship_battery::{
     units::{power::watt, ratio::percent, time::second},
     Battery, Manager, State,
@@ -66,6 +67,7 @@ impl BatteryData {
     }
 }
 
+#[cfg(feature = "battery")]
 pub fn refresh_batteries(manager: &Manager, batteries: &mut [Battery]) -> Vec<BatteryData> {
     batteries
         .iter_mut()

diff --git a/src/data_conversion.rs b/src/data_conversion.rs
@@ -73,6 +73,7 @@ pub struct ConvertedData {
 
     pub load_avg_data: [f32; 3],
     pub cpu_data: Vec<CpuWidgetData>,
+
     pub battery_data: Vec<BatteryData>,
     pub disk_data: Vec<DiskWidgetData>,
     pub temp_data: Vec<TempWidgetData>,