Fix the start script

[zukebox] / zukebox_server / src / bin / zukebox-server

diff --git a/zukebox_server/src/bin/zukebox-server b/zukebox_server/src/bin/zukebox-server
index 8d1034b..438c7b2 100755 (executable)
--- a/zukebox_server/src/bin/zukebox-server
+++ b/zukebox_server/src/bin/zukebox-server
@@ -10,7 +10,7 @@ from brisa.utils import options
 
 import zukebox_server
 from zukebox_server.system import linux
-from zukebox_server.server.zukebox_server import ZukeBoxServer
+from zukebox_server.server.zb_server import ZukeBoxServer
 
 pjoin = os.path.join
 pexists = os.path.exists
@@ -20,27 +20,22 @@ zb_base_path = pjoin(home_path, ".zukebox")
 zb_database_path = pjoin(zb_base_path, "audio_library.db")
 zb_module_path = zukebox_server.__path__[0]
 zb_plugins_path = pjoin(zb_module_path, "plugins")
+zb_services_path = pjoin(zb_module_path, "services")
+zb_xml_path = pjoin(zb_module_path, "xml_descriptions")
 
 plugin_section = "zukebox_server_plugin-audio-library"
 
 def get_zbus_service():
     import dbus
     bus = dbus.SessionBus()
-    bus_obj = bus.get_object("org.freedesktop.DBus",
-            "/org/freedesktop/DBus", introspect=False)
-    bus_iface = dbus.Interface(bus_obj, "org.freedesktop.DBus")
-    try:
-        reqname = bus_iface.RequestName("br.org.zagaia.ZukeBox",
-                                            dbus.UInt32(0))
-    except Exception, e:
-        log.error("error [%s] while getting the D-BUS service name for ZukeBox"\
-                "exiting ...", e, exc_info=True)
-        sys.exit(1)
-    else:
-        if not reqname:
-            log.error("Unknow error while getting D-BUS service name")
-            sys.exit(1)
+    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_iface.rescan_audio_folder()
+
 def config_dot_zb():
+    log.info("creating the dot zukebox path")
     version = pjoin(zb_base_path, "version")
     version_str = "0.1"
 
@@ -53,11 +48,14 @@ def config_dot_zb():
         return
 
 def setup_zukebox():
+    log.info("setting the zukebox variables in config.manager")
     # ZBox Server
     config.manager.set_parameter("zukebox_server", "name", "ZukeBox Server")
     config.manager.set_parameter("zukebox_server", "owner", "zukebox-server")
-    config.manager.set_parameter("zukebox_server", "home", zb_module_path)
+    config.manager.set_parameter("zukebox_server", "module_path", zb_module_path)
     config.manager.set_parameter("zukebox_server", "plugins", zb_plugins_path)
+    config.manager.set_parameter("zukebox_server", "services", zb_services_path)
+    config.manager.set_parameter("zukebox_server", "xml_path", zb_xml_path)
 
     # ZBox Plugins
     config.manager.set_parameter(plugin_section, "owner",
@@ -76,11 +74,12 @@ def setup_zukebox():
 def init_server():
     log.info("ZukeBox Server starting....")
     listen_url, daemon = options.parse_args("ZukeBox Server")
+    print listen_url, daemon
     if daemon:
         daemonize()
     server_name = config.get_parameter("zukebox_server", "name")
-    zb_server = ZukeBoxServer(server_name, listen_url)
-    zb_server.start()
+    zb_srv = ZukeBoxServer(server_name, listen_url)
+    zb_srv.start()
 
 def main():
     config_dot_zb()