aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2014-04-21 12:07:33 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2014-04-21 12:11:12 -0400
commit45f426ddee9900439c086a8bb3d1cfaedf3eca6f (patch)
treed7d4cec8763ee766b00a498582ad7b2d009e09c0 /mediagoblin/submit
parent0bfb4089cc187113a7808eed6643a73c86bb01cb (diff)
downloadmediagoblin-45f426ddee9900439c086a8bb3d1cfaedf3eca6f.tar.lz
mediagoblin-45f426ddee9900439c086a8bb3d1cfaedf3eca6f.tar.xz
mediagoblin-45f426ddee9900439c086a8bb3d1cfaedf3eca6f.zip
Made it possible to submit media with the metadata provided
Diffstat (limited to 'mediagoblin/submit')
-rw-r--r--mediagoblin/submit/lib.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index c70e2731..df3f7b62 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -98,7 +98,7 @@ class UserPastUploadLimit(UploadLimitError):
def submit_media(mg_app, user, submitted_file, filename,
title=None, description=None,
- license=None, tags_string=u"",
+ license=None, metadata=None, tags_string=u"",
upload_limit=None, max_file_size=None,
callback_url=None,
# If provided we'll do the feed_url update, otherwise ignore
@@ -142,6 +142,8 @@ def submit_media(mg_app, user, submitted_file, filename,
entry.license = license or None
+ entry.media_metadata = metadata or u""
+
# Process the user's folksonomy "tags"
entry.tags = convert_to_tag_list_of_dicts(tags_string)