heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare_queue_task: Take app not request.

Browse Source 
First rename prepare_entry to prepare_queue_task, because
this is really more like what this thing does.

Thanks to Velmont for noting that we do not need a request
in here, but an "app" is good enough. Which means, that
this stuff can be called from tool scripts too.
This commit is contained in:
Elrond 2012-12-26 23:40:42 +01:00
parent 01986008f6
commit b228d89715
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/plugins/api/views.py
View File

@ -27,7 +27,7 @@ from mediagoblin.meddleware.csrf import csrf_exempt
from mediagoblin.media_types import sniff_media from mediagoblin.media_types import sniff_media
from mediagoblin.plugins.api.tools import api_auth, get_entry_serializable, \ from mediagoblin.plugins.api.tools import api_auth, get_entry_serializable, \
json_response json_response
from mediagoblin.submit.lib import prepare_entry, run_process_media from mediagoblin.submit.lib import prepare_queue_task, run_process_media
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
@ -68,7 +68,7 @@ def post_entry(request):
entry.generate_slug() entry.generate_slug()
# queue appropriately # queue appropriately
queue_file = prepare_entry(request, entry, media_file.filename) queue_file = prepare_queue_task(request.app, entry, media_file.filename)
with queue_file: with queue_file:
queue_file.write(request.files['file'].stream.read()) queue_file.write(request.files['file'].stream.read())

9
mediagoblin/submit/lib.py
View File

@ -29,7 +29,10 @@ from mediagoblin.processing.task import ProcessMedia
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
def prepare_entry(request, entry, filename): def prepare_queue_task(app, entry, filename):
"""
Prepare a MediaEntry for the processing queue and get a queue file
"""
# We generate this ourselves so we know what the taks id is for # We generate this ourselves so we know what the taks id is for
# retrieval later. # retrieval later.
@ -40,13 +43,13 @@ def prepare_entry(request, entry, filename):
entry.queued_task_id = task_id entry.queued_task_id = task_id
# Now store generate the queueing related filename # Now store generate the queueing related filename
queue_filepath = request.app.queue_store.get_unique_filepath( queue_filepath = app.queue_store.get_unique_filepath(
['media_entries', ['media_entries',
task_id, task_id,
secure_filename(filename)]) secure_filename(filename)])
# queue appropriately # queue appropriately
queue_file = request.app.queue_store.get_file( queue_file = app.queue_store.get_file(
queue_filepath, 'wb') queue_filepath, 'wb')
# Add queued filename to the entry # Add queued filename to the entry

4
mediagoblin/submit/views.py
View File

@ -33,7 +33,7 @@ from mediagoblin.messages import add_message, SUCCESS
from mediagoblin.media_types import sniff_media, \ from mediagoblin.media_types import sniff_media, \
InvalidFileType, FileTypeNotSupported InvalidFileType, FileTypeNotSupported
from mediagoblin.submit.lib import handle_push_urls, run_process_media, \ from mediagoblin.submit.lib import handle_push_urls, run_process_media, \
prepare_entry prepare_queue_task
@require_active_login @require_active_login
@ -78,7 +78,7 @@ def submit_start(request):
# Generate a slug from the title # Generate a slug from the title
entry.generate_slug() entry.generate_slug()
queue_file = prepare_entry(request, entry, filename) queue_file = prepare_queue_task(request.app, entry, filename)
with queue_file: with queue_file:
queue_file.write(request.files['file'].stream.read()) queue_file.write(request.files['file'].stream.read())