Start fixing autoreload bug

postgresml · levkk · Sep 1, 2023 · Aug 31, 2023 · Aug 31, 2023 · Sep 1, 2023
commit 2e6896d9752779c349dd864e4e27de0529b9a0c6
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/src/frontend/components.rs b/pgml-apps/cargo-pgml-components/src/frontend/components.rs
@@ -1,6 +1,6 @@
 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;
 
@@ -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 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/frontend/javascript.rs b/pgml-apps/cargo-pgml-components/src/frontend/javascript.rs
@@ -13,6 +13,7 @@ use crate::util::{info, unwrap_or_exit, warn};
 /// The name of the JS file that imports all other JS files
 /// created in the modules.
 static MODULES_FILE: &'static str = "static/js/modules.js";
+static MODULES_FILE_TMP: &'static str = "/tmp/pgml-components-modules.js";
 
 /// The JS bundle.
 static JS_FILE: &'static str = "static/js/bundle.js";
@@ -52,7 +53,7 @@ fn assemble_modules() {
         !path.contains("main.js") && !path.contains("bundle.js") && !path.contains("modules.js")
     });
 
-    let mut modules = unwrap_or_exit!(File::create(MODULES_FILE));
+    let mut modules = unwrap_or_exit!(File::create(MODULES_FILE_TMP));
 
     unwrap_or_exit!(writeln!(&mut modules, "// Build with --bin components"));
     unwrap_or_exit!(writeln!(
@@ -92,7 +93,13 @@ fn assemble_modules() {
         ));
     }
 
-    info(&format!("written {}", MODULES_FILE));
+    let new_modules = unwrap_or_exit!(read_to_string(MODULES_FILE_TMP));
+    let old_modules = unwrap_or_exit!(read_to_string(MODULES_FILE));
+
+    if new_modules != old_modules {
+        unwrap_or_exit!(copy(MODULES_FILE_TMP, MODULES_FILE));
+        info(&format!("written {}", MODULES_FILE));
+    }
 }
 
 pub fn bundle() {

diff --git a/pgml-dashboard/src/components/.ignore b/pgml-dashboard/src/components/.ignore