From 14707c6177bb688ceb1dea38a8aa72e82139ea1f Mon Sep 17 00:00:00 2001 From: heliguy4599 Date: Mon, 14 Oct 2024 16:48:23 -0400 Subject: [PATCH] Fix data trashing refreshing things incorrectly --- src/properties_page/properties_page.py | 7 +++++-- src/user_data_page/data_box.py | 10 ++++++++-- src/user_data_page/user_data_page.py | 10 ++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/properties_page/properties_page.py b/src/properties_page/properties_page.py index c6d8ae7..af69f25 100644 --- a/src/properties_page/properties_page.py +++ b/src/properties_page/properties_page.py @@ -168,11 +168,14 @@ class PropertiesPage(Adw.NavigationPage): self.package.trash_data() self.set_properties(self.package, refresh=True) self.toast_overlay.add_toast(Adw.Toast.new("Trashed User Data")) - snapshot_list_page = HostInfo.main_window.pages[HostInfo.main_window.snapshots_row].list_page - snapshot_list_page.set_snapshots(snapshot_list_page.package_or_folder, True) user_data_page = HostInfo.main_window.pages[HostInfo.main_window.user_data_row] user_data_page.start_loading() user_data_page.end_loading() + snapshot_list_page = HostInfo.main_window.pages[HostInfo.main_window.snapshots_row].list_page + snapshot_list_package = snapshot_list_page.package_or_folder + if not snapshot_list_package is None: + snapshot_list_page.set_snapshots(snapshot_list_package, True) + except subprocess.CalledProcessError as cpe: self.toast_overlay.add_toast(ErrorToast(_("Could not trash data"), cpe.stderr).toast) except Exception as e: diff --git a/src/user_data_page/data_box.py b/src/user_data_page/data_box.py index 5ac8ac6..1f88bc9 100644 --- a/src/user_data_page/data_box.py +++ b/src/user_data_page/data_box.py @@ -80,9 +80,15 @@ class DataBox(Gtk.ListBox): try: subprocess.run(['gio', 'trash', self.data_path], check=True, text=True, capture_output=True) properties_page = HostInfo.main_window.pages[HostInfo.main_window.packages_row].properties_page - properties_page.set_properties(properties_page.package, True) + properties_package = properties_page.package + if not properties_package is None: + properties_page.set_properties(properties_package, True) + snapshot_list_page = HostInfo.main_window.pages[HostInfo.main_window.snapshots_row].list_page - snapshot_list_page.set_snapshots(snapshot_list_page.package_or_folder, True) + snapshot_list_package = snapshot_list_page.package_or_folder + if not snapshot_list_package is None: + snapshot_list_page.set_snapshots(snapshot_list_package, True) + except subprocess.CalledProcessError as cpe: self.failed_trash = cpe.stderr except Exception as e: diff --git a/src/user_data_page/user_data_page.py b/src/user_data_page/user_data_page.py index 7c65f29..b0dd0e8 100644 --- a/src/user_data_page/user_data_page.py +++ b/src/user_data_page/user_data_page.py @@ -164,9 +164,15 @@ class UserDataPage(Adw.BreakpointBin): try: subprocess.run(cmd, check=True, capture_output=True, text=True) properties_page = HostInfo.main_window.pages[HostInfo.main_window.packages_row].properties_page - properties_page.set_properties(properties_page.package, True) + properties_package = properties_page.package + if not properties_package is None: + properties_page.set_properties(properties_package, True) + snapshot_list_page = HostInfo.main_window.pages[HostInfo.main_window.snapshots_row].list_page - snapshot_list_page.set_snapshots(snapshot_list_page.package_or_folder, True) + snapshot_list_package = snapshot_list_page.package_or_folder + if not snapshot_list_package is None: + snapshot_list_page.set_snapshots(snapshot_list_package, True) + except subprocess.CalledProcessError as cpe: error[0] = cpe.stderr except Exception as e: