From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 28 Sep 2020 16:05:02 +0000 (+0000)
Subject: dbus: Move bus domain into bus submodule
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44cc4f59e6561de64f096c4eb01c533b494df733;p=collecty.git

dbus: Move bus domain into bus submodule

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

diff --git a/src/collecty/bus.py b/src/collecty/bus.py
index ef56e2c..d71de8c 100644
--- a/src/collecty/bus.py
+++ b/src/collecty/bus.py
@@ -32,6 +32,8 @@ from .constants import *
 
 log = logging.getLogger("collecty.bus")
 
+DOMAIN = "org.ipfire.collecty1"
+
 class Bus(threading.Thread):
 	def __init__(self, collecty):
 		threading.Thread.__init__(self)
@@ -72,16 +74,16 @@ class Bus(threading.Thread):
 
 class GraphGenerator(dbus.service.Object):
 	def __init__(self, collecty):
-		bus_name = dbus.service.BusName(BUS_DOMAIN, bus=dbus.SystemBus())
+		bus_name = dbus.service.BusName(DOMAIN, bus=dbus.SystemBus())
 		dbus.service.Object.__init__(self, bus_name, "/%s" % self.__class__.__name__)
 
 		self.collecty = collecty
 
-	@dbus.service.method(BUS_DOMAIN, in_signature="s")
+	@dbus.service.method(DOMAIN, in_signature="s")
 	def Backup(self, filename):
 		self.collecty.backup(filename)
 
-	@dbus.service.method(BUS_DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
+	@dbus.service.method(DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
 	def GenerateGraph(self, template_name, kwargs):
 		"""
 			Returns a graph generated from the given template and object.
@@ -94,14 +96,14 @@ class GraphGenerator(dbus.service.Object):
 
 		return graph
 
-	@dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="a{sv}")
+	@dbus.service.method(DOMAIN, in_signature="", out_signature="a{sv}")
 	def GraphInfo(self, template_name, kwargs):
 		"""
 			Returns a dictionary with information about the graph.
 		"""
 		return self.collecty.graph_info(template_name, **kwargs)
 
-	@dbus.service.method(BUS_DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
+	@dbus.service.method(DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
 	def LastUpdate(self, template_name, kwargs):
 		"""
 			Returns a graph generated from the given template and object.
@@ -114,13 +116,13 @@ class GraphGenerator(dbus.service.Object):
 
 		return last_update
 
-	@dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="as")
+	@dbus.service.method(DOMAIN, in_signature="", out_signature="as")
 	def ListTemplates(self):
 		"""
 			Returns a list of all available templates
 		"""
 		return [t.name for t in self.collecty.templates]
 
-	@dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="s")
+	@dbus.service.method(DOMAIN, in_signature="", out_signature="s")
 	def Version(self):
 		return COLLECTY_VERSION
diff --git a/src/collecty/client.py b/src/collecty/client.py
index d0fb3c9..c0693b0 100644
--- a/src/collecty/client.py
+++ b/src/collecty/client.py
@@ -26,14 +26,14 @@ import os
 import platform
 import sys
 
-from .constants import *
+from . import bus
 from .i18n import _
 
 class Collecty(object):
 	def __init__(self):
 		self.bus = dbus.SystemBus()
 
-		self.proxy = self.bus.get_object(BUS_DOMAIN, "/GraphGenerator")
+		self.proxy = self.bus.get_object(bus.DOMAIN, "/GraphGenerator")
 
 	def backup(self, filename):
 		"""
diff --git a/src/collecty/constants.py b/src/collecty/constants.py
index 7fd13be..a128630 100644
--- a/src/collecty/constants.py
+++ b/src/collecty/constants.py
@@ -25,8 +25,6 @@ from .__version__ import *
 
 DATABASE_DIR = "/var/lib/collecty"
 
-BUS_DOMAIN = "org.ipfire.collecty1"
-
 DEFAULT_IMAGE_FORMAT = "SVG"
 DEFAULT_LOCALE = "en_GB.utf8"
 DEFAULT_TIMEZONE = "UTC"