Fix mounted polling for USBStick

Author: magratheaner

software/openbookscanner/states/usbstick.py

@@ -47,7 +47,7 @@ def poll(self):
         """Check if USBStick is still mounted"""
         p = subprocess.run(["mount"], stdout=subprocess.PIPE)
         path = self.path.encode()
-        if path not in p.stdout:
+        if path not in p.stdout or not self.state_machine.is_plugged_in():
             self.transition_into(UnMounted())
         for line in p.stdout.splitlines():
             if path in line and not b"(rw" in line:
@@ -74,13 +74,14 @@ class NoSpaceLeft(FinalState, USBStickState):
 
 class USBStick(StateMachine):
 
-    def __init__(self, device):
+    def __init__(self, device, listener):
         """Create a new USB device.
         
         - device: is a path to a device in /dev/
         """
         super().__init__()
         self._device = device
+        self.listener = listener
         self.transition_into(PluggedIn())
 
     def __repr__(self):
@@ -105,3 +106,6 @@ def is_scanner(self):
     def get_mount_partition_path(self):
         return "/dev/" + self._device + "1"
 
+    def is_plugged_in(self):
+        return self._device in self.listener.get_block_devices()
+

software/openbookscanner/states/usbstick_listener.py

@@ -18,18 +18,6 @@ class USBStickListener(HardwareListener):
     def __init__(self):
         super().__init__()
 
-        '''
-        p = subprocess.run(["lsblk | grep disk"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        try:
-            p.check_returncode()
-        except CalledProcessError:
-            # TODO: Raise the exception purposefully
-            raise
-            # Maybe with: self.transition_into(InitializationFailed())
-
-        #self._block_devices = set([line.split()[0].decode() for line in p.stdout.splitlines()])
-        '''
-
         self._block_devices = self.get_block_devices()
 
     def get_block_devices(self):
@@ -44,11 +32,9 @@ def has_driver_support(self):
     def listen_for_hardware(self):
 
         new_block_devices = self.get_block_devices()
-        print(new_block_devices)
 
         for new_block_device in new_block_devices.difference(self._block_devices):
-            print('Found new block device')
-            self.found_new_hardware(USBStick(new_block_device))
+            self.found_new_hardware(USBStick(new_block_device, self))
 
         self._block_devices = new_block_devices