refactor: update markdown rendering for extra features and remove 'pu…

…re' markdown render mode
Gausix · Jun 10, 2024 · 5fbfc3d · 5fbfc3d
1 parent 50f6d8c
commit 5fbfc3d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 44 deletions.
diff --git a/src/prime_down/pd_extras.rs b/src/prime_down/pd_extras.rs
@@ -1,9 +1,7 @@
 use regex::Regex;
 
 use crate::{
-    consts::global::Global,
     utils::generate::Generate,
-    configs::settings::Settings,
     regexp::regex_core::CoreRegExp,
 };
 
@@ -12,42 +10,34 @@ pub struct PrimeDownExtras;
 impl PrimeDownExtras {
 
     pub fn gist(markdown: &str) -> String {
-        if Settings::get("render_markdown.mode", "STRING") == Global::APP_NAME {
-            let re = Regex::new(CoreRegExp::RENDER_EXTRA_GIST).unwrap();
-
-            let replaced_markdown = re.replace_all(markdown, |captures: &regex::Captures| {
-                let link = captures.get(1).unwrap().as_str();
-                format!("<script src='{}.js'></script>", link)
-            });
-
-            replaced_markdown.to_string()
-        } else {
-            markdown.to_string()
-        }
+        let re = Regex::new(CoreRegExp::RENDER_EXTRA_GIST).unwrap();
+
+        let replaced_markdown = re.replace_all(markdown, |captures: &regex::Captures| {
+            let link = captures.get(1).unwrap().as_str();
+            format!("<script src='{}.js'></script>", link)
+        });
+
+        replaced_markdown.to_string()
     }
 
     pub fn qrcode(markdown: &str) -> String {
-        if Settings::get("render_markdown.mode", "STRING") == Global::APP_NAME {
-            let re = Regex::new(CoreRegExp::RENDER_EXTRA_QRCODE).unwrap();
-
-            let replaced_markdown = re.replace_all(markdown, |captures: &regex::Captures| {
-                let link = captures.get(1).unwrap().as_str();
-                let size: u32 = captures.get(2).unwrap().as_str().parse().unwrap();
-
-                let qr_code_base64 = Generate::qrcode(link, size);
-                let link_qrcode = format!("data:image/png;base64,{}", qr_code_base64);
+        let re = Regex::new(CoreRegExp::RENDER_EXTRA_QRCODE).unwrap();
+
+        let replaced_markdown = re.replace_all(markdown, |captures: &regex::Captures| {
+            let link = captures.get(1).unwrap().as_str();
+            let size: u32 = captures.get(2).unwrap().as_str().parse().unwrap();
+
+            let qr_code_base64 = Generate::qrcode(link, size);
+            let link_qrcode = format!("data:image/png;base64,{}", qr_code_base64);
 
-                format!(
-                    "<p class='qrcode'>
-                        <img src='{}' alt='QR Code of {}' />
-                    </p>", link_qrcode, link
-                )
-            });
-
-            replaced_markdown.to_string()
-        } else {
-            markdown.to_string()
-        }
+            format!(
+                "<p class='qrcode'>
+                    <img src='{}' alt='QR Code of {}' />
+                </p>", link_qrcode, link
+            )
+        });
+
+        replaced_markdown.to_string()
     }
 
 }
diff --git a/src/ui/emojis.rs b/src/ui/emojis.rs
@@ -4,7 +4,6 @@ impl Emojis {
 
     pub const HOME: &'static str = "🏠";
     pub const CLOCK: &'static str = "⏰";
-    pub const TOOLS: &'static str = "🛠️";
     pub const VERSION: &'static str = "📜";
 
     pub const LOCKED: &'static str = "🔒";

diff --git a/src/ui/ui_base.rs b/src/ui/ui_base.rs
@@ -19,23 +19,15 @@ impl UI {
 
     pub fn header() {
         if Settings::get("ui.show_header", "BOOLEAN") == true {
-            let render_md_mode;
             let name = StrUtils::capitalize(Global::APP_NAME);
             let standard_font = FIGfont::standard().unwrap();
-
-            if Settings::get("render_markdown.mode", "STRING") == Global::APP_NAME {
-                render_md_mode = format!("{}", name.cyan());
-            } else {
-                render_md_mode = format!("{}", "Vanilla".cyan());
-            }
-
+
             if let Some(title) = standard_font.convert(&name) {
                 println!("{}", &title.to_string().bold().cyan());
                 println!("-------------------------------------------------------------------");
                 println!("{} Version: {}", Emojis::VERSION, Global::APP_VERSION.yellow());
                 println!("{} Homepage: {} • {}", Emojis::HOME, Global::APP_HOMEPAGE.blue(), Global::APP_AUTHOR.green());
                 println!("{} Started in: {}", Emojis::CLOCK, System::date_time().magenta());
-                println!("{} Render mode: {}", Emojis::TOOLS, render_md_mode);
                 println!("-------------------------------------------------------------------");
             }
         }