Skip to content

Fix file extension detection for files with multiple dot separators #1408

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

Merged
fviard merged 3 commits into from
Jan 18, 2025
+3 −1
Merged

Fix file extension detection for files with multiple dot separators #1408

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
160e3b5
Fix file extension detection for files with multiple dot separators
nerlihmax Dec 18, 2024
5d2de22
Consider files only with extensions
nerlihmax Jan 13, 2025
70608ce
Simplify code
nerlihmax Jan 13, 2025
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
7 changes: 3 additions & 4 deletions S3/S3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,15 +728,14 @@ def content_type(self, filename=None, is_dir=False):
return content_type

def add_encoding(self, filename, content_type):
if not filename:
return False
if 'charset=' in content_type:
return False
exts = self.config.add_encoding_exts.split(',')
if exts[0]=='':
return False
parts = filename.rsplit('.',2)
if len(parts) < 2:
return False
ext = parts[1]
ext = filename.rsplit('.', 1)[-1]
if ext in exts:
return True
else:
Expand Down