Merge branch 'current_branch' into 'dev'

Current branch

See merge request !100
feature/fix_generate_pass
Andrey 8 years ago
commit 60ce64d46f
  1. 4
      storage/api.py
  2. 6
      storage/models.py

@ -1,11 +1,11 @@
from storage.models import Comment, File
def upload_file(original=None, name=None, base64=None, **_kwargs) -> File:
def upload_file(ext=None, original=None, name=None, base64=None, **_kwargs) -> File:
if original:
new_file = File.objects.create(original=original)
else:
new_file = File.objects.upload_as_base64(base64)
new_file = File.objects.upload_as_base64(base64, ext)
if name:
new_file.name = name

@ -1,4 +1,5 @@
# encoding=utf-8
import base64
import uuid
@ -8,11 +9,10 @@ from django.db import models
class FileManager(models.Manager):
def upload_as_base64(self, file_base64):
def upload_as_base64(self, file_base64, ext):
if "data:" in file_base64:
my_str = file_base64[file_base64.index(";base64,")+8:]
content_type = file_base64[:file_base64.index(";base64,")].split('/')[1]
file_source = ContentFile(base64.b64decode(my_str), name='time.' + content_type)
file_source = ContentFile(base64.b64decode(my_str), name='time.' + ext)
file = self.create(original=file_source)
return file
raise ValueError()

Loading…
Cancel
Save