X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/5a8f3bd86e5fbcdd1ae077b15c17a66de14c091e..f263f51648eef9739caa92e19ec45b32d7a1e49e:/floof/controllers/art.py?ds=sidebyside diff --git a/floof/controllers/art.py b/floof/controllers/art.py index 5216da7..41298c8 100644 --- a/floof/controllers/art.py +++ b/floof/controllers/art.py @@ -9,11 +9,60 @@ log = logging.getLogger(__name__) import elixir from floof.model.users import User -from floof.model.art import Art, Rating, UserRelation +from floof.model import Art, Rating, UserRelation from floof.model.comments import Discussion +from floof.model.users import User, UserRelationship +from sqlalchemy import func 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): @@ -24,34 +73,38 @@ class ArtController(BaseController): def new(self): """ New Art! """ + c.form = ArtUploadForm() return render("/art/new.mako") # TODO: login required def create(self): - # if 'file' not in request.params or not request.params['file']: - # return "Validation Error: Needs a File" + c.form = ArtUploadForm(request.params) + if c.form.validate(): + c.art = Art(uploader=c.user, **request.params) + c.art.discussion = Discussion(count=0) - 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) - artist = User.get_by(name=request.params['artist']) - if not artist: - return "Validation Error: Artist not found" + file = request.params['file'] - relation = UserRelation(user=artist, kind="by", creator=c.user, art=c.art) + 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)) - 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): @@ -74,3 +127,20 @@ class ArtController(BaseController): elixir.session.commit() redirect(url('show_art', id=c.art.id)) + + + def watchstream(self, name): + """Watchstream for a certain user.""" + try: + c.watching_user = User.query.filter(func.lower(User.name) == name) \ + .one() + except NoResultFound: + abort(404) + + # This user has watches which are users which have art + # XXX use artist, not uploader + c.artwork = Art.query.join(Art.uploader, + User.target_of_relationships) \ + .filter(UserRelationship.user_id == c.watching_user.id) + + return render('/index.mako')