Remove notification manager (#51)

Containerfile.builder

@@ -22,5 +22,3 @@ RUN dnf install \
 FROM builder AS rpm
 
 RUN make build-rpm
-
-

README.md

@@ -4,7 +4,7 @@ Small update program written in python intended for use in Universal Blue, execu
 
 Includes systemd timers and services for auto update
 
-dependencies (fedora): ```sudo dnf install python3-notify2 python3-psutil```
+dependencies (fedora): ```sudo dnf install python3-psutil libnotify```
 
 
 # Usage
@@ -45,11 +45,11 @@ options:
 ## Location
 valid config paths (in order of priority)
 
-```"$HOME"/.config/ublue-update/ublue-update.conf```
+```"$HOME"/.config/ublue-update/ublue-update.toml```
 
-```/etc/ublue-update/ublue-update.conf```
+```/etc/ublue-update/ublue-update.toml```
 
-```/usr/etc/ublue-update/ublue-update.conf```
+```/usr/etc/ublue-update/ublue-update.toml```
 
 
 ## Config Variables

files/usr/lib/systemd/user/ublue-update.service

@@ -1,6 +1,10 @@
 [Unit]
-Description=auto-update oneshot service
+Description=Universal Blue Update Oneshot Service
 
 [Service]
+Restart=on-failure
+RestartSec=1h
 Type=oneshot
 ExecStart=/usr/bin/ublue-update
+
+

files/usr/lib/systemd/user/ublue-update.timer

@@ -1,10 +1,11 @@
 [Unit]
-Description=auto update system timer for uBlue
+Description=Auto Update System Timer For Universal Blue
 Wants=network-online.target
 
 [Timer]
-OnBootSec=15min
-OnUnitInactiveSec=6h
+RandomizedDelaySec=10m
+OnBootSec=2m
+OnCalendar=*-*-* 4:00:00
 Persistent=true
 
 [Install]

src/ublue_update/cli.py

@@ -5,21 +5,36 @@
 import tomllib
 import argparse
 
-from ublue_update.notification_manager import NotificationManager
 from ublue_update.update_checks.system import system_update_check
 
 
+def notify(title: str, body: str, actions: list = [], expire_time: int = 0):
+    args = [
+        "/usr/bin/notify-send",
+        title,
+        body,
+        "--app-name=Univeral Blue Updater",
+        "--icon=software-update-available-symbolic",
+    ]
+    if expire_time != 0:
+        args.append(f"--expire-time={expire_time}")
+    if actions != []:
+        for action in actions:
+            args.append(f"--action={action}")
+    out = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    return out
+
+
 def ask_for_updates():
-    update_notif = notification_manager.notification(
+    out = notify(
         "System Updater",
         "Update available, but system checks failed. Update now?",
+        ["universal-blue-update-confirm=Confirm"],
+        15000,
     )
-    update_notif.add_action(
-        "universal-blue-update-confirm",
-        "Confirm",
-        lambda: run_updates(),
-    )
-    update_notif.show(15)
+    # if the user has confirmed
+    if "universal-blue-update-confirm" in out.stdout.decode("utf-8"):
+        run_updates()
 
 
 def check_for_updates(checks_failed: bool) -> bool:
@@ -136,6 +151,8 @@ def load_value(key, value):
 def run_updates():
     root_dir = "/etc/ublue-update.d/"
 
+    log.info("Running system update")
+
     for root, dirs, files in os.walk(root_dir):
         for file in files:
             full_path = root_dir + str(file)
@@ -150,17 +167,17 @@ def run_updates():
                     log.info(f"{full_path} returned error code: {out.returncode}")
                     log.info(f"Program output: \n {out.stdout}")
                     if dbus_notify:
-                        notification_manager.notification(
+                        notify(
                             "System Updater",
                             f"Error in update script: {file}, check logs for more info",
-                        ).show(5)
+                        )
             else:
                 log.info(f"could not execute file {full_path}")
     if dbus_notify:
-        notification_manager.notification(
+        notify(
             "System Updater",
             "System update complete, reboot for changes to take effect",
-        ).show(5)
+        )
     log.info("System update complete")
     os._exit(0)
 
@@ -178,15 +195,6 @@ def run_updates():
 )
 log = logging.getLogger(__name__)
 
-notification_manager = None
-
-# Sometimes the system doesn't have a running dbus session or a notification daemon
-try:
-    notification_manager = NotificationManager("Universal Blue Updater")
-except Exception:
-    dbus_notify = False
-
-
 def main():
 
     # setup argparse
@@ -229,9 +237,8 @@ def main():
     # system checks passed
     log.info("System passed all update checks")
     if dbus_notify:
-        notification_manager.notification(
+        notify(
             "System Updater",
             "System passed checks, updating ...",
-        ).show(5)
-
+        )
     run_updates()

ublue-update.spec.rpkg

@@ -28,6 +28,7 @@ BuildRequires: pyproject-rpm-macros
 BuildRequires: python-setuptools_scm
 BuildRequires: python-wheel
 Requires: skopeo
+Requires: libnotify
 
 %global sub_name %{lua:t=string.gsub(rpm.expand("%{NAME}"), "^ublue%-", ""); print(t)}