Skip to content

Support file upload backend #24

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support file upload backend #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
614ba1d
:art: Support SIMDITOR_UPLOAD_BACKEND
Brightcells Feb 7, 2023
996eec5
:art: Support 'upload' and 'upload/'
Brightcells Feb 7, 2023
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
8 changes: 4 additions & 4 deletions simditor/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@

if django.VERSION >= (2, 0):
# pylint disable=C0103
from django.urls import path
from django.urls import re_path
urlpatterns = [
path('upload/', staff_member_required(views.UPLOAD),
re_path('upload[/]{0,1}', staff_member_required(views.UPLOAD),
name='simditor_upload'),
]
elif django.VERSION >= (1, 8):
from django.conf.urls import url
# pylint disable=C0103
urlpatterns = [
url(r'^upload/', staff_member_required(views.UPLOAD),
url(r'^upload[/]{0,1}', staff_member_required(views.UPLOAD),
name='simditor_upload'),
]
else:
from django.conf.urls import patterns, url # pylint disable=C0411
# pylint disable=C0103
urlpatterns = patterns(
'',
url(r'^upload/', staff_member_required(views.UPLOAD),
url(r'^upload[/]{0,1}', staff_member_required(views.UPLOAD),
name='simditor_upload'),
)

Expand Down
16 changes: 10 additions & 6 deletions simditor/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,19 @@ def upload_handler(request):
'msg': '图片格式错误!'}
return JsonResponse(retdata)

filename = get_upload_filename(uploaded_file.name)
saved_path = default_storage.save(filename, uploaded_file)
if hasattr(settings, 'SIMDITOR_UPLOAD_BACKEND') and hasattr(settings.SIMDITOR_UPLOAD_BACKEND, '__call__'):
retdata = settings.SIMDITOR_UPLOAD_BACKEND(request, uploaded_file) or {}

url = utils.get_media_url(saved_path)
else:
filename = get_upload_filename(uploaded_file.name)
saved_path = default_storage.save(filename, uploaded_file)

is_api = settings.SIMDITOR_CONFIGS.get('is_api', False)
url = request.META.get('HTTP_ORIGIN') + url if is_api else url
url = utils.get_media_url(saved_path)

retdata = {'file_path': url, 'success': True, 'msg': '上传成功!'}
is_api = settings.SIMDITOR_CONFIGS.get('is_api', False)
url = request.META.get('HTTP_ORIGIN') + url if is_api else url

retdata = {'file_path': url, 'success': True, 'msg': '上传成功!'}

return JsonResponse(retdata)

Expand Down