Merge branch 'main' into zdy

desktop_env/evaluators/getters/__init__.py

@@ -1,3 +1,3 @@
 from .file import get_cloud_file, get_vm_file, get_cache_file
 from .misc import get_rule, get_desktop_path, get_wallpaper, get_accessibility_tree
-from .vlc import get_vlc_playing_info
+from .vlc import get_vlc_playing_info, get_vlc_config

desktop_env/evaluators/getters/file.py

@@ -1,7 +1,7 @@
+import os
 from typing import Dict
 from typing import Optional
 
-import os
 import requests
 
 
@@ -40,11 +40,13 @@ def get_vm_file(env, config: Dict[str, str]) -> Optional[str]:
     file = env.controller.get_file(config["path"])
     if file is None:
         return None
+        #raise FileNotFoundError("File not found on VM: {:}".format(config["path"]))
     with open(_path, "wb") as f:
         f.write(file)
 
     return _path
 
+
 def get_cache_file(env, config: Dict[str, str]) -> str:
     """
     Config:

desktop_env/evaluators/getters/general.py

@@ -0,0 +1,23 @@
+from typing import Dict
+
+import os
+import requests
+
+
+def get_string(env, config: Dict[str, str]) -> str:
+    """
+    Config:
+        string (str)
+    """
+
+    return config["string"]
+
+def get_command_line(env, config: Dict[str, str]) -> str:
+    """
+    Config:
+        string (str)
+    """
+    
+    f = os.popen(config["command"])
+    
+    return f.read()

desktop_env/evaluators/getters/misc.py

@@ -1,95 +1,19 @@
+import logging
 from typing import TypeVar
 #from typing import Dict, List
 
-import platform
-import subprocess
-import ctypes
-import os
-
-#import pyatspi
-#from pyatspi import Accessible, StateType
-#from pyatspi import Component, Document
-#from pyatspi import Text as ATText
-#from pyatspi import Value as ATValue
-#from pyatspi import Action as ATAction
-#import lxml.etree
-#from lxml.etree import _Element
-
-import logging
 logger = logging.getLogger("desktopenv.getters.misc")
 
 R = TypeVar("Rule")
+
+
 def get_rule(env, config: R) -> R:
     """
     Returns the rule as-is.
     """
     return config["rules"]
 
-
-def get_desktop_path(*args):
-    username = os.getlogin()  # Get the current username
-    if platform.system() == "Windows":
-        return os.path.join("C:", "Users", username, "Desktop")
-    elif platform.system() == "Darwin":  # macOS is identified as 'Darwin'
-        return os.path.join("/Users", username, "Desktop")
-    elif platform.system() == "Linux":
-        return os.path.join("/home", username, "Desktop")
-    else:
-        raise Exception("Unsupported operating system")
-
-
-def get_wallpaper(*args):
-    def get_wallpaper_windows():
-        SPI_GETDESKWALLPAPER = 0x73
-        MAX_PATH = 260
-        buffer = ctypes.create_unicode_buffer(MAX_PATH)
-        ctypes.windll.user32.SystemParametersInfoW(SPI_GETDESKWALLPAPER, MAX_PATH, buffer, 0)
-        return buffer.value
-
-    def get_wallpaper_macos():
-        script = """
-        tell application "System Events" to tell every desktop to get picture
-        """
-        process = subprocess.Popen(['osascript', '-e', script], stdout=subprocess.PIPE)
-        output, error = process.communicate()
-        if error:
-            logger.error("Error: %s", error)
-        else:
-            return output.strip().decode('utf-8')
-
-    def get_wallpaper_linux():
-        try:
-            output = subprocess.check_output(["gsettings", "get", "org.gnome.desktop.background", "picture-uri"])
-            return output.decode('utf-8').strip().replace('file://', '').replace("'", "")
-        except Exception as e:
-            logger.error("Error: %s", e)
-            return None
-
-    os_name = platform.system()
-    if os_name == 'Windows':
-        return get_wallpaper_windows()
-    elif os_name == 'Darwin':
-        return get_wallpaper_macos()
-    elif os_name == 'Linux':
-        return get_wallpaper_linux()
-    else:
-        return "Unsupported OS"
-
-#def get_accessibility_tree(*args) -> _Element:
-    #desktop: Accessible = pyatspi.Registry.getDesktop(0)
-    #desktop_xml: _Element = _create_node(desktop)
-    #return desktop_xml
-
 def get_accessibility_tree(env, *args) -> str:
     accessibility_tree: str = env.controller.get_accessibility_tree()
     logger.debug("AT@eval: %s", accessibility_tree)
     return accessibility_tree
-
-#if __name__ == "__main__":
-    #import sys
-    #with open(sys.argv[1], "w") as f:
-        #f.write( lxml.etree.tostring( get_accessibility_tree()
-                                    #, encoding="unicode"
-                                    #, pretty_print=True
-                                    #)
-               #)

desktop_env/evaluators/getters/vlc.py

@@ -1,6 +1,9 @@
+import logging
 import os
 from typing import Dict
 
+logger = logging.getLogger("desktopenv.getters.vlc")
+
 
 def get_vlc_playing_info(env, config: Dict[str, str]):
     """
@@ -13,7 +16,33 @@ def get_vlc_playing_info(env, config: Dict[str, str]):
     password = 'password'
 
     content = env.controller.get_vlc_status(host, port, password)
-    print("content: ", content)
+    with open(_path, "wb") as f:
+        f.write(content)
+
+    return _path
+
+
+def get_vlc_config(env, config: Dict[str, str]):
+    """
+    Reads the VLC configuration file to check setting.
+    """
+    _path = os.path.join(env.cache_dir, config["dest"])
+
+    os_type = env.controller.execute_python_command("import platform; print(platform.system())")['output'].strip()
+
+    # fixme: depends on how we config and install the vlc in virtual machine, need to be aligned and double-checked
+    if os_type == "Linux":
+        config_path = \
+        env.controller.execute_python_command("import os; print(os.path.expanduser('~/.config/vlc/vlcrc'))")[
+            'output'].strip()
+    elif os_type == "Darwin":
+        config_path = env.controller.execute_python_command(
+            "import os; print(os.path.expanduser('~/Library/Preferences/org.videolan.vlc/vlcrc'))")['output'].strip()
+    elif os_type == "Windows":
+        config_path = env.controller.execute_python_command(
+            "import os; print(os.path.expanduser('~\\AppData\\Roaming\\vlc\\vlcrc'))")['output'].strip()
+
+    content = env.controller.get_file(config_path)
     with open(_path, "wb") as f:
         f.write(content)