import logging
-from pylons import request, response, session, tmpl_context as c, h
+from pylons import config, request, response, session, tmpl_context as c
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.users import User
-from floof.model import Art, Rating, UserRelation
+from floof.lib import file_storage as storage, helpers as h
+from floof.model import Art, Rating, ArtUser
+from floof.model.art import ArtUserType
from floof.model.comments import Discussion
from floof.model.users import User, UserRelationship
-from sqlalchemy import func
+import elixir
+#import magic
+import os.path
+import PIL
+import PIL.Image
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')
if field.data == u'':
raise ValidationError('File is required')
- # Also make this into a general User List field validator
- """ PLEASE NOTE! I just realized that I need to have a __str__ method on User
- to get it to write the usernames back in the form when it redisplays them, since
- this validator turns them into user objects instead. This fact actually sounds dangerous
- to me in the future, since it means I proably shouldn't be changing the data input
- by the user right here in the validator, or the user will see the post-mangled data instead
- of what they actually typed. Hm.
-
- One solution to this could be to only look up the users after normal validation is over,
- and then manually add validation errors to the form if that fails. But I think that kind of
- sucks. Perhaps the ideology in Formish, where they keep Validation and Conversion as
- separate tasks, is a better way of doing it? That way there is less risk of changing the user's
- input -- you do that at the conversiot stage -- yet it is still encapsulated in the form workflow.
- Hm. But that means I'd have to query for the users in the validation step and throw them away,
- or something equally stupid. Guess there's no perfect solution here, but I thought it was
- worth discussing.
-
- Btw, this is meant to be used by a field with multi user autocompletion on it (like on stackoverflow tags),
- so the user should never actually submit anything invalid unless they disable javascript and force it.
- """
- def validate_by(self, field):
- if not field.data:
- raise ValidationError("Needs at least one creator")
- user_names = field.data.split()
- users = []
- # TODO: Could totally do a filter__in here instead of picking them out individually
- for user_name in user_names:
- user = User.get_by(name=user_name)
- if not user:
- raise ValidationError("Couldn't find user %s" % user_name)
- users.append(user)
- field.data = users
class ArtController(BaseController):
def __before__(self, id=None):
# 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)
+
+ # <<<<<<< HEAD
+ # 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)
+ # =======
+ # For the moment, cheerfully assume that people are uploading their own
+ # art
+ ArtUser(art=c.art, user=c.user, type=ArtUserType.BY)
+ # >>>>>>> origin/master
+
+
+ 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)
def watchstream(self, name):
"""Watchstream for a certain user."""
try:
- c.watching_user = User.query.filter(func.lower(User.name) == name) \
- .one()
+ c.watching_user = User.get_by(name=name)
except NoResultFound:
abort(404)
projects / zzz-floof.git / blobdiff