initializer: Move triggers to dbus

[waydroid.git] / tools / __init__.py

diff --git a/tools/__init__.py b/tools/__init__.py
index 2443e6ebb5d6a7a5c2f580bdbca6288094fe5896..992049ec9a9f7c560228941dedbc6d65d5452f78 100644 (file)
--- a/tools/__init__.py
+++ b/tools/__init__.py
@@ -5,6 +5,7 @@ import sys
 import logging
 import os
 import traceback
 import logging
 import os
 import traceback

+import dbus.mainloop.glib

 
 from . import actions
 from . import config
 
 from . import actions
 from . import config


@@ -31,28 +32,24 @@ def main():
         args.sudo_timer = True
         args.timeout = 1800
 
         args.sudo_timer = True
         args.timeout = 1800
 

-        if not actions.initializer.is_initialized(args):
-            if args.action and (args.action != "init" and args.action != "log"):
-                if not args.wait_for_init:
-                    print('ERROR: WayDroid is not initialized, run "waydroid init"')
-                    return 0
+        if os.geteuid() == 0:
+            if not os.path.exists(args.work):
+                os.mkdir(args.work)
+        elif not os.path.exists(args.log):
+            args.log = "/tmp/tools.log"

 
 

-                print('WayDroid waiting for initialization...')
-                while helpers.ipc.listen(channel="init") != "done":
-                    pass
+        tools_logging.init(args)

 
 

-            elif os.geteuid() == 0 and args.action == "init":
-                if not os.path.exists(args.work):
-                    os.mkdir(args.work)
-            else:
-                # This branch is taken if:
-                # - waydroid is not yet initialized
-                # - waydroid is invoked with no command or with log
-                if not os.path.exists(args.log):
-                    # The log could have been already created if init was used and failed, if its not the case we use a temporary one
-                    args.log = "/tmp/tools.log"
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        dbus.mainloop.glib.threads_init()

 
 

-        tools_logging.init(args)
+        if not actions.initializer.is_initialized(args) and \
+                args.action and args.action not in ("init", "first-launch", "log"):
+            if args.wait_for_init:
+                actions.wait_for_init(args)
+            else:
+                print('ERROR: WayDroid is not initialized, run "waydroid init"')
+                return 0

 
         # Initialize or require config
         if args.action == "init":
 
         # Initialize or require config
         if args.action == "init":


@@ -116,6 +113,10 @@ def main():
             helpers.lxc.logcat(args)
         elif args.action == "show-full-ui":
             actions.app_manager.showFullUI(args)
             helpers.lxc.logcat(args)
         elif args.action == "show-full-ui":
             actions.app_manager.showFullUI(args)

+        elif args.action == "first-launch":
+            actions.remote_init_client(args)
+            if actions.initializer.is_initialized(args):
+                actions.app_manager.showFullUI(args)

         elif args.action == "status":
             actions.status.print_status(args)
         elif args.action == "log":
         elif args.action == "status":
             actions.status.print_status(args)
         elif args.action == "log":