Update html2print.py

Author: thseiler

.github/workflows/ci-linux-ubuntu-latest.yml

@@ -47,7 +47,7 @@ jobs:
     - name: Build HTML2PDF.js
       run: |
         invoke build
-
+ 
     - name: Run tests
       run: |
         invoke test

html2print/html2print.py

@@ -2,6 +2,7 @@
 import argparse
 import atexit
 import base64
+import logging
 import os.path
 import platform
 import re
@@ -15,12 +16,14 @@
 
 import browsers
 import requests
-from requests import Response, RequestException
+from requests import RequestException, Response
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options
 from selenium.webdriver.chrome.service import Service
 from webdriver_manager.core.os_manager import ChromeType, OperationSystemManager
 
+logging.getLogger().setLevel(logging.DEBUG)
+
 __version__ = "0.0.15"
 
 PATH_TO_HTML2PDF_JS = os.path.join(
@@ -41,7 +44,26 @@
 
 class ChromeDriverManager:
     def get_chrome_driver(self, path_to_cache_dir: str):
-        chrome_version = self.get_chrome_version()
+        for browser in browsers.browsers():
+            print(f"html2print: browser {browser['browser_type']}:")  # noqa: T201
+            print(f"             - path {browser['path']}")  # noqa: T201
+            print(f"             - display_name {browser['display_name']}")  # noqa: T201
+            print(f"             - version {browser['version']}:")  # noqa: T201
+
+        if sys.platform == "linux":
+            from .my_linux_browsers import browsers as bb
+
+            for browser in bb.browsers():
+                print(f"my_linux_browsers: browser {browser['browser_type']}:")  # noqa: T201
+                print(f"                   - path {browser['path']}")  # noqa: T201
+                print(  # noqa: T201
+                    f"                   - display_name {browser['display_name']}"
+                )
+                print(f"                   - version {browser['version']}:")  # noqa: T201
+
+        chrome_browser_info = browsers.get("chrome")
+        chrome_version = chrome_browser_info["version"]
+        chrome_path = chrome_browser_info["path"]
 
         # If Web Driver Manager cannot detect Chrome, it returns None.
         if chrome_version is None:
@@ -55,6 +77,9 @@ def get_chrome_driver(self, path_to_cache_dir: str):
         print(  # noqa: T201
             f"html2print: Installed Chrome version: {chrome_version}"
         )
+        print(  # noqa: T201
+            f"html2print: Installed Chrome path: {chrome_path}"
+        )
 
         system_map = {
             "Windows": "win32",
@@ -181,8 +206,9 @@ def send_http_get_request(url, params=None, **kwargs) -> Response:
             f"html2print: "
             f"failed to get response for URL: {url} with error: {last_error}"
         )
-        raise RequestException(f"GET request failed after 3 attempts: {url}") from last_error
-
+        raise RequestException(
+            f"html2print: GET request failed after 3 attempts: {url}"
+        ) from last_error
 
     @staticmethod
     def get_chrome_version():
@@ -329,7 +355,12 @@ def create_webdriver(
     else:
         service = Service(path_to_chrome)
 
+    path_to_chrome_browser = ""
+    path_to_chrome_browser = browsers.get("chrome")["path"]
+    print(f"html2print: Chrome available at path: {path_to_chrome_browser}")  # noqa: T201
+
     webdriver_options = Options()
+    webdriver_options.binary_location = path_to_chrome_browser
     webdriver_options.add_argument("start-maximized")
     webdriver_options.add_argument("disable-infobars")
     # Doesn't seem to be needed.
@@ -462,7 +493,7 @@ def main():
         if browsers.get("chrome") is not None:
             path_to_chrome_browser = browsers.get("chrome")["path"]
             print(  # noqa: T201
-                f"html2print: Chrome available at path:{path_to_chrome_browser}"
+                f"html2print: Chrome available at path: {path_to_chrome_browser}"
             )
         sys.exit(0)
 

html2print/my_linux_browsers.py

@@ -0,0 +1,74 @@
+import os
+import re
+import subprocess
+import sys
+from typing import Iterator
+
+from .common import Browser
+
+LINUX_DESKTOP_ENTRY_LIST = (
+    # desktop entry name can be "firefox.desktop" or "firefox_firefox.desktop"
+    ("chrome", ("google-chrome",)),
+    ("chromium", ("chromium", "chromium_chromium")),
+    ("firefox", ("firefox", "firefox_firefox")),
+    ("msedge", ("microsoft-edge",)),
+    ("opera", ("opera_opera",)),
+    ("opera-beta", ("opera-beta_opera-beta",)),
+    ("opera-developer", ("opera-developer_opera-developer",)),
+    ("brave", ("brave-browser", "brave_brave")),
+    ("brave-beta", ("brave-browser-beta",)),
+    ("brave-nightly", ("brave-browser-nightly",)),
+)
+
+# $XDG_DATA_HOME and $XDG_DATA_DIRS are not always set
+XDG_DATA_LOCATIONS = (
+    "~/.local/share/applications",
+    "/usr/share/applications",
+    "/var/lib/snapd/desktop/applications",
+)
+
+VERSION_PATTERN = re.compile(
+    r"\b(\S+\.\S+)\b"
+)  # simple pattern assuming all version strings have at least one dot with numbers around on them
+
+
+def browsers() -> Iterator[Browser]:
+    yielded = False
+
+    if sys.platform == "linux":
+        from xdg.DesktopEntry import DesktopEntry
+
+        for browser, desktop_entries in LINUX_DESKTOP_ENTRY_LIST:
+            for application_dir in XDG_DATA_LOCATIONS:
+                for desktop_entry in desktop_entries:
+                    path = os.path.join(
+                        application_dir, f"{desktop_entry}.desktop"
+                    )
+
+                    if not os.path.isfile(path):
+                        continue
+
+                    entry = DesktopEntry(path)
+                    executable_path = entry.getExec()
+
+                    if executable_path.lower().endswith(" %u"):
+                        executable_path = executable_path[:-3].strip()
+
+                    version = subprocess.getoutput(
+                        f"{executable_path} --version 2>&1"
+                    ).strip()
+                    print(f"browser: version was {version}")  # noqa: T201
+                    if match := VERSION_PATTERN.search(version):
+                        version = match[0]
+
+                    yield Browser(
+                        browser_type=browser,
+                        path=executable_path,
+                        display_name=entry.getName(),
+                        version=version,
+                    )
+                    yielded = True
+
+    if not yielded:
+        yield from ()
+        return