Added parent property/links for comments, and a Return link on comment threads.

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

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 6ce9762..9576109 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -1,16 +1,25 @@
 import logging
 
 import logging
 

-from pylons import request, response, session, tmpl_context as c
-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.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 floof.model.comments import Discussion
+
+from sqlalchemy.exceptions import IntegrityError
+

 
 class ArtController(BaseController):
 
 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()
 
     # def index():
     #     c.artwork = Art.query.order_by(Art.id.desc()).all()


@@ -19,14 +28,41 @@ class ArtController(BaseController):
     def new(self):
         """ New Art! """
         return render("/art/new.mako")
     def new(self):
         """ New Art! """
         return render("/art/new.mako")

-        
-        
-    def upload(self):
-        print "PARAMS", request.params
-        Art(uploaded_by=c.user, **request.params)
-        elixir.session.commit()
-        redirect_to(controller="main", action="index")
+
+    # TODO: login required
+    def create(self):
+        c.art = Art(uploader=c.user, **request.params)
+        c.art.discussion = Discussion(count=0)
+
+        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):
 
     def show(self, id):

-        c.art = Art.get(id)
-        return render("/art/show.mako")
\ No newline at end of file
+        # 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))