diff options
| -rw-r--r-- | mediagoblin/federation/views.py | 8 | ||||
| -rw-r--r-- | mediagoblin/media_types/image/__init__.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py index 5ae7754c..7107f4bc 100644 --- a/mediagoblin/federation/views.py +++ b/mediagoblin/federation/views.py @@ -1,5 +1,6 @@ import json import io +import mimetypes from werkzeug.datastructures import FileStorage @@ -56,14 +57,17 @@ def uploads(request): request.user = requested_user[0] if request.method == "POST": # Wrap the data in the werkzeug file wrapper + mimetype = request.headers.get("Content-Type", "application/octal-stream") + filename = mimetypes.guess_all_extensions(mimetype) + filename = 'unknown' + filename[0] if filename else filename file_data = FileStorage( stream=io.BytesIO(request.data), - filename=request.args.get("qqfile", "unknown"), + filename=filename, content_type=request.headers.get("Content-Type", "application/octal-stream") ) # Find media manager - media_type, media_manager = sniff_media(file_data) + media_type, media_manager = sniff_media(file_data, filename) entry = new_upload_entry(request.user) if hasattr(media_manager, "api_upload_request"): return media_manager.api_upload_request(request, file_data, entry) diff --git a/mediagoblin/media_types/image/__init__.py b/mediagoblin/media_types/image/__init__.py index ae0bfd11..7b9296fe 100644 --- a/mediagoblin/media_types/image/__init__.py +++ b/mediagoblin/media_types/image/__init__.py @@ -72,7 +72,7 @@ class ImageMediaManager(MediaManagerBase): queue_file = prepare_queue_task(request.app, entry, file_data.filename) with queue_file: queue_file.write(request.data) - + entry.save() feed_url = request.urlgen( |