Fixes after merging video into master - part 2
- Added handling of InvalidFileType to submit.views - Updated test_celery_setup and test_submission tests to reflect the changes to the media procesing infrastructure
This commit is contained in:
Joar Wandborg
parent
8e5f974684
commit
0bce749b21
@ -31,7 +31,7 @@ from mediagoblin.decorators import require_active_login
|
||||
from mediagoblin.submit import forms as submit_forms, security
|
||||
from mediagoblin.processing import mark_entry_failed, ProcessMedia
|
||||
from mediagoblin.messages import add_message, SUCCESS
|
||||
from mediagoblin.media_types import get_media_type_and_manager
|
||||
from mediagoblin.media_types import get_media_type_and_manager, InvalidFileType
|
||||
|
||||
|
||||
@require_active_login
|
||||
@ -48,86 +48,89 @@ def submit_start(request):
|
||||
submit_form.file.errors.append(
|
||||
_(u'You must provide a file.'))
|
||||
else:
|
||||
filename = request.POST['file'].filename
|
||||
|
||||
media_type, media_manager = get_media_type_and_manager(filename)
|
||||
|
||||
# create entry and save in database
|
||||
entry = request.db.MediaEntry()
|
||||
entry['_id'] = ObjectId()
|
||||
entry['media_type'] = unicode(media_type)
|
||||
entry['title'] = (
|
||||
unicode(request.POST['title'])
|
||||
or unicode(splitext(filename)[0]))
|
||||
|
||||
entry['description'] = unicode(request.POST.get('description'))
|
||||
entry['description_html'] = cleaned_markdown_conversion(
|
||||
entry['description'])
|
||||
|
||||
entry['uploader'] = request.user['_id']
|
||||
|
||||
# Process the user's folksonomy "tags"
|
||||
entry['tags'] = convert_to_tag_list_of_dicts(
|
||||
request.POST.get('tags'))
|
||||
|
||||
# Generate a slug from the title
|
||||
entry.generate_slug()
|
||||
|
||||
|
||||
# Now store generate the queueing related filename
|
||||
queue_filepath = request.app.queue_store.get_unique_filepath(
|
||||
['media_entries',
|
||||
unicode(entry._id),
|
||||
secure_filename(filename)])
|
||||
|
||||
# queue appropriately
|
||||
queue_file = request.app.queue_store.get_file(
|
||||
queue_filepath, 'wb')
|
||||
|
||||
with queue_file:
|
||||
queue_file.write(request.POST['file'].file.read())
|
||||
|
||||
# Add queued filename to the entry
|
||||
entry['queued_media_file'] = queue_filepath
|
||||
|
||||
# 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())
|
||||
entry['queued_task_id'] = task_id
|
||||
|
||||
# Save now so we have this data before kicking off processing
|
||||
entry.save(validate=True)
|
||||
|
||||
# Pass off to processing
|
||||
#
|
||||
# (... 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.
|
||||
filename = request.POST['file'].filename
|
||||
media_type, media_manager = get_media_type_and_manager(filename)
|
||||
|
||||
# create entry and save in database
|
||||
entry = request.db.MediaEntry()
|
||||
entry['_id'] = ObjectId()
|
||||
entry['media_type'] = unicode(media_type)
|
||||
entry['title'] = (
|
||||
unicode(request.POST['title'])
|
||||
or unicode(splitext(filename)[0]))
|
||||
|
||||
entry['description'] = unicode(request.POST.get('description'))
|
||||
entry['description_html'] = cleaned_markdown_conversion(
|
||||
entry['description'])
|
||||
|
||||
entry['uploader'] = request.user['_id']
|
||||
|
||||
# Process the user's folksonomy "tags"
|
||||
entry['tags'] = convert_to_tag_list_of_dicts(
|
||||
request.POST.get('tags'))
|
||||
|
||||
# Generate a slug from the title
|
||||
entry.generate_slug()
|
||||
|
||||
|
||||
# Now store generate the queueing related filename
|
||||
queue_filepath = request.app.queue_store.get_unique_filepath(
|
||||
['media_entries',
|
||||
unicode(entry._id),
|
||||
secure_filename(filename)])
|
||||
|
||||
# queue appropriately
|
||||
queue_file = request.app.queue_store.get_file(
|
||||
queue_filepath, 'wb')
|
||||
|
||||
with queue_file:
|
||||
queue_file.write(request.POST['file'].file.read())
|
||||
|
||||
# Add queued filename to the entry
|
||||
entry['queued_media_file'] = queue_filepath
|
||||
|
||||
# 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())
|
||||
entry['queued_task_id'] = task_id
|
||||
|
||||
# Save now so we have this data before kicking off processing
|
||||
entry.save(validate=True)
|
||||
|
||||
# Pass off to processing
|
||||
#
|
||||
# ... not completely the diaper pattern because the
|
||||
# exception is re-raised :)
|
||||
mark_entry_failed(entry._id, exc)
|
||||
# re-raise the exception
|
||||
raise
|
||||
# (... 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
|
||||
|
||||
add_message(request, SUCCESS, _('Woohoo! Submitted!'))
|
||||
add_message(request, SUCCESS, _('Woohoo! Submitted!'))
|
||||
|
||||
return redirect(request, "mediagoblin.user_pages.user_home",
|
||||
user=request.user['username'])
|
||||
return redirect(request, "mediagoblin.user_pages.user_home",
|
||||
user=request.user['username'])
|
||||
except InvalidFileType, exc:
|
||||
submit_form.file.errors.append(
|
||||
_(u'Invalid file type.'))
|
||||
|
||||
return render_to_response(
|
||||
request,
|
||||
|
||||
@ -50,7 +50,7 @@ def test_setup_celery_from_config():
|
||||
assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float)
|
||||
assert fake_celery_module.CELERY_RESULT_PERSISTENT is True
|
||||
assert fake_celery_module.CELERY_IMPORTS == [
|
||||
'foo.bar.baz', 'this.is.an.import', 'mediagoblin.process_media']
|
||||
'foo.bar.baz', 'this.is.an.import', 'mediagoblin.processing']
|
||||
assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == {
|
||||
'database': 'mediagoblin'}
|
||||
assert fake_celery_module.CELERY_RESULT_BACKEND == 'mongodb'
|
||||
@ -74,7 +74,7 @@ def test_setup_celery_from_config():
|
||||
assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float)
|
||||
assert fake_celery_module.CELERY_RESULT_PERSISTENT is False
|
||||
assert fake_celery_module.CELERY_IMPORTS == [
|
||||
'baz.bar.foo', 'import.is.a.this', 'mediagoblin.process_media']
|
||||
'baz.bar.foo', 'import.is.a.this', 'mediagoblin.processing']
|
||||
assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == {
|
||||
'database': 'captain_lollerskates',
|
||||
'host': 'mongodb.example.org',
|
||||
|
||||
@ -222,7 +222,7 @@ class TestSubmission:
|
||||
|
||||
context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/submit/start.html']
|
||||
form = context['submit_form']
|
||||
assert form.file.errors == ['The file doesn\'t seem to be an image!']
|
||||
assert form.file.errors == [u'Invalid file type.']
|
||||
|
||||
# NOTE: The following 2 tests will ultimately fail, but they
|
||||
# *will* pass the initial form submission step. Instead,
|
||||
@ -246,7 +246,7 @@ class TestSubmission:
|
||||
assert_equal(entry['state'], 'failed')
|
||||
assert_equal(
|
||||
entry['fail_error'],
|
||||
u'mediagoblin.process_media.errors:BadMediaFail')
|
||||
u'mediagoblin.processing:BadMediaFail')
|
||||
|
||||
# Test non-supported file with .png extension
|
||||
# -------------------------------------------
|
||||
@ -266,4 +266,4 @@ class TestSubmission:
|
||||
assert_equal(entry['state'], 'failed')
|
||||
assert_equal(
|
||||
entry['fail_error'],
|
||||
u'mediagoblin.process_media.errors:BadMediaFail')
|
||||
u'mediagoblin.processing:BadMediaFail')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user