aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/source/siteadmin/commandline-upload.rst1
-rw-r--r--mediagoblin/gmg_commands/batchaddmedia.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/source/siteadmin/commandline-upload.rst b/docs/source/siteadmin/commandline-upload.rst
index 913e7e6c..756f5fa8 100644
--- a/docs/source/siteadmin/commandline-upload.rst
+++ b/docs/source/siteadmin/commandline-upload.rst
@@ -87,6 +87,7 @@ just as easy to provide this information through the correct metadata columns.
- **license** is used to set a license for your piece a media for MediaGoblin's use. This must be a URI.
- **title** will set the title displayed to MediaGoblin users.
- **description** will set a description of your media.
+- **collection-slug** will add the media to a collection, if a collection with the given slug exists.
Metadata columns
----------------
diff --git a/mediagoblin/gmg_commands/batchaddmedia.py b/mediagoblin/gmg_commands/batchaddmedia.py
index 2e3d9a40..a521fe4d 100644
--- a/mediagoblin/gmg_commands/batchaddmedia.py
+++ b/mediagoblin/gmg_commands/batchaddmedia.py
@@ -110,6 +110,7 @@ def batchaddmedia(args):
title = file_metadata.get('title') or file_metadata.get('dc:title')
description = (file_metadata.get('description') or
file_metadata.get('dc:description'))
+ collection_slug = file_metadata.get('collection-slug')
license = file_metadata.get('license')
try:
@@ -152,6 +153,7 @@ FAIL: Local file {filename} could not be accessed.
filename=filename,
title=maybe_unicodeify(title),
description=maybe_unicodeify(description),
+ collection_slug=maybe_unicodeify(collection_slug),
license=maybe_unicodeify(license),
metadata=json_ld_metadata,
tags_string=u"")