morgan/warehouse
1
0
Fork 0
mirror of https://github.com/morgan9e/warehouse synced 2026-04-14 00:04:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

Flatpak uninstalls actually are good now!

Browse Source
This commit is contained in:
heliguy4599
2023-09-12 01:53:07 -04:00
parent fb7987b275
commit a203aacedf
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/window.py
View File

@@ -124,28 +124,21 @@ class FlattoolGuiWindow(Adw.ApplicationWindow):
self.disconnect(self.no_close)
def uninstall_flatpak_thread(self, ref_arr, id_arr, should_trash):
command = ['flatpak-spawn', '--host']
command.append('flatpak')
command.append('remove')
command.append('-y')
failures = []
for i in range(len(ref_arr)):
command.append(ref_arr[i])
try:
subprocess.run(command, capture_output=False, check=True)
except subprocess.CalledProcessError:
try:
command = ['flatpak-spawn', '--host']
command.append('pkexec')
command.append('flatpak')
command.append('remove')
command.append('-y')
for i in range(len(ref_arr)):
command.append(ref_arr[i])
subprocess.run(command, capture_output=False, check=True)
subprocess.run(['flatpak-spawn', '--host', 'flatpak', 'remove', '-y', ref_arr[i]], capture_output=False, check=True)
except subprocess.CalledProcessError:
self.toast_overlay.add_toast(Adw.Toast.new(_("Some apps could not be uninstalled")))
return # Avoid trashing user data if the app cant be uninstalled
failures.append(ref_arr[i])
if len(failures) > 0:
pk_command = ['flatpak-spawn', '--host', 'pkexec','flatpak', 'remove', '-y']
for i in range(len(failures)):
pk_command.append(failures[i])
try:
subprocess.run(pk_command, capture_output=False, check=True)
except subprocess.CalledProcessError:
self.toast_overlay.add_toast(Adw.Toast.new(_("Could not uninstall some apps")))
if should_trash:
for i in range(len(id_arr)):