from mediagoblin import messages
import mediagoblin.mg_globals as mg_globals
-import uuid
from os.path import splitext
-from celery import registry
import logging
_log = logging.getLogger(__name__)
-from werkzeug.utils import secure_filename
-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 _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
from mediagoblin.tools.response import render_to_response, redirect
from mediagoblin.decorators import require_active_login
from mediagoblin.submit import forms as submit_forms
-from mediagoblin.processing import mark_entry_failed
-from mediagoblin.processing.task import ProcessMedia
from mediagoblin.messages import add_message, SUCCESS
from mediagoblin.media_types import sniff_media, \
InvalidFileType, FileTypeNotSupported
-from mediagoblin.submit.lib import handle_push_urls
+from mediagoblin.submit.lib import check_file_field, prepare_queue_task, \
+ run_process_media
@require_active_login
"""
First view for submitting a file.
"""
- submit_form = submit_forms.SubmitStartForm(request.form)
+ submit_form = submit_forms.SubmitStartForm(request.form,
+ 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:
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()
- # We generate this ourselves so we know what the taks id is for
- # retrieval later.
-
- # (If we got it off the task's auto-generation, there'd be
- # a risk of a race condition when we'd save after sending
- # off the task)
- task_id = unicode(uuid.uuid4())
-
- # Now store generate the queueing related filename
- queue_filepath = request.app.queue_store.get_unique_filepath(
- ['media_entries',
- task_id,
- secure_filename(filename)])
-
- # queue appropriately
- queue_file = request.app.queue_store.get_file(
- queue_filepath, 'wb')
+ queue_file = prepare_queue_task(request.app, entry, filename)
with queue_file:
queue_file.write(request.files['file'].stream.read())
- # Add queued filename to the entry
- entry.queued_media_file = queue_filepath
-
- entry.queued_task_id = task_id
-
# Save now so we have this data before kicking off processing
entry.save()
#
# (... don't change entry after this point to avoid race
# conditions with changes to the document via processing code)
- process_media = registry.tasks[ProcessMedia.name]
- try:
- process_media.apply_async(
- [unicode(entry.id)], {},
- task_id=task_id)
- except BaseException as exc:
- # The purpose of this section is because when running in "lazy"
- # or always-eager-with-exceptions-propagated celery mode that
- # the failure handling won't happen on Celery end. Since we
- # expect a lot of users to run things in this way we have to
- # capture stuff here.
- #
- # ... not completely the diaper pattern because the
- # exception is re-raised :)
- mark_entry_failed(entry.id, exc)
- # re-raise the exception
- raise
-
- handle_push_urls(request)
-
+ feed_url = request.urlgen(
+ 'mediagoblin.user_pages.atom_feed',
+ qualified=True, user=request.user.username)
+ run_process_media(entry, feed_url)
add_message(request, SUCCESS, _('Woohoo! Submitted!'))
return redirect(request, "mediagoblin.user_pages.user_home",
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()
projects / mediagoblin.git / blobdiff