From 177c23da42d30baaca9959798d22ad9c556aa894 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Mon, 3 Jul 2023 00:37:36 -0400
Subject: [PATCH] modules

---
 src/links/mod.rs    | 37 ++++++++++++++++++++++++++++++
 src/main.rs         | 56 ++++++++++-----------------------------------
 templates/main.tera | 18 +++++++--------
 3 files changed, 58 insertions(+), 53 deletions(-)
 create mode 100644 src/links/mod.rs

diff --git a/src/links/mod.rs b/src/links/mod.rs
new file mode 100644
index 0000000..fde435b
--- /dev/null
+++ b/src/links/mod.rs
@@ -0,0 +1,37 @@
+use serde::{Serialize, Deserialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct RustyLinks {
+    config: Config,
+    links: Vec<Links>,
+    pub metadata: Option<MetaData>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MetaData {
+    pub last_updated: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Config {
+    title: String,
+    name: String,
+    description: String,
+    avatar: String,
+    background: String,
+    background_opacity: f64,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Links {
+    title: String,
+    links: Vec<Link>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Link {
+    text: String,
+    icon: String,
+    href: Option<String>,
+    copy: Option<String>,
+}
diff --git a/src/main.rs b/src/main.rs
index 6cd7ad8..0cb730c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,53 +1,15 @@
-use std::fs;
-use std::io;
+use std::{fs,io};
 use std::path::Path;
 
 use chrono::{DateTime, Utc};
-use serde::{Serialize, Deserialize};
 use serde_yaml::{self};
 use tera::{Tera,Context};
 
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct RustyLinks {
-    config: Config,
-    links: Vec<Links>,
-    metadata: Option<MetaData>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MetaData {
-    last_updated: String,
-}
-
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Config {
-    title: String,
-    name: String,
-    description: String,
-    avatar: String,
-    background: String,
-    background_opacity: f64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Links {
-    title: String,
-    links: Vec<Link>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Link {
-    text: String,
-    icon: String,
-    href: Option<String>,
-    copy: Option<String>,
-}
-
+mod links;
+use links::{RustyLinks,MetaData};
 
 pub fn copy_recursively(source: impl AsRef<Path>, destination: impl AsRef<Path>) -> io::Result<()> {
-    // https://nick.groenen.me/notes/recursively-copy-files-in-rust/
+    // Credit: https://nick.groenen.me/notes/recursively-copy-files-in-rust/
     fs::create_dir_all(&destination)?;
     for entry in fs::read_dir(source)? {
         let entry = entry?;
@@ -64,7 +26,10 @@ pub fn copy_recursively(source: impl AsRef<Path>, destination: impl AsRef<Path>)
 
 fn load_links(file_name: &str) -> RustyLinks {
     let links_yaml = std::fs::File::open(file_name).expect("Could not find file");
+
     let mut rusty_links: RustyLinks = serde_yaml::from_reader(links_yaml).expect("Could not read values");
+     
+    // Set last updated time to now.
     let now : DateTime<Utc> = Utc::now();
     let metadata : MetaData = MetaData { last_updated: now.to_rfc2822()};
     rusty_links.metadata = Some(metadata);
@@ -73,7 +38,6 @@ fn load_links(file_name: &str) -> RustyLinks {
 }
 
 fn render_links(rusty_links: RustyLinks) -> String {
-    let context: Context = Context::from_serialize(&rusty_links).expect("Could not parse");
     let tera = match Tera::new("templates/*.tera") {
       Ok(t) => t,
       Err(e) => {
@@ -81,11 +45,15 @@ fn render_links(rusty_links: RustyLinks) -> String {
           ::std::process::exit(1);
       }
     };
+
+    let context: Context = Context::from_serialize(&rusty_links).expect("Could not parse");
     tera.render("main.tera", &context).expect("Could not parse")
 }
 
 fn write_file(html: String ) {
-    fs::remove_dir_all("./output").expect("could not remove directory");
+    if Path::new("./output").exists() {
+      fs::remove_dir_all("./output").expect("could not remove directory");
+    }
     fs::create_dir("./output").expect("Could not create output directory");
     copy_recursively("./static", "./output").expect("Could not copy static directory");
     fs::write("./output/index.html", html).expect("Could not write to index.html");
diff --git a/templates/main.tera b/templates/main.tera
index fdf7b97..00713c8 100644
--- a/templates/main.tera
+++ b/templates/main.tera
@@ -40,24 +40,24 @@
     </div>
     <div class="links">
       {% for link in section.links %}
-      {% if 'href' in link and 'copy' in link %}
+      {% if link.href and link.copy %}
           <a class="link" href="{{link.href}}" target="_blank">
             <i class="{{link.icon}}"></i> {{link.text}}
             <div class="tooltip">
-              <span class="" href="#" onclick="copytext('{{link.copy}}','link._id')" onmouseout="outFunc('link._id')">
-                <span class="tooltiptext" id="link._id">Copy to clipboard</span>
+              <span class="" href="#" onclick="copytext('{{link.copy}}','{{loop.index}}')" onmouseout="outFunc('{{loop.index}}')">
+                <span class="tooltiptext" id="{{loop.index}}">Copy to clipboard</span>
                 <i class="fa-solid fa-copy"></i>
               </span>
             </div>
           </a>
-      {% elif 'href' in link %}
+      {% elif link.href %}
         <a class="link" href="{{link.href}}" target="_blank">
           <i class="{{link.icon}}"></i> {{link.text}}
         </a>
-      {% elif 'copy' in link %}
+      {% elif link.copy %}
         <div class="tooltip block">
-        <a class="link" href="#" onclick="copytext('{{link.copy}}','link._id')" onmouseout="outFunc('link._id')">
-          <span class="tooltiptext" id="link._id">Copy to clipboard</span>
+        <a class="link" href="#" onclick="copytext('{{link.copy}}','{{loop.index}}')" onmouseout="outFunc('{{loop.index}}')">
+          <span class="tooltiptext" id="{{loop.index}}">Copy to clipboard</span>
           <i class="{{link.icon}}"></i> {{link.text}}
         </a>
         </div>
@@ -74,7 +74,7 @@
 
 </body>
 <script>
-  /*
+  
   function copytext(val, linkid) {
     event.preventDefault();
     console.log(val);
@@ -87,6 +87,6 @@
     var tooltip = document.getElementById(linkid);
     tooltip.innerHTML = "Copy to clipboard";
   }
-  */
+  
 </script>
 </html>