From db41792afb43583ef129871f361b0ba5c4b7fa87 Mon Sep 17 00:00:00 2001 From: tobi-wan-kenobi Date: Thu, 27 Aug 2020 20:06:33 +0200 Subject: [PATCH] [dnf] simplify threading use framework threading to simplify the dnf module see #692 --- bumblebee_status/modules/contrib/dnf.py | 75 +++++++++++-------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/bumblebee_status/modules/contrib/dnf.py b/bumblebee_status/modules/contrib/dnf.py index 3f5e484..21c9245 100644 --- a/bumblebee_status/modules/contrib/dnf.py +++ b/bumblebee_status/modules/contrib/dnf.py @@ -5,13 +5,8 @@ Requires the following executable: * dnf -Parameters: - * dnf.interval: Time in minutes between two consecutive update checks (defaults to 30 minutes) - """ -import threading - import core.event import core.module import core.widget @@ -20,46 +15,13 @@ import core.decorators import util.cli -def get_dnf_info(widget): - res = util.cli.execute("dnf updateinfo", ignore_errors=True) - - security = 0 - bugfixes = 0 - enhancements = 0 - other = 0 - for line in res.split("\n"): - if not line.startswith(" "): - continue - elif "ecurity" in line: - for s in line.split(): - if s.isdigit(): - security += int(s) - elif "ugfix" in line: - for s in line.split(): - if s.isdigit(): - bugfixes += int(s) - elif "hancement" in line: - for s in line.split(): - if s.isdigit(): - enhancements += int(s) - else: - for s in line.split(): - if s.isdigit(): - other += int(s) - - widget.set("security", security) - widget.set("bugfixes", bugfixes) - widget.set("enhancements", enhancements) - widget.set("other", other) - - core.event.trigger("update", [widget.module.id], redraw_only=True) - - class Module(core.module.Module): @core.decorators.every(minutes=30) def __init__(self, config, theme): super().__init__(config, theme, core.widget.Widget(self.updates)) + self.background = True + def updates(self, widget): result = [] for t in ["security", "bugfixes", "enhancements", "other"]: @@ -67,8 +29,37 @@ class Module(core.module.Module): return "/".join(result) def update(self): - thread = threading.Thread(target=get_dnf_info, args=(self.widget(),)) - thread.start() + res = util.cli.execute("dnf updateinfo", ignore_errors=True) + + security = 0 + bugfixes = 0 + enhancements = 0 + other = 0 + for line in res.split("\n"): + if not line.startswith(" "): + continue + elif "ecurity" in line: + for s in line.split(): + if s.isdigit(): + security += int(s) + elif "ugfix" in line: + for s in line.split(): + if s.isdigit(): + bugfixes += int(s) + elif "hancement" in line: + for s in line.split(): + if s.isdigit(): + enhancements += int(s) + else: + for s in line.split(): + if s.isdigit(): + other += int(s) + + widget.set("security", security) + widget.set("bugfixes", bugfixes) + widget.set("enhancements", enhancements) + widget.set("other", other) + def state(self, widget): cnt = 0