use filetype

Author: navin772

py/test/selenium/webdriver/common/webserver.py

@@ -20,11 +20,12 @@
 
 import contextlib
 import logging
-import mimetypes
 import os
 import re
 import threading
 
+import filetype
+
 try:
     from urllib import request as urllib_request
 except ImportError:
@@ -71,20 +72,20 @@ def _serve_page(self, page_number):
 
     def _serve_file(self, file_path):
         """Serve a file from the HTML root directory."""
-        content_type, _ = mimetypes.guess_type(file_path)
-
-        if content_type and (
-            content_type.startswith("image/")
-            or content_type.startswith("application/")
-            or content_type.startswith("video/")
-            or content_type.startswith("audio/")
-        ):
-            with open(file_path, "rb") as f:
-                return f.read()
+        with open(file_path, "rb") as f:
+            content = f.read()
+
+        kind = filetype.guess(content)
+        if kind is not None:
+            return content, kind.mime
+
+        # fallback for text files that filetype can't detect
+        if file_path.endswith(".txt"):
+            return content, "text/plain"
+        elif file_path.endswith(".json"):
+            return content, "application/json"
         else:
-            # text files
-            with open(file_path, encoding="latin-1") as f:
-                return f.read().encode("utf-8")
+            return content, "text/html"
 
     def _send_response(self, content_type="text/html"):
         """Send a response."""
@@ -102,8 +103,7 @@ def do_GET(self):
                 self._send_response("text/html")
                 self.wfile.write(html)
             elif os.path.isfile(file_path):
-                content_type, _ = mimetypes.guess_type(file_path)
-                content = self._serve_file(file_path)
+                content, content_type = self._serve_file(file_path)
                 self._send_response(content_type)
                 self.wfile.write(content)
             else: