Properly allow configuring screenshot proxy
This commit is contained in:
parent
273404a615
commit
8ef909c33d
2 changed files with 5 additions and 2 deletions
|
@ -16,6 +16,8 @@ from selenium import webdriver
|
||||||
from selenium.webdriver.chrome.options import Options as ChromeOptions
|
from selenium.webdriver.chrome.options import Options as ChromeOptions
|
||||||
from selenium.webdriver.chrome.service import Service as ChromeService
|
from selenium.webdriver.chrome.service import Service as ChromeService
|
||||||
|
|
||||||
|
from conf import CONFIG
|
||||||
|
|
||||||
|
|
||||||
class ScreenshotCog(commands.Cog):
|
class ScreenshotCog(commands.Cog):
|
||||||
def __init__(self, bot: commands.Bot):
|
def __init__(self, bot: commands.Bot):
|
||||||
|
@ -107,8 +109,8 @@ class ScreenshotCog(commands.Cog):
|
||||||
start_init = time.time()
|
start_init = time.time()
|
||||||
try:
|
try:
|
||||||
options = copy.copy(self.chrome_options)
|
options = copy.copy(self.chrome_options)
|
||||||
if use_proxy:
|
if use_proxy and (server := CONFIG["screenshot"].get("proxy")):
|
||||||
options.add_argument("--proxy-server=http://127.0.0.1:8888")
|
options.add_argument("--proxy-server=" + server)
|
||||||
service = await asyncio.to_thread(ChromeService)
|
service = await asyncio.to_thread(ChromeService)
|
||||||
driver: webdriver.Chrome = await asyncio.to_thread(
|
driver: webdriver.Chrome = await asyncio.to_thread(
|
||||||
webdriver.Chrome,
|
webdriver.Chrome,
|
||||||
|
|
|
@ -28,6 +28,7 @@ try:
|
||||||
CONFIG.setdefault("jimmy", {})
|
CONFIG.setdefault("jimmy", {})
|
||||||
CONFIG.setdefault("ollama", {})
|
CONFIG.setdefault("ollama", {})
|
||||||
CONFIG.setdefault("rss", {"meta": {"channel": None}})
|
CONFIG.setdefault("rss", {"meta": {"channel": None}})
|
||||||
|
CONFIG.setdefault("screenshot", {})
|
||||||
CONFIG.setdefault(
|
CONFIG.setdefault(
|
||||||
"server",
|
"server",
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue