fixing pipes for systems with multiple users

keymapper/gui/helper.py

@@ -40,6 +40,7 @@ from keymapper.ipc.pipe import Pipe
 from keymapper.logger import logger
 from keymapper.groups import groups
 from keymapper import utils
+from keymapper.user import USER
 
 
 TERMINATE = 'terminate'
@@ -65,8 +66,8 @@ class RootHelper:
     """
     def __init__(self):
         """Construct the helper and initialize its sockets."""
-        self._results = Pipe('/tmp/key-mapper/results')
-        self._commands = Pipe('/tmp/key-mapper/commands')
+        self._results = Pipe(f'/tmp/key-mapper-{USER}/results')
+        self._commands = Pipe(f'/tmp/key-mapper-{USER}/commands')
 
         self._send_groups()
 

keymapper/gui/reader.py

@@ -35,6 +35,7 @@ from keymapper.ipc.pipe import Pipe
 from keymapper.gui.helper import TERMINATE, REFRESH_GROUPS
 from keymapper import utils
 from keymapper.state import custom_mapping
+from keymapper.user import USER
 
 
 DEBOUNCE_TICKS = 3
@@ -69,8 +70,8 @@ class Reader:
 
     def connect(self):
         """Connect to the helper."""
-        self._results = Pipe('/tmp/key-mapper/results')
-        self._commands = Pipe('/tmp/key-mapper/commands')
+        self._results = Pipe(f'/tmp/key-mapper-{USER}/results')
+        self._commands = Pipe(f'/tmp/key-mapper-{USER}/commands')
 
     def are_new_devices_available(self):
         """Check if groups contains new devices.

tests/testcases/test_ipc.py

@@ -103,7 +103,7 @@ class TestSocket(unittest.TestCase):
 
 class TestPipe(unittest.TestCase):
     def test_pipe_single(self):
-        p1 = Pipe('/tmp/key-mapper-test/pipe')
+        p1 = Pipe(f'/tmp/key-mapper-test/pipe')
         self.assertEqual(p1.recv(), None)
 
         p1.send(1)
@@ -123,8 +123,8 @@ class TestPipe(unittest.TestCase):
         self.assertEqual(p1.recv(), None)
 
     def test_pipe_duo(self):
-        p1 = Pipe('/tmp/key-mapper-test/pipe')
-        p2 = Pipe('/tmp/key-mapper-test/pipe')
+        p1 = Pipe(f'/tmp/key-mapper-test/pipe')
+        p2 = Pipe(f'/tmp/key-mapper-test/pipe')
         self.assertEqual(p2.recv(), None)
 
         p1.send(1)