X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/6fb3ad2a578aa2e0eced735187a02a79a8907668..366dedf71b3cdd775251c7cea4b1519b44b37164:/floof/controllers/art.py?ds=sidebyside

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 6c5e454..5186daa 100644
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -1,16 +1,24 @@
 import logging
 
 from pylons import request, response, session, tmpl_context as c, h
-from pylons.controllers.util import abort, redirect_to
-
+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
+from floof.model.art import Art, Rating
+
+from sqlalchemy.exceptions import IntegrityError
+
 
 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,29 +28,39 @@ class ArtController(BaseController):
         """ New Art! """
         return render("/art/new.mako")
 
+    # 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 upload(self):
-        print "PARAMS", request.params
-        Art(uploaded_by=c.user, **request.params)
-        elixir.session.commit()
-        redirect_to(controller="main", action="index")
 
     def show(self, id):
-        c.art = h.get_object_or_404(Art, id=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 tag(self, id):
-        c.art = h.get_object_or_404(Art, id=id)
-        c.art.add_tags(request.params["tags"], c.user)
-        elixir.session.commit()
-        redirect_to(action="show", id=c.art.id)
-    
+
     # TODO: login required
     def rate(self, id):
-        c.art = h.get_object_or_404(Art, id=id)
-        c.art.rate(request.params["score"], c.user)
+        # 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_to(action="show", id=c.art.id)
+            
+        redirect(url('show_art', id=c.art.id))