-
-
Notifications
You must be signed in to change notification settings - Fork 59
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
add option for an upload limit #232
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
from django import get_version | ||
from django.core.exceptions import ValidationError | ||
from django.utils.deconstruct import deconstructible | ||
|
||
if get_version() >= "4.0": | ||
from django.utils.translation import gettext_lazy as _ | ||
else: | ||
from django.utils.translation import ugettext_lazy as _ | ||
|
||
|
||
@deconstructible() | ||
class FileMaxSizeValidator: | ||
"""Validate that a file is not bigger than max_size mb, otherwise raise ValidationError. | ||
If zero is passed for max_size any file size is allowed. | ||
""" | ||
|
||
message = _("File should be at most %(max_size)s MB.") | ||
code = "invalid_size" | ||
|
||
def __init__(self, max_size): | ||
self.max_size = max_size * 1024 * 1024 | ||
self.orig_max_size = max_size | ||
|
||
def __call__(self, value): | ||
if value.size > self.max_size > 0: | ||
raise ValidationError( | ||
self.message, | ||
code=self.code, | ||
params={ | ||
"max_size": self.orig_max_size, | ||
}, | ||
) | ||
|
||
def __eq__(self, other): | ||
return ( | ||
isinstance(other, self.__class__) | ||
and self.max_size == other.max_size | ||
and self.message == other.message | ||
and self.code == other.code | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
from .settings import * | ||
|
||
# set to a small number for easier testing | ||
CKEDITOR_5_MAX_FILE_SIZE = 0.06 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @goapunk. Thank you for your work. What is the purpose of test_settings, which repeats exactly settings.py ? maybe it's better to use override_settings?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @hvlads , I changed it to import all settings from
settings.py
to make it more readable now. Using@override_settings
sadly doesn't work as the value is not read dynamically but set when initializing theFileMaxSizeValidator
. I don't know how else to do it (except for changing the logic in the validator itself)