Allow for choosing an outputter at runtime

Author: Dlurak

modules/src/modules/mod.rs

@@ -89,7 +89,7 @@ impl<T: fmt::Display> Module<T> {
         }
     }
 
-    pub fn output<O: Outputter>(&self, outputter: O) -> String {
+    pub fn output(&self, outputter: &Box<dyn Outputter>) -> String {
         let icon = self.icon.0.map(|icon| icon.to_string()).unwrap_or_default();
         let style = self.style.0;
         format!(

modules/src/outputter.rs

@@ -1,3 +1,5 @@
+// TODO: Should they stay as independent structs or be one enum?
+
 use crate::{Color, Style};
 
 pub trait Outputter {
@@ -60,3 +62,11 @@ impl Outputter for TtyOutputter {
         ansi_style.prefix().to_string()
     }
 }
+
+pub fn new_outputter(str: &str) -> Option<Box<dyn Outputter>> {
+    match str.to_lowercase().as_str() {
+        "tty" | "terminal" | "term" => Some(Box::new(TtyOutputter)),
+        "tmux" => Some(Box::new(TmuxOutputter)),
+        _ => None,
+    }
+}

src/main.rs

@@ -3,7 +3,7 @@ mod config;
 use itertools::Itertools;
 use modules::{
     modules::ToModule,
-    outputter::{self, Outputter},
+    outputter::{self, Outputter, TmuxOutputter},
     Module, Style,
 };
 use std::{
@@ -23,17 +23,12 @@ struct CacheEntry<'a> {
 
 struct Cache<'a>(Vec<CacheEntry<'a>>);
 
-#[cfg(not(debug_assertions))]
-const OUTPUTTER: outputter::TmuxOutputter = outputter::TmuxOutputter;
-#[cfg(debug_assertions)]
-const OUTPUTTER: outputter::TtyOutputter = outputter::TtyOutputter;
-
 impl<'a> Cache<'a> {
     fn new(entries: Vec<CacheEntry<'a>>) -> Self {
         Self(entries)
     }
 
-    fn update(self) -> (Self, bool) {
+    fn update(self, outputter: &Box<dyn Outputter>) -> (Self, bool) {
         let now = Instant::now();
         let mut rerender = false;
 
@@ -55,7 +50,7 @@ impl<'a> Cache<'a> {
                         .module
                         .internal_set_mut_style(entry.module.content.style());
                     entry.rerender_interval = entry.module.content.next_render_time();
-                    entry.cached_str = entry.module.output(OUTPUTTER);
+                    entry.cached_str = entry.module.output(outputter);
                     entry.include = entry.module.content.include();
                 }
                 entry
@@ -77,12 +72,15 @@ impl From<&Cache<'_>> for String {
 }
 
 fn main() {
+    let outputter_arg = std::env::args().nth(1);
+    let outputter = outputter_arg.and_then(|s| outputter::new_outputter(&s)).unwrap_or(Box::new(TmuxOutputter));
+
     let mods = config::get_modules();
     let cached_modules: Vec<_> = mods
         .iter()
         .map(|module| {
             (
-                module.output(OUTPUTTER),
+                module.output(&outputter),
                 module.content.next_render_time(),
                 module.content.include(),
             )
@@ -109,7 +107,7 @@ fn main() {
     loop {
         let now = Instant::now();
 
-        let updated = cache.update();
+        let updated = cache.update(&outputter);
         cache = updated.0;
 
         if updated.1 || !first_render {
@@ -119,7 +117,7 @@ fn main() {
                 config::PRE_MODULES,
                 String::from(&cache),
                 config::POST_MODULES,
-                OUTPUTTER.prefix(Style::default())
+                outputter.prefix(Style::default())
             );
         }