X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/55270a42bf0699bd78b95a945fddd73a165507ee..ce1c8b25f961df0810d735d2337a790e0563f4af:/floof/controllers/art.py

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 7378f7a..b8406ed 100644
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -1,46 +1,84 @@
 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.model.art import Art
+from floof.model.art import Art, Rating
+from floof.model.comments import Discussion
+from floof.model.users import User, UserRelationship
 
-class ArtController(BaseController):
+from sqlalchemy import func
+from sqlalchemy.exceptions import IntegrityError
+from sqlalchemy.orm.exc import NoResultFound
 
-    # def index():
-    #     c.artwork = Art.query.order_by(Art.id.desc()).all()
-    #     return render
+
+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 new(self):
         """ New Art! """
         return render("/art/new.mako")
 
+    # 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 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 = Art.get(id)
-        c.your_score = c.art.user_score(c.user)
+        # 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")
-        
-    # should force logged in on these things
-    def tag(self, id):
-        art = Art.get(id)
-        art.add_tags(request.params["tags"], c.user)
-        elixir.session.commit()
-        redirect_to(action="show", id=art.id)
-    
+
+
+    # TODO: login required
     def rate(self, id):
-        art = Art.get(id)
-        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=art.id)
+
+        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')