Fix set-initial-kanshi-state and usbguard-notify.py

usbguard-notify.py

@@ -4,6 +4,7 @@ import shutil
 import re
 import threading
 from subprocess import Popen, run, DEVNULL, PIPE
+import sys
 
 USBGUARD_EXEC_NAME = shutil.which("usbguard")
 DUNSTIFY_EXEC_NAME = shutil.which("dunstify")
@@ -12,14 +13,16 @@ open_notifications = {}
 
 def parse_event_type_and_id(stream):
     line = stream.readline()
+    if not line:
+        return None, True
     if not line.startswith("[device] "):
-        return None
+        return None, False
     event_type = re.findall("(?<=\\[device\\] )[a-zA-Z]+", line)
     if len(event_type) == 0:
-        return None
+        return None, False
     event_id = re.findall("(?<=id=)[0-9]+", line)
     if len(event_id) == 0:
-        return None
+        return None, False
     return event_type[0], int(event_id[0])
 
 
@@ -101,9 +104,15 @@ with Popen(
     bufsize=0,
 ) as usbguard_proc:
     new_devices = set()
-    usbguard_proc.stdout.readline()  # get rid of initial connection message
+    first_line = (
+        usbguard_proc.stdout.readline()
+    )  # get rid of initial connection message
+    if not first_line:
+        sys.exit()
     while True:
-        event_type_result = parse_event_type_and_id(usbguard_proc.stdout)
+        event_type_result, eof = parse_event_type_and_id(usbguard_proc.stdout)
+        if eof:
+            sys.exit()
         if event_type_result is None:
             continue
         event_type, dev_id = event_type_result