add support for Django STORAGES (#237)

* add support for Django STORAGES

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Johannes Wilm <mail@johanneswilm.org>
This commit is contained in:
Petr Dlouhý 2023-10-16 11:36:03 +02:00 committed by GitHub
parent 81ace968c7
commit 2687d6cd06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View file

@ -25,6 +25,7 @@ class AvatarConf(AppConf):
ALLOWED_MIMETYPES = None
CACHE_TIMEOUT = 60 * 60
STORAGE = settings.DEFAULT_FILE_STORAGE
STORAGE_ALIAS = "default"
CLEANUP_DELETED = True
AUTO_GENERATE_SIZES = (DEFAULT_SIZE,)
FACEBOOK_GET_ID = None

View file

@ -5,7 +5,6 @@ from io import BytesIO
from django.core.files import File
from django.core.files.base import ContentFile
from django.core.files.storage import get_storage_class
from django.db import models
from django.db.models import signals
from django.utils.encoding import force_bytes, force_str
@ -17,7 +16,14 @@ from PIL import Image, ImageOps
from avatar.conf import settings
from avatar.utils import get_username, invalidate_cache
avatar_storage = get_storage_class(settings.AVATAR_STORAGE)()
try: # Django 4.2+
from django.core.files.storage import storages
avatar_storage = storages[settings.AVATAR_STORAGE_ALIAS]
except ImportError:
from django.core.files.storage import get_storage_class
avatar_storage = get_storage_class(settings.AVATAR_STORAGE)()
def avatar_path_handler(