Merge remote-tracking branch 'spechards-mediagoblin/master'

Conflicts:
	mediagoblin/submit/lib.py -- happened because of creator->actor
                                     change

Fixes issue #915

docs/source/siteadmin/commandline-upload.rst

@@ -37,6 +37,7 @@ Here's a longer example that makes use of more options::
   ./bin/gmg addmedia aveyah awesome_spaceship.png \
       --title "My awesome spaceship" \
       --description "Flying my awesome spaceship, since I'm an awesome pilot" \
+      --collection-slug i-m-an-awesome-pilot \
       --license "http://creativecommons.org/licenses/by-sa/3.0/" \
       --tags "spaceships, pilots, awesome" \
       --slug "awesome-spaceship"

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:

mediagoblin/submit/lib.py

@@ -27,11 +27,12 @@ from mediagoblin import mg_globals
 from mediagoblin.tools.response import json_response
 from mediagoblin.tools.text import convert_to_tag_list_of_dicts
 from mediagoblin.tools.federation import create_activity, create_generator
-from mediagoblin.db.models import MediaEntry, ProcessingMetaData
+from mediagoblin.db.models import Collection, MediaEntry, ProcessingMetaData
 from mediagoblin.processing import mark_entry_failed
 from mediagoblin.processing.task import ProcessMedia
 from mediagoblin.notifications import add_comment_subscription
 from mediagoblin.media_types import sniff_media
+from mediagoblin.user_pages.lib import add_media_to_collection
 
 
 _log = logging.getLogger(__name__)
@@ -101,7 +102,7 @@ class UserPastUploadLimit(UploadLimitError):
 
 
 def submit_media(mg_app, user, submitted_file, filename,
-                 title=None, description=None,
+                 title=None, description=None, collection_slug=None,
                  license=None, metadata=None, tags_string=u"",
                  callback_url=None, urlgen=None,):
     """
@@ -115,6 +116,7 @@ def submit_media(mg_app, user, submitted_file, filename,
        one on disk being referenced by submitted_file.
      - title: title for this media entry
      - description: description for this media entry
+     - collection_slug: collection for this media entry
      - license: license for this media entry
      - tags_string: comma separated string of tags to be associated
        with this entry
@@ -203,6 +205,13 @@ def submit_media(mg_app, user, submitted_file, filename,
     create_activity("post", entry, entry.actor)
     entry.save()
 
+    # add to collection
+    if collection_slug:
+        collection = Collection.query.filter_by(slug=collection_slug,
+                                                actor=user.id).first()
+        if collection:
+            add_media_to_collection(collection, entry)
+
     # Pass off to processing
     #
     # (... don't change entry after this point to avoid race