From f46a82ded023e9e1520140cee4956a86d450265b Mon Sep 17 00:00:00 2001
From: nexy7574 <me@nexy7574.co.uk>
Date: Sat, 6 Jan 2024 22:32:43 +0000
Subject: [PATCH] Fix screenshot errors

---
 .idea/workspace.xml    | 30 +++++++++++++++++++++++++-----
 src/cogs/screenshot.py |  6 ++++++
 src/main.py            |  2 +-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 27145cc..0d799ba 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Fix ollama">
-      <change beforePath="$PROJECT_DIR$/src/cogs/ollama.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cogs/ollama.py" afterDir="false" />
+    <list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Better log ollama">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cogs/screenshot.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cogs/screenshot.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -78,7 +80,7 @@
       <workItem from="1704296563227" duration="780000" />
       <workItem from="1704317484555" duration="1407000" />
       <workItem from="1704572901106" duration="125000" />
-      <workItem from="1704573038888" duration="5748000" />
+      <workItem from="1704573038888" duration="7123000" />
     </task>
     <task id="LOCAL-00001" summary="Update gitignore">
       <option name="closed" value="true" />
@@ -192,7 +194,23 @@
       <option name="project" value="LOCAL" />
       <updated>1704578625479</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="Improve ollama UI">
+      <option name="closed" value="true" />
+      <created>1704578853090</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1704578853090</updated>
+    </task>
+    <task id="LOCAL-00016" summary="Better log ollama">
+      <option name="closed" value="true" />
+      <created>1704579168064</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1704579168064</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -214,6 +232,8 @@
     <MESSAGE value="Remove top level import" />
     <MESSAGE value="Fix stupid aiohttp base url req" />
     <MESSAGE value="Fix ollama" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix ollama" />
+    <MESSAGE value="Improve ollama UI" />
+    <MESSAGE value="Better log ollama" />
+    <option name="LAST_COMMIT_MESSAGE" value="Better log ollama" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/cogs/screenshot.py b/src/cogs/screenshot.py
index 4b11e65..61c109d 100644
--- a/src/cogs/screenshot.py
+++ b/src/cogs/screenshot.py
@@ -8,6 +8,7 @@ import time
 from urllib.parse import urlparse
 
 import discord
+import selenium.common
 from discord.ext import commands
 from PIL import Image
 from selenium import webdriver
@@ -123,6 +124,11 @@ class ScreenshotCog(commands.Cog):
         start_request = time.time()
         try:
             await asyncio.to_thread(driver.get, url)
+        except selenium.common.WebDriverException as e:
+            if "TimeoutException" in str(e):
+                return await ctx.respond("Timed out while loading webpage.")
+            else:
+                return await ctx.respond("Failed to load webpage:\n```\n%s\n```" % str(e.msg))
         except Exception as e:
             await ctx.respond("Failed to get the webpage: " + str(e))
             raise
diff --git a/src/main.py b/src/main.py
index e974ec8..274c18f 100644
--- a/src/main.py
+++ b/src/main.py
@@ -13,7 +13,7 @@ log = logging.getLogger("jimmy")
 CONFIG.setdefault("logging", {})
 
 logging.basicConfig(
-    format="%(asctime)s %(levelname)s %(name)s %(message)s",
+    format="%(asctime)s %(levelname)s %(name)s: %(message)s",
     datefmt="%Y-%m-%d %H:%M:%S",
     level=CONFIG["logging"].get("level", "INFO"),
     handlers=[