Merge branch 'configobj'

[mediagoblin.git] / mediagoblin / submit / views.py

diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 542017962731039ece30aef9d02fa08affe883f0..e9b5c37e0c4b4af2168141e7430eeaee114309b2 100644 (file)
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -14,12 +14,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from os.path import splitext
+from cgi import FieldStorage
 
-from webob import Response, exc
 from werkzeug.utils import secure_filename
 
+from mediagoblin.util import render_to_response, redirect
 from mediagoblin.decorators import require_active_login
-from mediagoblin.submit import forms as submit_forms
+from mediagoblin.submit import forms as submit_forms, security
+from mediagoblin.process_media import process_media_initial
 
 
 @require_active_login
@@ -27,56 +30,62 @@ def submit_start(request):
     """
     First view for submitting a file.
     """
-    submit_form = submit_forms.SubmitStartForm()
+    submit_form = submit_forms.SubmitStartForm(request.POST)
 
     if request.method == 'POST' and submit_form.validate():
-        # create entry and save in database
-        entry = request.db.MediaEntry()
-        entry['title'] = request.POST['title']
-        entry['description'] = request.POST.get(['description'])
-        entry['media_type'] = u'image' # heh
-        entry['uploader'] = request.user
-
-        # Save, just so we can get the entry id for the sake of using
-        # it to generate the file path
-        entry.save(validate=False)
-
-        # Now store generate the queueing related filename
-        queue_filepath = request.app.queue_store.get_unique_filepath(
-            ['media_entries',
-             unicode(request.user['_id']),
-             unicode(entry['_id']),
-             secure_filename(request.POST['file'].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.setdefault('queue_files', []).add(queue_filepath)
-        entry.save(validate=True)
-
-        # redirect
-        return exc.HTTPFound(
-            location=request.urlgen("mediagoblin.submit.submit_success"))
-
-    # render
-    template = request.template_env.get_template(
-        'mediagoblin/submit/start.html')
-    return Response(
-        template.render(
-            {'request': request,
-             'submit_form': submit_form}))
+        if not (request.POST.has_key('file')
+                and isinstance(request.POST['file'], FieldStorage)
+                and request.POST['file'].file):
+            submit_form.file.errors.append(
+                u'You must provide a file.')
+        elif not security.check_filetype(request.POST['file']):
+            submit_form.file.errors.append(
+                u'The file doesn\'t seem to be an image!')
+        else:
+            filename = request.POST['file'].filename
+
+            # create entry and save in database
+            entry = request.db.MediaEntry()
+            entry['title'] = request.POST['title'] or unicode(splitext(filename)[0])
+            entry['description'] = request.POST.get('description')
+            entry['media_type'] = u'image' # heh
+            entry['uploader'] = request.user['_id']
+
+            # Save, just so we can get the entry id for the sake of using
+            # it to generate the file path
+            entry.save(validate=False)
+
+            # 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
+            entry.save(validate=True)
+
+            # queue it for processing
+            process_media_initial.delay(unicode(entry['_id']))
+
+            return redirect(request, "mediagoblin.submit.success")
+
+    return render_to_response(
+        request,
+        'mediagoblin/submit/start.html',
+        {'submit_form': submit_form})
 
 
-@require_active_login
 def submit_success(request):
-    # render
-    template = request.template_env.get_template(
-        'mediagoblin/submit/success.html')
-    return Response(
-        template.render(
-            {'request': request}))
+    return render_to_response(
+        request, 'mediagoblin/submit/success.html', {})