Changeset 5e61643 in gignore

Timestamp:

21 Feb 2026, 19:27:29 (2 months ago)

Author:

Asher Mullaney <asher.mullaney@…>

Branches:

file_locations, help, logging, man, multi_arg, trunk

Children:

e36b2af

Parents:

eb42226

Message:

Completed template file location update

File:

• src/template.rs (modified) (7 diffs)

src/template.rs

@@ -39 +39 @@
     }
 
-    fn get_source_file(&self) -> &Path {
+    fn get_source_file(&self) -> &PathBuf {
         &self.source_file
     }
@@ -103 +103 @@
     let mut template_vec: Vec<Template> = lib_read().context("cannot read template library")?;
 
-    match template_vec.extract_if(.., |item| item.get_name() == name).next() {
-        None => { return Err(Error::msg(format!("No template under the name `{name}`"))) },
-        _ => {},
+    template_vec.extract_if(.., |item| item.get_name() == name).for_each(drop);
+
+    let template = match find_name(name).context(format!("cannot search for name {name} in /usr/lib/gignore/gignore_templates"))? {
+        None => {
+            eprintln!("No template exists in `/usr/lib/gignore/gignore_templates` under the name `{name}`.");
+            process::exit(0);
+        },
+        Some(t) => t,
     };
 
@@ -111 +116 @@
 
     if template_vec.is_empty() {
-        println!("template lib file is now empty.");
+        println!("{path} is now empty.");
         fs::write(path, b"").context("cannot write to `/usr/lib/gignore/gignore_templates`")?;
     } else {
@@ -118 +123 @@
         }
     }
+
+    fs::remove_file(template.get_source_file()).context(format!("cannot remove `{}`", template.get_source_file().display()))?;
     Ok(())
 }
@@ -126 +133 @@
     }
 
-    if (&*(template.get_source_file().to_string_lossy())).split_terminator('.').nth(2) != Some("ggnr") {
+    if (*(template.get_source_file())).to_str().expect("FATAL: Could not convert source_file to string!").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());
 
@@ -157 +164 @@
                 eprintln!("Continuing...");
 
-                fs::remove(&new_template_path).
+                fs::remove_file(&new_template_path).context(format!("cannot remove {new_template_path}"))?
             },
             _ => {
@@ -163 +170 @@
                 process::exit(0);
             },
-        }
+        };
     };