merged. Oh no, we have two different user relationship models. Mine's in relations...

[zzz-floof.git] / floof / controllers / art.py

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index b8406ed..41298c8 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -8,7 +8,8 @@ from floof.lib.base import BaseController, render
 log = logging.getLogger(__name__)
 
 import elixir
 log = logging.getLogger(__name__)
 
 import elixir

-from floof.model.art import Art, Rating
+from floof.model.users import User
+from floof.model import Art, Rating, UserRelation

 from floof.model.comments import Discussion
 from floof.model.users import User, UserRelationship
 
 from floof.model.comments import Discussion
 from floof.model.users import User, UserRelationship
 


@@ -16,6 +17,52 @@ from sqlalchemy import func
 from sqlalchemy.exceptions import IntegrityError
 from sqlalchemy.orm.exc import NoResultFound
 
 from sqlalchemy.exceptions import IntegrityError
 from sqlalchemy.orm.exc import NoResultFound
 

+from wtforms.validators import ValidationError
+from wtforms import *
+
+
+class ArtUploadForm(Form):
+    by = TextField('Artists')
+    file = FileField('Upload')
+    url = TextField('Link')
+
+    # TODO: make this general purpose
+    def validate_file(self, field):
+        if field.data == u'':
+            raise ValidationError('File is required')
+    
+    # Also make this into a general User List field validator
+    """ PLEASE NOTE!  I just realized that I need to have a __str__ method on User
+    to get it to write the usernames back in the form when it redisplays them, since
+    this validator turns them into user objects instead.  This fact actually sounds dangerous
+    to me in the future, since it means I proably shouldn't be changing the data input
+    by the user right here in the validator, or the user will see the post-mangled data instead
+    of what they actually typed.  Hm.
+    
+    One solution to this could be to only look up the users after normal validation is over, 
+    and then manually add validation errors to the form if that fails.  But I think that kind of
+    sucks.  Perhaps the ideology in Formish, where they keep Validation and Conversion as
+    separate tasks, is a better way of doing it?  That way there is less risk of changing the user's
+    input -- you do that at the conversiot stage -- yet it is still encapsulated in the form workflow.
+    Hm.  But that means I'd have to query for the users in the validation step and throw them away,
+    or something equally stupid.  Guess there's no perfect solution here, but I thought it was
+    worth discussing.
+    
+    Btw, this is meant to be used by a field with multi user autocompletion on it (like on stackoverflow tags),
+    so the user should never actually submit anything invalid unless they disable javascript and force it.
+    """
+    def validate_by(self, field):
+        if not field.data:
+            raise ValidationError("Needs at least one creator")
+        user_names = field.data.split()
+        users = []
+        # TODO: Could totally do a filter__in here instead of picking them out individually
+        for user_name in user_names:
+            user = User.get_by(name=user_name)
+            if not user:
+                raise ValidationError("Couldn't find user %s" % user_name)
+            users.append(user)
+        field.data = users

 
 class ArtController(BaseController):
     def __before__(self, id=None):
 
 class ArtController(BaseController):
     def __before__(self, id=None):


@@ -26,23 +73,38 @@ class ArtController(BaseController):
 
     def new(self):
         """ New Art! """
 
     def new(self):
         """ New Art! """

+        c.form = ArtUploadForm()

         return render("/art/new.mako")
 
     # TODO: login required
     def create(self):
         return render("/art/new.mako")
 
     # TODO: login required
     def create(self):

-        c.art = Art(uploader=c.user, **request.params)
-        c.art.discussion = Discussion(count=0)
+        c.form = ArtUploadForm(request.params)
+        if c.form.validate():

 
 

-        try:
-            elixir.session.commit()
-            redirect(url('show_art', id=c.art.id))
-        except IntegrityError:
-            # hurr, there must be a better way to do this but I am lazy right now
-            hash = c.art.hash
-            elixir.session.rollback()
-            duplicate_art = Art.get_by(hash=hash)
-            h.flash("We already have that one.")
-            redirect(url('show_art', id=duplicate_art.id))
+            c.art = Art(uploader=c.user, **request.params)
+            c.art.discussion = Discussion(count=0)
+
+            for artist in c.form.by.data:
+                UserRelation(user=artist, kind="by", creator=c.user, art=c.art)
+
+            file = request.params['file']
+
+            try:
+                elixir.session.commit()
+                redirect(url('show_art', id=c.art.id))
+            except IntegrityError:
+                # hurr, there must be a better way to do this but I am lazy right now
+                hash = c.art.hash
+                elixir.session.rollback()
+                duplicate_art = Art.get_by(hash=hash)
+                h.flash("We already have that one.")
+                redirect(url('show_art', id=duplicate_art.id))
+
+        else:
+            ## TODO: JavaScript should be added to the upload form so that it is
+            ## impossible to submit the form when it contains any invalid users, 
+            ## so this never happens.  Only autocompled usernames should be allowed.
+            return render("/art/new.mako")

 
 
     def show(self, id):
 
 
     def show(self, id):