maxscout/HyperHeadset
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: eliminate code duplication in DeviceState display methods

Browse Source 
Create helper function get_display_data() that returns the device data
array with 4-tuple format (prefix, value, suffix, readonly_flag).

Both to_string_with_padding() and to_string_with_readonly_info() now
call this helper function:
- to_string_with_padding() ignores the readonly flag
- to_string_with_readonly_info() uses it to add (read-only) markers

This eliminates ~100 lines of duplicated code and makes the codebase
easier to maintain.

Addresses PR #14 review comment from @LennardKittner
This commit is contained in:
Fabio Scaccabarozzi
2025-10-27 23:08:44 +00:00
parent 51eb341985
commit 84bbc4a122
1 changed files with 22 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/devices/mod.rs
View File

@@ -138,97 +138,8 @@ impl DeviceState {
})
}
pub fn to_string_with_padding(&self, padding: usize) -> String {
let data = [
(
"Battery level:",
self.battery_level.map(|l| l.to_string()),
"%",
false, // read-only flag (not applicable for read-only fields)
),
(
"Charging status:",
self.charging.map(|c| c.to_string()),
"",
false,
),
("Muted:", self.muted.map(|c| c.to_string()), "", false),
(
"Mic connected:",
self.mic_connected.map(|c| c.to_string()),
"",
false,
),
(
"Automatic shutdown after:",
self.automatic_shutdown_after
.map(|c| (c.as_secs() / 60).to_string()),
"min",
false,
),
(
"pairing info:",
self.pairing_info.map(|c| c.to_string()),
"",
false,
),
(
"product color:",
self.product_color.map(|c| c.to_string()),
"",
false,
),
(
"Side tone:",
self.side_tone_on.map(|c| c.to_string()),
"",
false,
),
(
"Side tone volume:",
self.side_tone_volume.map(|c| c.to_string()),
"",
false,
),
(
"Surround sound:",
self.surround_sound.map(|c| c.to_string()),
"",
false,
),
(
"Voice prompt:",
self.voice_prompt_on.map(|c| c.to_string()),
"",
false,
),
(
"Connected:",
self.connected.map(|c| c.to_string()),
"",
false,
),
(
"Playback muted:",
self.silent.map(|c| c.to_string()),
"",
false,
),
];
data.iter()
.filter_map(|(prefix, data, suffix, _)| {
if let Some(data) = data {
Some(format!("{:<padding$} {}{}", prefix, data, suffix))
} else {
None
}
})
.collect::<Vec<String>>()
.join("\n")
}
pub fn to_string_with_readonly_info(&self, padding: usize) -> String {
let data = [
fn get_display_data(&self) -> Vec<(&str, Option<String>, &str, bool)> {
vec![
(
"Battery level:",
self.battery_level.map(|l| l.to_string()),
@@ -308,8 +219,26 @@ impl DeviceState {
"",
!self.can_set_silent_mode,
),
];
data.iter()
]
}
pub fn to_string_with_padding(&self, padding: usize) -> String {
self.get_display_data()
.iter()
.filter_map(|(prefix, data, suffix, _)| {
if let Some(data) = data {
Some(format!("{:<padding$} {}{}", prefix, data, suffix))
} else {
None
}
})
.collect::<Vec<String>>()
.join("\n")
}
pub fn to_string_with_readonly_info(&self, padding: usize) -> String {
self.get_display_data()
.iter()
.filter_map(|(prefix, data, suffix, readonly)| {
if let Some(data) = data {
let readonly_marker = if *readonly { " (read-only)" } else { "" };