Merge pull request #2019 from seleniumbase/improve-uc-mode-on-linux

Improve UC Mode on Linux

Author: mdmintz

mkdocs_build/requirements.txt

@@ -20,7 +20,7 @@ paginate==0.5.6
 pyquery==2.0.0
 readtime==3.0.0
 mkdocs==1.5.2
-mkdocs-material==9.2.1
+mkdocs-material==9.2.3
 mkdocs-exclude-search==0.6.5
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.1.1

requirements.txt

@@ -6,7 +6,7 @@ setuptools>=59.6.0;python_version<"3.7"
 setuptools>=68.0.0;python_version>="3.7" and python_version<"3.8"
 setuptools>=68.1.2;python_version>="3.8"
 wheel>=0.37.1;python_version<"3.7"
-wheel>=0.41.1;python_version>="3.7"
+wheel>=0.41.2;python_version>="3.7"
 attrs==22.1.0;python_version<"3.7"
 attrs>=23.1.0;python_version>="3.7"
 certifi>=2023.7.22

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.17.9"
+__version__ = "4.17.10"

seleniumbase/core/browser_launcher.py

@@ -855,6 +855,11 @@ def _set_chrome_options(
         if is_using_uc(undetectable, browser_name):
             chrome_options.add_argument("--disable-application-cache")
             chrome_options.add_argument("--disable-setuid-sandbox")
+    if is_using_uc(undetectable, browser_name) and not binary_location:
+        br_app = "google-chrome"
+        binary_loc = detect_b_ver.get_binary_location(br_app, True)
+        if os.path.exists(binary_loc):
+            binary_location = binary_loc
     if chromium_arg:
         # Can be a comma-separated list of Chromium args
         chromium_arg_list = chromium_arg.split(",")
@@ -875,7 +880,9 @@ def _set_chrome_options(
                     pass
             if "set-binary" in chromium_arg_item and not binary_location:
                 br_app = "google-chrome"
-                binary_loc = detect_b_ver.get_binary_location(br_app)
+                binary_loc = detect_b_ver.get_binary_location(
+                    br_app, is_using_uc(undetectable, browser_name)
+                )
                 if os.path.exists(binary_loc):
                     binary_location = binary_loc
             elif len(chromium_arg_item) >= 3:
@@ -2897,11 +2904,11 @@ def get_local_driver(
             major_chrome_version = None
             if selenium4_or_newer:
                 try:
-                    if binary_location:
+                    if chrome_options.binary_location:
                         try:
                             major_chrome_version = (
                                 detect_b_ver.get_browser_version_from_binary(
-                                    binary_location
+                                    chrome_options.binary_location,
                                 )
                             ).split(".")[0]
                             if len(major_chrome_version) < 2:

seleniumbase/core/detect_b_ver.py

@@ -96,6 +96,105 @@ def linux_browser_apps_to_cmd(*apps):
     )
 
 
+def chrome_on_linux_path(prefer_chromium=False):
+    if os_name() != "linux":
+        return ""
+    primary_chrome = "google-chrome"
+    secondary_chrome = "chromium"
+    if prefer_chromium:
+        primary_chrome = "chromium"
+        secondary_chrome = "google-chrome"
+    paths = os.environ["PATH"].split(os.pathsep)
+    binaries = []
+    binaries.append(primary_chrome)
+    binaries.append(secondary_chrome)
+    binaries.append("chromium-browser")
+    binaries.append("chrome")
+    binaries.append("google-chrome-stable")
+    binaries.append("google-chrome-beta")
+    binaries.append("google-chrome-dev")
+    binaries.append("google-chrome-unstable")
+    for binary in binaries:
+        for path in paths:
+            full_path = os.path.join(path, binary)
+            if os.path.exists(full_path) and os.access(full_path, os.X_OK):
+                return full_path
+    return "/usr/bin/google-chrome"
+
+
+def edge_on_linux_path():
+    if os_name() != "linux":
+        return ""
+    paths = os.environ["PATH"].split(os.pathsep)
+    binaries = []
+    binaries.append("microsoft-edge")
+    binaries.append("microsoft-edge-stable")
+    binaries.append("microsoft-edge-beta")
+    binaries.append("microsoft-edge-dev")
+    for binary in binaries:
+        for path in paths:
+            full_path = os.path.join(path, binary)
+            if os.path.exists(full_path) and os.access(full_path, os.X_OK):
+                return full_path
+    return "/usr/bin/microsoft-edge"
+
+
+def chrome_on_windows_path():
+    if os_name() != "win32":
+        return ""
+    candidates = []
+    for item in map(
+        os.environ.get,
+        (
+            "PROGRAMFILES",
+            "PROGRAMFILES(X86)",
+            "LOCALAPPDATA",
+            "PROGRAMW6432",
+        ),
+    ):
+        for subitem in (
+            "Google/Chrome/Application",
+            "Google/Chrome Beta/Application",
+            "Google/Chrome Canary/Application",
+        ):
+            try:
+                candidates.append(os.sep.join((item, subitem, "chrome.exe")))
+            except TypeError:
+                pass
+    for candidate in candidates:
+        if os.path.exists(candidate) and os.access(candidate, os.X_OK):
+            return os.path.normpath(candidate)
+    return ""
+
+
+def edge_on_windows_path():
+    if os_name() != "win32":
+        return ""
+    candidates = []
+    for item in map(
+        os.environ.get,
+        (
+            "PROGRAMFILES",
+            "PROGRAMFILES(X86)",
+            "LOCALAPPDATA",
+            "PROGRAMW6432",
+        ),
+    ):
+        for subitem in (
+            "Microsoft/Edge/Application",
+            "Microsoft/Edge Beta/Application",
+            "Microsoft/Edge Canary/Application",
+        ):
+            try:
+                candidates.append(os.sep.join((item, subitem, "msedge.exe")))
+            except TypeError:
+                pass
+    for candidate in candidates:
+        if os.path.exists(candidate) and os.access(candidate, os.X_OK):
+            return os.path.normpath(candidate)
+    return ""
+
+
 def windows_browser_apps_to_cmd(*apps):
     """Create analogue of browser --version command for windows."""
     powershell = determine_powershell()
@@ -106,63 +205,21 @@ def windows_browser_apps_to_cmd(*apps):
     return '%s -NoProfile "%s"' % (powershell, script)
 
 
-def get_binary_location(browser_type):
+def get_binary_location(browser_type, prefer_chromium=False):
+    """Return the full path of the browser binary.
+    If going for better results in UC Mode, use: prefer_chromium=True"""
     cmd_mapping = {
         ChromeType.GOOGLE: {
-            OSType.LINUX: linux_browser_apps_to_cmd(
-                "google-chrome-stable",
-                "google-chrome",
-                "chrome",
-                "chromium",
-                "chromium-browser",
-                "google-chrome-beta",
-                "google-chrome-dev",
-                "google-chrome-unstable",
-            ),
+            OSType.LINUX: chrome_on_linux_path(prefer_chromium),
             OSType.MAC: r"/Applications/Google Chrome.app"
                         r"/Contents/MacOS/Google Chrome",
-            OSType.WIN: windows_browser_apps_to_cmd(
-                r'(Get-Item -Path "$env:PROGRAMFILES\Google\Chrome'
-                r'\Application\chrome.exe")',
-                r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Google\Chrome'
-                r'\Application\chrome.exe")',
-                r'(Get-Item -Path "$env:LOCALAPPDATA\Google\Chrome'
-                r'\Application\chrome.exe")',
-            ),
+            OSType.WIN: chrome_on_windows_path(),
         },
         ChromeType.MSEDGE: {
-            OSType.LINUX: linux_browser_apps_to_cmd(
-                "microsoft-edge-stable",
-                "microsoft-edge",
-                "microsoft-edge-beta",
-                "microsoft-edge-dev",
-            ),
+            OSType.LINUX: edge_on_linux_path(),
             OSType.MAC: r"/Applications/Microsoft Edge.app"
                         r"/Contents/MacOS/Microsoft Edge",
-            OSType.WIN: windows_browser_apps_to_cmd(
-                # stable edge
-                r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge'
-                r'\Application\msedge.exe")',
-                r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft'
-                r'\Edge\Application\msedge.exe")',
-                # beta edge
-                r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge Beta'
-                r'\Application\msedge.exe")',
-                r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge Beta'
-                r'\Application\msedge.exe")',
-                r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft\Edge Beta'
-                r'\Application\msedge.exe")',
-                # dev edge
-                r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge Dev'
-                r'\Application\msedge.exe")',
-                r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge Dev'
-                r'\Application\msedge.exe")',
-                r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft\Edge Dev'
-                r'\Application\msedge.exe")',
-                # canary edge
-                r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge SxS'
-                r'\Application\msedge.exe")',
-            ),
+            OSType.WIN: edge_on_windows_path(),
         },
     }
     return cmd_mapping[browser_type][os_name()]
@@ -185,11 +242,11 @@ def get_browser_version_from_os(browser_type):
     cmd_mapping = {
         ChromeType.GOOGLE: {
             OSType.LINUX: linux_browser_apps_to_cmd(
-                "google-chrome-stable",
                 "google-chrome",
-                "chrome",
                 "chromium",
                 "chromium-browser",
+                "chrome",
+                "google-chrome-stable",
                 "google-chrome-beta",
                 "google-chrome-dev",
                 "google-chrome-unstable",
@@ -212,8 +269,8 @@ def get_browser_version_from_os(browser_type):
         },
         ChromeType.MSEDGE: {
             OSType.LINUX: linux_browser_apps_to_cmd(
-                "microsoft-edge-stable",
                 "microsoft-edge",
+                "microsoft-edge-stable",
                 "microsoft-edge-beta",
                 "microsoft-edge-dev",
             ),

seleniumbase/fixtures/constants.py

@@ -360,18 +360,18 @@ class ValidBrowsers:
 
 class ValidBinaries:
     valid_chrome_binaries_on_linux = [
-        "google-chrome-stable",
         "google-chrome",
-        "chrome",
         "chromium",
         "chromium-browser",
+        "chrome",
+        "google-chrome-stable",
         "google-chrome-beta",
         "google-chrome-dev",
         "google-chrome-unstable",
     ]
     valid_edge_binaries_on_linux = [
-        "microsoft-edge-stable",
         "microsoft-edge",
+        "microsoft-edge-stable",
         "microsoft-edge-beta",
         "microsoft-edge-dev",
     ]

seleniumbase/undetected/__init__.py

@@ -502,15 +502,21 @@ def __hash__(self):
 
 
 def find_chrome_executable():
+    from seleniumbase.core import detect_b_ver
+
+    binary_location = detect_b_ver.get_binary_location("google-chrome", True)
+    if os.path.exists(binary_location) and os.access(binary_location, os.X_OK):
+        return os.path.normpath(binary_location)
+
     candidates = set()
     if IS_POSIX:
         for item in os.environ.get("PATH").split(os.pathsep):
             for subitem in (
-                "google-chrome-stable",
-                "google-chrome",
-                "chrome",
                 "chromium",
+                "google-chrome",
                 "chromium-browser",
+                "chrome",
+                "google-chrome-stable",
                 "google-chrome-beta",
                 "google-chrome-dev",
                 "google-chrome-unstable",
@@ -542,3 +548,4 @@ def find_chrome_executable():
     for candidate in candidates:
         if os.path.exists(candidate) and os.access(candidate, os.X_OK):
             return os.path.normpath(candidate)
+    return None  # Browser not found!

setup.py

@@ -140,7 +140,7 @@
         'setuptools>=68.0.0;python_version>="3.7" and python_version<"3.8"',
         'setuptools>=68.1.2;python_version>="3.8"',
         'wheel>=0.37.1;python_version<"3.7"',
-        'wheel>=0.41.1;python_version>="3.7"',
+        'wheel>=0.41.2;python_version>="3.7"',
         'attrs==22.1.0;python_version<"3.7"',
         'attrs>=23.1.0;python_version>="3.7"',
         "certifi>=2023.7.22",