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

Make progress bar status more accurate

Browse Source
This commit is contained in:
heliguy
2023-11-07 15:39:00 -05:00
parent 652f74ddc3
commit a46b084195
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common.py
View File

@@ -184,7 +184,7 @@ class myUtils:
return(1)
return(0)
def uninstallFlatpak(self, ref_arr, type_arr, should_trash):
def uninstallFlatpak(self, ref_arr, type_arr, should_trash, progress_bar=None):
self.uninstall_success = True
to_uninstall = []
@@ -204,6 +204,9 @@ class myUtils:
command = ['flatpak-spawn', '--host', 'flatpak', 'remove', '-y', f"--{apps[i][2]}", apps[i][0]]
try:
subprocess.run(command, capture_output=False, check=True, env=self.new_env)
if progress_bar:
progress_bar.set_visible(True)
progress_bar.set_fraction((i + 1.0) / len(app_arr))
except subprocess.CalledProcessError:
fails.append(apps[i])
@@ -219,6 +222,9 @@ class myUtils:
pk_command.append(fails[i][0])
try:
print(pk_command)
if progress_bar:
progress_bar.set_visible(True)
progress_bar.set_fraction(0.9)
subprocess.run(pk_command, capture_output=False, check=True, env=self.new_env)
except subprocess.CalledProcessError:
self.uninstall_success = False
@@ -255,15 +261,14 @@ class myUtils:
fails.append(app_arr[i])
if (len(fails) > 0) and (user_or_system == "system"):
if progress_bar:
progress_bar.set_fraction(0.9)
pk_command = ['flatpak-spawn', '--host', 'pkexec', 'flatpak', 'install', remote, f"--{user_or_system}", '-y']
for i in range(len(fails)):
pk_command.append(fails[i])
try:
subprocess.run(pk_command, capture_output=False, check=True, env=self.new_env)
if progress_bar:
progress_bar.set_fraction(1)
progress_bar.set_visible(True)
progress_bar.set_fraction(0.9)
subprocess.run(pk_command, capture_output=False, check=True, env=self.new_env)
except subprocess.CalledProcessError:
self.install_success = False