diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-14 13:02:30 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-14 13:02:30 -0400 |
| commit | da537ed44ef855954696a18dccd832feb6e56328 (patch) | |
| tree | 9eaa78895c0faeff2fb05d37e687e59fbc5f9e8f /mediagoblin/submit/lib.py | |
| parent | 03766fd87069cb4f1394790f81ac7b853085bf71 (diff) | |
| parent | 2daf8ec00043a4cc5cd120f875a5382aca6ec7f9 (diff) | |
| download | mediagoblin-da537ed44ef855954696a18dccd832feb6e56328.tar.lz mediagoblin-da537ed44ef855954696a18dccd832feb6e56328.tar.xz mediagoblin-da537ed44ef855954696a18dccd832feb6e56328.zip | |
Merge branch 'metadata'
Diffstat (limited to 'mediagoblin/submit/lib.py')
| -rw-r--r-- | mediagoblin/submit/lib.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py index c70e2731..93ae7a1f 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 {} + # Process the user's folksonomy "tags" entry.tags = convert_to_tag_list_of_dicts(tags_string) |