Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FORKED: AsgiWhiteNoise and async WhiteNoiseMiddleware #359

Open
wants to merge 131 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
9a56981
Add ASGI adapter
kmichel Sep 14, 2020
8590e82
add venv to gitignore
Archmonger Feb 7, 2022
24c5319
Merge remote-tracking branch 'upstream/master' into asgi-compat
Archmonger Feb 7, 2022
391bd8e
add aiofile
Archmonger Feb 7, 2022
3e735ec
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 7, 2022
42fbe15
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Feb 7, 2022
aec9ac1
Revert "add venv to gitignore"
Archmonger Feb 8, 2022
cf4ee09
add ASGI extra
Archmonger Feb 10, 2022
9616e78
absolute imports
Archmonger Feb 10, 2022
35b9003
use SimpleNamespace
Archmonger Feb 10, 2022
8eef8d3
add zero-copy send todo
Archmonger Feb 10, 2022
2f0f685
replace empty equality with boolean operation
Archmonger Feb 10, 2022
f4931e3
minor syntax or performance improvements
Archmonger Feb 10, 2022
3fb5a38
BaseWhiteNoise class
Archmonger Feb 10, 2022
3bb4088
Merge remote-tracking branch 'upstream/master' into asgi-compat
Archmonger Feb 10, 2022
8a0930e
use f-strings
Archmonger Feb 10, 2022
e6fd03b
fix imports
Archmonger Feb 10, 2022
8fc1682
Merge remote-tracking branch 'upstream/master' into asgi-compat
Archmonger Feb 10, 2022
64fc5c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 10, 2022
83fea65
Revert "minor syntax or performance improvements"
Archmonger Feb 10, 2022
58f3743
Revert "use f-strings"
Archmonger Feb 10, 2022
f79aec7
re-add missing import
Archmonger Feb 10, 2022
e18df38
Remove upper bound
Archmonger Feb 10, 2022
45301b2
fix recceive call
Archmonger Feb 10, 2022
88ccf21
fix some of the tests
Archmonger Feb 11, 2022
998cf5e
temporarily remove broken tests
Archmonger Feb 11, 2022
d611e90
fix py3.10 deprecation warning
Archmonger Feb 11, 2022
54c7148
convert wsgi to asgi
Archmonger Feb 12, 2022
1057a77
remove contrived tests
Archmonger Feb 12, 2022
ea2e84c
AsgiWhiteNoise -> AsyncWhiteNoise
Archmonger Feb 12, 2022
6dcecc0
Revert "convert wsgi to asgi"
Archmonger Feb 12, 2022
c506e96
ASGI v3 static file server
Archmonger Jun 21, 2023
9892bea
Merge remote-tracking branch 'upstream/main' into asgi-compat
Archmonger Jun 21, 2023
e636411
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 21, 2023
41468a1
guarantee_single_callable
Archmonger Jun 22, 2023
08c70fb
customizable block size
Archmonger Jun 22, 2023
240ce22
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 22, 2023
be3796c
clean up comment
Archmonger Jun 22, 2023
b81ab6b
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Jun 22, 2023
7aeb29a
Add functional middleware
Archmonger Jun 22, 2023
cd0ab1b
add aiofiles to all tests
Archmonger Jun 22, 2023
1265f03
temporarily add aiofiles to tox.ini
Archmonger Jun 22, 2023
f5e9d37
temporarily disable asgi tests
Archmonger Jun 22, 2023
0e42cb8
async -> asgi
Archmonger Jun 22, 2023
279b342
aiofile != aiofiles
Archmonger Jul 20, 2023
890fdd8
fix comment
Archmonger Jul 20, 2023
ba3bed4
properly close Django file responses
Archmonger Jul 21, 2023
7af5b32
async find_file within AsgiWhiteNoise
Archmonger Jul 21, 2023
ee068a7
AsyncSlicedFile
Archmonger Jul 21, 2023
f09b384
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 21, 2023
ca26354
simplify __call__ method
Archmonger Jul 21, 2023
c2c320c
Add WSGI compat docstring
Archmonger Jul 21, 2023
d0e9bfa
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Jul 21, 2023
33ad918
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 21, 2023
067ab33
aget_response update comment
Archmonger Jul 21, 2023
a15422f
add prototypes and warnings for call/serve
Archmonger Jul 21, 2023
8d01092
update middleware comment
Archmonger Jul 21, 2023
d6bb4d8
fix compatibilty with SecurityMiddleware
Archmonger Jul 21, 2023
2a386cc
fix name
Archmonger Jul 21, 2023
06a874f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 21, 2023
1f9f8b3
refactor WhiteNoiseFileResponse
Archmonger Jul 21, 2023
64c1c27
reduce code duplication for AsyncSlicedFile
Archmonger Jul 21, 2023
f3b00ab
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Jul 21, 2023
68f19c2
update WhiteNoiseFileResponse docstring
Archmonger Jul 21, 2023
00f064d
customizable block_size
Archmonger Jul 21, 2023
e5f7526
docstring update
Archmonger Jul 21, 2023
9ee0d7d
rename aiofile param
Archmonger Jul 21, 2023
d97a05b
fix file seeking
Archmonger Jul 23, 2023
2dbc8b2
add async pytest for django
Archmonger Jul 23, 2023
de3456e
merge imports
Archmonger Jul 23, 2023
f0f0a66
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 23, 2023
511da12
comment out everything from test_asgi
Archmonger Jul 23, 2023
7fd30ef
handle file closure within iterator
Archmonger Jul 24, 2023
62de430
remove pytest asyncio
Archmonger Jul 24, 2023
bb62496
async file closure
Archmonger Jul 24, 2023
d839cf8
Py 3.8 compatibility
Archmonger Jul 24, 2023
b40ff65
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 24, 2023
522a50b
remove unused import
Archmonger Jul 24, 2023
518a46b
start from scratch for ASGI tests
Archmonger Jul 24, 2023
ed07496
Add async iterator support to old django versions
Archmonger Jul 24, 2023
3bff168
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Jul 24, 2023
4c98b5e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 24, 2023
4656a53
new base for AsyncSlicedFile
Archmonger Jul 24, 2023
4a77e8b
Py 3.12+ compatibility
Archmonger Jul 24, 2023
dd2d700
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Jul 24, 2023
ea74977
refactor file closure and docstrings
Archmonger Jul 25, 2023
2bc2a7b
way more performant way of retaining WSGI compatibility
Archmonger Jul 26, 2023
d648ffc
move file closure to AsgiFileServer loop
Archmonger Jul 26, 2023
f6bf0c2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 26, 2023
367a17d
Support for ASGI on Django<4.2
Archmonger Jul 26, 2023
e3bea39
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 26, 2023
b895b8f
resolve flake8 lint warning
Archmonger Jul 26, 2023
7132626
Remove `USE_ASYNC`. Always use the best available method.
Archmonger Jul 27, 2023
56fe9d1
remove type hints that break visual similarity between sync/async code
Archmonger Jul 27, 2023
17b9dc7
reduce tab depth
Archmonger Jul 27, 2023
2dc620e
add first batch of ASGI tests
Archmonger Jul 27, 2023
6d4baf3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 27, 2023
f8fb573
complete tests for asgi.py
Archmonger Jul 28, 2023
b91dd7e
get_response is always mandatory
Archmonger Jul 28, 2023
5eaac51
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Jul 28, 2023
292de02
More tests
Archmonger Jul 28, 2023
3117769
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 28, 2023
5de2d63
minor refactoring
Archmonger Jul 28, 2023
6197911
Merge branch 'asgi-compat' of https://github.com/Archmonger/whitenois…
Archmonger Jul 28, 2023
37dfac6
Make aiofiles mandatory because of Django
Archmonger Jul 28, 2023
f20e90d
format setup.cfg
Archmonger Jul 28, 2023
865a68d
WHITENOISE_BLOCK_SIZE docs
Archmonger Jul 28, 2023
d8f564e
rename base to wsgi
Archmonger Jul 28, 2023
4c2ca1d
QuickStart for other ASGI apps
Archmonger Jul 28, 2023
b238278
AsgiWhiteNoise docs
Archmonger Jul 28, 2023
fb118ad
Merge remote-tracking branch 'upstream/main' into asgi-compat
Archmonger Jul 28, 2023
8e8c63b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 28, 2023
bd580a2
minor comment cleanup
Archmonger Jul 28, 2023
371ca90
minor docs wordsmithing
Archmonger Jul 28, 2023
6695140
Remove block size configuration attributes
Archmonger Jul 28, 2023
018f864
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 28, 2023
3a0180a
use dict comphrension for header conversion
Archmonger Jul 28, 2023
29c678c
headers -> wsgi_headers
Archmonger Jul 28, 2023
6da4dfd
serve doesn't need stubs
Archmonger Jul 28, 2023
b1c8ae3
Add ASGI to readme and pkg info
Archmonger Jul 29, 2023
88e8a86
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 29, 2023
1f0fa9f
More readible way of converting ASGI app
Archmonger Aug 2, 2023
5b74486
asgi_app -> user_app
Archmonger Aug 2, 2023
9f77bf7
no need for make_bytes
Archmonger Aug 4, 2023
484ddb4
make middleware sync capable
Archmonger Aug 6, 2023
07b8b3d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 6, 2023
4db8458
reduce LOC changes for serve
Archmonger Aug 6, 2023
503e957
rename to `AsyncSlicedFile`
Archmonger Aug 7, 2023
67f8dee
Update tests/test_asgi.py
Archmonger Mar 23, 2024
1f8c4b2
Update docs/asgi.rst
Archmonger Mar 23, 2024
aa36dce
Update docs/asgi.rst
Archmonger Mar 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "use f-strings"
This reverts commit 8a0930e.
Archmonger committed Feb 10, 2022
commit 58f3743c0c8c320cff380f53affd6da636073a43
12 changes: 6 additions & 6 deletions src/whitenoise/base.py
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ def update_files_dictionary(self, root, prefix):
def add_file_to_dictionary(self, url, path, stat_cache=None):
if self.is_compressed_variant(path, stat_cache=stat_cache):
return
if self.index_file and url.endswith(f"/{self.index_file}"):
if self.index_file and url.endswith("/" + self.index_file):
index_url = url[: -len(self.index_file)]
index_no_slash = index_url.rstrip("/")
self.files[url] = self.redirect(url, index_url)
@@ -140,15 +140,15 @@ def find_file_at_path_with_indexes(self, path, url):
if url.endswith("/"):
path = os.path.join(path, self.index_file)
return self.get_static_file(path, url)
elif url.endswith(f"/{self.index_file}"):
elif url.endswith("/" + self.index_file):
if os.path.isfile(path):
return self.redirect(url, url[: -len(self.index_file)])
else:
try:
return self.get_static_file(path, url)
except IsDirectoryError:
if os.path.isfile(os.path.join(path, self.index_file)):
return self.redirect(url, f"{url}/")
return self.redirect(url, url + "/")
raise MissingFileError(path)

@staticmethod
@@ -189,7 +189,7 @@ def get_static_file(self, path, url, stat_cache=None):
path,
headers.items(),
stat_cache=stat_cache,
encodings={"gzip": f"{path}.gz", "br": f"{path}.br"},
encodings={"gzip": path + ".gz", "br": path + ".br"},
)

def add_mime_headers(self, headers, path, url):
@@ -222,8 +222,8 @@ def redirect(self, from_url, to_url):
We use relative redirects as we don't know the absolute URL the app is
being hosted under
"""
if to_url == f"{from_url}/":
relative_url = f'{from_url.split("/")[-1]}/'
if to_url == from_url + "/":
relative_url = from_url.split("/")[-1] + "/"
elif from_url == to_url + self.index_file:
relative_url = "./"
else: