resync with 194

2 files changed, 9 insertions, 5 deletions

diff --git a/plugins/rfid/rfid.py b/plugins/rfid/rfid.py
index c8742ff..5355646 100644
--- a/plugins/rfid/rfid.py
+++ b/plugins/rfid/rfid.py
@@ -61,7 +61,7 @@ class Rfid(Plugin):
         """
 
         self.rfid_connected = False
-        self.rfid_device = find_device()
+        self.rfid_device = find_device(path=parent.path)
         self.rfid_idn = ''
 
         if self.rfid_device is not None:
@@ -118,7 +118,7 @@ class Rfid(Plugin):
         Called from hal connection when a new device is plugged.
         """
         if not self.rfid_connected:
-            self.rfid_device = find_device()
+            self.rfid_device = find_device(path=parent.path)
             _logger.debug("DEVICE_ADDED: %s" % self.rfid_device)
             if self.rfid_device is not None:
                 _logger.debug("DEVICE_ADDED: RFID device is not None!")
diff --git a/plugins/rfid/rfidutils.py b/plugins/rfid/rfidutils.py
index 4e02619..a00e518 100644
--- a/plugins/rfid/rfidutils.py
+++ b/plugins/rfid/rfidutils.py
@@ -17,14 +17,18 @@
 import os
 import logging
 
-def find_device():
+def find_device(path=None):
     """
     Search for devices.
     Return a device instance or None.
     """
     device = None
-    for i in os.listdir(os.path.join('.', 'plugins/rfid')):
-        if not os.path.isdir(os.path.join('.', 'plugins/rfid', i)):
+    if path is not None:
+        path = os.path.join(path, 'plugins/rfid')
+    else:
+        path = os.path.join('.', 'plugins/rfid')
+    for i in os.listdir(path):
+        if not os.path.isdir(os.path.join(path, i)):
             try:
                 _tempmod = __import__('rfid.%s'%i.split('.')[0], globals(),
                                       locals(), ['RFIDReader'], -1)