Tidying

session.py

@@ -493,12 +493,17 @@ def downloadImageAnyMimeType(session, url: str, timeoutSec: int, debug: bool):
     if not contentType:
         return None, None
 
-    if 'image/x-icon' in contentType:
+    imageFormats = {
-        mimeType = 'image/x-icon'
+        'ico': 'x-icon',
-    elif 'image/webp' in contentType:
+        'png': 'png',
-        mimeType = 'image/webp'
+        'jpg': 'jpeg',
-    elif 'image/jpeg' in contentType:
+        'jpeg': 'jpeg',
-        mimeType = 'image/jpeg'
+        'gif': 'gif',
-    elif 'image/gif' in contentType:
+        'svg': 'svg+xml',
-        mimeType = 'image/gif'
+        'webp': 'webp',
+        'avif': 'avif'
+    }
+    for imFormat, mType in imageFormats.items():
+        if 'image/' + mType in contentType:
+            mimeType = 'image/' + mType
     return result.content, mimeType