Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Fix deleting presets where the file name differs from the preset name #511

Merged
merged 4 commits into from
Sep 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions gradience/preset_row.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand All @@ -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")
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions gradience/presets_manager_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down