From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Mon, 17 Dec 2012 19:05:37 +0000 (+0100)
Subject: Processing: Factor out prepare_entry.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8eb47d02d922fa90abd56729c6c6898f43cf7413;p=mediagoblin.git

Processing: Factor out prepare_entry.

prepare_entry handles the task_id setup and generating a
queue filename and file. it returns the queue file.
---

diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index f174d4ea..6660eb53 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -17,7 +17,9 @@
 import urllib
 import urllib2
 import logging
+import uuid
 from celery import registry
+from werkzeug.utils import secure_filename
 
 from mediagoblin import mg_globals
 from mediagoblin.processing import mark_entry_failed
@@ -27,6 +29,32 @@ from mediagoblin.processing.task import ProcessMedia
 _log = logging.getLogger(__name__)
 
 
+def prepare_entry(request, entry, filename):
+    # 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
+
+    # 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')
+
+    # Add queued filename to the entry
+    entry.queued_media_file = queue_filepath
+
+    return queue_file
+
+
 def run_process_media(entry):
     process_media = registry.tasks[ProcessMedia.name]
     try:
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index ad9fedae..d36f5f5d 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -16,14 +16,12 @@
 
 from mediagoblin import messages
 import mediagoblin.mg_globals as mg_globals
-import uuid
 from os.path import splitext
 
 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
@@ -34,7 +32,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 handle_push_urls, run_process_media
+from mediagoblin.submit.lib import handle_push_urls, run_process_media, \
+    prepare_entry
 
 
 @require_active_login
@@ -79,32 +78,11 @@ def submit_start(request):
                 # 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_entry(request, 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()