Move DBModel._id -> DBModel.id

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

diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 517fb646cb07289cbe25676bedffb6f4032867b0..3628fa0da679fcb49ef5194ce2ee7ca58c4f41d3 100644 (file)
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -14,10 +14,10 @@
 # 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 mediagoblin import messages
 import mediagoblin.mg_globals as mg_globals
 import uuid
 from os.path import splitext
-from cgi import FieldStorage
 
 from celery import registry
 import urllib
@@ -27,6 +27,7 @@ import logging
 _log = logging.getLogger(__name__)
 
 from werkzeug.utils import secure_filename
+from werkzeug.datastructures import FileStorage
 
 from mediagoblin.db.util import ObjectId
 from mediagoblin.tools.text import convert_to_tag_list_of_dicts
@@ -46,40 +47,40 @@ def submit_start(request):
     """
     First view for submitting a file.
     """
-    submit_form = submit_forms.SubmitStartForm(request.POST)
+    submit_form = submit_forms.SubmitStartForm(request.form)
 
     if request.method == 'POST' and submit_form.validate():
-        if not ('file' in request.POST
-                and isinstance(request.POST['file'], FieldStorage)
-                and request.POST['file'].file):
+        if not ('file' in request.files
+                and isinstance(request.files['file'], FileStorage)
+                and request.files['file'].stream):
             submit_form.file.errors.append(
                 _(u'You must provide a file.'))
         else:
             try:
-                filename = request.POST['file'].filename
+                filename = request.files['file'].filename
 
                 # Sniff the submitted media to determine which
                 # media plugin should handle processing
                 media_type, media_manager = sniff_media(
-                    request.POST['file'])
+                    request.files['file'])
 
                 # 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'])
+                    unicode(request.form['title'])
                     or unicode(splitext(filename)[0]))
 
-                entry.description = unicode(request.POST.get('description'))
+                entry.description = unicode(request.form.get('description'))
 
-                entry.license = unicode(request.POST.get('license', "")) or None
+                entry.license = unicode(request.form.get('license', "")) or None
 
-                entry.uploader = request.user._id
+                entry.uploader = request.user.id
 
                 # Process the user's folksonomy "tags"
                 entry.tags = convert_to_tag_list_of_dicts(
-                    request.POST.get('tags'))
+                    request.form.get('tags'))
 
                 # Generate a slug from the title
                 entry.generate_slug()
@@ -103,7 +104,7 @@ def submit_start(request):
                     queue_filepath, 'wb')
 
                 with queue_file:
-                    queue_file.write(request.POST['file'].file.read())
+                    queue_file.write(request.files['file'].stream.read())
 
                 # Add queued filename to the entry
                 entry.queued_media_file = queue_filepath
@@ -120,7 +121,7 @@ def submit_start(request):
                 process_media = registry.tasks[ProcessMedia.name]
                 try:
                     process_media.apply_async(
-                        [unicode(entry._id)], {},
+                        [unicode(entry.id)], {},
                         task_id=task_id)
                 except BaseException as exc:
                     # The purpose of this section is because when running in "lazy"
@@ -131,7 +132,7 @@ def submit_start(request):
                     #
                     # ... not completely the diaper pattern because the
                     # exception is re-raised :)
-                    mark_entry_failed(entry._id, exc)
+                    mark_entry_failed(entry.id, exc)
                     # re-raise the exception
                     raise
 
@@ -167,7 +168,7 @@ def submit_start(request):
             except Exception as e:
                 '''
                 This section is intended to catch exceptions raised in
-                mediagobling.media_types
+                mediagoblin.media_types
                 '''
                 if isinstance(e, InvalidFileType) or \
                         isinstance(e, FileTypeNotSupported):
@@ -181,3 +182,46 @@ def submit_start(request):
         'mediagoblin/submit/start.html',
         {'submit_form': submit_form,
          'app_config': mg_globals.app_config})
+
+@require_active_login
+def add_collection(request, media=None):
+    """
+    View to create a new collection
+    """
+    submit_form = submit_forms.AddCollectionForm(request.form)
+
+    if request.method == 'POST' and submit_form.validate():
+        try:
+            collection = request.db.Collection()
+            collection.id = ObjectId()
+
+            collection.title = unicode(request.form['title'])
+
+            collection.description = unicode(request.form.get('description'))
+            collection.creator = request.user.id
+            collection.generate_slug()
+
+            # Make sure this user isn't duplicating an existing collection
+            existing_collection = request.db.Collection.find_one({
+                    'creator': request.user.id,
+                    'title':collection.title})
+
+            if existing_collection:
+                messages.add_message(
+                    request, messages.ERROR, _('You already have a collection called "%s"!' % collection.title))
+            else:
+                collection.save(validate=True)
+
+                add_message(request, SUCCESS, _('Collection "%s" added!' % collection.title))
+
+            return redirect(request, "mediagoblin.user_pages.user_home",
+                            user=request.user.username)
+
+        except Exception as e:
+            raise
+
+    return render_to_response(
+        request,
+        'mediagoblin/submit/collection.html',
+        {'submit_form': submit_form,
+         'app_config': mg_globals.app_config})