From a3c480248f8dbe649ced86d80b038e80cc77e9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20P=C3=A9chard?= Date: Sun, 13 Jul 2014 19:01:09 +0200 Subject: Add collection option to 'addmedia' cli uploading --- mediagoblin/submit/lib.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mediagoblin/submit/lib.py') diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py index 93ae7a1f..b23bdf69 100644 --- a/mediagoblin/submit/lib.py +++ b/mediagoblin/submit/lib.py @@ -23,11 +23,12 @@ from werkzeug.datastructures import FileStorage from mediagoblin import mg_globals from mediagoblin.tools.text import convert_to_tag_list_of_dicts -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__) @@ -97,7 +98,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"", upload_limit=None, max_file_size=None, callback_url=None, @@ -114,6 +115,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 @@ -191,6 +193,11 @@ def submit_media(mg_app, user, submitted_file, filename, else: feed_url = None + # add to collection + if collection_slug: + collection = Collection.query.filter_by(slug=collection_slug).first() + add_media_to_collection(collection, entry) + # Pass off to processing # # (... don't change entry after this point to avoid race -- cgit v1.2.3 From e119aed22900b682c7dd2cce979f694282f5dbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Pe=CC=81chard?= Date: Tue, 23 Sep 2014 16:11:39 +0200 Subject: Add creator to filter collections --- mediagoblin/submit/lib.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mediagoblin/submit/lib.py') diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py index b23bdf69..d54591d6 100644 --- a/mediagoblin/submit/lib.py +++ b/mediagoblin/submit/lib.py @@ -195,8 +195,9 @@ def submit_media(mg_app, user, submitted_file, filename, # add to collection if collection_slug: - collection = Collection.query.filter_by(slug=collection_slug).first() - add_media_to_collection(collection, entry) + collection = Collection.query.filter_by(slug=collection_slug, creator=user.id).first() + if collection: + add_media_to_collection(collection, entry) # Pass off to processing # -- cgit v1.2.3