Properly require files when users submit

mediagoblin/submit/views.py

@@ -15,6 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+from cgi import FieldStorage
+
 from webob import Response, exc
 from werkzeug.utils import secure_filename
 
@@ -30,38 +32,44 @@ def submit_start(request):
     submit_form = submit_forms.SubmitStartForm(request.POST)
 
     if request.method == 'POST' and submit_form.validate():
-        # create entry and save in database
+        if not (request.POST.has_key('file')
-        entry = request.db.MediaEntry()
+                and isinstance(request.POST['file'], FieldStorage)
-        entry['title'] = request.POST['title']
+                and request.POST['file'].file):
-        entry['description'] = request.POST.get(['description'])
+            submit_form.file.errors.append(
-        entry['media_type'] = u'image' # heh
+                u'You must provide a file.')
-        entry['uploader'] = request.user
+        else:
+            # 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
+            # Save, just so we can get the entry id for the sake of using
-        # it to generate the file path
+            # it to generate the file path
-        entry.save(validate=False)
+            entry.save(validate=False)
 
-        # 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 = request.app.queue_store.get_unique_filepath(
-            ['media_entries',
+                ['media_entries',
-             unicode(request.user['_id']),
+                 unicode(request.user['_id']),
-             unicode(entry['_id']),
+                 unicode(entry['_id']),
-             secure_filename(request.POST['file'].filename)])
+                 secure_filename(request.POST['file'].filename)])
 
-        # queue appropriately
+            # queue appropriately
-        queue_file = request.app.queue_store.get_file(
+            queue_file = request.app.queue_store.get_file(
-            queue_filepath, 'wb')
+                queue_filepath, 'wb')
 
-        with queue_file:
+            with queue_file:
-            queue_file.write(request.POST['file'].file.read())
+                queue_file.write(request.POST['file'].file.read())
 
-        # Add queued filename to the entry
+            # Add queued filename to the entry
-        entry.setdefault('queue_files', []).append(queue_filepath)
+            entry.setdefault('queue_files', []).append(queue_filepath)
-        entry.save(validate=True)
+            entry.save(validate=True)
 
-        # redirect
+            # redirect
-        return exc.HTTPFound(
+            return exc.HTTPFound(
-            location=request.urlgen("mediagoblin.submit.success"))
+                location=request.urlgen("mediagoblin.submit.success"))
 
     # render
     template = request.template_env.get_template(