Raise custom exception in case of connection issue

Author: Nicolas

pybecker/becker.py

@@ -7,6 +7,7 @@
 from .database import Database
 from .becker_helper import finalize_code
 from .becker_helper import generate_code
+from .becker_helper import BeckerConnectionError
 
 COMMAND_UP = 0x20
 COMMAND_UP2 = 0x21  # move up
@@ -54,7 +55,7 @@ def __init__(self, device_name=DEFAULT_DEVICE_NAME, init_dummy=False):
         """
         self.is_serial = "/" in device_name
         if self.is_serial and not os.path.exists(device_name):
-            raise FileExistsError(device_name + " don't exists")
+            raise BeckerConnectionError(device_name + " is not existing")
         self.device = device_name
         self.db = Database()
 
@@ -63,7 +64,10 @@ def __init__(self, device_name=DEFAULT_DEVICE_NAME, init_dummy=False):
         if not units and init_dummy:
             self.db.init_dummy()
 
-        self._connect()
+        try:
+            self._connect()
+        except serial.SerialException:
+            raise BeckerConnectionError("Error when trying to establish connection using " + device_name)
 
     def _connect(self):
         if self.is_serial:

pybecker/becker_helper.py

@@ -44,3 +44,16 @@ def generate_code(channel, unit, cmd_code, with_checksum=True):
 
 def finalize_code(code):
     return b"".join([STX, code.encode(), ETX])
+
+
+class BeckerConnectionError(Error):
+    """Exception raised in case of connection error (serial error).
+
+    Attributes:
+        expression -- input expression in which the error occurred
+        message -- explanation of the error
+    """
+
+    def __init__(self, expression, message):
+        self.expression = expression
+        self.message = message

pybecker/database.py

@@ -99,6 +99,25 @@ def get_all_units(self):
 
         return result
 
+    def get_rowid_from_unit(self, code, create=True):
+        c = self.conn.cursor()
+        res = c.execute('SELECT rowid FROM unit WHERE code = ?', (code,))
+
+        result = res.fetchone()
+        rowid = result[0] if result is not None else -1
+
+        return rowid
+
+    def add_unit(self, unit):
+        c = self.conn.cursor()
+        c.execute("INSERT INTO unit VALUES (?, ?, ?, ?)", (unit[0], int(unit[1]), int(unit[2]), 0,))
+        self.conn.commit()
+
+    def remove_unit(self, code):
+        c = self.conn.cursor()
+        c.execute("DELETE FROM unit WHERE code = ?", (code,))
+        self.conn.commit()
+
     def set_unit(self, unit, test=False):
         c = self.conn.cursor()
         last_run = int(time.time())

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pybecker",
-    version="1.0.3",
+    version="1.0.4",
     author="Nicolas Berthel",
     author_email="[email protected]",
     install_requires=['pyserial>=3.4'],