Fix prop set command

[waydroid.git] / tools / actions / session_manager.py

diff --git a/tools/actions/session_manager.py b/tools/actions/session_manager.py
index 7d89757edeeb027f7854d5359c0d85fac4542190..cfcd267988eafaf699c5f4c12e5728d7113f7490 100644 (file)
--- a/tools/actions/session_manager.py
+++ b/tools/actions/session_manager.py
@@ -5,21 +5,45 @@ import os
 import time
 import signal
 import sys
 import time
 import signal
 import sys

+import shutil

 import tools.config
 import tools.config

+import tools.helpers.ipc

 from tools import services
 from tools import services

+import dbus
+import dbus.service
+import dbus.exceptions
+from gi.repository import GLib
+import copy

 
 

+class DbusSessionManager(dbus.service.Object):
+    def __init__(self, looper, bus, object_path, args):
+        self.args = args
+        self.looper = looper
+        dbus.service.Object.__init__(self, bus, object_path)

 
 

-def start(args):
-    def signal_handler(sig, frame):
-        stop(args)
-        sys.exit(0)
+    @dbus.service.method("id.waydro.SessionManager", in_signature='', out_signature='')
+    def Stop(self):
+        do_stop(self.args, self.looper)
+        stop_container()
+
+def service(args, looper):
+    dbus_obj = DbusSessionManager(looper, dbus.SessionBus(), '/SessionManager', args)
+    looper.run()

 
 

-    xdg_session = os.getenv("XDG_SESSION_TYPE")
-    if xdg_session != "wayland":
-        logging.warning('XDG Session is not "wayland"')
+def start(args, unlocked_cb=None):
+    try:
+        name = dbus.service.BusName("id.waydro.Session", dbus.SessionBus(), do_not_queue=True)
+    except dbus.exceptions.NameExistsException:
+        logging.error("Session is already running")
+        if unlocked_cb:
+            unlocked_cb()
+        return

 
 

-    cfg = tools.config.load_session()
-    waydroid_data = cfg["session"]["waydroid_data"]
+    session = copy.copy(tools.config.session_defaults);
+    wayland_display = session["wayland_display"]
+    if wayland_display == "None" or not wayland_display:
+        logging.warning('WAYLAND_DISPLAY is not set, defaulting to "wayland-0"')
+    waydroid_data = session["waydroid_data"]

     if not os.path.isdir(waydroid_data):
         os.makedirs(waydroid_data)
     dpi = tools.helpers.props.host_get(args, "ro.sf.lcd_density")
     if not os.path.isdir(waydroid_data):
         os.makedirs(waydroid_data)
     dpi = tools.helpers.props.host_get(args, "ro.sf.lcd_density")


@@ -29,23 +53,44 @@ def start(args):
             dpi = str(int(dpi) * 20)
         else:
             dpi = "0"
             dpi = str(int(dpi) * 20)
         else:
             dpi = "0"

-    cfg["session"]["lcd_density"] = dpi
-    tools.config.save_session(cfg)
+    session["lcd_density"] = dpi
+
+    mainloop = GLib.MainLoop()
+
+    def sigint_handler(data):
+        do_stop(args, mainloop)
+        stop_container()
+
+    def sigusr_handler(data):
+        do_stop(args, mainloop)

 
 

-    services.user_manager.start(args)
+    GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGINT, sigint_handler, None)
+    GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGTERM, sigint_handler, None)
+    GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGUSR1, sigusr_handler, None)
+    try:
+        tools.helpers.ipc.DBusContainerService().Start(session)
+    except dbus.DBusException:
+        logging.error("WayDroid container is not listening")
+        sys.exit(0)
+
+
+    services.user_manager.start(args, session, unlocked_cb)

     services.clipboard_manager.start(args)
     services.clipboard_manager.start(args)

+    service(args, mainloop)

 
 

-    signal.signal(signal.SIGINT, signal_handler)
-    while os.path.exists(tools.config.session_defaults["config_path"]):
-        time.sleep(1)
+def do_stop(args, looper):

     services.user_manager.stop(args)
     services.clipboard_manager.stop(args)
     services.user_manager.stop(args)
     services.clipboard_manager.stop(args)

+    looper.quit()

 
 def stop(args):
 
 def stop(args):

-    config_path = tools.config.session_defaults["config_path"]
-    if os.path.isfile(config_path):
-        services.user_manager.stop(args)
-        services.clipboard_manager.stop(args)
-        os.remove(config_path)
-    else:
-        logging.error("WayDroid session is not started")
+    try:
+        tools.helpers.ipc.DBusSessionService().Stop()
+    except dbus.DBusException:
+        stop_container()
+
+def stop_container():
+    try:
+        tools.helpers.ipc.DBusContainerService().Stop()
+    except dbus.DBusException:
+        pass