Fix deleting presets where the file name differs from the preset name (…

…#511)

Presets with different filenames and preset names (Like Classic, which
has the filename classic-light.json) would fail to be deleted (it would
previously try to delete classic.json instead). This passes the actual
filename to the row so it can remove it properly.

gradience/preset_row.py

@@ -38,11 +38,11 @@ class GradiencePresetRow(Adw.ExpanderRow):
     remove_button = Gtk.Template.Child("remove_button")
     btn_report = Gtk.Template.Child()
 
-    def __init__(self, name, win, repo_name, author="", **kwargs):
+    def __init__(self, name, win, repo_name, file_name, author="", **kwargs):
         super().__init__(**kwargs)
 
         self.name = name
-        self.old_name = name
+        self.file_name = file_name
 
         self.prefix = to_slug_case(repo_name)
 
@@ -129,16 +129,17 @@ def on_remove_button_clicked(self, *_args):
                                    os.environ["HOME"] + "/.config"),
                     "presets",
                     self.prefix,
-                    to_slug_case(self.old_name) + ".json",
+                    self.file_name + ".json",
                 ),
                 os.path.join(
                     os.environ.get("XDG_CONFIG_HOME",
                                    os.environ["HOME"] + "/.config"),
                     "presets",
                     self.prefix,
-                    to_slug_case(self.old_name) + ".json.to_delete",
+                    self.file_name + ".json.to_delete",
                 ),
             )
+
             self.set_name(self.name + "(" + _("Pending deletion") + ")")
         except Exception as exception:
             buglog(exception)
@@ -155,10 +156,9 @@ def update_value(self):
             os.path.join(
                 PRESET_DIR,
                 self.prefix,
-                to_slug_case(self.old_name) + ".json",
+                self.file_name + ".json",
             )
         )
-        self.old_name = self.name
 
     def on_delete_toast_dismissed(self, widget):
         buglog("dismissed")
@@ -172,7 +172,7 @@ def on_delete_toast_dismissed(self, widget):
                         ),
                         "presets",
                         self.prefix,
-                        to_slug_case(self.old_name) + ".json.to_delete",
+                        self.file_name + ".json.to_delete",
                     )
                 )
             except Exception as exception:
@@ -192,15 +192,15 @@ def on_delete_toast_dismissed(self, widget):
                         ),
                         "presets",
                         self.prefix,
-                        to_slug_case(self.old_name) + ".json.to_delete",
+                        self.file_name + ".json.to_delete",
                     ),
                     os.path.join(
                         os.environ.get(
                             "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config"
                         ),
                         "presets",
                         self.prefix,
-                        to_slug_case(self.old_name) + ".json",
+                        self.file_name + ".json",
                     ),
                 )
             except Exception as exception:

gradience/presets_manager_window.py

@@ -399,8 +399,8 @@ def reload_pref_group(self):
 
         if presets_check:
             for repo, presets in self.custom_presets.items():
-                for preset, preset_name in presets.items():
-                    row = GradiencePresetRow(preset_name, self, repo)
+                for preset_file, preset_name in presets.items():
+                    row = GradiencePresetRow(preset_name, self, repo, preset_file)
                     self.preset_list.add(row)
 
         else: