🔨 Run OSX executables directly (#12)

roniemartinez · Apr 23, 2022 · 77f5cd8 · 77f5cd8
1 parent 8550e12
commit 77f5cd8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/browsers/__init__.py b/browsers/__init__.py
@@ -73,11 +73,8 @@ def _launch(browser: str, path: str, args: Sequence[str], url: str = None) -> su
         url_arg.append(url)
 
     if sys.platform != "linux":
-        command = [path, *url_arg, "--args", *args]
+        command = [path, *url_arg, *args]
     else:
-        command = [*shlex.split(path), *url_arg, "--args", *args]
-
-    if sys.platform == "darwin":
-        command = ["open", "--wait-apps", "--new", "--fresh", "-a", *command]
+        command = [*shlex.split(path), *url_arg, *args]
 
     return subprocess.Popen(command)
diff --git a/browsers/osx.py b/browsers/osx.py
@@ -34,6 +34,8 @@ def browsers() -> Iterator[Tuple[str, Dict]]:  # type: ignore[return]
             for path in paths:
                 with open(os.path.join(path, "Contents/Info.plist"), "rb") as f:
                     plist = plistlib.load(f)
+                    executable_name = plist.get("CFBundleExecutable")
+                    executable = os.path.join(path, "Contents/MacOS", executable_name)
                     display_name = plist.get("CFBundleDisplayName") or plist.get("CFBundleName", browser)
                     version = plist[version_string]
-                    yield browser, dict(path=path, display_name=display_name, version=version)
+                    yield browser, dict(path=executable, display_name=display_name, version=version)
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybrowsers"
-version = "0.2.0"
+version = "0.3.0"
 repository = "https://github.com/roniemartinez/browsers"
 description = "Python library for detecting and launching browsers"
 authors = ["Ronie Martinez <ronmarti18@gmail.com>"]

diff --git a/tests/test_detect.py b/tests/test_detect.py
@@ -35,7 +35,7 @@ def test_get_available_browsers(browser: str) -> None:
             "chrome",
             {
                 "display_name": "Google Chrome",
-                "path": "/Applications/Google Chrome.app",
+                "path": "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
                 "version": ANY,
             },
             marks=pytest.mark.skipif(sys.platform != "darwin", reason="osx-only"),
@@ -45,7 +45,7 @@ def test_get_available_browsers(browser: str) -> None:
             "firefox",
             {
                 "display_name": "Firefox",
-                "path": "/Applications/Firefox.app",
+                "path": "/Applications/Firefox.app/Contents/MacOS/firefox",
                 "version": ANY,
             },
             marks=pytest.mark.skipif(sys.platform != "darwin", reason="osx-only"),
@@ -55,7 +55,7 @@ def test_get_available_browsers(browser: str) -> None:
             "safari",
             {
                 "display_name": "Safari",
-                "path": "/Applications/Safari.app",
+                "path": "/Applications/Safari.app/Contents/MacOS/Safari",
                 "version": ANY,
             },
             marks=pytest.mark.skipif(sys.platform != "darwin", reason="osx-only"),
@@ -65,7 +65,7 @@ def test_get_available_browsers(browser: str) -> None:
             "msedge",
             {
                 "display_name": "Microsoft Edge",
-                "path": "/Applications/Microsoft Edge.app",
+                "path": "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
                 "version": ANY,
             },
             marks=pytest.mark.skipif(sys.platform != "darwin", reason="osx-only"),

diff --git a/tests/test_launch.py b/tests/test_launch.py
@@ -14,7 +14,7 @@
     "chrome_path",
     (
         pytest.param(
-            "/Applications/Google Chrome.app",
+            "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
             id="osx",
             marks=pytest.mark.skipif(sys.platform != "darwin", reason="osx-only"),
         ),