diff --git a/scimon.yml b/scimon.yml index 131da70..675ab29 100644 --- a/scimon.yml +++ b/scimon.yml @@ -9,10 +9,3 @@ render_markdown: overwrite: true # Boolean (valid values: 'true' or 'false'; default: 'true') mode: 'scimon' # String (valid values: 'scimon' and 'pure'; default: 'scimon') minify_html: true # Boolean (valid values: 'true' or 'false'; default: 'true') - minify_extra_plugins: true # Boolean (valid values: 'true' or 'false'; default: 'true') - - load_js_cdn: # List - - 'https://cdn.jsdelivr.net/npm/citation-js' - - 'https://cdn.jsdelivr.net/npm/mathjax@3.2.2/es5/tex-mml-chtml.min.js' - - 'https://cdnjs.cloudflare.com/ajax/libs/mermaid/10.9.0/mermaid.min.js' - - 'https://addons.scibun.com/static/prism.js' diff --git a/src/prime_down/inject/mod.rs b/src/prime_down/inject/mod.rs deleted file mode 100644 index 2bb3912..0000000 --- a/src/prime_down/inject/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod pd_inject; -pub mod pd_inject_js; \ No newline at end of file diff --git a/src/prime_down/inject/pd_inject_js.rs b/src/prime_down/inject/pd_inject_js.rs deleted file mode 100644 index 18019fc..0000000 --- a/src/prime_down/inject/pd_inject_js.rs +++ /dev/null @@ -1,45 +0,0 @@ -use serde_yaml::Value; - -use crate::configs::settings::Settings; - -pub struct PrimeDownInjectJS; - -impl PrimeDownInjectJS { - - fn generate_script_tags(css_list: &[Value]) -> String { - let mut tags = String::new(); - - for css_file in css_list { - if let Value::String(file_name) = css_file { - let script_js = &format!( - "\n", file_name - ); - - tags.push_str(&script_js); - } - } - - tags - } - - fn from_cdn() -> Value { - let js_list = Settings::get("render_markdown.load_js_cdn", "LIST"); - - if let Value::Sequence(js_list) = js_list { - Value::String( - Self::generate_script_tags(&js_list) - ) - } else { - Value::Null - } - } - - pub fn load_from_cdn() -> String { - serde_yaml::to_string( - &Self::from_cdn() - ).unwrap_or_default().replace( - "|\n", "\n" - ).trim().to_string() - } - -} diff --git a/src/prime_down/mod.rs b/src/prime_down/mod.rs index 6bb1aa1..b482984 100644 --- a/src/prime_down/mod.rs +++ b/src/prime_down/mod.rs @@ -2,7 +2,7 @@ pub mod pd_io; pub mod pd_core; // Helpers -pub mod inject; +pub mod pd_inject; // Extras pub mod pd_extras; \ No newline at end of file diff --git a/src/prime_down/pd_core.rs b/src/prime_down/pd_core.rs index db25eb8..a939cc7 100644 --- a/src/prime_down/pd_core.rs +++ b/src/prime_down/pd_core.rs @@ -11,7 +11,7 @@ use headless_chrome::{ use crate::{ consts::uris::Uris, configs::settings::Settings, - prime_down::inject::pd_inject::PrimeDownInject, + prime_down::pd_inject::PrimeDownInject, utils::{ base64::Base64, diff --git a/src/prime_down/inject/pd_inject.rs b/src/prime_down/pd_inject.rs similarity index 64% rename from src/prime_down/inject/pd_inject.rs rename to src/prime_down/pd_inject.rs index d07bf79..5ff945d 100644 --- a/src/prime_down/inject/pd_inject.rs +++ b/src/prime_down/pd_inject.rs @@ -1,9 +1,5 @@ -use serde_yaml::Value; - use crate::{ utils::str::StrUtils, - configs::settings::Settings, - prime_down::inject::pd_inject_js::PrimeDownInjectJS, consts::{ uris::Uris, @@ -15,19 +11,7 @@ pub struct PrimeDownInject; impl PrimeDownInject { - fn get_js(render_mode: Value) -> String { - let cdn = if render_mode == Global::APP_NAME { - PrimeDownInjectJS::load_from_cdn() - } else { - "".to_string() - }; - - format!("{}", cdn) - } - pub fn content(file: &str, contents: String, markdown_html: String) -> String { - let render_mode = Settings::get("render_markdown.mode", "STRING"); - let title = format!( "{}: {}: README", StrUtils::capitalize(&Global::APP_NAME), &file.replace( ".md", "" @@ -45,8 +29,6 @@ impl PrimeDownInject { "{{ dist_bundle_js }}", &bundle_js_link ).replace( "{{ markdown_content }}", &markdown_html - ).replace( - "{{ inject_js }}", &Self::get_js(render_mode) ) }