Merge branch 'master' into feature/crypto-aes256

robocorp · Nov 21, 2023 · d50dad4 · d50dad4
2 parents 1a396c5 + 6a37e7e
commit d50dad4
Show file tree

Hide file tree

Showing 7 changed files with 385 additions and 341 deletions.
diff --git a/packages/core/pyproject.toml b/packages/core/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rpaframework-core"
-version = "11.2.3"
+version = "11.3.0"
 description = "Core utilities used by RPA Framework"
 authors = ["RPA Framework <[email protected]>"]
 license = "Apache-2.0"

diff --git a/packages/core/src/RPA/core/windows/__init__.py b/packages/core/src/RPA/core/windows/__init__.py
@@ -17,6 +17,7 @@ class WindowsElementsMixin:
 
     def __init__(self, locators_path: Optional[str] = None):
         self.logger = logging.getLogger(__name__)
+        self.list_processes = True
         self.global_timeout: float = float(
             auto.uiautomation.TIME_OUT_SECOND if IS_WINDOWS else 10
         )

diff --git a/packages/core/src/RPA/core/windows/window.py b/packages/core/src/RPA/core/windows/window.py
@@ -67,10 +67,12 @@ def get_fullpath(pid: int) -> str:
 
     @method
     def list_windows(
-        self, icons: bool = False, icon_save_directory: Optional[str] = None
+        self,
+        icons: bool = False,
+        icon_save_directory: Optional[str] = None,
     ) -> List[Dict]:
         windows = auto.GetRootControl().GetChildren()
-        process_list = get_process_list()
+        process_list = get_process_list() if self.ctx.list_processes else {}
         win_list = []
         for win in windows:
             pid = win.ProcessId
@@ -87,10 +89,13 @@ def list_windows(
             rectangle = (
                 [rect.left, rect.top, rect.right, rect.bottom] if rect else [None] * 4
             )
+            name = process_list[pid] if pid in process_list else None
+            if not name and fullpath:
+                name = Path(fullpath).name
             info = {
                 "title": win.Name,
                 "pid": pid,
-                "name": process_list[pid] if pid in process_list else None,
+                "name": name,
                 "path": fullpath,
                 "handle": handle,
                 "icon": icon_string,

diff --git a/packages/main/poetry.lock b/packages/main/poetry.lock
diff --git a/packages/main/pyproject.toml b/packages/main/pyproject.toml
@@ -71,7 +71,7 @@ cryptography = "^41.0.3"
 mss = "^6.0.0"
 chardet = "^3.0.0"
 PySocks = ">=1.5.6,!=1.5.7,<2.0.0"
-selenium = "4.13.0"
+selenium = "4.15.2"
 click = "^8.1.2"
 PyYAML = ">=5.4.1,<7.0.0"
 tenacity = "^8.0.1"

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,6 +14,7 @@ rpaframework-google = "^8.0.0"
 rpaframework-openai = "^1.3.0"
 rpaframework-recognition = "^5.2.0"
 rpaframework-windows = "^7.4.0"
+robotframework = "^5.0.1"
 
 [tool.poetry.group.dev.dependencies]
 invoke = "^2.2.0"