robotframework-browser-tray 1.1.0__tar.gz → 1.2.0__tar.gz

{robotframework_browser_tray-1.1.0 → robotframework_browser_tray-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework-browser-tray
-Version: 1.1.0
+Version: 1.2.0
 Summary: Tray icon to start the Chromium installed by Browser Library
 Author-email: Marduk Bolaños <marduk.bolanos@imbus.de>
 Requires-Python: >=3.8.2
@@ -35,7 +35,9 @@ pip install robotframework-browser-tray
 
 2. Execute `browser-tray`
 
-3. Add these lines to the top of the .robot file with your tests:
+3. Click on the tray icon with the Chromium logo and select `Open Chromium`
+
+4. Add these lines to the top of the .robot file with your tests:
 
 ```robotframework
 Library       Browser               playwright_process_port=55555

{robotframework_browser_tray-1.1.0 → robotframework_browser_tray-1.2.0}/README.md

@@ -25,7 +25,9 @@ pip install robotframework-browser-tray
 
 2. Execute `browser-tray`
 
-3. Add these lines to the top of the .robot file with your tests:
+3. Click on the tray icon with the Chromium logo and select `Open Chromium`
+
+4. Add these lines to the top of the .robot file with your tests:
 
 ```robotframework
 Library       Browser               playwright_process_port=55555

{robotframework_browser_tray-1.1.0 → robotframework_browser_tray-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "robotframework-browser-tray"
-version = "1.1.0"
+version = "1.2.0"
 description = "Tray icon to start the Chromium installed by Browser Library"
 authors = [
     {name = "Marduk Bolaños", email = "marduk.bolanos@imbus.de"},
@@ -22,4 +22,4 @@ build-backend = "flit_core.buildapi"
 
 
 [tool.pdm]
-package-type = "library"
+distribution = true

{robotframework_browser_tray-1.1.0 → robotframework_browser_tray-1.2.0}/src/robotframework_browser_tray/tray.py

@@ -14,7 +14,6 @@ _, site_packages = site.getsitepackages()
 browser_wrapper = Path(site_packages) / "Browser" / "wrapper"
 index_js = browser_wrapper / "index.js"
 node_modules = browser_wrapper / "node_modules"
-local_browsers = node_modules / "playwright-core" / ".local-browsers"
 
 
 def find_chromium(path: Path) -> list[Path]:
@@ -25,71 +24,78 @@ def find_chromium(path: Path) -> list[Path]:
     ]
 
 
-def assert_playwright_initialized():
-    if not (node_modules.is_dir() and local_browsers.is_dir() and find_chromium(local_browsers)):
-       raise FileNotFoundError("Playwright has not been initialized. Execute 'rfbrowser init chromium'.")
-
-
-def start_playwright(playwright_process_port: int) -> Popen:
-    return Popen(f"node {index_js} {playwright_process_port}")
-
+def get_chromium_dir(node_modules: Path):
+    local_browsers = node_modules / "playwright-core" / ".local-browsers"
 
-def start_chromium(remote_debugging_port: int, incognito=False) -> Popen:
-    incognito_flag = "-incognito" if incognito else ""
-    chromium_dir = find_chromium(local_browsers)[0]
-    chrome_exe = chromium_dir / "chrome-win" / "chrome.exe"
-    return Popen(f"{chrome_exe} --remote-debugging-port={remote_debugging_port} --test-type {incognito_flag}")
+    if not (node_modules.is_dir() and local_browsers.is_dir() and find_chromium(local_browsers)):
+       return None
 
+    return find_chromium(local_browsers)[0]
 
-def new_tray_icon(processes: list[Popen], remote_debugging_port: int) -> Icon:
-    def exit():
-        for proc in processes:
-            proc.terminate()
 
-        icon.stop()
+def start_playwright(index_js: Path, playwright_process_port: int) -> Popen:
+    return Popen(['node', index_js, str(playwright_process_port)])
 
-    def open_chromium():
-        chromium = start_chromium(remote_debugging_port)
-        processes.append(chromium)
 
-    def open_chromium_incognito():
-        chromium = start_chromium(remote_debugging_port, True)
-        processes.append(chromium)
+def start_chromium(chromium_dir: Path, remote_debugging_port: int, incognito: bool) -> Popen:
+    incognito_flag = ["-incognito"] if incognito else []
+    chrome_exe = chromium_dir / "chrome-win" / "chrome.exe"
+    return Popen([chrome_exe, f"--remote-debugging-port={remote_debugging_port}", "--test-type"] + incognito_flag)
 
-    chromium_icon = Image.open(Path(realpath(__file__)).parent / "chromium.png")
 
-    icon = Icon(
+class TrayIcon:
+    def __init__(self, processes: list[Popen], chromium_dir: Path, remote_debugging_port: int):
+        chromium_icon = Image.open(Path(realpath(__file__)).parent / "chromium.png")
+        self.chromium_dir = chromium_dir
+        self.processes = processes
+        self.remote_debugging_port = remote_debugging_port
+        self.icon = Icon(
         name='Browser Tray',
         icon=chromium_icon,
         menu=Menu(
             MenuItem(
                 'Open Chromium',
-                open_chromium,
+                self.open_chromium,
                 default=True
             ),        
             MenuItem(
                 'Open Chromium Incognito',
-                open_chromium_incognito,
+                self.open_chromium_incognito,
             ),
             MenuItem(
                 'Exit',
-                exit
+                self.exit
             )
         )
     )
 
-    return icon
+    def exit(self):
+        for proc in self.processes:
+            proc.terminate()
+
+        self.icon.stop()
+
+    def open_chromium(self):
+        chromium = start_chromium(self.chromium_dir, self.remote_debugging_port, False)
+        self.processes.append(chromium)
+
+    def open_chromium_incognito(self):
+        chromium = start_chromium(self.chromium_dir, self.remote_debugging_port, True)
+        self.processes.append(chromium)
+
+    def run(self):
+        self.icon.run()
 
 
 def is_running(cmd: str) -> bool:
     process_list = subprocess.check_output(
-        ["TASKLIST", "/FI", f'imagename eq {cmd}'],
+        ["TASKLIST", "/V", "/FI", f'imagename eq {cmd}'],
         encoding="utf-8"
     ).splitlines()
     instances = [
         process 
         for process in process_list 
-        if process.startswith(cmd)
+        if process.startswith(cmd) and os.getlogin().lower() in process.lower()
     ]
     return len(instances) > 1
 
@@ -119,8 +125,12 @@ def run():
         sys.exit(1)
 
     playwright_process_port, remote_debugging_port = get_ports()
+    chromium_dir = get_chromium_dir(node_modules)
+
+    if not chromium_dir:
+        raise Exception("Playwright has not been initialized. Execute 'rfbrowser init chromium'.")
 
-    assert_playwright_initialized()
-    playwright_process = start_playwright(playwright_process_port)
-    tray_icon = new_tray_icon([playwright_process], remote_debugging_port)
+    playwright_process = start_playwright(index_js, playwright_process_port)
+    processes = [playwright_process]
+    tray_icon = TrayIcon(processes, chromium_dir, remote_debugging_port)
     tray_icon.run()