Commit 82901b08 authored by Roman Alifanov's avatar Roman Alifanov

daemon: use JSON instead of ast.literal_eval

parent 55c40af3
import ast import json
import logging import logging
import dbus import dbus
...@@ -82,10 +82,10 @@ class Daemon(dbus.service.Object): ...@@ -82,10 +82,10 @@ class Daemon(dbus.service.Object):
"Permission denied" "Permission denied"
) )
try: try:
backend_params = ast.literal_eval(backend_params) backend_params = json.loads(backend_params)
backend = root_backend_factory.get_backend(backend_name, backend_params) backend = root_backend_factory.get_backend(backend_name, backend_params)
if backend: if backend:
return str(backend.get_value(key, gtype)) return json.dumps(backend.get_value(key, gtype))
except Exception as e: except Exception as e:
return dbus.DBusException( return dbus.DBusException(
"ru.ximperlinux.TuneIt.Daemon", e "ru.ximperlinux.TuneIt.Daemon", e
...@@ -106,7 +106,7 @@ class Daemon(dbus.service.Object): ...@@ -106,7 +106,7 @@ class Daemon(dbus.service.Object):
"Permission denied" "Permission denied"
) )
try: try:
backend_params = ast.literal_eval(backend_params) backend_params = json.loads(backend_params)
backend = root_backend_factory.get_backend(backend_name, backend_params) backend = root_backend_factory.get_backend(backend_name, backend_params)
if backend: if backend:
backend.set_value(key, value, gtype) backend.set_value(key, value, gtype)
...@@ -130,10 +130,10 @@ class Daemon(dbus.service.Object): ...@@ -130,10 +130,10 @@ class Daemon(dbus.service.Object):
"Permission denied" "Permission denied"
) )
try: try:
backend_params = ast.literal_eval(backend_params) backend_params = json.loads(backend_params)
backend = root_backend_factory.get_backend(backend_name, backend_params) backend = root_backend_factory.get_backend(backend_name, backend_params)
if backend: if backend:
return str(backend.get_range(key, gtype)) return json.dumps(backend.get_range(key, gtype))
except Exception as e: except Exception as e:
return dbus.DBusException( return dbus.DBusException(
"ru.ximperlinux.TuneIt.Daemon", e "ru.ximperlinux.TuneIt.Daemon", e
......
import json
import logging import logging
import dbus import dbus
import ast
class DaemonClient: class DaemonClient:
...@@ -57,7 +57,7 @@ class DaemonClient: ...@@ -57,7 +57,7 @@ class DaemonClient:
:param backend_params: Параметры backend в формате JSON. :param backend_params: Параметры backend в формате JSON.
""" """
self.backend_params = str(backend_params) self.backend_params = json.dumps(backend_params)
def get_value(self, key, gtype): def get_value(self, key, gtype):
""" """
...@@ -68,7 +68,7 @@ class DaemonClient: ...@@ -68,7 +68,7 @@ class DaemonClient:
:return: Полученное значение. :return: Полученное значение.
""" """
try: try:
return ast.literal_eval(str(self.interface.GetValue(self.backend_name, str(self.backend_params), key, gtype))) return json.loads(str(self.interface.GetValue(self.backend_name, self.backend_params, key, gtype)))
except dbus.DBusException as e: except dbus.DBusException as e:
self.logger.error(f"Error in GetValue: {e}") self.logger.error(f"Error in GetValue: {e}")
return None return None
...@@ -83,7 +83,7 @@ class DaemonClient: ...@@ -83,7 +83,7 @@ class DaemonClient:
:return: Результат операции. :return: Результат операции.
""" """
try: try:
self.interface.SetValue(self.backend_name, str(self.backend_params), key, str(value), gtype) self.interface.SetValue(self.backend_name, self.backend_params, key, str(value), gtype)
except dbus.DBusException as e: except dbus.DBusException as e:
self.logger.error(f"Error in SetValue: {e}") self.logger.error(f"Error in SetValue: {e}")
...@@ -96,7 +96,7 @@ class DaemonClient: ...@@ -96,7 +96,7 @@ class DaemonClient:
:return: Диапазон значений. :return: Диапазон значений.
""" """
try: try:
return ast.literal_eval(str(self.interface.GetRange(self.backend_name, str(self.backend_params), key, gtype))) return json.loads(str(self.interface.GetRange(self.backend_name, self.backend_params, key, gtype)))
except dbus.DBusException as e: except dbus.DBusException as e:
self.logger.error(f"Error in GetRange: {e}") self.logger.error(f"Error in GetRange: {e}")
return None return None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment