1 files changed, 19 insertions, 26 deletions

diff --git a/src/main.rs b/src/main.rs
index 48a73a4..8a139af 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,28 +6,19 @@ mod term;
 mod tui;
 mod utils;
 
-use crossterm::style::Color;
-use lazy_static::lazy_static;
-use minimad::mad_inline;
-use termimad::{CompoundStyle, MadSkin};
 use tokio::runtime::Runtime;
 use tokio::task;
 
 use config::Config;
 use error::{Error, Result};
 use stackexchange::{LocalStorage, Question, Search};
+use term::Term;
 use tui::markdown::Markdown;
 
 fn main() -> Result<()> {
-    // Markdown styles (outside of TUI)
-    let mut skin = MadSkin::default();
-    skin.inline_code = CompoundStyle::with_fg(Color::Cyan);
-    skin.code_block.compound_style = CompoundStyle::with_fg(Color::Cyan);
-    let mut print_error = term::mk_print_error(&skin);
-
     // Tokio runtime
     let mut rt = Runtime::new()?;
-    rt.block_on(run(&mut skin))
+    rt.block_on(run())
         .and_then(|qs| {
             // Run TUI
             qs.map(tui::run);
@@ -35,18 +26,22 @@ fn main() -> Result<()> {
         })
         .or_else(|e: Error| {
             // Handle errors
-            print_error(&e.to_string())
+            term::print_error(&e.to_string())
         })
 }
 
 /// Runs the CLI and, if the user wishes to enter the TUI, returns
 /// question/answer data
-async fn run(skin: &mut MadSkin) -> Result<Option<Vec<Question<Markdown>>>> {
+async fn run() -> Result<Option<Vec<Question<Markdown>>>> {
+    // Get CLI opts
     let opts = cli::get_opts()?;
     let config = opts.config;
     let sites = &config.sites;
     let lucky = config.lucky;
 
+    // Term tools and markdown styles (outside of TUI)
+    let mut term = Term::new();
+
     let ls = LocalStorage::new(opts.update_sites).await?;
 
     if let Some(key) = opts.set_api_key {
@@ -66,21 +61,19 @@ async fn run(skin: &mut MadSkin) -> Result<Option<Vec<Question<Markdown>>>> {
             md.push_str(&format!("|{}|{}\n", s.api_site_parameter, s.site_url));
         }
         md.push_str("|-\n");
-        termimad::print_text(&md);
+        term.print(&md);
         return Ok(None);
     }
 
     if let Some(site) = ls.find_invalid_site(sites).await {
-        print_error!(skin, "$0 is not a valid StackExchange site.\n\n", site)?;
-        // TODO should only use inline for single lines; use termimad::text stuff
-        print_notice!(
-            skin,
+        term.print_error(&format!("{} is not a valid StackExchange site.\n\n", site))?;
+        term.print_notice(
             "If you think this is incorrect, try running\n\
                 ```\n\
                 so --update-sites\n\
                 ```\n\
-                to update the cached site listing. You can also run `so --list-sites` \
-                to list all available sites.",
+                to update the cached site listing. \
+                You can also run `so --list-sites` to list all available sites.",
         )?;
         return Ok(None);
     }
@@ -89,20 +82,20 @@ async fn run(skin: &mut MadSkin) -> Result<Option<Vec<Question<Markdown>>>> {
         let mut search = Search::new(config, ls, q);
         if lucky {
             // Show top answer
-            let md = term::wrap_spinner(search.search_lucky()).await??;
-            skin.print_text(&md);
-            skin.print_text("\nPress **[SPACE]** to see more results, or any other key to exit");
+            let md = Term::wrap_spinner(search.search_lucky()).await??;
+            term.print(&md);
+            term.print("\nPress **[SPACE]** to see more results, or any other key to exit");
 
             // Kick off the rest of the search in the background
             let qs = task::spawn(async move { search.search_md().await });
-            if !term::wait_for_char(' ')? {
+            if !Term::wait_for_char(' ')? {
                 return Ok(None);
             }
 
             // Get the rest of the questions
-            return Ok(Some(term::wrap_spinner(qs).await?.unwrap()?));
+            return Ok(Some(Term::wrap_spinner(qs).await?.unwrap()?));
         } else {
-            return Ok(Some(term::wrap_spinner(search.search_md()).await??));
+            return Ok(Some(Term::wrap_spinner(search.search_md()).await??));
         }
     }
     Ok(None)