diff options
Diffstat (limited to 'mediagoblin/submit/views.py')
| -rw-r--r-- | mediagoblin/submit/views.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 4055d394..9d31c844 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -22,7 +22,6 @@ import logging _log = logging.getLogger(__name__) -from werkzeug.datastructures import FileStorage from mediagoblin.tools.text import convert_to_tag_list_of_dicts from mediagoblin.tools.translate import pass_to_ugettext as _ @@ -32,7 +31,8 @@ from mediagoblin.submit import forms as submit_forms from mediagoblin.messages import add_message, SUCCESS from mediagoblin.media_types import sniff_media, \ InvalidFileType, FileTypeNotSupported -from mediagoblin.submit.lib import run_process_media, prepare_queue_task +from mediagoblin.submit.lib import check_file_field, prepare_queue_task, \ + run_process_media @require_active_login @@ -41,12 +41,10 @@ def submit_start(request): First view for submitting a file. """ submit_form = submit_forms.SubmitStartForm(request.form, - license=request.user.get('license_preference')) + license=request.user.license_preference) if request.method == 'POST' and submit_form.validate(): - if not ('file' in request.files - and isinstance(request.files['file'], FileStorage) - and request.files['file'].stream): + if not check_file_field(request, 'file'): submit_form.file.errors.append( _(u'You must provide a file.')) else: @@ -62,18 +60,18 @@ def submit_start(request): entry = request.db.MediaEntry() entry.media_type = unicode(media_type) entry.title = ( - unicode(request.form['title']) + unicode(submit_form.title.data) or unicode(splitext(filename)[0])) - entry.description = unicode(request.form.get('description')) + entry.description = unicode(submit_form.description.data) - entry.license = unicode(request.form.get('license', "")) or None + entry.license = unicode(submit_form.license.data) or None entry.uploader = request.user.id # Process the user's folksonomy "tags" entry.tags = convert_to_tag_list_of_dicts( - request.form.get('tags')) + submit_form.tags.data) # Generate a slug from the title entry.generate_slug() @@ -127,8 +125,8 @@ def add_collection(request, media=None): try: collection = request.db.Collection() - collection.title = unicode(request.form['title']) - collection.description = unicode(request.form.get('description')) + collection.title = unicode(submit_form.title.data) + collection.description = unicode(submit_form.description.data) collection.creator = request.user.id collection.generate_slug() |