diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2017-01-29 19:09:06 +0300 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2017-01-29 19:09:06 +0300 |
| commit | f86dafe2a01e64183e54d4a98eccb01d007c68e6 (patch) | |
| tree | b0820ed282615c8b87297e198ce4b141c869a84a /mediagoblin/gmg_commands | |
| parent | d26ea3f3bcb4543f6e3eefb507d278fc4d068b4e (diff) | |
| parent | e119aed22900b682c7dd2cce979f694282f5dbe5 (diff) | |
| download | mediagoblin-f86dafe2a01e64183e54d4a98eccb01d007c68e6.tar.lz mediagoblin-f86dafe2a01e64183e54d4a98eccb01d007c68e6.tar.xz mediagoblin-f86dafe2a01e64183e54d4a98eccb01d007c68e6.zip | |
Merge remote-tracking branch 'spechards-mediagoblin/master'
Conflicts:
mediagoblin/submit/lib.py -- happened because of creator->actor
change
Fixes issue #915
Diffstat (limited to 'mediagoblin/gmg_commands')
| -rw-r--r-- | mediagoblin/gmg_commands/addmedia.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mediagoblin/gmg_commands/addmedia.py b/mediagoblin/gmg_commands/addmedia.py index 9685d5a5..babc6ed7 100644 --- a/mediagoblin/gmg_commands/addmedia.py +++ b/mediagoblin/gmg_commands/addmedia.py @@ -56,6 +56,11 @@ def parser_setup(subparser): help=( "Slug for this media entry. " "Will be autogenerated if unspecified.")) + subparser.add_argument( + "-c", "--collection-slug", + help=( + "Slug of the collection for this media entry." + "Should already exits.")) subparser.add_argument( '--celery', @@ -100,6 +105,7 @@ def addmedia(args): submitted_file=open(abs_filename, 'rb'), filename=filename, title=maybe_unicodeify(args.title), description=maybe_unicodeify(args.description), + collection_slug=args.collection_slug, license=maybe_unicodeify(args.license), tags_string=maybe_unicodeify(args.tags) or u"") except FileUploadLimit: |