Merge pull request #94 from joegasewicz/filetypes-#93

#93 content-type should be set based on filetypes

Author: Joe Gasewicz

bobtail/parser.py

@@ -57,13 +57,13 @@ def _match(self) -> Dict:
                     self._set_metadata(k, path_segment, None, None)
                     return self.meta_data["routes"][k]
                 # Test route matches path
-                if route_segment[0] != "{" and route_segment != path_segment:
+                if route_segment and route_segment[0] != "{" and route_segment != path_segment:
                     if route_segment == "*":
                         self.meta_data["matched"] = k
                         return self.meta_data["routes"][k]
                     # No match, break out of this route class
                     break
-                if route_segment[0] == "{":
+                if route_segment and route_segment[0] == "{":
                     # If we reach this point then store the vars
                     n, t = route_segment[1:-1].split(":")
                     self._set_metadata(k, path_segment, t, n)

bobtail/response.py

@@ -3,7 +3,13 @@
 
 from bobtail.options import BaseOptions
 from bobtail.exceptions import StaticFileError
-
+from bobtail.static_files import (
+    AUDIO_FILETYPE ,
+    IMAGE_FILETYPE,
+    StaticFiles,
+    TXT_FILETYPE,
+    VIDEO_FILETYPE,
+)
 
 class Response:
     """
@@ -179,8 +185,18 @@ def get(self, req: Request, res: Response) -> None:
         try:
             file_suffix = path.split("/")[-1:][0].split(".")[-1:][0]
             path = f"{self.options.STATIC_DIR}{path}"
-            if file_suffix in ("jpg", "jpeg", "png"):
-                self.set_headers({"Content-Type": "image/jpeg"})
+
+            if file_suffix in IMAGE_FILETYPE:
+                StaticFiles(self, "image").set_headers(file_suffix)
+            elif file_suffix == "css":
+                StaticFiles(self, "text").set_headers(file_suffix)
+            elif file_suffix in VIDEO_FILETYPE:
+                StaticFiles(self, "video").set_headers(file_suffix)
+            elif file_suffix in AUDIO_FILETYPE:
+                StaticFiles(self, "audio").set_headers(file_suffix)
+            else:
+                StaticFiles(self, "text").set_headers("plain")
+
         except Exception as exc:
             self.set_status(500)
             raise StaticFileError(

bobtail/static_files.py

@@ -0,0 +1,50 @@
+from typing import Any
+
+
+IMAGE_FILETYPE = (
+    "jpg",
+    "jpeg",
+    "png",
+    "gif",
+    "tiff",
+    "svg+xml",
+    "x-icon",
+)
+
+TXT_FILETYPE = (
+    "css",
+    "csv",
+    "html",
+    "javascript",
+    "plain",
+    "xml",
+)
+
+VIDEO_FILETYPE = (
+    "mpeg",
+    "mp4",
+    "quicktime",
+    "webm",
+    "x-ms-wmv",
+    "x-msvideo",
+    "x-flv",
+)
+
+AUDIO_FILETYPE = (
+    "mpeg",
+    "x-ms-wma",
+    "vnd.rn-realaudio",
+    "x-wav",
+)
+
+
+class StaticFiles:
+    response: Any  # Response
+    mimetypes: str
+
+    def __init__(self, response: Any, mimetype: str):
+        self.response = response
+        self.mimetype = mimetype
+
+    def set_headers(self, file_type: str) -> None:
+        self.response.set_headers({"Content-Type": f"{self.mimetype}/{file_type}"})

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name="bobtail",
-    version="0.0.27",
+    version="0.0.28",
     description="A little Python http framework",
     packages=["bobtail"],
     py_modules=["bobtail"],