packaging: install icons to xdg icons resource path, and get the .desktop file to...

[waydroid.git] / tools / services / user_manager.py

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index 09b6bab0a240a0a96952275699c1ea13c593c526..5e03d255a300a61fbc64447d6a9dc51713ec6efb 100644 (file)
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -7,8 +7,9 @@ import tools.config
 from tools.interfaces import IUserMonitor
 from tools.interfaces import IPlatform
 
 from tools.interfaces import IUserMonitor
 from tools.interfaces import IPlatform
 

+stopping = False

 
 

-def start(args, unlocked_cb=None):
+def start(args, session, unlocked_cb=None):

 
     def makeDesktopFile(appInfo):
         showApp = False
 
     def makeDesktopFile(appInfo):
         showApp = False


@@ -21,21 +22,12 @@ def start(args, unlocked_cb=None):
         packageName = appInfo["packageName"]
 
         desktop_file_path = args.apps_dir + "/waydroid." + packageName + ".desktop"
         packageName = appInfo["packageName"]
 
         desktop_file_path = args.apps_dir + "/waydroid." + packageName + ".desktop"

-        #TODO: Drop me
-        if os.path.exists(desktop_file_path):
-            with open(desktop_file_path) as file:
-                filedata = file.read()
-            filedata = filedata.replace(
-                "Icon=" + args.old_waydroid_data, "Icon=" + args.waydroid_data)
-            with open(desktop_file_path, 'w') as file:
-                file.write(filedata)
-            os.chmod(desktop_file_path, 0o755)
-

         if not os.path.exists(desktop_file_path):
             lines = ["[Desktop Entry]", "Type=Application"]
             lines.append("Name=" + appInfo["name"])
             lines.append("Exec=waydroid app launch " + packageName)
             lines.append("Icon=" + args.waydroid_data + "/icons/" + packageName + ".png")
         if not os.path.exists(desktop_file_path):
             lines = ["[Desktop Entry]", "Type=Application"]
             lines.append("Name=" + appInfo["name"])
             lines.append("Exec=waydroid app launch " + packageName)
             lines.append("Icon=" + args.waydroid_data + "/icons/" + packageName + ".png")

+            lines.append("X-Purism-FormFactor=Workstation;Mobile;")

             desktop_file = open(desktop_file_path, "w")
             for line in lines:
                 desktop_file.write(line + "\n")
             desktop_file = open(desktop_file_path, "w")
             for line in lines:
                 desktop_file.write(line + "\n")


@@ -50,9 +42,10 @@ def start(args, unlocked_cb=None):
         lines = ["[Desktop Entry]", "Type=Application"]
         lines.append("Name=Waydroid")
         lines.append("Exec=waydroid show-full-ui")
         lines = ["[Desktop Entry]", "Type=Application"]
         lines.append("Name=Waydroid")
         lines.append("Exec=waydroid show-full-ui")

+        lines.append("X-Purism-FormFactor=Workstation;Mobile;")

         if hide:
             lines.append("NoDisplay=true")
         if hide:
             lines.append("NoDisplay=true")

-        lines.append("Icon=" + tools.config.tools_src + "/data/AppIcon.png")
+        lines.append("Icon=waydroid")

         desktop_file = open(desktop_file_path, "w")
         for line in lines:
             desktop_file.write(line + "\n")
         desktop_file = open(desktop_file_path, "w")
         for line in lines:
             desktop_file.write(line + "\n")


@@ -61,12 +54,8 @@ def start(args, unlocked_cb=None):
 
     def userUnlocked(uid):
         logging.info("Android with user {} is ready".format(uid))
 
     def userUnlocked(uid):
         logging.info("Android with user {} is ready".format(uid))

-        session_cfg = tools.config.load_session()
-        args.waydroid_data = session_cfg["session"]["waydroid_data"]
-        #TODO: Drop me
-        args.old_waydroid_data = session_cfg["session"]["host_user"] + \
-            "/waydroid/data"
-        args.apps_dir = session_cfg["session"]["xdg_data_home"] + \
+        args.waydroid_data = session["waydroid_data"]
+        args.apps_dir = session["xdg_data_home"] + \

             "/applications/"
 
         platformService = IPlatform.get_service(args)
             "/applications/"
 
         platformService = IPlatform.get_service(args)


@@ -83,13 +72,13 @@ def start(args, unlocked_cb=None):
             else:
                 makeWaydroidDesktopFile(True)
         if unlocked_cb:
             else:
                 makeWaydroidDesktopFile(True)
         if unlocked_cb:

-            unlocked_cb(args)
+            unlocked_cb()

 
     def packageStateChanged(mode, packageName, uid):
         platformService = IPlatform.get_service(args)
         if platformService:
             appInfo = platformService.getAppInfo(packageName)
 
     def packageStateChanged(mode, packageName, uid):
         platformService = IPlatform.get_service(args)
         if platformService:
             appInfo = platformService.getAppInfo(packageName)

-            desktop_file_path = args.apps_dir + "/" + packageName + ".desktop"
+            desktop_file_path = args.apps_dir + "/waydroid." + packageName + ".desktop"

             if mode == 0:
                 # Package added
                 makeDesktopFile(appInfo)
             if mode == 0:
                 # Package added
                 makeDesktopFile(appInfo)


@@ -102,12 +91,17 @@ def start(args, unlocked_cb=None):
                         os.remove(desktop_file_path)
 
     def service_thread():
                         os.remove(desktop_file_path)
 
     def service_thread():

-        IUserMonitor.add_service(args, userUnlocked, packageStateChanged)
+        while not stopping:
+            IUserMonitor.add_service(args, userUnlocked, packageStateChanged)

 
 

+    global stopping
+    stopping = False

     args.user_manager = threading.Thread(target=service_thread)
     args.user_manager.start()
 
 def stop(args):
     args.user_manager = threading.Thread(target=service_thread)
     args.user_manager.start()
 
 def stop(args):

+    global stopping
+    stopping = True

     try:
         if args.userMonitorLoop:
             args.userMonitorLoop.quit()
     try:
         if args.userMonitorLoop:
             args.userMonitorLoop.quit()