ok

levkk · levkk · commit 61e40cf02636 · 2023-08-31T17:28:24.000-07:00
diff --git a/pgml-apps/cargo-pgml-components/src/frontend/components.rs b/pgml-apps/cargo-pgml-components/src/frontend/components.rs
@@ -5,7 +5,7 @@ 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";
@@ -133,7 +133,7 @@ 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));
 
-    if modules != existing_modules {
+    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));
diff --git a/pgml-apps/cargo-pgml-components/src/frontend/javascript.rs b/pgml-apps/cargo-pgml-components/src/frontend/javascript.rs
@@ -13,7 +13,6 @@ 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";
@@ -53,7 +52,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_TMP));
+    let mut modules = unwrap_or_exit!(File::create(MODULES_FILE));
 
     unwrap_or_exit!(writeln!(&mut modules, "// Build with --bin components"));
     unwrap_or_exit!(writeln!(
@@ -93,13 +92,7 @@ fn assemble_modules() {
         ));
     }
 
-    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));
-    }
+    info(&format!("written {}", MODULES_FILE));
 }
 
 pub fn bundle() {
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)
+}
