🐛 修复linux下图片黑线的问题

Author: coolrc136

browser.py

@@ -16,31 +16,33 @@
 
 from selenium import webdriver
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
-from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.chrome.options import Options
 
 
 def new_web_driver(
     http_proxy=None, socks5_proxy=None, socks_username=None, socks_password=None
-) -> webdriver.Firefox:
-    ffoptions = Options()
-    ffoptions.add_argument("--headless")  #
-    ffoptions.add_argument("window-size=2560,1440")
-    if http_proxy is not None:
-        webdriver.DesiredCapabilities.FIREFOX["proxy"] = {
-            "httpProxy": http_proxy,
-            "sslProxy": http_proxy,
-            "proxyType": "MANUAL",
-        }
-        return webdriver.Firefox(options=ffoptions)
-    if socks5_proxy is not None:
-        webdriver.DesiredCapabilities.FIREFOX["proxy"] = {
-            "socks_proxy": socks5_proxy,
-            "socksUsername": socks_username,
-            "socksPassword": socks_password,
-            "proxyType": "MANUAL",
-        }
-        return webdriver.Firefox(options=ffoptions)
-    return webdriver.Firefox(options=ffoptions)
+) -> webdriver.Chrome:
+    chrome_options = Options()
+    chrome_options.add_argument("--headless")  #
+    chrome_options.add_argument("--disable-gpu")
+    chrome_options.add_argument("window-size=2560,1440")
+    # TODO: chrome proxy
+    # if http_proxy is not None:
+    #     webdriver.DesiredCapabilities.FIREFOX["proxy"] = {
+    #         "httpProxy": http_proxy,
+    #         "sslProxy": http_proxy,
+    #         "proxyType": "MANUAL",
+    #     }
+    #     return webdriver.Chrome(options=chrome_options)
+    # if socks5_proxy is not None:
+    #     webdriver.DesiredCapabilities.FIREFOX["proxy"] = {
+    #         "socks_proxy": socks5_proxy,
+    #         "socksUsername": socks_username,
+    #         "socksPassword": socks_password,
+    #         "proxyType": "MANUAL",
+    #     }
+    #     return webdriver.Firefox(options=ffoptions)
+    return webdriver.Chrome(options=chrome_options)
 
 
 def new_remote_web_driver(url: str):

dockerfile

@@ -1,14 +1,8 @@
 FROM python:3.9-alpine
 
 WORKDIR /usr/src/app
-ENV gecko_version=v0.29.1
 
-RUN wget https://ghproxy.com/https://github.com/mozilla/geckodriver/releases/download/${gecko_version}/geckodriver-${gecko_version}-linux64.tar.gz \
-&& tar -x geckodriver -zf geckodriver-${gecko_version}-linux64.tar.gz -O > /usr/bin/geckodriver \
-&& chmod +x /usr/bin/geckodriver \
-&& rm geckodriver-${gecko_version}-linux64.tar.gz
-
-RUN apk add --no-cache firefox
+RUN apk add --no-cache chromium-chromedriver chromium
 
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt

main.py

@@ -36,34 +36,29 @@ def hello_world():
 @app.route("/raysopic", methods=["GET"])
 def capture_rayso_pic():
     content = request_parse(request)
+    args = {
+        "content": content.get("content"),
+        "font": content.get("font"),
+        "padding": parse_float(content.get("padding")),
+        "title": content.get("title"),
+        "size": parse_float(content.get("size")),
+    }
 
-    try:
-        args = {
-            "content": content.get("content"),
-            "font": content.get("font"),
-            "padding": parse_float(content.get("padding")),
-            "title": content.get("title"),
-            "size": parse_float(content.get("size")),
-        }
-
-        for k in list(args.keys()):
-            if args[k] is None:
-                del args[k]
-
-        if not args["content"]:
-            return {"ok": 400, "msg": "no content!", "data": None}
+    for k in list(args.keys()):
+        if args[k] is None:
+            del args[k]
 
-        args["content"] = base64.b64decode(args["content"]).decode("utf-8")
+    if not args["content"]:
+        return {"ok": 400, "msg": "no content!", "data": None}
 
-        print(args["content"] + "\n")
+    args["content"] = base64.b64decode(args["content"]).decode("utf-8")
 
-        global rayso
+    print(args["content"] + "\n")
 
-        rayso.capture_img(**args)
-        return send_from_directory("./", "test.png")
+    global rayso
 
-    except Exception as e:
-        return {"ok": 500, "msg": format(e), "data": None}
+    rayso.capture_img(**args)
+    return send_from_directory("./", "screenshot.png")
 
 
 @app.route("/rayso", methods=["POST", "GET"])
@@ -103,10 +98,10 @@ def on_exit_app():  # 由于quit() 执行有问题，所以退出时候直接杀
     sys = platform.system()
     if sys == "Windows":
         command = "taskkill /F /T /IM "
-        command = command + "firefox.exe"
+        command = command + "chromium-browser.exe"
         os.system(command)  # nosec
     else:
-        command = "pkill geckodriver && pkill firefox"
+        command = "pkill chromedriver && pkill chromium-browser"
         os.system(command)  # nosec
 
 

rayso.py

@@ -18,6 +18,10 @@
 import unittest
 import threading
 
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
 from browser import new_web_driver
 
 # from browser import new_remote_web_driver
@@ -80,7 +84,7 @@ def capture_img(self, content, font="Fira code", padding=26, title="", size=1):
 
         box = self.webdriver.find_element_by_xpath('//*[@id="frame"]')
         self.lock.release()
-        return box.screenshot("test.png")
+        return box.screenshot("screenshot.png")
 
     def set_content(self, content: str):
         lock = threading.Lock()
@@ -90,6 +94,17 @@ def set_content(self, content: str):
         """
         ActionChains(self.webdriver).send_keys("r").perform()  # 随机更换主题
 
+        # Chrome需要激活textarea才能开始输入
+        textarea = WebDriverWait(self.webdriver, 10).until(
+            EC.element_to_be_clickable(
+                (
+                    By.CSS_SELECTOR,
+                    "#frame > div.app-frame-container > div.app-frame > div.vue-codemirror.code-editor > div",
+                )
+            )
+        )
+        textarea.click()
+
         textarea = self.webdriver.find_element_by_css_selector(
             ".CodeMirror > div > textarea"
         )