Propagate dmenu command errors to user instead of failing silently.

Author: firecat53

keepmenu/__main__.py

@@ -140,18 +140,21 @@ def run(**kwargs):
     """Start the background Manager and Dmenu runner processes.
 
     """
-    server = Server()
-    if kwargs.get('totp'):
-        server.totp_flag.set()
-    dmenu = DmenuRunner(server, **kwargs)
-    dmenu.daemon = True
-    server.start()
-    dmenu.start()
+    server = None
     try:
+        server = Server()
+        if kwargs.get('totp'):
+            server.totp_flag.set()
+        dmenu = DmenuRunner(server, **kwargs)
+        dmenu.daemon = True
+        server.start()
+        dmenu.start()
         server.join()
     except KeyboardInterrupt:
-        sys.exit()
+        pass
     finally:
+        if server is not None and server.is_alive():
+            server.terminate()
         if exists(expanduser(keepmenu.AUTH_FILE)):
             os.remove(expanduser(keepmenu.AUTH_FILE))
 

keepmenu/keepmenu.py

@@ -315,28 +315,31 @@ def _set_timer(self):
         self.cache_timer.start()
 
     def run(self):
-        while True:
-            self.server.start_flag.wait()
-            if self.server.kill_flag.is_set():
-                break
-            if not self.database or not self.database.kpo:
-                pass
-            elif self.server.args_flag.is_set():
-                dargs = self.server.get_args()
-                keepmenu.CLIPBOARD = dargs.get('clipboard', False) or keepmenu.CLIPBOARD
-                self.menu_open_another_database(**dargs)
-                self.server.args_flag.clear()
-
-                if self.server.totp_flag.is_set():
+        try:
+            while True:
+                self.server.start_flag.wait()
+                if self.server.kill_flag.is_set():
+                    break
+                if not self.database or not self.database.kpo:
+                    pass
+                elif self.server.args_flag.is_set():
+                    dargs = self.server.get_args()
+                    keepmenu.CLIPBOARD = dargs.get('clipboard', False) or keepmenu.CLIPBOARD
+                    self.menu_open_another_database(**dargs)
+                    self.server.args_flag.clear()
+
+                    if self.server.totp_flag.is_set():
+                        self.server.totp_flag.clear()
+                else:
+                    self.dmenu_run(self.server.totp_flag.is_set())
                     self.server.totp_flag.clear()
-            else:
-                self.dmenu_run(self.server.totp_flag.is_set())
-                self.server.totp_flag.clear()
-            if self.server.cache_time_expired.is_set():
-                self.server.kill_flag.set()
-            if self.server.kill_flag.is_set():
-                break
-            self.server.start_flag.clear()
+                if self.server.cache_time_expired.is_set():
+                    self.server.kill_flag.set()
+                if self.server.kill_flag.is_set():
+                    break
+                self.server.start_flag.clear()
+        except (SystemExit, KeyboardInterrupt):
+            self.server.kill_flag.set()
 
     def cache_time(self):
         """Kill keepmenu daemon when cache timer expires

keepmenu/menu.py

@@ -3,6 +3,7 @@
 """
 from os.path import basename
 import shlex
+import sys
 from subprocess import run
 
 import keepmenu
@@ -78,12 +79,19 @@ def dmenu_select(num_lines, prompt="Entries", inp=""):
 
     """
     cmd = dmenu_cmd(num_lines, prompt)
-    res = run(cmd,
-              capture_output=True,
-              check=False,
-              encoding=keepmenu.ENC,
-              env=keepmenu.ENV,
-              input=inp)
+    try:
+        res = run(cmd,
+                  capture_output=True,
+                  check=False,
+                  encoding=keepmenu.ENC,
+                  env=keepmenu.ENV,
+                  input=inp)
+    except FileNotFoundError:
+        print(f"dmenu command not found: {cmd[0]}", file=sys.stderr)
+        sys.exit(1)
+    if res.returncode != 0 and res.stderr:
+        print(f"dmenu command error: {res.stderr.strip()}", file=sys.stderr)
+        sys.exit(1)
     return res.stdout.rstrip('\n') if res.stdout is not None else None