Fix the zukebox-scan

diff --git a/zukebox_server/setup.py b/zukebox_server/setup.py
index 3280637..1a7ca52 100644 (file)
--- a/zukebox_server/setup.py
+++ b/zukebox_server/setup.py
@@ -43,7 +43,7 @@ def main():
                  ],
         package_data={'zukebox_server/xml_descriptions': ['*.xml']},
         data_files=[('share/dbus-1/services',
-                    ['src/br.org.zagaia.zukebox.ZukeBoxServer.service']),
+                    ['src/org.zagaia.zukebox.ZukeBoxServer.service']),
                    ])
 
 if __name__ == "__main__":

diff --git a/zukebox_server/src/bin/zukebox-scan b/zukebox_server/src/bin/zukebox-scan
index f1835c2..c4aa392 100755 (executable)
--- a/zukebox_server/src/bin/zukebox-scan
+++ b/zukebox_server/src/bin/zukebox-scan
@@ -3,9 +3,8 @@
 def get_zbus_service():
     import dbus
     bus = dbus.SessionBus()
-    bus_obj = bus.get_object("br.org.zagaia", "/br/org/zagaia/ZukeBox")
-    bus_iface = dbus.Interface(bus_obj, "br.org.zagaia.ZukeBox")
-    log.info("zukebox-server.executing rescan audio path...")
+    bus_obj = bus.get_object("org.zagaia", "/org/zagaia/zukebox")
+    bus_iface = dbus.Interface(bus_obj, "org.zagaia.zukebox")
     bus_iface.rescan_audio_folder()
 
 if __name__ == "__main__":

diff --git a/zukebox_server/src/org.zagaia.zukebox.ZukeBoxServer.service b/zukebox_server/src/org.zagaia.zukebox.ZukeBoxServer.service
new file mode 100644 (file)
index 0000000..d7b0f8a
--- /dev/null
+++ b/zukebox_server/src/org.zagaia.zukebox.ZukeBoxServer.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.zagaia.zukebox.ZukeBoxServer
+Exec=/usr/bin/env zukebox-server

diff --git a/zukebox_server/src/server/zb_server.py b/zukebox_server/src/server/zb_server.py
index 3c8c21a..f74a091 100644 (file)
--- a/zukebox_server/src/server/zb_server.py
+++ b/zukebox_server/src/server/zb_server.py
@@ -39,9 +39,9 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
     rescan the default paths and save in the database.
     """
 
-    DBUS_SERVICE_NAME = "br.org.zagaia"
-    DBUS_OBJ_PATH = "/br/org/zagaia/zukebox/ZukeBoxServer"
-    DBUS_IFACE = "br.org.zagaia.zukebox.ZukeBoxServer"
+    DBUS_SERVICE_NAME = "org.zagaia"
+    DBUS_OBJ_PATH = "/org/zagaia/zukebox/ZukeBoxServer"
+    DBUS_IFACE = "org.zagaia.zukebox.ZukeBoxServer"
 
     plugins_folder = config.get_parameter("zukebox_server", "plugins")
     plugins_module_path = "zukebox_server.plugins"
@@ -84,7 +84,7 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
         cm = ConnectionManagerServer()
         x_path = config.get_parameter("zukebox_server", "xml_path")
         playlist = PlayList(10, x_path)
-       search = Search(x_path)
+        search = Search(x_path)
 
         self.device.add_service(self.cds)
         self.device.add_service(cm)