settings: Remove database settings

We read stuff from the configuration file now.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 4cff09bcbb74c3618644189878fdde10e5d9aea0..8a44eb967831864200efa2bcef05d12685d4749d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,6 @@ pkgpython_PYTHON = \
        src/buildservice/releasemonitoring.py \
        src/buildservice/repos.py \
        src/buildservice/sessions.py \
-       src/buildservice/settings.py \
        src/buildservice/sources.py \
        src/buildservice/uploads.py \
        src/buildservice/users.py

diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index 17cbc74d3fc538c29d91b0a360623e11099b8296..57d1c0f524d77e6e5c50a74596fe6bce9a1a8115 100644 (file)
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -31,7 +31,6 @@ from . import packages
 from . import ratelimiter
 from . import releasemonitoring
 from . import repos
-from . import settings
 from . import sessions
 from . import sources
 from . import uploads
@@ -60,9 +59,6 @@ class Backend(object):
                # Fetch the base path
                self.basepath = self.config.get("global", "basepath")
 
-               # Global pakfire settings (from database).
-               self.settings = settings.Settings(self)
-
                # Initialize the HTTP Client
                self.httpclient = httpclient.HTTPClient(self)
 

diff --git a/src/buildservice/base.py b/src/buildservice/base.py
index d55d41c2579cd9de1d0896edc00dd32de4114981..7f6bcb5a50450c7b2402e748b9655cfc3ac9a746 100644 (file)
--- a/src/buildservice/base.py
+++ b/src/buildservice/base.py
@@ -27,7 +27,3 @@ class Object(object):
                        Shortcut to database
                """
                return self.backend.db
-
-       @functools.cached_property
-       def settings(self):
-               return self.backend.settings

diff --git a/src/buildservice/settings.py b/src/buildservice/settings.py
deleted file mode 100644 (file)
index 2f6b457..0000000
--- a/src/buildservice/settings.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-
-from . import base
-
-class Settings(base.Object):
-       async def get(self, key, default=None):
-               res = await self.db.get("SELECT v FROM settings WHERE k = %s", key)
-               if res:
-                       return res.v
-
-               return default
-
-       async def get_int(self, key, default=None):
-               value = await self.get(key, default)
-
-               try:
-                       return int(value)
-               except ValueError:
-                       return None
-
-       async def get_float(self, key, default=None):
-               value = await self.get(key, default)
-
-               try:
-                       return float(value)
-               except ValueError:
-                       return None
-
-       async def set(self, key, value):
-               await self.db.execute("""
-                       INSERT INTO
-                               settings(
-                                       k,
-                                       v
-                               )
-                       VALUES(
-                               %s, %s
-                       )
-                       ON CONFLICT
-                               (k)
-                       DO UPDATE SET
-                               v = excluded.v
-                       WHERE
-                               settings.k = excluded.k
-                       """, key, value,
-               )
-