Added a watchstream page.

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

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index ca1d7dc..b8406ed 100644 (file)
--- 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
 
 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.exceptions import IntegrityError

+from sqlalchemy.orm.exc import NoResultFound

 
 
 class ArtController(BaseController):
 
 
 class ArtController(BaseController):


@@ -20,10 +24,6 @@ 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")
     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)
     # TODO: login required
     def create(self):
         c.art = Art(uploader=c.user, **request.params)

+        c.art.discussion = Discussion(count=0)

 
         try:
             elixir.session.commit()
 
         try:
             elixir.session.commit()


@@ -64,3 +65,20 @@ class ArtController(BaseController):
         elixir.session.commit()
 
         redirect(url('show_art', id=c.art.id))
         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')