diff --git a/Cargo.lock b/Cargo.lock index cb2b73e..f823a3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,7 +508,7 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mlem" -version = "0.1.0" +version = "0.2.0" dependencies = [ "chrono", "derive_more", diff --git a/Cargo.toml b/Cargo.toml index c78d783..1379000 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mlem" -version = "0.1.0" +version = "0.2.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/config.rs b/src/config.rs index 286dc20..79e1812 100644 --- a/src/config.rs +++ b/src/config.rs @@ -6,8 +6,8 @@ pub struct Config { pub output_dir: String, pub src_dir: String, pub templates_dir: String, - pub emoji_web_directory: String, - pub emoji_local_directory: String, + pub emoji_web_directory: Option, + pub emoji_local_directory: Option, } pub fn read_config() -> Config { diff --git a/src/emoji.rs b/src/emoji.rs index 1325e24..a9d8627 100644 --- a/src/emoji.rs +++ b/src/emoji.rs @@ -2,20 +2,24 @@ use regex::Regex; use std::{ffi::OsString, fs::read_dir}; pub fn emoji_pass( markdown: &str, - emoji_web_directory: &String, - emoji_local_directory: &String, + emoji_web_directory: &Option, + emoji_local_directory: &Option, ) -> String { + if emoji_web_directory.is_none() | emoji_local_directory.is_none() { + return markdown.to_string(); + } let mut markdown = markdown.to_owned(); let re_emojis = Regex::new(r":\w+:").unwrap(); for emoji in re_emojis.find_iter(&markdown.clone()) { let emoji_file_name = - get_emoji_file_name(&get_emoji_name(emoji.as_str()), emoji_local_directory); + get_emoji_file_name(&get_emoji_name(emoji.as_str()), &emoji_local_directory.as_ref().unwrap()); if emoji_file_name.is_none() { continue; } let html_string = format!( - "", + "", + emoji_web_directory.as_ref().unwrap(), emoji_file_name.unwrap().to_str().unwrap() ); markdown = markdown.replacen(emoji.as_str(), &html_string, 1); diff --git a/src/main.rs b/src/main.rs index b5e2b36..9d52544 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ use std::fs::read_to_string; -mod config; -mod emoji; -mod index; +pub mod config; +pub mod emoji; +pub mod index; use mlem::*; fn main() { let config = config::read_config();