timmo001 · timmo001 · Aug 6, 2022 · Aug 5, 2022 · Aug 5, 2022 · Aug 5, 2022
diff --git a/backend/systembridgebackend/__main__.py b/backend/systembridgebackend/__main__.py
@@ -8,10 +8,10 @@
 from systembridgeshared.logger import setup_logger
 from systembridgeshared.settings import Settings
 
-from systembridgebackend.autostart import autostart_disable, autostart_enable
-from systembridgebackend.modules.system import System
-from systembridgebackend.server import Server
-from systembridgebackend.shortcut import create_shortcuts
+from .autostart import autostart_disable, autostart_enable
+from .modules.system import System
+from .server import Server
+from .shortcut import create_shortcuts
 
 
 class Main(Base):

diff --git a/backend/systembridgebackend/autostart/__init__.py b/backend/systembridgebackend/autostart/__init__.py
@@ -6,12 +6,12 @@ def autostart_disable():
     """Disable autostart"""
     if "Windows" in platform.system():
         # pylint: disable=import-error, import-outside-toplevel
-        from systembridgebackend.autostart.windows import autostart_windows_disable
+        from .windows import autostart_windows_disable
 
         autostart_windows_disable()
     elif "Linux" in platform.system():
         # pylint: disable=import-error, import-outside-toplevel
-        from systembridgebackend.autostart.linux import autostart_linux_disable
+        from .linux import autostart_linux_disable
 
         autostart_linux_disable()
 
@@ -20,11 +20,11 @@ def autostart_enable():
     """Enable autostart"""
     if "Windows" in platform.system():
         # pylint: disable=import-error, import-outside-toplevel
-        from systembridgebackend.autostart.windows import autostart_windows_enable
+        from .windows import autostart_windows_enable
 
         autostart_windows_enable()
     elif "Linux" in platform.system():
         # pylint: disable=import-error, import-outside-toplevel
-        from systembridgebackend.autostart.linux import autostart_linux_enable
+        from .linux import autostart_linux_enable
 
         autostart_linux_enable()
diff --git a/backend/systembridgebackend/data.py b/backend/systembridgebackend/data.py
@@ -6,7 +6,7 @@
 from systembridgeshared.base import Base
 from systembridgeshared.database import Database
 
-from systembridgebackend.modules.update import Update
+from .modules.update import Update
 
 
 class UpdateThread(Thread):

diff --git a/backend/systembridgebackend/modules/base.py b/backend/systembridgebackend/modules/base.py
@@ -1,6 +1,6 @@
 """System Bridge: Module Base"""
+
 from systembridgeshared.base import Base
-from systembridgeshared.const import COLUMN_KEY, COLUMN_TIMESTAMP, COLUMN_VALUE
 from systembridgeshared.database import Database
 
 
@@ -10,19 +10,10 @@ class ModuleUpdateBase(Base):
     def __init__(
         self,
         database: Database,
-        table: str,
     ):
         super().__init__()
 
         self._database = database
-        self._database.create_table(
-            table,
-            [
-                (COLUMN_KEY, "TEXT PRIMARY KEY"),
-                (COLUMN_VALUE, "TEXT"),
-                (COLUMN_TIMESTAMP, "DOUBLE"),
-            ],
-        )
 
     async def update_all_data(self) -> None:
         """Update data"""

diff --git a/backend/systembridgebackend/modules/battery/update.py b/backend/systembridgebackend/modules/battery/update.py
@@ -3,9 +3,10 @@
 
 from systembridgeshared.common import camel_to_snake
 from systembridgeshared.database import Database
+from systembridgeshared.models.database_data import Battery as DatabaseModel
 
-from systembridgebackend.modules.base import ModuleUpdateBase
-from systembridgebackend.modules.battery import Battery
+from . import Battery
+from ..base import ModuleUpdateBase
 
 
 class BatteryUpdate(ModuleUpdateBase):
@@ -16,7 +17,7 @@ def __init__(
         database: Database,
     ) -> None:
         """Initialize"""
-        super().__init__(database, "battery")
+        super().__init__(database)
         self._battery = Battery()
 
     async def update_sensors(self) -> None:
@@ -26,12 +27,24 @@ async def update_sensors(self) -> None:
                 # From status
                 if key == "percent":
                     continue
-                self._database.write("battery", f"sensors_{key}", value)
+                self._database.update_data(
+                    DatabaseModel,
+                    DatabaseModel(
+                        key="sensors_{key}",
+                        value=value,
+                    ),
+                )
 
     async def update_status(self) -> None:
         """Update Battery Status"""
         for key, value in self._battery.status().items():
-            self._database.write("battery", camel_to_snake(key), value)
+            self._database.update_data(
+                DatabaseModel,
+                DatabaseModel(
+                    key=camel_to_snake(key),
+                    value=value,
+                ),
+            )
 
     async def update_all_data(self) -> None:
         """Update data"""

diff --git a/backend/systembridgebackend/modules/bridge/__init__.py b/backend/systembridgebackend/modules/bridge/__init__.py
diff --git a/backend/systembridgebackend/modules/bridge/update.py b/backend/systembridgebackend/modules/bridge/update.py
diff --git a/backend/systembridgebackend/modules/cpu/__init__.py b/backend/systembridgebackend/modules/cpu/__init__.py
@@ -14,13 +14,10 @@
 )
 from psutil._common import pcputimes, scpufreq, scpustats
 from systembridgeshared.base import Base
-from systembridgeshared.const import (
-    COLUMN_HARDWARE_TYPE,
-    COLUMN_KEY,
-    COLUMN_TYPE,
-    COLUMN_VALUE,
-)
 from systembridgeshared.database import Database
+from systembridgeshared.models.database_data_sensors import (
+    Sensors as SensorsDatabaseModel,
+)
 
 
 class CPU(Base):
@@ -53,23 +50,23 @@ def temperature(
         database: Database,
     ) -> Optional[float]:
         """CPU temperature"""
-        for item in database.read_table("sensors").to_dict(orient="records"):
-            if item[COLUMN_HARDWARE_TYPE] is not None and (
+        for item in database.get_data(SensorsDatabaseModel):
+            if item.hardware_type is not None and (
                 (
-                    "cpu" in item[COLUMN_HARDWARE_TYPE].lower()
-                    and "temperature" in item[COLUMN_TYPE].lower()
+                    "cpu" in item.hardware_type.lower()
+                    and "temperature" in item.type.lower()
                 )
                 or (
-                    "k10temp" in item[COLUMN_HARDWARE_TYPE].lower()
-                    and "current" in item[COLUMN_TYPE].lower()
+                    "k10temp" in item.hardware_type.lower()
+                    and "current" in item.type.lower()
                 )
             ):
                 self._logger.debug(
                     "Found CPU temperature: %s = %s",
-                    item[COLUMN_KEY],
-                    item[COLUMN_VALUE],
+                    item.key,
+                    item.value,
                 )
-                return item[COLUMN_VALUE]
+                return item.value
         return None
 
     def times(self) -> pcputimes:
@@ -105,14 +102,12 @@ def voltage(
         database: Database,
     ) -> Optional[float]:
         """CPU voltage"""
-        for item in database.read_table("sensors").to_dict(orient="records"):
+        for item in database.get_data(SensorsDatabaseModel):
             if (
-                item[COLUMN_HARDWARE_TYPE] is not None
-                and "cpu" in item[COLUMN_HARDWARE_TYPE].lower()
-                and "voltage" in item[COLUMN_TYPE].lower()
+                item.hardware_type is not None
+                and "cpu" in item.hardware_type.lower()
+                and "voltage" in item.type.lower()
             ):
-                self._logger.debug(
-                    "Found CPU voltage: %s = %s", item[COLUMN_KEY], item[COLUMN_VALUE]
-                )
-                return item[COLUMN_VALUE]
+                self._logger.debug("Found CPU voltage: %s = %s", item.key, item.value)
+                return item.value
         return None