Merge branch 'comments'

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

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 7ca1285..d598292 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -9,6 +9,10 @@ log = logging.getLogger(__name__)
 
 import elixir
 from floof.model.art import Art, Rating
 
 import elixir
 from floof.model.art import Art, Rating

+from floof.model.comments import Discussion
+
+from sqlalchemy.exceptions import IntegrityError
+

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


@@ -17,33 +21,34 @@ class ArtController(BaseController):
         if id:
             c.art = h.get_object_or_404(Art, id=id)
 
         if id:
             c.art = h.get_object_or_404(Art, id=id)
 

-    # def index():
-    #     c.artwork = Art.query.order_by(Art.id.desc()).all()
-    #     return render
-

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

-        Art(uploaded_by=c.user, **request.params)
-        elixir.session.commit()
-        redirect_to(controller="main", action="index")
+        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):
         # 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")
 
     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 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('show_art', id=c.art.id)
-    # 
+
+

     # TODO: login required
     def rate(self, id):
         # c.art = h.get_object_or_404(Art, id=id)
     # TODO: login required
     def rate(self, id):
         # c.art = h.get_object_or_404(Art, id=id)


@@ -52,8 +57,8 @@ class ArtController(BaseController):
             score = int(score)
         else:
             score = Rating.reverse_options.get(score)
             score = int(score)
         else:
             score = Rating.reverse_options.get(score)

-        
+

         c.art.rate(score, c.user)
         elixir.session.commit()
         c.art.rate(score, c.user)
         elixir.session.commit()

-            
-        redirect(url('art', id=c.art.id))
+
+        redirect(url('show_art', id=c.art.id))