X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/69d5189cc4fb2ca63418a0741bf744cf5fee8bc9..ce1c8b25f961df0810d735d2337a790e0563f4af:/floof/controllers/art.py?ds=sidebyside

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 8dfc487..b8406ed 100644
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -9,8 +9,12 @@ log = logging.getLogger(__name__)
 
 import elixir
 from floof.model.art import Art, Rating
+from floof.model.comments import Discussion
+from floof.model.users import User, UserRelationship
 
+from sqlalchemy import func
 from sqlalchemy.exceptions import IntegrityError
+from sqlalchemy.orm.exc import NoResultFound
 
 
 class ArtController(BaseController):
@@ -20,10 +24,6 @@ class ArtController(BaseController):
         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")
@@ -31,6 +31,7 @@ class ArtController(BaseController):
     # TODO: login required
     def create(self):
         c.art = Art(uploader=c.user, **request.params)
+        c.art.discussion = Discussion(count=0)
 
         try:
             elixir.session.commit()
@@ -49,14 +50,8 @@ class ArtController(BaseController):
         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)
@@ -65,8 +60,25 @@ class ArtController(BaseController):
             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))
+
+
+    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')