Changeset 5bd9641 in gignore

Timestamp:

19 Feb 2026, 22:16:46 (2 months ago)

Author:

Asher Mullaney <asher.mullaney@…>

Branches:

file_locations, help, logging, man, multi_arg, trunk

Children:

eb42226

Parents:

d5c0cff

Message:

Updated file locations. Also added method.

Files:

• Cargo.toml (modified) (1 diff)
• src/main.rs (modified) (2 diffs)
• src/template.rs (modified) (4 diffs)
• temp.txt (added)

Cargo.toml

@@ -6 +6 @@
 [dependencies]
 clap = { version = "4.5.53", features = ["derive"] }
-home = "0.5.12"
 anyhow = "1.0.100"
 serde = { version = "1.0.228", features = ["derive"] }

src/main.rs

@@ -184 +184 @@
             open_truncate(".gitignore".as_ref()).context("cannot open `.gitignore` in truncate mode")?.write_all(b"").context("cannot write to `.gitignore`")?;
 
-            // Re-add lines to file, without [PATH].
+            // Re-add lines to file, without PATH.
             for line in lines {
                 open_append(".gitignore".as_ref()).context("cannot open `.gitignore` in append mode")?
@@ -219 +219 @@
             }
         } => {
-            template::add(&template::Template::new(source_file.as_ref(), name, *append)).context("cannot add template")?;
+            let x = template::Template::new(source_file.as_ref(), name, *append);
+
+            template::add(x).context("cannot add template")?;
 
             Ok(())

src/template.rs

@@ -4 +4 @@
         PathBuf,
     },
-    io::Write,
+    io::{self, Write},
     fs,
     os::unix::fs::MetadataExt,
+    process,
 };
 
@@ -41 +42 @@
         &self.source_file
     }
+    fn change_source_file<T: AsRef<Path>>(&mut self, new: T) {
+        self.source_file = new.as_ref().to_owned();
+    }
     pub(crate) fn get_name(&self) -> &str {
         &self.name
@@ -117 +121 @@
 }
 
-pub(crate) fn add(template: &Template) -> Result<()> {
+pub(crate) fn add(mut template: Template) -> Result<()> {
     if !fs::exists(template.get_source_file()).context(format!("cannot search for `{}`", template.get_name()))? {
         return Err(Error::msg(format!("The source file specified, `{}`, does not exist.", template.get_source_file().display())));
     }
 
+    if (&*(template.get_source_file().to_string_lossy())).split_terminator('.').nth(2) != Some("ggnr") {
+        eprintln!("WARNING: specified source file, `{}`, does not have the file extension for gignore templates (`.ggnr`). Continue anyway? [y/N]", template.get_source_file().display());
+
+        let mut buf = String::new();
+        io::stdin()
+            .read_line(&mut buf)
+            .context("cannot read from stdin")?;
+
+        match &*buf.to_lowercase().trim() {
+            "y" => { eprintln!("Continuing..."); },
+            _ => {
+                eprintln!("User denied operation. Exiting.");
+                process::exit(0);
+            },
+        }
+    };
+
     let new_template_path = format!("/usr/lib/gignore/{}", template.get_source_file().display());
+
+    if fs::exists(&new_template_path).context(format!("cannot search for `{new_template_path}`"))? {
+        eprintln!("WARNING: the file `{new_template_path}` already exists. Overwrite it? [y/N]");
+        
+        let mut buf = String::new();
+        io::stdin()
+            .read_line(&mut buf)
+            .context("cannot read from stdin")?;
+
+        match &*buf.to_lowercase().trim() {
+            "y" => {
+                eprintln!("Continuing...");
+
+                fs::remove(&new_template_path).
+            },
+            _ => {
+                eprintln!("User denied operation. Exiting.");
+                process::exit(0);
+            },
+        }
+    };
 
     drop(
@@ -142 +184 @@
     }
 
-    fs::remove_file(template.get_source_file()).context(format!("cannot remove `{}`", template.get_source_file().display()))?;
-
     if find_name(template.get_name()).context("cannot search for name in template library")?.is_some() {
         return Err(Error::msg(format!("A template with the name `{}` already exists!", template.get_name())));
     }
+    template.change_source_file(new_template_path);
+
     template.save().context("cannot save template")?;