heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some more code to work better with image uploads

Browse Source
This commit is contained in:
xray7224 2013-09-28 15:22:18 -04:00 committed by Jessica Tallon
parent d4a21d7e74
commit 62dc7d3e6c
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mediagoblin/federation/views.py
View File

@ -59,7 +59,7 @@ def uploads(request):
# Wrap the data in the werkzeug file wrapper # Wrap the data in the werkzeug file wrapper
file_data = FileStorage( file_data = FileStorage(
stream=io.BytesIO(request.data), stream=io.BytesIO(request.data),
filename=request.form.get("qqfile", "unknown.jpg"), filename=request.args.get("qqfile", "unknown.jpg"),
content_type=request.headers.get("Content-Type", "application/octal-stream") content_type=request.headers.get("Content-Type", "application/octal-stream")
) )
@ -67,8 +67,8 @@ def uploads(request):
media_type, media_manager = sniff_media(file_data) media_type, media_manager = sniff_media(file_data)
entry = new_upload_entry(request.user) entry = new_upload_entry(request.user)
entry.media_type = unicode(media_type) entry.media_type = unicode(media_type)
entry.title = u"Hello ^_^" entry.title = unicode(request.args.get("title", "Hello ^_^"))
entry.description = u"" entry.description = unicode(request.args.get("description", ""))
entry.license = None entry.license = None
entry.generate_slug() entry.generate_slug()
@ -122,10 +122,25 @@ def feed(request):
content=data["object"]["content"] content=data["object"]["content"]
) )
comment.save() comment.save()
elif obj.get("objectType", None) == "image":
# Posting an image to the feed
# NB: This is currently just handing the image back until we have an
# to send the image to the actual feed
media_id = int(data["object"]["id"])
media = MediaEntry.query.filter_by(id=media_id)
if media is None:
error = "No such 'image' with id '{0}'".format(id=media_id)
return json_response(error, status=404)
media = media[0]
return json_response(media.serialize(request))
elif obj.get("objectType", None) is None: elif obj.get("objectType", None) is None:
# They need to tell us what type of object they're giving us.
error = {"error": "No objectType specified."} error = {"error": "No objectType specified."}
return json_response(error, status=400) return json_response(error, status=400)
else: else:
# Oh no! We don't know about this type of object (yet)
error = {"error": "Unknown object type '{0}'.".format(obj.get("objectType", None))} error = {"error": "Unknown object type '{0}'.".format(obj.get("objectType", None))}
return json_response(error, status=400) return json_response(error, status=400)