From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 5 Feb 2025 15:41:07 +0000 (+0000)
Subject: settings: Remove database settings
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beeb042b7a7f54bdbca458275ced048cf6b061e6;p=pbs.git

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 4cff09bc..8a44eb96 100644
--- 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 17cbc74d..57d1c0f5 100644
--- 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 d55d41c2..7f6bcb5a 100644
--- 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
index 2f6b4578..00000000
--- 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,
-		)
-