From 3fab7048d0cd0cf9caf9983c1db7f73cc0e0708a Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 28 Feb 2018 13:18:37 +0300 Subject: [PATCH 1/2] migrate update --- storage/api.py | 4 ++-- storage/models.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/storage/api.py b/storage/api.py index 2b80a8b..1afcf62 100644 --- a/storage/api.py +++ b/storage/api.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 diff --git a/storage/models.py b/storage/models.py index 9946f71..eb66371 100755 --- a/storage/models.py +++ b/storage/models.py @@ -8,11 +8,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() From 3a0b2020f97603063b8aa5b7c978f3508091598b Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 28 Feb 2018 13:19:37 +0300 Subject: [PATCH 2/2] migrate update --- storage/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/models.py b/storage/models.py index eb66371..8e1b9d7 100755 --- a/storage/models.py +++ b/storage/models.py @@ -1,4 +1,5 @@ # encoding=utf-8 + import base64 import uuid