add rfid listener

Author: brainsmoke

doorctl.py

@@ -82,7 +82,7 @@ def enable(conn, rfid):
 def disable(conn, rfid):
     userdb.disable(conn, encode_rfid(rfid))
 
-sock_commands = ('addkey', 'openmode', 'authmode', 'resetpin')
+sock_commands = ('addkey', 'openmode', 'authmode', 'resetpin', 'rfidlisten')
 
 db_commands = collections.OrderedDict([
     ( 'initdb'       , (userdb.init_db, 0, '') ),
@@ -104,11 +104,14 @@ def usage():
         pre = "       "+sys.argv[0]
     sys.exit(1)
 
-def socket_command(command):
+def socket_command(command, close=True):
     s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
     s.connect( (host, port) )
     s.send(command+'\n')
-    s.close()
+    if close:
+        s.close()
+    else:
+        return s
 
 if len(sys.argv) < 2:
     usage()
@@ -117,7 +120,11 @@ def socket_command(command):
 args = sys.argv[2:]
 
 if cmd in sock_commands:
-    socket_command(cmd)
+    if cmd == 'rfidlisten':
+        for line in socket_command(cmd, close = False).makefile():
+            print decode_rfid(line.rstrip('\n\r\0'))
+    else:
+        socket_command(cmd)
 elif cmd in db_commands:
     func, n_args, _ = db_commands[cmd]
     if len(args) != n_args:

doorio.py

@@ -10,6 +10,7 @@ def __init__(self, auth_serial, lock_serial, cmd_in=None, socket=None):
         self._auth      = auth_serial
         self._lock      = lock_serial
         self._socklist  = []
+        self._rfidsocks = []
         self._cmd_in    = cmd_in
         self._sock      = socket
         self._led_state = "LED OFF"
@@ -44,13 +45,22 @@ def led_blink(self):
         self._led_state = 'LED BLINK\n'
         self.update_led()
 
+    def socket_remove(self, s):
+        s.close()
+        self._socklist.remove(pair)
+        if s in self._rfidsocks:
+            self._rfidsocks.remove(s)
+
     def get_socket_line(self):
         for pair in self._socklist:
             s, data = pair
             if data.find('\n') >= 0:
                 pair[1] = data[data.find('\n')+1:]
                 data = data[:data.find('\n')+1]
-                return data
+                if data == 'rfidlisten':
+                    self._rfidsocks.append(s)
+                else:
+                    return data
         else:
             return None
 
@@ -64,11 +74,17 @@ def read_socket_data(self, r):
                     read_data = ''
 
                 if read_data == '':
-                    s.close()
-                    self._socklist.remove(pair)
+                    self.socket_remove(s)
                 else:
                     pair[1] += read_data
 
+    def write_rfid(self):
+        for s in self._rfidsocks:
+            try:
+                s.send(code+'\n')
+            except IOError:
+                self.socket_remove(s)
+
     def get_command(self, line):
         cmd = line.rstrip('\r\n\0')
 
@@ -118,6 +134,7 @@ def get_event(self, timeout=None):
             if line.startswith("RFID "):
                 code = line.strip("RFID ")
                 if re.match("^[01]{34}$", code):
+                    self.write_rfid()
                     return { 'type': 'rfid', 'value': code }
 
             if line == 'RESET':

start_doorbotd.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 ERRLOG=/srv/doorbot/doorbot.err
 cd "$(dirname "$0")"
-su "$(stat -c "%U" user.db)" -c "while true; do python ./doorbotd.py; sleep 5; done" >>"$ERRLOG" 2>&1 &
+su "$(stat -c "%U" user.db)" -c "while true; do python ./doorbotd.py && exit; sleep 5; done" >>"$ERRLOG" 2>&1 &