X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/5837da26db915faca89925c39fa83202bfb84e32..ee952326340b2251b42db34f4823b0495338be86:/floof/controllers/art.py diff --git a/floof/controllers/art.py b/floof/controllers/art.py index dd06f12..ca1d7dc 100644 --- a/floof/controllers/art.py +++ b/floof/controllers/art.py @@ -1,17 +1,24 @@ import logging -from pylons import request, response, session, tmpl_context as c, config -from pylons.controllers.util import abort, redirect_to - +from pylons import request, response, session, tmpl_context as c, h +from pylons.controllers.util import abort, redirect +from pylons import url from floof.lib.base import BaseController, render log = logging.getLogger(__name__) +import elixir +from floof.model.art import Art, Rating +from sqlalchemy.exceptions import IntegrityError -from floof.lib.file_storage import save_file class ArtController(BaseController): + def __before__(self, id=None): + super(ArtController, self).__before__() + # Awesome refactoring! + if id: + c.art = h.get_object_or_404(Art, id=id) # def index(): # c.artwork = Art.query.order_by(Art.id.desc()).all() @@ -20,10 +27,40 @@ class ArtController(BaseController): def new(self): """ New Art! """ return render("/art/new.mako") - - - def upload(self): - file = request.POST['file'] - root = config['app_conf']['art_root'] - save_file(root, file) - redirect_to(controller="main", action="index") + + # TODO: login required + def create(self): + c.art = Art(uploader=c.user, **request.params) + + 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)) + + + def show(self, id): + # c.art = h.get_object_or_404(Art, id=id) + if c.user: + c.your_score = c.art.user_score(c.user) + return render("/art/show.mako") + + + # TODO: login required + def rate(self, id): + # c.art = h.get_object_or_404(Art, id=id) + score = request.params.get("score") + if score and score.isnumeric(): + score = int(score) + else: + score = Rating.reverse_options.get(score) + + c.art.rate(score, c.user) + elixir.session.commit() + + redirect(url('show_art', id=c.art.id))