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

fixed a bug with non-utf8 characters in output

This commit is contained in:
Djairo Hougee 2023-05-10 14:32:06 +02:00
parent ba587bac48
commit a87e7828ff
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/print_text.rs
View File

@ -9,13 +9,25 @@ fn fuzzy_cutoff(str: &str) -> usize{
str.rfind(char::is_whitespace).unwrap_or(usize::MAX) str.rfind(char::is_whitespace).unwrap_or(usize::MAX)
} }
fn get_char_boundary(str: &str, max_len: usize) -> usize {
match str.is_char_boundary(max_len) {
true => max_len,
false => {
let mut idx = max_len;
while !str.is_char_boundary(idx) {
idx -= 1;
}
idx
},
}
}
fn cutoff(fields: &Vec<Field>, brk: Option<char>, fuzzy: bool, strings: &mut HashMap<String, String>) { fn cutoff(fields: &Vec<Field>, brk: Option<char>, fuzzy: bool, strings: &mut HashMap<String, String>) {
for field in fields { for field in fields {
if let Some(str) = strings.get_mut(&field.field) { if let Some(str) = strings.get_mut(&field.field) {
if !field.field.eq("xesam:userRating") && str.len() >= field.num_chars as usize { if !field.field.eq("xesam:userRating") && str.len() >= field.num_chars as usize {
str.truncate(field.num_chars as usize); str.truncate(get_char_boundary(str, field.num_chars as usize));
if fuzzy {str.truncate(fuzzy_cutoff(str))} if fuzzy {str.truncate(fuzzy_cutoff(str))}
// The above crashes on non-utf8 characters. FIXME: do something about that
if let Some(c) = brk { if let Some(c) = brk {
str.push(c); str.push(c);
} }