zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-04-19 19:34:24 +02:00
Code Activity

fix(dynamic string): always sending partial string on initialization

Browse source
This commit is contained in:
Jake Stanger 2024-01-25 22:22:57 +00:00
parent af7e037dd5
commit 63304a9ddd
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/dynamic_value/dynamic_string.rs
View file

@ -29,7 +29,7 @@ pub fn dynamic_string<F>(input: &str, mut f: F)
where where
F: FnMut(String) + 'static, F: FnMut(String) + 'static,
{ {
let tokens = parse_input(input); let (tokens, is_static) = parse_input(input);
let label_parts = arc_mut!(vec![]); let label_parts = arc_mut!(vec![]);
let (tx, rx) = mpsc::channel(32); let (tx, rx) = mpsc::channel(32);
@ -91,17 +91,17 @@ where
glib_recv_mpsc!(rx , val => f(val)); glib_recv_mpsc!(rx , val => f(val));
// initialize // initialize
{ if is_static {
let label_parts = lock!(label_parts).join(""); let label_parts = lock!(label_parts).join("");
try_send!(tx, label_parts); try_send!(tx, label_parts);
} }
} }
/// Parses the input string into static and dynamic segments /// Parses the input string into static and dynamic segments
fn parse_input(input: &str) -> Vec<DynamicStringSegment> { fn parse_input(input: &str) -> (Vec<DynamicStringSegment>, bool) {
// short-circuit parser if it's all static // short-circuit parser if it's all static
if !input.contains("{{") && !input.contains('#') { if !input.contains("{{") && !input.contains('#') {
return vec![DynamicStringSegment::Static(input.to_string())]; return (vec![DynamicStringSegment::Static(input.to_string())], true);
} }
let mut tokens = vec![]; let mut tokens = vec![];
@ -129,7 +129,7 @@ fn parse_input(input: &str) -> Vec<DynamicStringSegment> {
chars.drain(..skip); chars.drain(..skip);
} }
tokens (tokens, false)
} }
fn parse_script(chars: &[char]) -> (DynamicStringSegment, usize) { fn parse_script(chars: &[char]) -> (DynamicStringSegment, usize) {
@ -190,7 +190,7 @@ mod tests {
#[test] #[test]
fn test_static() { fn test_static() {
const INPUT: &str = "hello world"; const INPUT: &str = "hello world";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 1); assert_eq!(tokens.len(), 1);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(value) if value == INPUT)) assert!(matches!(&tokens[0], DynamicStringSegment::Static(value) if value == INPUT))
@ -199,7 +199,7 @@ mod tests {
#[test] #[test]
fn test_static_odd_char_count() { fn test_static_odd_char_count() {
const INPUT: &str = "hello"; const INPUT: &str = "hello";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 1); assert_eq!(tokens.len(), 1);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(value) if value == INPUT)) assert!(matches!(&tokens[0], DynamicStringSegment::Static(value) if value == INPUT))
@ -208,7 +208,7 @@ mod tests {
#[test] #[test]
fn test_script() { fn test_script() {
const INPUT: &str = "{{echo hello}}"; const INPUT: &str = "{{echo hello}}";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 1); assert_eq!(tokens.len(), 1);
assert!( assert!(
@ -219,7 +219,7 @@ mod tests {
#[test] #[test]
fn test_variable() { fn test_variable() {
const INPUT: &str = "#variable"; const INPUT: &str = "#variable";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 1); assert_eq!(tokens.len(), 1);
assert!( assert!(
@ -230,7 +230,7 @@ mod tests {
#[test] #[test]
fn test_static_script() { fn test_static_script() {
const INPUT: &str = "hello {{echo world}}"; const INPUT: &str = "hello {{echo world}}";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 2); assert_eq!(tokens.len(), 2);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello ")); assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello "));
@ -242,7 +242,7 @@ mod tests {
#[test] #[test]
fn test_static_variable() { fn test_static_variable() {
const INPUT: &str = "hello #subject"; const INPUT: &str = "hello #subject";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 2); assert_eq!(tokens.len(), 2);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello ")); assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello "));
@ -254,7 +254,7 @@ mod tests {
#[test] #[test]
fn test_static_script_static() { fn test_static_script_static() {
const INPUT: &str = "hello {{echo world}} foo"; const INPUT: &str = "hello {{echo world}} foo";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 3); assert_eq!(tokens.len(), 3);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello ")); assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello "));
@ -267,7 +267,7 @@ mod tests {
#[test] #[test]
fn test_static_variable_static() { fn test_static_variable_static() {
const INPUT: &str = "hello #subject foo"; const INPUT: &str = "hello #subject foo";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 3); assert_eq!(tokens.len(), 3);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello ")); assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello "));
@ -280,7 +280,7 @@ mod tests {
#[test] #[test]
fn test_static_script_variable() { fn test_static_script_variable() {
const INPUT: &str = "hello {{echo world}} #foo"; const INPUT: &str = "hello {{echo world}} #foo";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 4); assert_eq!(tokens.len(), 4);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello ")); assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "hello "));
@ -296,7 +296,7 @@ mod tests {
#[test] #[test]
fn test_escape_hash() { fn test_escape_hash() {
const INPUT: &str = "number ###num"; const INPUT: &str = "number ###num";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 3); assert_eq!(tokens.len(), 3);
assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "number ")); assert!(matches!(&tokens[0], DynamicStringSegment::Static(str) if str == "number "));
@ -309,7 +309,7 @@ mod tests {
#[test] #[test]
fn test_script_with_hash() { fn test_script_with_hash() {
const INPUT: &str = "{{echo #hello}}"; const INPUT: &str = "{{echo #hello}}";
let tokens = parse_input(INPUT); let (tokens, _) = parse_input(INPUT);
assert_eq!(tokens.len(), 1); assert_eq!(tokens.len(), 1);
assert!( assert!(