Fix some autoreloading bugs (#972)

levkk · web-flow · commit 295be8360c99 · 2023-08-31T17:30:17.000-07:00
diff --git a/pgml-apps/cargo-pgml-components/Cargo.lock b/pgml-apps/cargo-pgml-components/Cargo.lock
diff --git a/pgml-apps/cargo-pgml-components/Cargo.toml b/pgml-apps/cargo-pgml-components/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-pgml-components"
-version = "0.1.9"
+version = "0.1.10"
 edition = "2021"
 authors = ["PostgresML <team@postgresml.org>"]
 license = "MIT"
diff --git a/pgml-apps/cargo-pgml-components/src/frontend/components.rs b/pgml-apps/cargo-pgml-components/src/frontend/components.rs
@@ -1,11 +1,11 @@
 use convert_case::{Case, Casing};
 use sailfish::TemplateOnce;
-use std::fs::{create_dir_all, read_dir};
+use std::fs::{create_dir_all, read_dir, read_to_string};
 use std::path::Path;
 use std::process::exit;
 
 use crate::frontend::templates;
-use crate::util::{error, info, unwrap_or_exit, write_to_file};
+use crate::util::{compare_strings, error, info, unwrap_or_exit, write_to_file};
 
 static COMPONENT_DIRECTORY: &'static str = "src/components";
 static COMPONENT_MOD: &'static str = "src/components/mod.rs";
@@ -131,7 +131,13 @@ pub fn update_modules() {
     }
 
     let modules = unwrap_or_exit!(templates::Mod { modules }.render_once());
+    let existing_modules = unwrap_or_exit!(read_to_string(COMPONENT_MOD));
 
-    unwrap_or_exit!(write_to_file(&Path::new(COMPONENT_MOD), &modules));
-    info(&format!("written {}", COMPONENT_MOD));
+    if !unwrap_or_exit!(compare_strings(&modules, &existing_modules)) {
+        debug!("mod.rs is different");
+        unwrap_or_exit!(write_to_file(&Path::new(COMPONENT_MOD), &modules));
+        info(&format!("written {}", COMPONENT_MOD));
+    }
+
+    debug!("mod.rs is the same");
 }
diff --git a/pgml-apps/cargo-pgml-components/src/util.rs b/pgml-apps/cargo-pgml-components/src/util.rs
@@ -1,5 +1,5 @@
 use owo_colors::OwoColorize;
-use std::fs::File;
+use std::fs::{read_to_string, File};
 use std::io::{ErrorKind, Write};
 use std::path::Path;
 use std::process::Command;
@@ -78,3 +78,16 @@ pub fn write_to_file(path: &Path, content: &str) -> std::io::Result<()> {
 
     Ok(())
 }
+
+#[allow(dead_code)]
+pub fn compare_files(path1: &Path, path2: &Path) -> std::io::Result<bool> {
+    let content1 = read_to_string(path1)?;
+    let content2 = read_to_string(path2)?;
+
+    compare_strings(&content1, &content2)
+}
+
+pub fn compare_strings(string1: &str, string2: &str) -> std::io::Result<bool> {
+    // TODO: faster string comparison method needed.
+    Ok(string1 == string2)
+}
diff --git a/pgml-dashboard/static/js/.ignore b/pgml-dashboard/static/js/.ignore
@@ -0,0 +1 @@
+main.js
diff --git a/pgml-dashboard/templates/content/playground.html b/pgml-dashboard/templates/content/playground.html
@@ -1 +1,11 @@
+<% use crate::components::*; %>
+
 <h3 class="h3">Playground</h3>
+
+<div class="mb-3">
+  <%+ GithubIcon::new() %>
+</div>
+
+<div class="mb-3">
+  <%- Navbar::render(None) %>
+</div>
