Fix the zukebox-scan

[zukebox] / zukebox_server / src / server / zb_server.py

diff --git a/zukebox_server/src/server/zb_server.py b/zukebox_server/src/server/zb_server.py
index c1f16ea..f74a091 100644 (file)
--- a/zukebox_server/src/server/zb_server.py
+++ b/zukebox_server/src/server/zb_server.py
@@ -14,6 +14,7 @@ from brisa.upnp.services.cds import ContentDirectory
 from brisa.upnp.services.connmgr import ConnectionManagerServer
 
 from zukebox_server.services.playlist.zb_playlist import PlayList
+from zukebox_server.services.search.zb_search import Search
 
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
@@ -38,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"
-    DBUS_IFACE = "br.org.zagaia.ZukeBox"
+    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"
@@ -71,24 +72,24 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
 
         self.device = Device('urn:schemas-upnp-org:device:ZukeBoxServer:1',
                 self.server_name, force_listen_url=self.listen_url,
-                manufacturer="Zagaia Laboratory and INdT Brazil",
+                manufacturer="Zagaia Laboratory",
                 manufacturer_url=project_page,
                 model_description=model_description,
-                model_name=model_name, model_number=serial_no,
+                model_name=model_name, model_number="1.0",
                 model_url=project_page, serial_number=serial_no)
 
     def _create_services(self):
         self.cds = ContentDirectory(self.plugins_folder,
                 self.plugins_module_path)
         cm = ConnectionManagerServer()
-        mod_path = config.get_parameter("zukebox_server", "home")
-        x_path = os.path.join(mod_path, "xml_descriptions")
-        print x_path
-        playlist = PlayList(positions=10, xml_path=x_path)
+        x_path = config.get_parameter("zukebox_server", "xml_path")
+        playlist = PlayList(10, x_path)
+        search = Search(x_path)
 
         self.device.add_service(self.cds)
         self.device.add_service(cm)
         self.device.add_service(playlist)
+        self.device.add_service(search)
 
     def start(self):
         """Start the ZukeBox Server"""
@@ -116,5 +117,3 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
     def reload_config(self):
         config.manager.update()
 
-
-