diff --git a/src/buildsystem/wasm.rs b/src/buildsystem/wasm.rs index e69de29bb..8b1378917 100644 --- a/src/buildsystem/wasm.rs +++ b/src/buildsystem/wasm.rs @@ -0,0 +1 @@ + diff --git a/src/cli/translate/extract_svgs.rs b/src/cli/translate/extract_svgs.rs index e69de29bb..8b1378917 100644 --- a/src/cli/translate/extract_svgs.rs +++ b/src/cli/translate/extract_svgs.rs @@ -0,0 +1 @@ + diff --git a/src/cli/translate/mod.rs b/src/cli/translate/mod.rs index 60a3361d7..5799cad02 100644 --- a/src/cli/translate/mod.rs +++ b/src/cli/translate/mod.rs @@ -3,6 +3,7 @@ use html_parser::Node; use std::fmt::Write; use std::io::Read; use std::path::PathBuf; +use std::process::exit; use structopt::StructOpt; pub mod extract_svgs; @@ -40,21 +41,30 @@ impl Translate { source, } = self; - let contents = input - .map(|f| { - std::fs::read_to_string(&f) - .unwrap_or_else(|e| panic!("Could not read input file: {}", e)) + let contents; + let temp = input.map(|f| { + std::fs::read_to_string(&f).unwrap_or_else(|e| { + log::error!("Cloud not read input file: {}.", e); + exit(0); }) - .unwrap_or(source.unwrap_or_else(|| { + }); + if let None = temp { + if let Some(s) = source { + contents = s; + } else { if atty::is(atty::Stream::Stdin) { - panic!("No input file, source, or stdin to translate from"); + log::error!("No input file, source, or stdin to translate from."); + exit(0); } let mut buffer = String::new(); std::io::stdin().read_to_string(&mut buffer).unwrap(); - buffer.trim().to_string() - })); + contents = buffer.trim().to_string(); + } + } else { + contents = temp.unwrap(); + } // parse the input as html and prepare the output let dom = Dom::parse(&contents)?; diff --git a/src/cli/watch/mod.rs b/src/cli/watch/mod.rs index e69de29bb..8b1378917 100644 --- a/src/cli/watch/mod.rs +++ b/src/cli/watch/mod.rs @@ -0,0 +1 @@ + diff --git a/src/main.rs b/src/main.rs index 7ecb50ac7..798c492dc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,24 +9,21 @@ async fn main() -> Result<()> { match args.action { Commands::Translate(opts) => { opts.translate(); - } + } // Commands::Build(_) => { + // // + // } - // Commands::Build(_) => { - // // - // } + // Commands::Clean(_) => { + // // + // } + // Commands::Config(_) => { + // // + // } - // Commands::Clean(_) => { - // // - // } - - // Commands::Config(_) => { - // // - // } - - // Commands::Serve(_) => { - // // - // } + // Commands::Serve(_) => { + // // + // } } Ok(()) diff --git a/src/watch.rs b/src/watch.rs index e69de29bb..8b1378917 100644 --- a/src/watch.rs +++ b/src/watch.rs @@ -0,0 +1 @@ +