mirror of
https://github.com/nexy7574/LCC-bot.git
synced 2024-09-20 02:26:32 +01:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
33947d3c94
1 changed files with 8 additions and 5 deletions
|
@ -62,6 +62,7 @@ class OtherCog(commands.Cog):
|
||||||
website: str,
|
website: str,
|
||||||
driver: Literal["chrome", "firefox"],
|
driver: Literal["chrome", "firefox"],
|
||||||
render_time: int = 10,
|
render_time: int = 10,
|
||||||
|
load_timeout: int = 30,
|
||||||
window_height: int = 1920,
|
window_height: int = 1920,
|
||||||
window_width: int = 1080,
|
window_width: int = 1080,
|
||||||
full_screenshot: bool = False,
|
full_screenshot: bool = False,
|
||||||
|
@ -148,8 +149,9 @@ class OtherCog(commands.Cog):
|
||||||
def _edit(content: str):
|
def _edit(content: str):
|
||||||
self.bot.loop.create_task(ctx.interaction.edit_original_response(content=content))
|
self.bot.loop.create_task(ctx.interaction.edit_original_response(content=content))
|
||||||
|
|
||||||
_edit(content=f"Screenshotting <{friendly_url}>... (49%, loading webpage)")
|
expires = round(time() + load_timeout)
|
||||||
await _blocking(driver.set_page_load_timeout, render_time)
|
_edit(content=f"Screenshotting <{friendly_url}>... (49%, loading webpage, aborts <t:{expires}:R>)")
|
||||||
|
await _blocking(driver.set_page_load_timeout, load_timeout)
|
||||||
start = time()
|
start = time()
|
||||||
await _blocking(driver.get, website)
|
await _blocking(driver.get, website)
|
||||||
end = time()
|
end = time()
|
||||||
|
@ -593,8 +595,9 @@ class OtherCog(commands.Cog):
|
||||||
self,
|
self,
|
||||||
ctx: discord.ApplicationContext,
|
ctx: discord.ApplicationContext,
|
||||||
url: str,
|
url: str,
|
||||||
browser: discord.Option(str, description="Browser to use", choices=["chrome", "firefox"], default="firefox"),
|
browser: discord.Option(str, description="Browser to use", choices=["chrome", "firefox"], default="chrome"),
|
||||||
render_timeout: discord.Option(int, name="render-timeout", description="Timeout for rendering", default=10),
|
render_timeout: discord.Option(int, name="render-timeout", description="Timeout for rendering", default=3),
|
||||||
|
load_timeout: discord.Option(int, name="load-timeout", description="Timeout for page load", default=60),
|
||||||
window_height: discord.Option(
|
window_height: discord.Option(
|
||||||
int, name="window-height", description="the height of the window in pixels", default=1920
|
int, name="window-height", description="the height of the window in pixels", default=1920
|
||||||
),
|
),
|
||||||
|
@ -680,7 +683,7 @@ class OtherCog(commands.Cog):
|
||||||
try:
|
try:
|
||||||
async with self.lock:
|
async with self.lock:
|
||||||
screenshot, driver, fetch_time, screenshot_time = await self.screenshot_website(
|
screenshot, driver, fetch_time, screenshot_time = await self.screenshot_website(
|
||||||
ctx, url.geturl(), browser, render_timeout, window_height, window_width, capture_whole_page
|
ctx, url.geturl(), browser, render_timeout, load_timeout, window_height, window_width, capture_whole_page
|
||||||
)
|
)
|
||||||
except TimeoutError:
|
except TimeoutError:
|
||||||
return await ctx.edit(content="Rendering screenshot timed out. Try using a smaller resolution.")
|
return await ctx.edit(content="Rendering screenshot timed out. Try using a smaller resolution.")
|
||||||
|
|
Loading…
Reference in a new issue