From 0c9c2f214aea805136a4ef4e30452a0b456a98ae Mon Sep 17 00:00:00 2001
From: David Chang <zdy004007@126.com>
Date: Mon, 11 Mar 2024 22:45:16 +0800
Subject: [PATCH 1/3] ver Mar11thv2

minor adjustment
---
 at_processing/filter.anal                            |  4 +++-
 .../accessibility_tree_wrap/heuristic_retrieve.py    | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/at_processing/filter.anal b/at_processing/filter.anal
index 98fc1fe..9e3ba1d 100644
--- a/at_processing/filter.anal
+++ b/at_processing/filter.anal
@@ -231,6 +231,8 @@ worker-window 1
 xldesk 1
 xlmain 1
 
+TODO: 对Windows元素，可能按win:class属性筛选会更贴近UFO的方案。
+
 |3. 筛选属性
 
 UFO中筛选的几种元素属性：
@@ -238,7 +240,7 @@ P: is_visible, is_enabled, title_list, class_name_list
 
 对Ubuntu，照葫芦画瓢，筛选
 P: visible & showing
-P: enabled
+P: enabled | editable | expandable | checkable
 P: name
 P: text
 
diff --git a/mm_agents/accessibility_tree_wrap/heuristic_retrieve.py b/mm_agents/accessibility_tree_wrap/heuristic_retrieve.py
index 337b402..34a1d76 100644
--- a/mm_agents/accessibility_tree_wrap/heuristic_retrieve.py
+++ b/mm_agents/accessibility_tree_wrap/heuristic_retrieve.py
@@ -55,12 +55,12 @@ def judge_node(node: ET, platform="ubuntu") -> bool:
                      or platform=="windows"\
                         and node.get("{{{:}}}visible".format(state_ns), "false")=="true"\
                       )\
-                    and ( node.get("{{{:}}}enabled".format(state_ns), "false")=="true"\
-                       or node.get("{{{:}}}editable".format(state_ns), "false")=="true"\
-                       or node.get("{{{:}}}expandable".format(state_ns), "false")=="true"\
-                       or node.get("{{{:}}}checkable".format(state_ns), "false")=="true"
-                        )\
-                    and (node.get("name", "") != "" or node.text is not None and len(node.text)>0)
+                  and ( node.get("{{{:}}}enabled".format(state_ns), "false")=="true"\
+                     or node.get("{{{:}}}editable".format(state_ns), "false")=="true"\
+                     or node.get("{{{:}}}expandable".format(state_ns), "false")=="true"\
+                     or node.get("{{{:}}}checkable".format(state_ns), "false")=="true"
+                      )\
+                  and (node.get("name", "") != "" or node.text is not None and len(node.text)>0)
 
     coordinates: Tuple[int, int] = eval(node.get("{{{:}}}screencoord".format(component_ns), "(-1, -1)"))
     sizes: Tuple[int, int] = eval(node.get("{{{:}}}size".format(component_ns), "(-1, -1)"))

From 3a0ab526c8f981066b96d3825ed5e1900a38162d Mon Sep 17 00:00:00 2001
From: David Chang <zdy004007@126.com>
Date: Wed, 13 Mar 2024 12:25:46 +0800
Subject: [PATCH 2/3] ver Mar13th

service file for server/main.py
---
 desktop_env/server/osbench_server.service | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 desktop_env/server/osbench_server.service

diff --git a/desktop_env/server/osbench_server.service b/desktop_env/server/osbench_server.service
new file mode 100644
index 0000000..d0fa216
--- /dev/null
+++ b/desktop_env/server/osbench_server.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSBench Server
+StartLimitIntervalSec=60
+StartLimitBurst=4
+After=network.target auditd.service
+
+[Service]
+ExecStart=/usr/bin/python3 /home/user/main.py
+User=user
+WorkingDirectory=/home/user
+Restart=on-failure
+RestartSec=1
+Environment="DISPLAY=:1"
+
+[Install]
+WantedBy=graphical.target

From 587a89fa7f8d8237c70f15e539765835eb9307ee Mon Sep 17 00:00:00 2001
From: David Chang <zdy004007@126.com>
Date: Wed, 13 Mar 2024 19:42:49 +0800
Subject: [PATCH 3/3] ver Mar13thv2

added a new service file with replacable arguments
---
 desktop_env/server/osbench_server@.service | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 desktop_env/server/osbench_server@.service

diff --git a/desktop_env/server/osbench_server@.service b/desktop_env/server/osbench_server@.service
new file mode 100644
index 0000000..87fc59f
--- /dev/null
+++ b/desktop_env/server/osbench_server@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSBench Server
+StartLimitIntervalSec=60
+StartLimitBurst=4
+After=network.target auditd.service
+
+[Service]
+ExecStart=/usr/bin/python3 /home/user/main.py
+User=user
+WorkingDirectory=/home/user
+Restart=on-failure
+RestartSec=1
+Environment="DISPLAY=%i"
+
+[Install]
+WantedBy=graphical.target