ajour · tarkah · Jul 2, 2021 · Jul 2, 2021 · Jul 2, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ and `Removed`.
 
 - Fixed error importing Gitlab addons from repos under a nested subgroup
 - Fixed inconsistent size & styling in the segmented mode button
+- Fixed bug where SavedVariables files ending in `.bak` weren't deleted
 
 ## [1.2.0] - 2021-05-18
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -52,6 +52,9 @@ urlencoding = "1.3.3"
 
 iced_native = { version = "0.4.0", optional = true }
 
+[dev-dependencies]
+tempfile = "3.2.0"
+
 [target.'cfg(target_os = "macos")'.dependencies]
 flate2 = "1.0"
 tar = "0.4"
diff --git a/crates/core/src/addon.rs b/crates/core/src/addon.rs
@@ -33,7 +33,7 @@ pub enum AddonState {
 
 /// Struct that stores the metadata parsed from an Addon folder's
 /// `.toc` file
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct AddonFolder {
     /// ID is always the folder name
     pub id: String,

diff --git a/crates/core/src/fs/addon.rs b/crates/core/src/fs/addon.rs
@@ -34,9 +34,9 @@ pub fn delete_saved_variables(addon_folders: &[AddonFolder], wtf_path: &Path) ->
 
         if parent_name == Some("SavedVariables") {
             let file_name = path
-                .file_stem()
+                .file_name()
                 .and_then(|a| a.to_str())
-                .map(|a| a.trim_end_matches(".bak"));
+                .map(|a| a.trim_end_matches(".bak").trim_end_matches(".lua"));
 
             // NOTE: Will reject "Foobar_<invalid utf8>".
             if let Some(file_name_str) = file_name {
@@ -128,3 +128,82 @@ pub async fn install_addon(
 
     Ok(addon_folders)
 }
+
+#[cfg(test)]
+mod test {
+    use std::fs;
+
+    use tempfile::tempdir;
+
+    use super::*;
+
+    #[test]
+    fn test_delete_saved_variables() {
+        let folders = vec![
+            AddonFolder {
+                id: "AddonA".to_string(),
+                ..Default::default()
+            },
+            AddonFolder {
+                id: "AddonB".to_string(),
+                ..Default::default()
+            },
+            AddonFolder {
+                id: "AddonC".to_string(),
+                ..Default::default()
+            },
+            AddonFolder {
+                id: "AddonD".to_string(),
+                ..Default::default()
+            },
+            AddonFolder {
+                id: "AddonE".to_string(),
+                ..Default::default()
+            },
+            AddonFolder {
+                id: "AddonF".to_string(),
+                ..Default::default()
+            },
+            AddonFolder {
+                id: "AddonG".to_string(),
+                ..Default::default()
+            },
+        ];
+
+        let tempdir = tempdir().unwrap();
+        let root = tempdir.path();
+        let sv = root.join("SavedVariables");
+
+        fs::create_dir_all(&sv).unwrap();
+
+        let mut files = vec![];
+        for (idx, folder) in folders.iter().enumerate() {
+            let mut name = if idx % 2 == 0 {
+                format!("{}.lua", &folder.id)
+            } else {
+                format!("{}.lua.bak", &folder.id)
+            };
+
+            // change filename of last file, it shouldn't get removed
+            if idx == folders.len() - 1 {
+                name = format!("{}.nonlua", &folder.id)
+            }
+
+            let path = sv.join(&name);
+            fs::File::create(&path).unwrap();
+
+            files.push(path);
+        }
+
+        delete_saved_variables(&folders, &root).unwrap();
+
+        let mut exists = 0;
+        for file in files {
+            if file.exists() {
+                exists += 1;
+            }
+        }
+
+        assert_eq!(exists, 1);
+    }
+}