heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Tidy up federation code and add tests to cover more of the APIs

Browse Source
This commit is contained in:
Jessica Tallon
2014-08-05 22:04:50 +01:00
committed by Christopher Allan Webber
parent 32ff6f4dc0
commit 9246a6ba89
11 changed files with 335 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/submit/lib.py
View File

@@ -266,7 +266,9 @@ def api_upload_request(request, file_data, entry):
""" This handles a image upload request """
# Use the same kind of method from mediagoblin/submit/views:submit_start
entry.title = file_data.filename
entry.generate_slug()
# This will be set later but currently we just don't have enough information
entry.slug = None
queue_file = prepare_queue_task(request.app, entry, file_data.filename)
with queue_file:
@@ -278,15 +280,13 @@ def api_upload_request(request, file_data, entry):
def api_add_to_feed(request, entry):
""" Add media to Feed """
if entry.title:
# Shame we have to do this here but we didn't have the data in
# api_upload_request as no filename is usually specified.
entry.slug = None
entry.generate_slug()
feed_url = request.urlgen(
'mediagoblin.user_pages.atom_feed',
qualified=True, user=request.user.username)
qualified=True, user=request.user.username
)
run_process_media(entry, feed_url)
add_comment_subscription(request.user, entry)
return json_response(entry.serialize(request))
return json_response(entry.serialize(request))