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.

Sign up for GitHub

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

Skip compression of already compressed files #347

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Skip compression of already compressed files #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/whitenoise/compress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ def compress(self, path):
stat_result = os.fstat(f.fileno())
data = f.read()
size = len(data)
if self.use_brotli:
if self.use_brotli and not os.path.isfile(f"{path}.br"):
Copy link
Contributor

@Archmonger Archmonger Aug 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file names are only unique when using the CompressedManifestStaticFilesStorage backend.

When using the CompressedStaticFilesStorage backend, this would cause WhiteNoise to never re-compress a file, even if its contents have changed

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, exactly. And unfortunately, in the default config, the non-MD5-hashed names are left around and can still be served... This needs some more involved consideration, and tests.

compressed = self.compress_brotli(data)
if self.is_compressed_effectively("Brotli", path, size, compressed):
yield self.write_data(path, compressed, ".br", stat_result)
else:
# If Brotli compression wasn't effective gzip won't be either
return
if self.use_gzip:
if self.use_gzip and not os.path.isfile(f"{path}.gz"):
compressed = self.compress_gzip(data)
if self.is_compressed_effectively("Gzip", path, size, compressed):
yield self.write_data(path, compressed, ".gz", stat_result)
Expand Down
Loading