Skip to content

Commit b4eba8b

Browse files
committed
Allow import of storage classes from the module root
Classes can now be imported directly from `minio_storage`, instead of `minio_storage.storage`. Fixes #85.
1 parent 25798c5 commit b4eba8b

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

docs/usage.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pip install django-minio-storage
77
Add `minio_storage` to `INSTALLED_APPS` in your project settings.
88

99
The last step is setting `STORAGES['default']['BACKEND']` to
10-
`'minio_storage.storage.MinioMediaStorage'`, and `STORAGES['staticfiles']['BACKEND']` to
11-
`'minio_storage.storage.MinioStaticStorage'`.
10+
`'minio_storage.MinioMediaStorage'`, and `STORAGES['staticfiles']['BACKEND']` to
11+
`'minio_storage.MinioStaticStorage'`.
1212

1313
## Django settings Configuration
1414

@@ -112,10 +112,10 @@ STATIC_ROOT = './static_files/'
112112

113113
STORAGES = {
114114
'default': {
115-
'BACKEND': 'minio_storage.storage.MinioMediaStorage',
115+
'BACKEND': 'minio_storage.MinioMediaStorage',
116116
},
117117
'staticfiles': {
118-
'BACKEND': 'minio_storage.storage.MinioStaticStorage',
118+
'BACKEND': 'minio_storage.MinioStaticStorage',
119119
},
120120
}
121121
MINIO_STORAGE_ENDPOINT = 'minio:9000'

minio_storage/__init__.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from minio_storage.storage import MinioMediaStorage, MinioStaticStorage, MinioStorage
2+
3+
__all__ = [
4+
"MinioMediaStorage",
5+
"MinioStaticStorage",
6+
"MinioStorage",
7+
]

minio_storage/management/commands/minio.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def add_arguments(self, parser):
2828
group.add_argument(
2929
"--class",
3030
type=str,
31-
default="minio_storage.storage.MinioMediaStorage",
31+
default="minio_storage.MinioMediaStorage",
3232
help="Storage class to modify "
3333
"(media/static are short names for default classes)",
3434
)
@@ -124,9 +124,9 @@ def handle(self, *args, **options):
124124
def storage(self, options):
125125
class_name: str = options["class"]
126126
if class_name == "media":
127-
class_name = "minio_storage.storage.MinioMediaStorage"
127+
class_name = "minio_storage.MinioMediaStorage"
128128
elif class_name == "static":
129-
class_name = "minio_storage.storage.MinioStaticStorage"
129+
class_name = "minio_storage.MinioStaticStorage"
130130

131131
try:
132132
storage_class = import_string(class_name)

tests/django_minio_storage_tests/settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
STORAGES = {
3333
"default": {
34-
"BACKEND": "minio_storage.storage.MinioMediaStorage",
34+
"BACKEND": "minio_storage.MinioMediaStorage",
3535
},
3636
"staticfiles": {
37-
"BACKEND": "minio_storage.storage.MinioStaticStorage",
37+
"BACKEND": "minio_storage.MinioStaticStorage",
3838
},
3939
}
4040

0 commit comments

Comments
 (0)