Redo chromium.py changes?

Author: ayjayt

choreographer/_browsers/chromium.py

@@ -2,76 +2,121 @@
 
 import os
 import platform
+import subprocess
 import sys
 from pathlib import Path
 
 if platform.system() == "Windows":
     import msvcrt
 
 from choreographer._channels import Pipe
-from choreographer._sys_utils import get_browser_path
+from choreographer._sys_utils import TmpDirectory, get_browser_path
 
+from ._chrome_constants import chrome_names, typical_chrome_paths
 
-class Chromium:
-    def __init__(self, channel):
-        self._channel = channel
-        if not isinstance(channel, Pipe):
-            raise NotImplementedError("Websocket style channels not implemented yet")
+chromium_wrapper_path = Path(__file__).resolve().parent / "chromium_wrapper.py"
+
+
+def _is_exe(path):
+    try:
+        return os.access(path, os.X_OK)
+    except:  # noqa: E722 bare except ok, weird errors, best effort.
+        return False
 
-    # where do we get user data dir
-    def get_cli(self, temp_dir, **kwargs):
-        gpu_enabled = kwargs.pop("with_gpu", False)
-        headless = kwargs.pop("headless", True)
-        sandbox = kwargs.pop("with_sandbox", False)
+
+class Chromium:
+    def __init__(self, channel, **kwargs):
+        self.gpu_enabled = kwargs.pop("with_gpu", False)
+        self.headless = kwargs.pop("headless", True)
+        self.sandbox_enabled = kwargs.pop("with_sandbox", False)
+        self.path = kwargs.pop("path", None)
+        self._tmp_dir_path = kwargs.pop("tmp_dir", None)
+        self.skip_local = bool(
+            "ubuntu" in platform.version().lower() and self.enable_sandbox,
+        )
         if kwargs:
             raise RuntimeError(
                 "Chromium.get_cli() received " f"invalid args: {kwargs.keys()}",
             )
-        path = get_browser_path()
-        if not path:
-            raise RuntimeError("Browser not found.")
 
-        chromium_wrapper_path = Path(__file__).resolve().parent / "chromium_wrapper.py"
+        if not self.path:
+            self.path = get_browser_path(chrome_names, skip_local=self.skip_local)
+        if not self.path:
+            # do typical chrome paths
+            for candidate in typical_chrome_paths:
+                if _is_exe(candidate):
+                    self.path = candidate
+                    break
+        if not self.path:
+            raise RuntimeError(
+                "Browser not found. You can use get_chrome(), "
+                "please see documentation.",
+            )
+        self._channel = channel
+        if not isinstance(channel, Pipe):
+            raise NotImplementedError("Websocket style channels not implemented yet")
+
+        self.tmp_dir = TmpDirectory(
+            path=self._tmp_dir_path,
+            sneak="snap" in self.path,
+        )
+
+    def get_popen_args(self):
+        args = {}
+        # need to check pipe
+        if platform.system() == "Windows":
+            args["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
+            args["close_fds"] = False
+        else:
+            args["close_fds"] = True
+            if isinstance(self.channel, Pipe):
+                args["stdin"] = self.channel.from_choreo_to_external
+                args["stdout"] = self.channel.from_external_to_choreo
+
+    def get_cli(self):
         if platform.system() != "Windows":
             cli = [
                 sys.executable,
                 chromium_wrapper_path,
-                path,
+                self.path,
             ]
         else:
             cli = [
-                path,
+                self.path,
             ]
 
         cli.extend(
             [
                 "--disable-breakpad",
                 "--allow-file-access-from-files",
                 "--enable-logging=stderr",
-                f"--user-data-dir={temp_dir}",
+                f"--user-data-dir={self.tmp_dir.name}",
                 "--no-first-run",
                 "--enable-unsafe-swiftshader",
             ],
         )
-        if not gpu_enabled:
+        if not self.gpu_enabled:
             cli.append("--disable-gpu")
-        if headless:
+        if self.headless:
             cli.append("--headless")
-        if not sandbox:
+        if not self.sandbox_enabled:
             cli.append("--no-sandbox")
 
         if isinstance(self._channel, Pipe):
             cli.append("--remote-debugging-pipe")
             if platform.system() == "Windows":
-                _inheritable = True
                 w_handle = msvcrt.get_osfhandle(self._channel.from_choreo_to_external)
                 r_handle = msvcrt.get_osfhandle(self._channel.from_external_to_choreo)
+                _inheritable = True
                 os.set_handle_inheritable(w_handle, _inheritable)
                 os.set_handle_inheritable(r_handle, _inheritable)
                 cli += [
                     f"--remote-debugging-io-pipes={r_handle!s},{w_handle!s}",
                 ]
+        return cli
 
+    def get_env():
+        return os.environ().copy()
 
-def get_env():
-    return os.environ().copy()
+    def clean():
+        raise ValueError("Look at tempdir")

choreographer/_sys_utils/_which.py

@@ -64,5 +64,5 @@ def browser_which(executable_names, *, skip_local=False):
     return None
 
 
-def get_browser_path(**kwargs):
-    return os.environ.get("BROWSER_PATH", browser_which(**kwargs))
+def get_browser_path(*args, **kwargs):
+    return os.environ.get("BROWSER_PATH", browser_which(*args, **kwargs))