djairoh
/
polybar-now-playing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small changes to resource allocation, marginally increasing efficiency

This commit is contained in:
Djairo Hougee 2023-05-12 15:33:19 +02:00
parent e3e4953560
commit 723808cf1d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/print_text.rs
View File

@ -80,8 +80,8 @@ fn append_fields(b: &mut Builder, cfg: &Config, data: &Data) {
for field in &cfg.metadata_fields {
if let Some(string) = data.field_text.get(&field.field) {
idx += 1;
b.append(string.clone());
if idx < len {b.append(cfg.metadata_separator.clone())};
b.append(string.as_str());
if idx < len {b.append(cfg.metadata_separator.as_str())};
} else {
info!("failed to get {} value!", field.field);
}

14
src/update_message.rs
View File

@ -60,7 +60,7 @@ fn rating_to_string(r: Option<&MetadataValue>, str: &Vec<String>) -> Option<Stri
if i > 10 {i = 10}
if i < 0 {i = 0}
Some(str[i as usize].clone()) //TODO: still inefficient. would be better to note the idx and load it in print_text
Some(str[i as usize].to_owned()) //TODO: still inefficient. would be better to note the idx and load it in print_text
} else {
debug!("failed to convert MetadataValue to f64!");
None
@ -85,17 +85,17 @@ pub fn update_message(cfg: &Config, data: &mut Data, ratings: &Vec<String>) {
if let Some(player) = &data.current_player {
if let Ok(meta) = player.get_metadata() {
for field in &cfg.metadata_fields {
let key = field.field.clone();
let key: &str = field.field.as_ref();
if field.field.eq("xesam:userRating") {
if let Some(rating_string) = rating_to_string(meta.get(&key), ratings) {
data.field_text.insert(key, rating_string);
if let Some(rating_string) = rating_to_string(meta.get(key), ratings) {
data.field_text.insert(key.to_owned(), rating_string);
} else {
data.field_text.remove(&key);
data.field_text.remove(key);
}
} else {
match meta.get(&key) {
Some(value) => data.field_text.insert(key, value_to_string(value, cfg.array_separator)),
None => data.field_text.insert(key, format!("No {}", field.field.clone().trim_start_matches("xesam:"))),
Some(value) => data.field_text.insert(key.to_owned(), value_to_string(value, cfg.array_separator)),
None => data.field_text.insert(key.to_owned(), format!("No {}", key.trim_start_matches("xesam:"))),
};
}
}

4
src/update_players.rs
View File

@ -16,10 +16,10 @@ use crate::structs::{data::Data, config::Config};
/// name: name of active player, to fetch the appropriate prefix from cfg.
fn update_prefix(cfg: &Config, data: &mut char, name: &str) {
if let Some(char) = cfg.player_prefixes.get(name) {
*data = char.clone();
*data = *char;
trace!("updated prefix to {}", data);
} else {
*data = cfg.player_prefixes.get("default").unwrap_or(&'>').clone();
*data = *cfg.player_prefixes.get("default").unwrap_or(&'>');
trace!("set prefix to default ({})", data);
}
}