napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] Report progress by scanning pacman output

Browse Source 
- during install and remove, check for (n/m) output lines which
  report progress of the pacman actions and turn those into progress
  reports for the *packages* module.
This commit is contained in:
Adriaan de Groot 2021-11-09 13:07:29 +01:00
parent 575654941f
commit 4821f450f3
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/packages/main.py
View File

@ -370,17 +370,33 @@ class PMPackageKit(PackageManager):
class PMPacman(PackageManager):
backend = "pacman"
def __init__(self):
import re
progress_match = re.compile("^\\((\\d+)/(\\d+)\\)")
def line_cb(line):
global completed_packages, group_packages
if line.startswith("("):
m = progress_match.match(line)
if m:
try:
completed_packages = int(m.groups()[0])
group_packages = int(m.groups()[1])
libcalamares.job.setprogress(completed_packages / group_packages)
except ValueError as e:
pass
self.line_cb = line_cb
def install(self, pkgs, from_local=False):
if from_local:
pacman_flags = "-U"
else:
pacman_flags = "-S"
check_target_env_call(["pacman", pacman_flags,
"--noconfirm"] + pkgs)
libcalamares.utils.target_env_process_output(["pacman", pacman_flags,
"--noconfirm"] + pkgs, self.line_cb)
def remove(self, pkgs):
check_target_env_call(["pacman", "-Rs", "--noconfirm"] + pkgs)
libcalamares.utils.target_env_process_output(["pacman", "-Rs", "--noconfirm"] + pkgs, self.line_cb)
def update_db(self):
check_target_env_call(["pacman", "-Sy"])