using custom formatting in listener

1 files changed, 21 insertions, 14 deletions

diff --git a/src/client/listener.rs b/src/client/listener.rs
index 6aefbb1..0b403b2 100644
--- a/src/client/listener.rs
+++ b/src/client/listener.rs
@@ -24,13 +24,15 @@ use crate::daemon::pomo::{Pomo,State};
 
 struct Format {
     format_work: String,
-    format_work_paused: String,
-    format_work_idle: String,
     format_break: String,
-    format_break_paused: String,
-    format_break_idle: String,
     format_long_break: String,
+
+    format_work_paused: String,
+    format_break_paused: String,
     format_long_break_paused: String,
+
+    format_work_idle: String,
+    format_break_idle: String,
     format_long_break_idle: String,
 }
 
@@ -40,15 +42,17 @@ pub fn start_listener() {
     let mut reader = BufReader::new(stream);
 
     let f = Format {
-        format_work: get_envvar("FORMAT_WORK", "work"),
-        format_work_paused: get_envvar("FORMAT_WORK_PAUSED", "[work]"),
-        format_work_idle: get_envvar("FORMAT_WORK_IDLE", "(work)"),
-        format_break: get_envvar("FORMAT_BREAK", "break"),
-        format_break_paused: get_envvar("FORMAT_BREAK_PAUSED", "[break]"),
-        format_break_idle: get_envvar("FORMAT_BREAK_IDLE", "(break)"),
-        format_long_break: get_envvar("FORMAT_LONG_BREAK", "long break"),
-        format_long_break_paused: get_envvar("FORMAT_LONG_BREAK_PAUSED", "[long break]"),
-        format_long_break_idle: get_envvar("FORMAT_LONG_BREAK_IDLE", "(long break)"),
+        format_work: get_envvar("FORMAT_WORK", "WORK {counter} - {time}"),
+        format_break: get_envvar("FORMAT_BREAK", "BREAK {counter} - {time}"),
+        format_long_break: get_envvar("FORMAT_LONG_BREAK", "LONG BREAK {counter} - {time}"),
+
+        format_work_paused: get_envvar("FORMAT_WORK_PAUSED", "[WORK] {counter} - {time}"),
+        format_break_paused: get_envvar("FORMAT_BREAK_PAUSED", "[BREAK] {counter} - {time}"),
+        format_long_break_paused: get_envvar("FORMAT_LONG_BREAK_PAUSED", "[LONG BREAK] {counter} - {time}"),
+
+        format_work_idle: get_envvar("FORMAT_WORK_IDLE", "(WORK) {counter}"),
+        format_break_idle: get_envvar("FORMAT_BREAK_IDLE", "(BREAK) {counter}"),
+        format_long_break_idle: get_envvar("FORMAT_LONG_BREAK_IDLE", "(LONG BREAK) {counter}"),
     };
 
     loop {
@@ -89,5 +93,8 @@ fn pretty_print(f: &Format, p: Pomo) {
         State::LongBreakIdle => &f.format_long_break_idle,
     };
 
-    println!("{} {} - {}", format, p.counter, format_time(p.secs_elapsed));
+
+    println!("{}", format
+        .replace("{time}", format_time(p.secs_elapsed).as_str())
+        .replace("{counter}", format!("{}", p.counter).as_str()));
 }