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

Add file storage option #12590

Draft
wants to merge 10 commits into
base: release-v0.17.x
Choose a base branch
from
Draft

Add file storage option #12590

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
640e754
add file storage option, validator
nucleogenesis Aug 22, 2024
2680a29
WIP
nucleogenesis Aug 23, 2024
560a3ca
validate storage option; add reqs/storages.txt
nucleogenesis Aug 23, 2024
1d5f2e3
return the value from gcs storage_option validation fn
nucleogenesis Oct 28, 2024
3bbb017
simplify imports, add filestorage util class to pass importpath to DE…
nucleogenesis Oct 30, 2024
bbd2fe4
exportusers & csv_utils updated to use DefaultStorage
nucleogenesis Oct 30, 2024
72ec241
simplify gcs settings and calsses
nucleogenesis Dec 20, 2024
63722d7
update facility views to use DefaultStorage in csv file response
nucleogenesis Dec 20, 2024
793b83f
logs csv_export use DefaultStorage
nucleogenesis Dec 20, 2024
43309bc
WIP - Users CSV export use DefaultStorage
nucleogenesis Dec 20, 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
10 changes: 10 additions & 0 deletions kolibri/deployment/default/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,16 @@
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"


# File Storage Backend
# https://docs.djangoproject.com/en/3.2/ref/files/storage/

if not os.environ.get("DEFAULT_FILE_STORAGE"):
if conf.OPTIONS["FileStorage"]["STORAGE_BACKEND"] == "file_system":
DEFAULT_FILE_STORAGE = "django.core.files.storage.FileSystemStorage"
elif conf.OPTIONS["FileStorage"]["STORAGE_BAKCEND"] == "gcloud":
DEFAULT_FILE_STORAGE = "some-other-thing-gotta-figure-that-out"


# Internationalization
# https://docs.djangoproject.com/en/3.2/topics/i18n/

Expand Down
12 changes: 12 additions & 0 deletions kolibri/utils/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from configobj import ConfigObj
from configobj import flatten_errors
from configobj import get_extra_values
from django.core.files.storage import Storage
Copy link
Member Author

Choose a reason for hiding this comment

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

This is probably why flake8 wouldn't let pre-commit pass but it didn't give me useful output

from django.utils.functional import SimpleLazyObject
from django.utils.module_loading import import_string
from validate import is_boolean
Expand Down Expand Up @@ -359,6 +360,17 @@ def lazy_import_callback_list(value):


base_option_spec = {
"FileStorage": {
"STORAGE_BACKEND": {
"type": "option",
"options": ("file_system", "gcloud"),
"default": "file_system",
"description": """
The storage backend class that Django will use when managing files. The class given here must implement
the Django files.storage.Storage class.
""",
},
},
"Cache": {
"CACHE_BACKEND": {
"type": "cache_option",
Expand Down
Loading