plain 0.2.3__tar.gz → 0.2.5__tar.gz

{plain-0.2.3 → plain-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plain
-Version: 0.2.3
+Version: 0.2.5
 Summary: A web framework for building products with Python.
 Author: Dave Gaeddert
 Author-email: dave.gaeddert@dropseed.dev

{plain-0.2.3 → plain-0.2.5}/plain/assets/views.py

@@ -1,4 +1,5 @@
 import functools
+import mimetypes
 import os
 from email.utils import formatdate, parsedate
 from io import BytesIO
@@ -53,9 +54,12 @@ class AssetView(View):
         if not_modified_response := self.get_conditional_response(absolute_path):
             return not_modified_response
 
+        content_type, _ = mimetypes.guess_type(absolute_path)
+
         response = FileResponse(
             open(absolute_path, "rb"),
-            filename=os.path.basename(absolute_path),  # Used for Content-Type
+            filename=os.path.basename(absolute_path),
+            content_type=content_type,
         )
         response.headers = self.update_headers(response.headers, absolute_path)
         return response
@@ -124,10 +128,8 @@ class AssetView(View):
             headers["Vary"] = vary + ", Accept-Encoding"
 
         # If the file is compressed, tell the browser
-        if path.endswith(".gz"):
-            headers.setdefault("Content-Encoding", "gzip")
-        elif path.endswith(".br"):
-            headers.setdefault("Content-Encoding", "br")
+        if encoding := mimetypes.guess_type(path)[1]:
+            headers.setdefault("Content-Encoding", encoding)
 
         is_immutable = self.is_immutable(path)
 
@@ -147,6 +149,12 @@ class AssetView(View):
             if etag := self.get_etag(path):
                 headers.setdefault("ETag", etag)
 
+        if "Content-Disposition" in headers:
+            # This header messes up Safari...
+            # https://github.com/evansd/whitenoise/commit/93657cf88e14b919cb726864814617a6a639e507
+            # At some point, should probably look at not using FileResponse at all?
+            del headers["Content-Disposition"]
+
         return headers
 
     def is_immutable(self, path):

{plain-0.2.3 → plain-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "plain"
-version = "0.2.3"
+version = "0.2.5"
 description = "A web framework for building products with Python."
 authors = ["Dave Gaeddert <dave.gaeddert@dropseed.dev>"]
 readme = "README.md"