X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/40a5c182712d31d44aeacddd16a457f5ab707de7..c472ed30b5d4600a8ead8846ddbcbf3bb1b027d6:/floof/controllers/art.py?ds=sidebyside

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index be75ee7..9a2f1ba 100644
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -1,25 +1,33 @@
 import logging
 
-from pylons import request, response, session, tmpl_context as c, h
+from pylons import config, 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 import file_storage as storage
 from floof.model.users import User
 from floof.model import Art, Rating, UserRelation
 from floof.model.comments import Discussion
+from floof.model.users import User, UserRelationship
 
+import elixir
+#import magic
+import os.path
+import PIL
+import PIL.Image
+from sqlalchemy import func
 from sqlalchemy.exceptions import IntegrityError
-
+from sqlalchemy.orm.exc import NoResultFound
 from wtforms.validators import ValidationError
 from wtforms import *
 
 
 class ArtUploadForm(Form):
     by = TextField('Artists')
+    by_me = BooleanField('me')
     file = FileField('Upload')
     url = TextField('Link')
 
@@ -76,33 +84,70 @@ class ArtController(BaseController):
     # TODO: login required
     def create(self):
         c.form = ArtUploadForm(request.params)
-        if c.form.validate():
-
-            c.art = Art(uploader=c.user, **request.params)
-            c.art.discussion = Discussion(count=0)
-
-            for artist in c.form.by.data:
-                UserRelation(user=artist, kind="by", creator=c.user, art=c.art)
-
-            file = request.params['file']
-
-            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))
-
-        else:
+        if not c.form.validate():
             ## TODO: JavaScript should be added to the upload form so that it is
             ## impossible to submit the form when it contains any invalid users, 
             ## so this never happens.  Only autocompled usernames should be allowed.
             return render("/art/new.mako")
 
+        # Save the file
+        upload = request.params['file']
+        hash = storage.save_file('art/original', upload.file)
+
+        # Create a thumbnail and a medium view
+        img = PIL.Image.open(
+            config['app_conf']['static_root']
+            + storage.get_path('art/original', hash)[1:]
+        )
+        for subdir, config_size in [('medium',    config['medium_size']),
+                                    ('thumbnail', config['thumbnail_size'])]:
+            path = config['app_conf']['static_root'] + storage.get_path("art/{0}".format(subdir), hash)
+
+            dir, _ = os.path.split(path)
+            if not os.path.exists(dir):
+                os.makedirs(dir)
+
+            size = int(config_size)
+            shrunken_img = img.copy()
+            shrunken_img.thumbnail((size, size), PIL.Image.ANTIALIAS)
+            shrunken_img.save(path, img.format)
+
+        #magicker = magic.Magic(mime=True)
+        buffer = upload.file.read(64)
+        upload.file.seek(0)
+        mimetype = 'image/unknown' #magickery.from_buffer(buffer)
+
+        # XXX Ensure we can actually handle the mimetype
+
+        print mimetype
+        c.art = Art(
+            uploader=c.user,
+            original_filename=upload.filename,
+            hash=hash,
+            mimetype=mimetype,
+        )
+        c.art.discussion = Discussion(count=0)
+
+        if c.form.by_me and c.user not in c.form.by.data:
+            UserRelation(user=c.user, creator=c.user, kind="by", art=c.art)
+
+        for artist in c.form.by.data:
+            UserRelation(user=artist, creator=c.user, kind="by", art=c.art)
+
+
+        try:
+            elixir.session.commit()
+            redirect(url('show_art', id=c.art.id))
+        except IntegrityError:
+            # XXX Check this as early as possible, and clean up the filesystem!
+            # Right now this replaces the original file!
+            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)
@@ -124,3 +169,20 @@ class ArtController(BaseController):
         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')