From 55076beae41c986dd7b684d49008ae43fc24978e Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Fri, 24 Aug 2012 15:59:44 +0530 Subject: [PATCH 001/541] Add testing.py --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 379571ab..0586dace 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ dist/ .webassets-cache nosetests.xml .sass-cache -instance/testing.py instance/production.py instance/development.py baseframe-packed.css From 5b4f063833ab3e364b7fb1db1e69f2f6bde649ec Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Fri, 24 Aug 2012 16:01:31 +0530 Subject: [PATCH 002/541] Add tests! --- imgee/tests/__init__.py | 1 + imgee/tests/fixtures.py | 10 ++++++++++ imgee/tests/test_listing.py | 28 ++++++++++++++++++++++++++++ runtests.py | 1 + 4 files changed, 40 insertions(+) create mode 100644 imgee/tests/__init__.py create mode 100644 imgee/tests/fixtures.py create mode 100644 imgee/tests/test_listing.py diff --git a/imgee/tests/__init__.py b/imgee/tests/__init__.py new file mode 100644 index 00000000..8a7593ae --- /dev/null +++ b/imgee/tests/__init__.py @@ -0,0 +1 @@ +from test_listing import * diff --git a/imgee/tests/fixtures.py b/imgee/tests/fixtures.py new file mode 100644 index 00000000..1dbcde99 --- /dev/null +++ b/imgee/tests/fixtures.py @@ -0,0 +1,10 @@ +from imgee.models import db, User + +def create_user(self): + user = User(username=u'nigelb', userid=u'WzTwFMKEQ5yozIkDj7feCw', + lastuser_token_scope=u'id', lastuser_token_type=u'bearer', + lastuser_token=u'-zhQm-NRSRaVfLQnebR3Mw', + fullname=u'Nigel Babu', id=1) + db.session.add(user) + db.session.commit() + return user diff --git a/imgee/tests/test_listing.py b/imgee/tests/test_listing.py new file mode 100644 index 00000000..aaab42a3 --- /dev/null +++ b/imgee/tests/test_listing.py @@ -0,0 +1,28 @@ +import os +from imgee import init_for, app +from imgee.models import db, User +import unittest +import tempfile + +class UploadTestCase(unittest.TestCase): + + def setUp(self): + init_for('testing') + app.config['TESTING'] = True + self.app = app.test_client() + db.create_all() + + def tearDown(self): + db.drop_all() + + def create_user(self): + user = User(username=u'nigelb', userid=u'WzTwFMKEQ5yozIkDj7feCw', + lastuser_token_scope=u'id', lastuser_token_type=u'bearer', + lastuser_token=u'-zhQm-NRSRaVfLQnebR3Mw', + fullname=u'Nigel Babu', id=1) + db.session.add(user) + db.session.commit() + + def test_listing_without_login(self): + rv = self.app.get('/list') + assert "You should be redirected automatically to target URL" in rv.data diff --git a/runtests.py b/runtests.py index af8b126d..09f59e13 100755 --- a/runtests.py +++ b/runtests.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # -*- coding: iso-8859-15 -*- import nose From 2a61eb284be343481bd385bcc3c8f4c045072ac6 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 30 Aug 2012 21:32:58 +0530 Subject: [PATCH 003/541] Create thumbnail model --- imgee/models/__init__.py | 2 +- imgee/models/thumbnail.py | 9 +++++++++ imgee/models/uploaded_file.py | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 imgee/models/thumbnail.py diff --git a/imgee/models/__init__.py b/imgee/models/__init__.py index 05c6ff47..05e9691e 100644 --- a/imgee/models/__init__.py +++ b/imgee/models/__init__.py @@ -2,9 +2,9 @@ from flask.ext.sqlalchemy import SQLAlchemy from imgee import app -from coaster.sqlalchemy import IdMixin, TimestampMixin, BaseMixin, BaseNameMixin db = SQLAlchemy(app) from imgee.models.user import * from imgee.models.uploaded_file import * +from imgee.models.thumbnail import * diff --git a/imgee/models/thumbnail.py b/imgee/models/thumbnail.py new file mode 100644 index 00000000..b8a372bd --- /dev/null +++ b/imgee/models/thumbnail.py @@ -0,0 +1,9 @@ +from coaster.sqlalchemy import BaseMixin +from imgee.models import db + + +class Thumbnail(BaseMixin, db.Model): + __tablename__ = 'file' + + name = db.Column(db.Unicode(250), nullable=False, unique=True) + uploaded_file_id = db.Column(db.Integer, db.ForeignKey('file.id')) diff --git a/imgee/models/uploaded_file.py b/imgee/models/uploaded_file.py index 07a9b70f..fd99b6aa 100644 --- a/imgee/models/uploaded_file.py +++ b/imgee/models/uploaded_file.py @@ -7,4 +7,5 @@ class UploadedFile(BaseNameMixin, db.Model): __tablename__ = 'file' + thumbnails = db.relationship('Thumbnail', backref='uploadedfile') user_id = db.Column(db.Integer, db.ForeignKey('user.id')) From eaa9de7bc7cc54f755a70dc02e3144b47bb82599 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 30 Aug 2012 22:00:13 +0530 Subject: [PATCH 004/541] Rename the thumbnail table --- imgee/models/thumbnail.py | 2 +- imgee/storage.py | 14 ++++++++++++++ imgee/views/index.py | 11 +++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/imgee/models/thumbnail.py b/imgee/models/thumbnail.py index b8a372bd..1fe02724 100644 --- a/imgee/models/thumbnail.py +++ b/imgee/models/thumbnail.py @@ -3,7 +3,7 @@ class Thumbnail(BaseMixin, db.Model): - __tablename__ = 'file' + __tablename__ = 'thumbnail' name = db.Column(db.Unicode(250), nullable=False, unique=True) uploaded_file_id = db.Column(db.Integer, db.ForeignKey('file.id')) diff --git a/imgee/storage.py b/imgee/storage.py index 80dd2e53..b22bbb84 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -4,6 +4,10 @@ from boto.s3.key import Key from imgee import app + +IMAGES = list('jpg jpe jpeg png gif svg bmp'.split()) + + def upload(name, title): """ Upload a file to S3 @@ -13,3 +17,13 @@ def upload(name, title): k = Key(bucket) k.key = name k.set_contents_from_filename(path.join(app.config['UPLOADED_FILES_DEST'], title)) + + +def is_image(filename): + """ + Check if a given filename is an image or not + """ + extension = filename.rsplit('.', 1)[-1] + if extension in IMAGES: + return True + return False diff --git a/imgee/views/index.py b/imgee/views/index.py index 42226ac5..291273d6 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -5,7 +5,7 @@ from imgee.forms import UploadForm from imgee.models import UploadedFile, db from imgee.views.login import lastuser -from imgee.storage import upload +from imgee.storage import upload, check_file_type @app.route('/upload', methods=('GET', 'POST')) @@ -18,7 +18,7 @@ def upload_files(): db.session.commit() upload(uploaded_file.name, uploaded_file.title) return jsonify({'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], uploaded_file.name)}) - + return jsonify({'error': 'No file was uploaded'}) @app.route('/list') @lastuser.requires_login @@ -26,3 +26,10 @@ def list_files(): files = UploadedFile.query.filter_by(user=g.user).all() file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} return jsonify(file_list) + + +@app.route('/file/') +@lastuser.requires_login +def get_thumbnail(filename): + uploadedfile = UploadedFile.query.filter_by(name=filename).first() + if check_file_type From a453c3f376ee0b0dad3ff3e1b1478b22a14b28a3 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 30 Aug 2012 22:59:07 +0530 Subject: [PATCH 005/541] Add index to thumbnail name --- imgee/models/thumbnail.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imgee/models/thumbnail.py b/imgee/models/thumbnail.py index 1fe02724..51fcb4de 100644 --- a/imgee/models/thumbnail.py +++ b/imgee/models/thumbnail.py @@ -5,5 +5,6 @@ class Thumbnail(BaseMixin, db.Model): __tablename__ = 'thumbnail' - name = db.Column(db.Unicode(250), nullable=False, unique=True) + name = db.Column(db.Unicode(250), nullable=False, unique=True, index=True) + size = db.Column(db.Unicode(100), nullable=False, index=True) uploaded_file_id = db.Column(db.Integer, db.ForeignKey('file.id')) From c3ec8df340fb1c23d837920bcc3802cb813dfb61 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 30 Aug 2012 22:59:48 +0530 Subject: [PATCH 006/541] Add storage code for thumbnail creation --- imgee/storage.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/imgee/storage.py b/imgee/storage.py index b22bbb84..4ce83b5f 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -1,7 +1,9 @@ from os import path +from uuid import uuid4 from boto import connect_s3 from boto.s3.bucket import Bucket from boto.s3.key import Key +from PIL import Image from imgee import app @@ -27,3 +29,36 @@ def is_image(filename): if extension in IMAGES: return True return False + + +def create_thumbnail(uploadedfile, size): + """ + Create a thumbnail for a given file and given size + """ + thumbnail = Thumbnail(name=uuid4().hex, size=size, uploadedfile=uploadedfile) + conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) + bucket = Bucket(conn, app.config['AWS_BUCKET']) + thumbnail_path = path.join(app.config['UPLOADED_FILES_DEST'], thumbnail.name) + k = Key(bucket) + k.key = uploadedfile.name + k.get_contents_to_filename(thumbnail_path) + try: + img = Image.open(thumbnail_path) + img.load() + img.thumbnail(size, Image.ANTIALIAS) + img.save(thumbnail_pathj) + except IOError: + return None + return thumbnail.name + + +def convert_size(size): + converted = size.split('x') + if len(converted) != 2: + return None + for k, v in enumerate(converted): + if v.isdigit(): + converted[k] = int(v) + else: + return None + return converted From 22def3457dc058dc0c86235cba300c9bcaca834b Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 30 Aug 2012 23:00:01 +0530 Subject: [PATCH 007/541] Add API endpoint for thumbnail generation --- imgee/views/index.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 291273d6..11928724 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -3,9 +3,9 @@ from flask import render_template, request, flash, g, jsonify from imgee import app, uploadedfiles from imgee.forms import UploadForm -from imgee.models import UploadedFile, db +from imgee.models import UploadedFile, Thumbnail, db from imgee.views.login import lastuser -from imgee.storage import upload, check_file_type +from imgee.storage import upload, is_image, create_thumbnail, convert_size @app.route('/upload', methods=('GET', 'POST')) @@ -20,6 +20,7 @@ def upload_files(): return jsonify({'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], uploaded_file.name)}) return jsonify({'error': 'No file was uploaded'}) + @app.route('/list') @lastuser.requires_login def list_files(): @@ -31,5 +32,19 @@ def list_files(): @app.route('/file/') @lastuser.requires_login def get_thumbnail(filename): + size = request.args.get('size') + if not size: + return jsonify({'error': 'Size not specified'}) uploadedfile = UploadedFile.query.filter_by(name=filename).first() - if check_file_type + if not is_image(uploadedfile.name): + return jsonify({'error': 'File is not an image'}) + existing_thumnail = Thumbnail.query.filter_by(size=size, uploadedfile=uploadedfile).first() + if existing_thumbnail: + return jsonify({'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], existing_thumnail.name)}) + converted_size = convert_size(size) + if not converted_size: + return jsonify({'error': 'The size is invalid'}) + new_thumbnail = create_thumbnail(uploadedfile, converted_size) + if new_thumbnail: + return jsonify({'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumnail.name)}) + return jsonify({'error': 'Thumbnail creation error'}) From bfcb86d5ff2448a056eeb67c6ff412deb00cf6ba Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 4 Sep 2012 16:30:37 +0530 Subject: [PATCH 008/541] Add an index route --- imgee/templates/index.html | 4 +--- imgee/views/index.py | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/imgee/templates/index.html b/imgee/templates/index.html index 0abb4981..75ee0b9e 100644 --- a/imgee/templates/index.html +++ b/imgee/templates/index.html @@ -6,8 +6,6 @@ {% block content %} -

- Insert content here. -

+

The HasGeek Image Hosting Website.

{% endblock %} diff --git a/imgee/views/index.py b/imgee/views/index.py index 11928724..5a82a2d8 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -8,6 +8,9 @@ from imgee.storage import upload, is_image, create_thumbnail, convert_size +@app.route('/') +def index(): + return render_template('index.html') @app.route('/upload', methods=('GET', 'POST')) @lastuser.requires_login def upload_files(): From de5c216c6c5f074395f433a44de0007ef1791a8e Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Wed, 5 Sep 2012 14:27:32 +0530 Subject: [PATCH 009/541] Switch from requires_login to resource_handler --- imgee/views/index.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 5a82a2d8..a2a2716f 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -11,8 +11,10 @@ @app.route('/') def index(): return render_template('index.html') + + @app.route('/upload', methods=('GET', 'POST')) -@lastuser.requires_login +@lastuser.resource_handler def upload_files(): if request.files['uploaded_file']: filename = uploadedfiles.save(request.files['uploaded_file']) @@ -25,7 +27,7 @@ def upload_files(): @app.route('/list') -@lastuser.requires_login +@lastuser.resource_handler def list_files(): files = UploadedFile.query.filter_by(user=g.user).all() file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} @@ -33,7 +35,7 @@ def list_files(): @app.route('/file/') -@lastuser.requires_login +@lastuser.resource_handler def get_thumbnail(filename): size = request.args.get('size') if not size: From 0e947d563aa5ba8bfd7e2c8591682b1e640dda40 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 6 Sep 2012 18:48:41 +0530 Subject: [PATCH 010/541] Renamed UploadedFile, changed upload view --- imgee/models/{uploaded_file.py => file_storage.py} | 6 +++--- imgee/models/thumbnail.py | 2 +- imgee/models/user.py | 2 +- imgee/views/index.py | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) rename imgee/models/{uploaded_file.py => file_storage.py} (52%) diff --git a/imgee/models/uploaded_file.py b/imgee/models/file_storage.py similarity index 52% rename from imgee/models/uploaded_file.py rename to imgee/models/file_storage.py index fd99b6aa..84e92f9c 100644 --- a/imgee/models/uploaded_file.py +++ b/imgee/models/file_storage.py @@ -4,8 +4,8 @@ from imgee.models import db -class UploadedFile(BaseNameMixin, db.Model): - __tablename__ = 'file' +class FileStorage(BaseNameMixin, db.Model): + __tablename__ = 'file_storage' - thumbnails = db.relationship('Thumbnail', backref='uploadedfile') + thumbnails = db.relationship('Thumbnail', backref='file_storage') user_id = db.Column(db.Integer, db.ForeignKey('user.id')) diff --git a/imgee/models/thumbnail.py b/imgee/models/thumbnail.py index 51fcb4de..19149dbb 100644 --- a/imgee/models/thumbnail.py +++ b/imgee/models/thumbnail.py @@ -7,4 +7,4 @@ class Thumbnail(BaseMixin, db.Model): name = db.Column(db.Unicode(250), nullable=False, unique=True, index=True) size = db.Column(db.Unicode(100), nullable=False, index=True) - uploaded_file_id = db.Column(db.Integer, db.ForeignKey('file.id')) + file_storage_id = db.Column(db.Integer, db.ForeignKey('file_storage.id')) diff --git a/imgee/models/user.py b/imgee/models/user.py index 09b49741..a7f6b12d 100644 --- a/imgee/models/user.py +++ b/imgee/models/user.py @@ -7,4 +7,4 @@ class User(UserBase, db.Model): __tablename__ = 'user' - files = db.relationship('UploadedFile', backref='user') + files = db.relationship('FileStorage', backref='user') diff --git a/imgee/views/index.py b/imgee/views/index.py index a2a2716f..63322baa 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- from uuid import uuid4 -from flask import render_template, request, flash, g, jsonify +from flask import render_template, request, flash, g, jsonify, make_response from imgee import app, uploadedfiles from imgee.forms import UploadForm -from imgee.models import UploadedFile, Thumbnail, db +from imgee.models import FileStorage, Thumbnail, db from imgee.views.login import lastuser from imgee.storage import upload, is_image, create_thumbnail, convert_size @@ -18,18 +18,18 @@ def index(): def upload_files(): if request.files['uploaded_file']: filename = uploadedfiles.save(request.files['uploaded_file']) - uploaded_file = UploadedFile(name=uuid4().hex, title=filename, user=g.user) + uploaded_file = FileStorage(name=uuid4().hex, title=filename, user=g.user) db.session.add(uploaded_file) db.session.commit() upload(uploaded_file.name, uploaded_file.title) - return jsonify({'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], uploaded_file.name)}) + return jsonify({'idl': uploaded_file.name}) return jsonify({'error': 'No file was uploaded'}) @app.route('/list') @lastuser.resource_handler def list_files(): - files = UploadedFile.query.filter_by(user=g.user).all() + files = FileStorage.query.filter_by(user=g.user).all() file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} return jsonify(file_list) @@ -40,7 +40,7 @@ def get_thumbnail(filename): size = request.args.get('size') if not size: return jsonify({'error': 'Size not specified'}) - uploadedfile = UploadedFile.query.filter_by(name=filename).first() + uploadedfile = FileStorage.query.filter_by(name=filename).first() if not is_image(uploadedfile.name): return jsonify({'error': 'File is not an image'}) existing_thumnail = Thumbnail.query.filter_by(size=size, uploadedfile=uploadedfile).first() From 888cb413800eaaa6c74e34ba99d5afb0614cfee5 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 6 Sep 2012 19:44:46 +0530 Subject: [PATCH 011/541] Add Profile model --- imgee/models/__init__.py | 1 + imgee/models/file_storage.py | 5 +++-- imgee/models/profile.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 imgee/models/profile.py diff --git a/imgee/models/__init__.py b/imgee/models/__init__.py index 05e9691e..242c55a6 100644 --- a/imgee/models/__init__.py +++ b/imgee/models/__init__.py @@ -8,3 +8,4 @@ from imgee.models.user import * from imgee.models.uploaded_file import * from imgee.models.thumbnail import * +from imgee.models.profile import * diff --git a/imgee/models/file_storage.py b/imgee/models/file_storage.py index 84e92f9c..ff21f226 100644 --- a/imgee/models/file_storage.py +++ b/imgee/models/file_storage.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- from coaster.sqlalchemy import BaseNameMixin -from imgee.models import db +from imgee.models import db, Profile class FileStorage(BaseNameMixin, db.Model): __tablename__ = 'file_storage' + profile_id = db.Column(db.Integer, db.ForeignKey('profile.id'), nullable=False) + profile = db.relationship('Profile', backref='file_storage') thumbnails = db.relationship('Thumbnail', backref='file_storage') - user_id = db.Column(db.Integer, db.ForeignKey('user.id')) diff --git a/imgee/models/profile.py b/imgee/models/profile.py new file mode 100644 index 00000000..2b40c532 --- /dev/null +++ b/imgee/models/profile.py @@ -0,0 +1,29 @@ +from coaster.sqlalchemy import BaseNameMixin +from imgee.models import db + + +class PROFILE_TYPE: + UNDEFINED = 0 + PERSON = 1 + ORGANIZATION = 2 + EVENTSERIES = 3 + + +profile_types = { + 0: u"Undefined", + 1: u"Person", + 2: u"Organization", + 3: u"Event Series", + } + + +class Profile(BaseNameMixin, db.Model): + __tablename__ = 'profile' + + userid = db.Column(db.Unicode(22), nullable=False, unique=True) + description = db.Column(db.UnicodeText, default=u'', nullable=False) + type = db.Column(db.Integer, default=PROFILE_TYPE.UNDEFINED, nullable=False) + + def type_label(self): + return profile_types.get(self.type, profile_types[0]) + From 94930a30de7582791505528089a5c6a486b40764 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 6 Sep 2012 19:46:21 +0530 Subject: [PATCH 012/541] Remove unnecessary import --- imgee/models/file_storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgee/models/file_storage.py b/imgee/models/file_storage.py index ff21f226..96ff0967 100644 --- a/imgee/models/file_storage.py +++ b/imgee/models/file_storage.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from coaster.sqlalchemy import BaseNameMixin -from imgee.models import db, Profile +from imgee.models import db class FileStorage(BaseNameMixin, db.Model): From 470ad0f69a0885e1c325c506ace70071b0a15cbb Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Thu, 6 Sep 2012 20:18:26 +0530 Subject: [PATCH 013/541] Change model name again, add the cached_property --- imgee/models/__init__.py | 2 +- imgee/models/file_storage.py | 12 ------------ imgee/models/stored_file.py | 14 ++++++++++++++ imgee/models/thumbnail.py | 2 +- imgee/models/user.py | 10 +++++++++- imgee/views/index.py | 8 ++++---- 6 files changed, 29 insertions(+), 19 deletions(-) delete mode 100644 imgee/models/file_storage.py create mode 100644 imgee/models/stored_file.py diff --git a/imgee/models/__init__.py b/imgee/models/__init__.py index 242c55a6..1733f752 100644 --- a/imgee/models/__init__.py +++ b/imgee/models/__init__.py @@ -6,6 +6,6 @@ db = SQLAlchemy(app) from imgee.models.user import * -from imgee.models.uploaded_file import * +from imgee.models.stored_file import * from imgee.models.thumbnail import * from imgee.models.profile import * diff --git a/imgee/models/file_storage.py b/imgee/models/file_storage.py deleted file mode 100644 index 96ff0967..00000000 --- a/imgee/models/file_storage.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- - -from coaster.sqlalchemy import BaseNameMixin -from imgee.models import db - - -class FileStorage(BaseNameMixin, db.Model): - __tablename__ = 'file_storage' - - profile_id = db.Column(db.Integer, db.ForeignKey('profile.id'), nullable=False) - profile = db.relationship('Profile', backref='file_storage') - thumbnails = db.relationship('Thumbnail', backref='file_storage') diff --git a/imgee/models/stored_file.py b/imgee/models/stored_file.py new file mode 100644 index 00000000..181e1730 --- /dev/null +++ b/imgee/models/stored_file.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- + +from coaster.sqlalchemy import BaseNameMixin +from imgee.models import db + + +class StoredFile(BaseNameMixin, db.Model): + __tablename__ = 'stored_file' + + profile_id = db.Column(None, db.ForeignKey('profile.id'), nullable=False) + profile = db.relationship('Profile', backref='stored_file') + thumbnails = db.relationship('Thumbnail', backref='stored_file', + cascade='all, delete-orphan') + diff --git a/imgee/models/thumbnail.py b/imgee/models/thumbnail.py index 19149dbb..0a58f204 100644 --- a/imgee/models/thumbnail.py +++ b/imgee/models/thumbnail.py @@ -7,4 +7,4 @@ class Thumbnail(BaseMixin, db.Model): name = db.Column(db.Unicode(250), nullable=False, unique=True, index=True) size = db.Column(db.Unicode(100), nullable=False, index=True) - file_storage_id = db.Column(db.Integer, db.ForeignKey('file_storage.id')) + stored_file_id = db.Column(db.Integer, db.ForeignKey('stored_file.id')) diff --git a/imgee/models/user.py b/imgee/models/user.py index a7f6b12d..7350f603 100644 --- a/imgee/models/user.py +++ b/imgee/models/user.py @@ -1,10 +1,18 @@ # -*- coding: utf-8 -*- from flask.ext.lastuser.sqlalchemy import UserBase +from werkzeug.utils import cached_property from imgee.models import db class User(UserBase, db.Model): __tablename__ = 'user' - files = db.relationship('FileStorage', backref='user') + @cached_property + def profile(self): + return Profile.query.filter_by(userid=self.userid).first() + + @cached_property + def profiles(self): + return [self.profile] + Profile.query.filter( + Profile.userid.in_(self.organizations_owned_ids())).order_by('title').all() diff --git a/imgee/views/index.py b/imgee/views/index.py index 63322baa..7b45f623 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -3,7 +3,7 @@ from flask import render_template, request, flash, g, jsonify, make_response from imgee import app, uploadedfiles from imgee.forms import UploadForm -from imgee.models import FileStorage, Thumbnail, db +from imgee.models import StoredFile, Thumbnail, db from imgee.views.login import lastuser from imgee.storage import upload, is_image, create_thumbnail, convert_size @@ -18,7 +18,7 @@ def index(): def upload_files(): if request.files['uploaded_file']: filename = uploadedfiles.save(request.files['uploaded_file']) - uploaded_file = FileStorage(name=uuid4().hex, title=filename, user=g.user) + uploaded_file = StoredFile(name=uuid4().hex, title=filename, user=g.user) db.session.add(uploaded_file) db.session.commit() upload(uploaded_file.name, uploaded_file.title) @@ -29,7 +29,7 @@ def upload_files(): @app.route('/list') @lastuser.resource_handler def list_files(): - files = FileStorage.query.filter_by(user=g.user).all() + files = StoredFile.query.filter_by(user=g.user).all() file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} return jsonify(file_list) @@ -40,7 +40,7 @@ def get_thumbnail(filename): size = request.args.get('size') if not size: return jsonify({'error': 'Size not specified'}) - uploadedfile = FileStorage.query.filter_by(name=filename).first() + uploadedfile = StoredFile.query.filter_by(name=filename).first() if not is_image(uploadedfile.name): return jsonify({'error': 'File is not an image'}) existing_thumnail = Thumbnail.query.filter_by(size=size, uploadedfile=uploadedfile).first() From d054ea1c3a559ca40745ecbf7e99b1d4c99165e5 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 11 Sep 2012 16:48:46 +0530 Subject: [PATCH 014/541] Added Profile support --- imgee/storage.py | 6 +++--- imgee/views/index.py | 42 ++++++++++++++++++++++++++---------------- imgee/views/login.py | 44 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 67 insertions(+), 25 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index 4ce83b5f..e9979927 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -31,16 +31,16 @@ def is_image(filename): return False -def create_thumbnail(uploadedfile, size): +def create_thumbnail(stored_file, size): """ Create a thumbnail for a given file and given size """ - thumbnail = Thumbnail(name=uuid4().hex, size=size, uploadedfile=uploadedfile) + thumbnail = Thumbnail(name=uuid4().hex, size=size, stored_file=stored_file) conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) bucket = Bucket(conn, app.config['AWS_BUCKET']) thumbnail_path = path.join(app.config['UPLOADED_FILES_DEST'], thumbnail.name) k = Key(bucket) - k.key = uploadedfile.name + k.key = stored_file.name k.get_contents_to_filename(thumbnail_path) try: img = Image.open(thumbnail_path) diff --git a/imgee/views/index.py b/imgee/views/index.py index 7b45f623..d11945c6 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -3,8 +3,8 @@ from flask import render_template, request, flash, g, jsonify, make_response from imgee import app, uploadedfiles from imgee.forms import UploadForm -from imgee.models import StoredFile, Thumbnail, db -from imgee.views.login import lastuser +from imgee.models import StoredFile, Thumbnail, db, Profile +from imgee.views.login import lastuser, make_profiles from imgee.storage import upload, is_image, create_thumbnail, convert_size @@ -13,30 +13,40 @@ def index(): return render_template('index.html') -@app.route('/upload', methods=('GET', 'POST')) -@lastuser.resource_handler -def upload_files(): - if request.files['uploaded_file']: +@app.route('/upload', methods=('POST')) +@lastuser.resource_handler('imgee/upload') +def upload_files(callerinfo): + profileid = request.args.get('profileid', g.user.userid) + make_profiles() + if profileid not in g.user.user_organizations_owned_ids(): + return jsonify({'error': 'You do not have permission to access this resource'})j + if 'uploaded_file' in request.files: filename = uploadedfiles.save(request.files['uploaded_file']) - uploaded_file = StoredFile(name=uuid4().hex, title=filename, user=g.user) - db.session.add(uploaded_file) + profile = Profile.query(userid=profileid).first() + stored_file = StoredFile(name=uuid4().hex, title=filename, profile=profile) + db.session.add(stored_file) db.session.commit() - upload(uploaded_file.name, uploaded_file.title) - return jsonify({'idl': uploaded_file.name}) + upload(stored_file.name, stored_file.title) + return jsonify({'id': uploaded_file.name}) return jsonify({'error': 'No file was uploaded'}) @app.route('/list') -@lastuser.resource_handler -def list_files(): - files = StoredFile.query.filter_by(user=g.user).all() - file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} - return jsonify(file_list) +@lastuser.resource_handler('imgee/list') +def list_files(callerinfo): + profileid = request.args.get('profileid', g.user.userid) + make_profiles() + if profileid in g.user.user_organizations_owned_ids(): + files = StoredFile.query.filter(Profile.userid == profileid).all() + file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} + return jsonify(file_list) + return jsonify({'error': 'You do not have permission to access this resource'}) @app.route('/file/') -@lastuser.resource_handler +@lastuser.resource_handler('imgee/thumbnail') def get_thumbnail(filename): + make_profiles() size = request.args.get('size') if not size: return jsonify({'error': 'Size not specified'}) diff --git a/imgee/views/login.py b/imgee/views/login.py index 061bbc73..03f3f58e 100644 --- a/imgee/views/login.py +++ b/imgee/views/login.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -from flask import Response, redirect, flash +from flask import Response, redirect, flash, g +from flask.ext.lastuser import LastUser from flask.ext.lastuser.sqlalchemy import UserManager from coaster.views import get_next_url from imgee import app, lastuser -from imgee.models import db, User +from imgee.models import db, User, Profile, PROFILE_TYPE lastuser.init_usermanager(UserManager(db, User)) @@ -13,21 +14,52 @@ @app.route('/login') @lastuser.login_handler def login(): - return {'scope': 'id'} + return {'scope': 'id email organizations'} @app.route('/logout') @lastuser.logout_handler def logout(): - flash(u"You are now logged out", category='success') + flash(u"You are now logged out", category='info') return get_next_url() + +def make_profiles(): + # Make profiles for the user's organizations + username = g.user.username or g.user.userid + profile = Profile.query.filter_by(userid=g.user.userid).first() + if profile is None: + profile = Profile(userid=g.user.userid, + name=g.user.username or g.user.userid, + title=g.user.fullname, + type=PROFILE_TYPE.PERSON) + db.session.add(profile) + else: + if profile.name != username: + profile.name = username + if profile.title != g.user.fullname: + profile.title = g.user.fullname + for org in g.user.organizations_owned(): + profile = Profile.query.filter_by(userid=org['userid']).first() + if profile is None: + profile = Profile(userid=org['userid'], + name=org['name'], + title=org['title'], + type=PROFILE_TYPE.ORGANIZATION) + db.session.add(profile) + else: + if profile.name != org['name']: + profile.name = org['name'] + if profile.title != org['title']: + profile.title = org['title'] + db.session.commit() + + @app.route('/login/redirect') @lastuser.auth_handler def lastuserauth(): - # Save the user object - db.session.commit() + make_profiles() return redirect(get_next_url()) From 392d1e21928f4dea33ff0242122e02efe00cffda Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 11 Sep 2012 17:38:35 +0530 Subject: [PATCH 015/541] Upload endpoint working --- imgee/views/index.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index d11945c6..7f0a9b4b 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -13,21 +13,21 @@ def index(): return render_template('index.html') -@app.route('/upload', methods=('POST')) +@app.route('/upload', methods=['POST']) @lastuser.resource_handler('imgee/upload') def upload_files(callerinfo): profileid = request.args.get('profileid', g.user.userid) make_profiles() if profileid not in g.user.user_organizations_owned_ids(): - return jsonify({'error': 'You do not have permission to access this resource'})j - if 'uploaded_file' in request.files: - filename = uploadedfiles.save(request.files['uploaded_file']) - profile = Profile.query(userid=profileid).first() + return jsonify({'error': 'You do not have permission to access this resource'}) + if request.files.get('stored_file', None): + filename = uploadedfiles.save(request.files['stored_file']) + profile = Profile.query.filter_by(userid=profileid).first() stored_file = StoredFile(name=uuid4().hex, title=filename, profile=profile) db.session.add(stored_file) db.session.commit() upload(stored_file.name, stored_file.title) - return jsonify({'id': uploaded_file.name}) + return jsonify({'id': stored_file.name}) return jsonify({'error': 'No file was uploaded'}) From 083af0f0e59b7beb53f33340afb13d8d14130622 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 11 Sep 2012 19:28:32 +0530 Subject: [PATCH 016/541] Use basename --- imgee/views/index.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 7f0a9b4b..20942490 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import os.path from uuid import uuid4 from flask import render_template, request, flash, g, jsonify, make_response from imgee import app, uploadedfiles @@ -21,7 +22,7 @@ def upload_files(callerinfo): if profileid not in g.user.user_organizations_owned_ids(): return jsonify({'error': 'You do not have permission to access this resource'}) if request.files.get('stored_file', None): - filename = uploadedfiles.save(request.files['stored_file']) + filename = uploadedfiles.save(request.files['stored_file'], name=os.path.basename(request.files['stored_file'].filename)) profile = Profile.query.filter_by(userid=profileid).first() stored_file = StoredFile(name=uuid4().hex, title=filename, profile=profile) db.session.add(stored_file) From c56c3c1d3d695026d07c999b44c20d9062849542 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 11 Sep 2012 19:49:12 +0530 Subject: [PATCH 017/541] Save the title correctly --- imgee/views/index.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 20942490..d004d0e2 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -22,12 +22,12 @@ def upload_files(callerinfo): if profileid not in g.user.user_organizations_owned_ids(): return jsonify({'error': 'You do not have permission to access this resource'}) if request.files.get('stored_file', None): - filename = uploadedfiles.save(request.files['stored_file'], name=os.path.basename(request.files['stored_file'].filename)) + filename = uploadedfiles.save(request.files['stored_file']) profile = Profile.query.filter_by(userid=profileid).first() - stored_file = StoredFile(name=uuid4().hex, title=filename, profile=profile) + stored_file = StoredFile(name=uuid4().hex, title=os.path.basename(request.files['stored_file'].filename), profile=profile) db.session.add(stored_file) db.session.commit() - upload(stored_file.name, stored_file.title) + upload(stored_file.name, filename) return jsonify({'id': stored_file.name}) return jsonify({'error': 'No file was uploaded'}) From 20672996045d15f9a1c3032326c6112dcd034dd6 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 11 Sep 2012 20:52:21 +0530 Subject: [PATCH 018/541] Updated thumbnail view. It's not a resource endpoint --- imgee/views/index.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index d004d0e2..f561054a 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os.path from uuid import uuid4 -from flask import render_template, request, flash, g, jsonify, make_response +from flask import render_template, request, flash, g, jsonify, make_response, redirect from imgee import app, uploadedfiles from imgee.forms import UploadForm from imgee.models import StoredFile, Thumbnail, db, Profile @@ -45,22 +45,17 @@ def list_files(callerinfo): @app.route('/file/') -@lastuser.resource_handler('imgee/thumbnail') def get_thumbnail(filename): make_profiles() size = request.args.get('size') - if not size: - return jsonify({'error': 'Size not specified'}) - uploadedfile = StoredFile.query.filter_by(name=filename).first() - if not is_image(uploadedfile.name): - return jsonify({'error': 'File is not an image'}) + stored_file = StoredFile.query.filter_by(name=filename).first() + converted_size = convert_size(size) + if not size or is_image(uploadedfile.name) or not converted_size: + return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) existing_thumnail = Thumbnail.query.filter_by(size=size, uploadedfile=uploadedfile).first() if existing_thumbnail: - return jsonify({'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], existing_thumnail.name)}) - converted_size = convert_size(size) - if not converted_size: - return jsonify({'error': 'The size is invalid'}) + return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], existing_thumnail.name)) new_thumbnail = create_thumbnail(uploadedfile, converted_size) if new_thumbnail: - return jsonify({'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumnail.name)}) - return jsonify({'error': 'Thumbnail creation error'}) + return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumnail.name)) + return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) From c740e0a92060d316a859dabac13c4f1510a0ac76 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 11 Sep 2012 21:05:03 +0530 Subject: [PATCH 019/541] Thumbnail generation code a little more bugfree --- imgee/storage.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/imgee/storage.py b/imgee/storage.py index e9979927..a2684d9f 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -5,6 +5,7 @@ from boto.s3.key import Key from PIL import Image from imgee import app +from imgee.models import db IMAGES = list('jpg jpe jpeg png gif svg bmp'.split()) @@ -36,6 +37,8 @@ def create_thumbnail(stored_file, size): Create a thumbnail for a given file and given size """ thumbnail = Thumbnail(name=uuid4().hex, size=size, stored_file=stored_file) + db.session.add(thumbnail) + db.session.commit() conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) bucket = Bucket(conn, app.config['AWS_BUCKET']) thumbnail_path = path.join(app.config['UPLOADED_FILES_DEST'], thumbnail.name) @@ -46,7 +49,7 @@ def create_thumbnail(stored_file, size): img = Image.open(thumbnail_path) img.load() img.thumbnail(size, Image.ANTIALIAS) - img.save(thumbnail_pathj) + img.save(thumbnail_path) except IOError: return None return thumbnail.name From fdd1eeac041031e72973d3d01f16280db0cb634c Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Tue, 11 Sep 2012 21:05:28 +0530 Subject: [PATCH 020/541] Delete route --- imgee/views/index.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/imgee/views/index.py b/imgee/views/index.py index f561054a..244bb882 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -59,3 +59,21 @@ def get_thumbnail(filename): if new_thumbnail: return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumnail.name)) return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) + + +@app.route('/delete') +@lastuser.resource_handler('imgee/delete') +def list_files(callerinfo): + profileid = request.args.get('profileid', g.user.userid) + fileid = request.args.get('fileid', g.user.userid) + if not fileid: + return jsonify({'error': 'No filename given'}) + make_profiles() + if profileid in g.user.user_organizations_owned_ids(): + stored_file = StoredFile.query.filter_by(name=fileid).first() + if stored_file: + db.session.delete(stored_file) + db.session.commit() + return jsonify({'success': 'File deleted'}) + return jsonify({'error': 'No file found'}) + return jsonify({'error': 'You do not have permission to access this resource'}) From 21d9daa6f74b1f4def0aed2ce99397ce1a82566d Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Wed, 12 Sep 2012 14:24:06 +0530 Subject: [PATCH 021/541] Delete image and thumbnails --- imgee/storage.py | 11 +++++++++++ imgee/views/index.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/imgee/storage.py b/imgee/storage.py index a2684d9f..b5f9aa39 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -65,3 +65,14 @@ def convert_size(size): else: return None return converted + + +def delete_image(stored_file): + """ + Delete all the thumbnails and images associated with a file + """ + keys = [thumbnail.name for thumbnail in stored_file.thumbnails] + keys.append(stored_file.name) + conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) + bucket = Bucket(conn, app.config['AWS_BUCKET']) + bucket.delete_keys(keys) diff --git a/imgee/views/index.py b/imgee/views/index.py index 244bb882..ffe998d1 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -6,7 +6,7 @@ from imgee.forms import UploadForm from imgee.models import StoredFile, Thumbnail, db, Profile from imgee.views.login import lastuser, make_profiles -from imgee.storage import upload, is_image, create_thumbnail, convert_size +from imgee.storage import upload, is_image, create_thumbnail, convert_size, delete_image @app.route('/') @@ -72,6 +72,7 @@ def list_files(callerinfo): if profileid in g.user.user_organizations_owned_ids(): stored_file = StoredFile.query.filter_by(name=fileid).first() if stored_file: + delete_image(stored_file) db.session.delete(stored_file) db.session.commit() return jsonify({'success': 'File deleted'}) From ff6a9aa42cdcef88ec4e719e41edbada01b3abab Mon Sep 17 00:00:00 2001 From: Kiran Jonnalagadda Date: Wed, 12 Sep 2012 16:46:50 +0530 Subject: [PATCH 022/541] Corrections courtesy SublimeLinter. --- imgee/__init__.py | 1 + imgee/models/profile.py | 1 - imgee/models/stored_file.py | 1 - imgee/models/user.py | 1 + imgee/storage.py | 2 +- imgee/views/index.py | 15 +++++++-------- imgee/views/login.py | 2 -- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/imgee/__init__.py b/imgee/__init__.py index f369a4c6..c540cfa5 100644 --- a/imgee/__init__.py +++ b/imgee/__init__.py @@ -29,6 +29,7 @@ import imgee.models import imgee.views + # Configure the app def init_for(env): coaster.app.init_app(app, env) diff --git a/imgee/models/profile.py b/imgee/models/profile.py index 2b40c532..5f2aedde 100644 --- a/imgee/models/profile.py +++ b/imgee/models/profile.py @@ -26,4 +26,3 @@ class Profile(BaseNameMixin, db.Model): def type_label(self): return profile_types.get(self.type, profile_types[0]) - diff --git a/imgee/models/stored_file.py b/imgee/models/stored_file.py index 181e1730..6e2bd169 100644 --- a/imgee/models/stored_file.py +++ b/imgee/models/stored_file.py @@ -11,4 +11,3 @@ class StoredFile(BaseNameMixin, db.Model): profile = db.relationship('Profile', backref='stored_file') thumbnails = db.relationship('Thumbnail', backref='stored_file', cascade='all, delete-orphan') - diff --git a/imgee/models/user.py b/imgee/models/user.py index 7350f603..78750535 100644 --- a/imgee/models/user.py +++ b/imgee/models/user.py @@ -3,6 +3,7 @@ from flask.ext.lastuser.sqlalchemy import UserBase from werkzeug.utils import cached_property from imgee.models import db +from imgee.models.profile import Profile class User(UserBase, db.Model): diff --git a/imgee/storage.py b/imgee/storage.py index b5f9aa39..71754f72 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -5,7 +5,7 @@ from boto.s3.key import Key from PIL import Image from imgee import app -from imgee.models import db +from imgee.models import db, Thumbnail IMAGES = list('jpg jpe jpeg png gif svg bmp'.split()) diff --git a/imgee/views/index.py b/imgee/views/index.py index ffe998d1..e654c21a 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- import os.path from uuid import uuid4 -from flask import render_template, request, flash, g, jsonify, make_response, redirect +from flask import render_template, request, g, jsonify, redirect from imgee import app, uploadedfiles -from imgee.forms import UploadForm from imgee.models import StoredFile, Thumbnail, db, Profile from imgee.views.login import lastuser, make_profiles from imgee.storage import upload, is_image, create_thumbnail, convert_size, delete_image @@ -50,20 +49,20 @@ def get_thumbnail(filename): size = request.args.get('size') stored_file = StoredFile.query.filter_by(name=filename).first() converted_size = convert_size(size) - if not size or is_image(uploadedfile.name) or not converted_size: + if not size or is_image(stored_file.name) or not converted_size: return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) - existing_thumnail = Thumbnail.query.filter_by(size=size, uploadedfile=uploadedfile).first() + existing_thumbnail = Thumbnail.query.filter_by(size=size, stored_file=stored_file).first() if existing_thumbnail: - return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], existing_thumnail.name)) - new_thumbnail = create_thumbnail(uploadedfile, converted_size) + return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], existing_thumbnail.name)) + new_thumbnail = create_thumbnail(stored_file, converted_size) if new_thumbnail: - return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumnail.name)) + return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumbnail.name)) return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) @app.route('/delete') @lastuser.resource_handler('imgee/delete') -def list_files(callerinfo): +def delete_files(callerinfo): profileid = request.args.get('profileid', g.user.userid) fileid = request.args.get('fileid', g.user.userid) if not fileid: diff --git a/imgee/views/login.py b/imgee/views/login.py index 03f3f58e..710053dd 100644 --- a/imgee/views/login.py +++ b/imgee/views/login.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from flask import Response, redirect, flash, g -from flask.ext.lastuser import LastUser from flask.ext.lastuser.sqlalchemy import UserManager from coaster.views import get_next_url @@ -24,7 +23,6 @@ def logout(): return get_next_url() - def make_profiles(): # Make profiles for the user's organizations username = g.user.username or g.user.userid From faebaf8ea4f24692c2b8a193e2635b09477f2a0b Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 25 Mar 2013 18:36:43 +0530 Subject: [PATCH 023/541] add missing requirements --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index b30cec40..ec2387c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,6 @@ Flask-SQLAlchemy https://github.com/hasgeek/flask-lastuser/zipball/master Flask-Admin boto +-e git+http://github.com/FelixLoether/flask-uploads#egg=Flask-Uploads +-e git://github.com/kvesteri/flask-storage.git#egg=Flask-Storage +PIL From 5d6b5f70430d75d2f7ba4d428145f6cd612cbc54 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 25 Mar 2013 18:40:31 +0530 Subject: [PATCH 024/541] make upload work with latest flask-uploads --- imgee/__init__.py | 7 ++++--- imgee/templates/form.html | 2 +- imgee/views/index.py | 26 ++++++++++++++------------ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/imgee/__init__.py b/imgee/__init__.py index c540cfa5..64e0f7b9 100644 --- a/imgee/__init__.py +++ b/imgee/__init__.py @@ -5,7 +5,9 @@ from flask import Flask from flask.ext.assets import Environment, Bundle from flask.ext.lastuser import LastUser -from flask.ext.uploads import UploadSet, configure_uploads, ALL +from flask.ext.sqlalchemy import SQLAlchemy +from flask.ext.uploads import init +from flask.ext.storage import get_default_storage_class from baseframe import baseframe, baseframe_js, baseframe_css import coaster.app @@ -22,7 +24,6 @@ js = Bundle(baseframe_js) css = Bundle(baseframe_css, 'css/app.css') -uploadedfiles = UploadSet(extensions=ALL) # Third, after config, import the models and views @@ -36,4 +37,4 @@ def init_for(env): assets.register('js_all', js) assets.register('css_all', css) lastuser.init_app(app) - configure_uploads(app, (uploadedfiles)) + init(SQLAlchemy(app), get_default_storage_class(app)) diff --git a/imgee/templates/form.html b/imgee/templates/form.html index aa3da206..92c356d1 100644 --- a/imgee/templates/form.html +++ b/imgee/templates/form.html @@ -7,6 +7,6 @@ {% block content %} -{{ renderform(form, multipart=True) }} +{{ renderform(form, "upload", multipart=True) }} {% endblock %} diff --git a/imgee/views/index.py b/imgee/views/index.py index e654c21a..53fd5af9 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -2,33 +2,35 @@ import os.path from uuid import uuid4 from flask import render_template, request, g, jsonify, redirect -from imgee import app, uploadedfiles +from imgee import app, forms +from flask.ext.uploads import save from imgee.models import StoredFile, Thumbnail, db, Profile from imgee.views.login import lastuser, make_profiles from imgee.storage import upload, is_image, create_thumbnail, convert_size, delete_image - @app.route('/') def index(): return render_template('index.html') -@app.route('/upload', methods=['POST']) +@app.route('/upload', methods=['GET', 'POST']) @lastuser.resource_handler('imgee/upload') -def upload_files(callerinfo): - profileid = request.args.get('profileid', g.user.userid) - make_profiles() - if profileid not in g.user.user_organizations_owned_ids(): - return jsonify({'error': 'You do not have permission to access this resource'}) - if request.files.get('stored_file', None): - filename = uploadedfiles.save(request.files['stored_file']) +def upload_files(): + if request.method == 'GET': + upload_form = forms.UploadForm() + return render_template('form.html', form=upload_form) + else: + profileid = request.args.get('profileid', g.user.userid) + make_profiles() + if profileid not in g.user.user_organizations_owned_ids(): + return jsonify({'error': 'You do not have permission to access this resource'}) + filename = save(request.files['uploaded_file']) profile = Profile.query.filter_by(userid=profileid).first() stored_file = StoredFile(name=uuid4().hex, title=os.path.basename(request.files['stored_file'].filename), profile=profile) db.session.add(stored_file) db.session.commit() upload(stored_file.name, filename) return jsonify({'id': stored_file.name}) - return jsonify({'error': 'No file was uploaded'}) @app.route('/list') @@ -60,7 +62,7 @@ def get_thumbnail(filename): return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) -@app.route('/delete') +@app.route('/delete', methods=['POST']) @lastuser.resource_handler('imgee/delete') def delete_files(callerinfo): profileid = request.args.get('profileid', g.user.userid) From 8c02b1af87938869ed6e8db9e3f0f06c1c202217 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 25 Mar 2013 18:48:04 +0530 Subject: [PATCH 025/541] pass aws credentials to flask-storage --- instance/settings.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/instance/settings.py b/instance/settings.py index 3055e362..23753411 100644 --- a/instance/settings.py +++ b/instance/settings.py @@ -37,5 +37,12 @@ AWS_ACCESS_KEY = 'Set aws access key here' AWS_SECRET_KEY = 'Set aws secret key here' AWS_BUCKET = 'set your bucketname here' + +# bear with the non-standard aws key names used in flask-storage + +AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY +AWS_SECRET_ACCESS_KEY=AWS_SECRET_KEY +AWS_STORAGE_BUCKET_NAME=AWS_BUCKET + #: Domain name for files MEDIA_DOMAIN = 'set domain name here' From 7a8a02e2a0f96fe6388d8bfeb041a97d065cd461 Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 26 Mar 2013 15:11:29 +0530 Subject: [PATCH 026/541] fix db in uploads init --- imgee/__init__.py | 7 ++----- runserver.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/imgee/__init__.py b/imgee/__init__.py index 64e0f7b9..3e54c535 100644 --- a/imgee/__init__.py +++ b/imgee/__init__.py @@ -5,7 +5,6 @@ from flask import Flask from flask.ext.assets import Environment, Bundle from flask.ext.lastuser import LastUser -from flask.ext.sqlalchemy import SQLAlchemy from flask.ext.uploads import init from flask.ext.storage import get_default_storage_class from baseframe import baseframe, baseframe_js, baseframe_css @@ -22,19 +21,17 @@ assets = Environment(app) js = Bundle(baseframe_js) -css = Bundle(baseframe_css, - 'css/app.css') +css = Bundle(baseframe_css, 'css/app.css') # Third, after config, import the models and views import imgee.models import imgee.views - # Configure the app def init_for(env): coaster.app.init_app(app, env) assets.register('js_all', js) assets.register('css_all', css) lastuser.init_app(app) - init(SQLAlchemy(app), get_default_storage_class(app)) + init(imgee.models.db, get_default_storage_class(app)) diff --git a/runserver.py b/runserver.py index 5087fab2..08b48d9d 100755 --- a/runserver.py +++ b/runserver.py @@ -1,6 +1,6 @@ #!/usr/bin/env python from imgee import app, init_for from imgee.models import db -init_for('dev') db.create_all() +init_for('dev') app.run('0.0.0.0', debug=True, port=4500) From 9c13e6552f9469e4faf95fa983afa09584fd1e77 Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 26 Mar 2013 17:40:54 +0530 Subject: [PATCH 027/541] clean up --- imgee/storage.py | 12 +++++------- imgee/views/index.py | 7 ++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index 71754f72..3be2ec7a 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -8,18 +8,18 @@ from imgee.models import db, Thumbnail -IMAGES = list('jpg jpe jpeg png gif svg bmp'.split()) +IMAGES = 'jpg jpe jpeg png gif svg bmp'.split() -def upload(name, title): +def upload(local_name, remote_name=None): """ Upload a file to S3 """ conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) bucket = Bucket(conn, app.config['AWS_BUCKET']) k = Key(bucket) - k.key = name - k.set_contents_from_filename(path.join(app.config['UPLOADED_FILES_DEST'], title)) + k.key = remote_name or local_name + k.set_contents_from_filename(path.join(app.config['UPLOADED_FILES_DEST'], local_name)) def is_image(filename): @@ -27,9 +27,7 @@ def is_image(filename): Check if a given filename is an image or not """ extension = filename.rsplit('.', 1)[-1] - if extension in IMAGES: - return True - return False + return extension in IMAGES def create_thumbnail(stored_file, size): diff --git a/imgee/views/index.py b/imgee/views/index.py index 53fd5af9..06feb39a 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -24,12 +24,13 @@ def upload_files(): make_profiles() if profileid not in g.user.user_organizations_owned_ids(): return jsonify({'error': 'You do not have permission to access this resource'}) - filename = save(request.files['uploaded_file']) + save(request.files['uploaded_file']) + localname = os.path.basename(request.files['stored_file'].filename) profile = Profile.query.filter_by(userid=profileid).first() - stored_file = StoredFile(name=uuid4().hex, title=os.path.basename(request.files['stored_file'].filename), profile=profile) + stored_file = StoredFile(name=uuid4().hex, title=localname, profile=profile) db.session.add(stored_file) db.session.commit() - upload(stored_file.name, filename) + upload(localname, stored_file.name) return jsonify({'id': stored_file.name}) From 3b6a695b1810889c0386a91295a8cd3eeb75398b Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 26 Mar 2013 17:43:15 +0530 Subject: [PATCH 028/541] create tables at the right place --- runserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runserver.py b/runserver.py index 08b48d9d..5087fab2 100755 --- a/runserver.py +++ b/runserver.py @@ -1,6 +1,6 @@ #!/usr/bin/env python from imgee import app, init_for from imgee.models import db -db.create_all() init_for('dev') +db.create_all() app.run('0.0.0.0', debug=True, port=4500) From 6b82e30ad48ff93b28221e5709ecd00ad33926fd Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 26 Mar 2013 17:46:20 +0530 Subject: [PATCH 029/541] add login_required --- imgee/views/index.py | 5 ++++- imgee/views/login.py | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 06feb39a..ebac90f1 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -5,7 +5,7 @@ from imgee import app, forms from flask.ext.uploads import save from imgee.models import StoredFile, Thumbnail, db, Profile -from imgee.views.login import lastuser, make_profiles +from imgee.views.login import lastuser, make_profiles, login_required from imgee.storage import upload, is_image, create_thumbnail, convert_size, delete_image @app.route('/') @@ -15,6 +15,7 @@ def index(): @app.route('/upload', methods=['GET', 'POST']) @lastuser.resource_handler('imgee/upload') +@login_required def upload_files(): if request.method == 'GET': upload_form = forms.UploadForm() @@ -36,6 +37,7 @@ def upload_files(): @app.route('/list') @lastuser.resource_handler('imgee/list') +@login_required def list_files(callerinfo): profileid = request.args.get('profileid', g.user.userid) make_profiles() @@ -65,6 +67,7 @@ def get_thumbnail(filename): @app.route('/delete', methods=['POST']) @lastuser.resource_handler('imgee/delete') +@login_required def delete_files(callerinfo): profileid = request.args.get('profileid', g.user.userid) fileid = request.args.get('fileid', g.user.userid) diff --git a/imgee/views/login.py b/imgee/views/login.py index 710053dd..681673b9 100644 --- a/imgee/views/login.py +++ b/imgee/views/login.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- -from flask import Response, redirect, flash, g +from functools import wraps + +from flask import Response, redirect, flash, g, url_for, request from flask.ext.lastuser.sqlalchemy import UserManager from coaster.views import get_next_url @@ -9,6 +11,13 @@ lastuser.init_usermanager(UserManager(db, User)) +def login_required(f): + @wraps(f) + def decorated_func(*args, **kwargs): + if g.user is None: + return redirect(url_for('login', next=request.url)) + return f(*args, **kwargs) + return decorated_func @app.route('/login') @lastuser.login_handler From 751be22c5736c85f2f7b018e9b7a437e34e50bc6 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 27 Mar 2013 16:02:35 +0530 Subject: [PATCH 030/541] validate form --- imgee/forms.py | 4 ++-- imgee/views/index.py | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index e30fd7ae..bb75ec2d 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -from flask.ext.wtf import Form, FileField +from flask.ext.wtf import Form, FileField, Required class UploadForm(Form): - uploaded_file = FileField("Uploaded File") + uploaded_file = FileField("Uploaded File", validators=[Required()]) diff --git a/imgee/views/index.py b/imgee/views/index.py index ebac90f1..9b0640d4 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -17,23 +17,23 @@ def index(): @lastuser.resource_handler('imgee/upload') @login_required def upload_files(): - if request.method == 'GET': - upload_form = forms.UploadForm() - return render_template('form.html', form=upload_form) - else: - profileid = request.args.get('profileid', g.user.userid) - make_profiles() - if profileid not in g.user.user_organizations_owned_ids(): - return jsonify({'error': 'You do not have permission to access this resource'}) + profileid = request.args.get('profileid', g.user.userid) + make_profiles() + if profileid not in g.user.user_organizations_owned_ids(): + return jsonify({'error': 'You do not have permission to access this resource'}) + + upload_form = forms.UploadForm() + if upload_form.validate_on_submit(): save(request.files['uploaded_file']) - localname = os.path.basename(request.files['stored_file'].filename) + localname = os.path.basename(request.files['uploaded_file'].filename) profile = Profile.query.filter_by(userid=profileid).first() stored_file = StoredFile(name=uuid4().hex, title=localname, profile=profile) db.session.add(stored_file) db.session.commit() upload(localname, stored_file.name) return jsonify({'id': stored_file.name}) - + # form invalid or request.method == 'GET' + return render_template('form.html', form=upload_form) @app.route('/list') @lastuser.resource_handler('imgee/list') From 5ef3317493b91c4f12d10f6ef5216f440b228cc9 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 27 Mar 2013 16:06:47 +0530 Subject: [PATCH 031/541] save the image directly in s3 --- imgee/views/index.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 9b0640d4..a6a6036d 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -24,13 +24,12 @@ def upload_files(): upload_form = forms.UploadForm() if upload_form.validate_on_submit(): - save(request.files['uploaded_file']) localname = os.path.basename(request.files['uploaded_file'].filename) profile = Profile.query.filter_by(userid=profileid).first() stored_file = StoredFile(name=uuid4().hex, title=localname, profile=profile) db.session.add(stored_file) db.session.commit() - upload(localname, stored_file.name) + save(request.files['uploaded_file'], stored_file.name) return jsonify({'id': stored_file.name}) # form invalid or request.method == 'GET' return render_template('form.html', form=upload_form) From 01ecbdd7ed4f718d8416f14ae28027613b7f1520 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 27 Mar 2013 16:19:24 +0530 Subject: [PATCH 032/541] secure filename and other small fixes --- imgee/views/index.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index a6a6036d..101959b8 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- -import os.path +from werkzeug import secure_filename from uuid import uuid4 from flask import render_template, request, g, jsonify, redirect -from imgee import app, forms from flask.ext.uploads import save + +from imgee import app, forms from imgee.models import StoredFile, Thumbnail, db, Profile from imgee.views.login import lastuser, make_profiles, login_required from imgee.storage import upload, is_image, create_thumbnail, convert_size, delete_image @@ -13,20 +14,20 @@ def index(): return render_template('index.html') -@app.route('/upload', methods=['GET', 'POST']) +@app.route('/upload', methods=('GET', 'POST')) @lastuser.resource_handler('imgee/upload') @login_required def upload_files(): - profileid = request.args.get('profileid', g.user.userid) + profileid = g.user.userid make_profiles() if profileid not in g.user.user_organizations_owned_ids(): return jsonify({'error': 'You do not have permission to access this resource'}) upload_form = forms.UploadForm() if upload_form.validate_on_submit(): - localname = os.path.basename(request.files['uploaded_file'].filename) + filename = secure_filename(request.files['uploaded_file'].filename) profile = Profile.query.filter_by(userid=profileid).first() - stored_file = StoredFile(name=uuid4().hex, title=localname, profile=profile) + stored_file = StoredFile(name=uuid4().hex, title=filename, profile=profile) db.session.add(stored_file) db.session.commit() save(request.files['uploaded_file'], stored_file.name) From 91154d43cc49d7b21b12239e8bf550e736c76fc2 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 27 Mar 2013 16:28:42 +0530 Subject: [PATCH 033/541] upload the file with the same extension as src --- imgee/views/index.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 101959b8..cf371a58 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import os.path from werkzeug import secure_filename from uuid import uuid4 from flask import render_template, request, g, jsonify, redirect @@ -26,8 +27,10 @@ def upload_files(): upload_form = forms.UploadForm() if upload_form.validate_on_submit(): filename = secure_filename(request.files['uploaded_file'].filename) + extn = os.path.splitext(filename)[1] + uniq_name = uuid4().hex + extn profile = Profile.query.filter_by(userid=profileid).first() - stored_file = StoredFile(name=uuid4().hex, title=filename, profile=profile) + stored_file = StoredFile(name=uniq_name, title=filename, profile=profile) db.session.add(stored_file) db.session.commit() save(request.files['uploaded_file'], stored_file.name) From c0fbe45fc41f3d88dd930f0af50f25cca6dfaeec Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 27 Mar 2013 17:07:54 +0530 Subject: [PATCH 034/541] rename route /upload as /new --- imgee/views/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index cf371a58..ca386061 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -15,7 +15,7 @@ def index(): return render_template('index.html') -@app.route('/upload', methods=('GET', 'POST')) +@app.route('/new', methods=('GET', 'POST')) @lastuser.resource_handler('imgee/upload') @login_required def upload_files(): @@ -41,7 +41,7 @@ def upload_files(): @app.route('/list') @lastuser.resource_handler('imgee/list') @login_required -def list_files(callerinfo): +def list_files(): profileid = request.args.get('profileid', g.user.userid) make_profiles() if profileid in g.user.user_organizations_owned_ids(): From c8be139adee090d92fd1ec06b1cc2b1a87ee8e77 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 27 Mar 2013 18:38:33 +0530 Subject: [PATCH 035/541] clean up --- imgee/storage.py | 42 ++++++++++++++++-------------------------- imgee/views/index.py | 20 ++++++++------------ 2 files changed, 24 insertions(+), 38 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index 3be2ec7a..9f6e7ae3 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -1,5 +1,6 @@ -from os import path +import os.path from uuid import uuid4 +import re from boto import connect_s3 from boto.s3.bucket import Bucket from boto.s3.key import Key @@ -8,19 +9,13 @@ from imgee.models import db, Thumbnail -IMAGES = 'jpg jpe jpeg png gif svg bmp'.split() +IMAGES = 'jpg jpe jpeg png gif svg bmp'.split() -def upload(local_name, remote_name=None): - """ - Upload a file to S3 - """ +def get_s3_bucket(): conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) bucket = Bucket(conn, app.config['AWS_BUCKET']) - k = Key(bucket) - k.key = remote_name or local_name - k.set_contents_from_filename(path.join(app.config['UPLOADED_FILES_DEST'], local_name)) - + return bucket def is_image(filename): """ @@ -37,9 +32,8 @@ def create_thumbnail(stored_file, size): thumbnail = Thumbnail(name=uuid4().hex, size=size, stored_file=stored_file) db.session.add(thumbnail) db.session.commit() - conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) - bucket = Bucket(conn, app.config['AWS_BUCKET']) - thumbnail_path = path.join(app.config['UPLOADED_FILES_DEST'], thumbnail.name) + thumbnail_path = os.path.join(app.config['UPLOADED_FILES_DEST'], thumbnail.name) + bucket = get_s3_bucket() k = Key(bucket) k.key = stored_file.name k.get_contents_to_filename(thumbnail_path) @@ -53,17 +47,14 @@ def create_thumbnail(stored_file, size): return thumbnail.name -def convert_size(size): - converted = size.split('x') - if len(converted) != 2: - return None - for k, v in enumerate(converted): - if v.isdigit(): - converted[k] = int(v) - else: - return None - return converted - +def split_size(size): + """ return (a, b) if size is 'axb' + """ + r = r'^(\d+)x(\d+)$' + matched = re.match(r, size) + if matched: + a, b = matched.group(1, 2) + return int(a), int(b) def delete_image(stored_file): """ @@ -71,6 +62,5 @@ def delete_image(stored_file): """ keys = [thumbnail.name for thumbnail in stored_file.thumbnails] keys.append(stored_file.name) - conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) - bucket = Bucket(conn, app.config['AWS_BUCKET']) + bucket = get_s3_bucket() bucket.delete_keys(keys) diff --git a/imgee/views/index.py b/imgee/views/index.py index ca386061..89a267fd 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -8,7 +8,7 @@ from imgee import app, forms from imgee.models import StoredFile, Thumbnail, db, Profile from imgee.views.login import lastuser, make_profiles, login_required -from imgee.storage import upload, is_image, create_thumbnail, convert_size, delete_image +from imgee.storage import is_image, create_thumbnail, split_size, delete_image @app.route('/') def index(): @@ -54,19 +54,15 @@ def list_files(): @app.route('/file/') def get_thumbnail(filename): make_profiles() - size = request.args.get('size') + size = request.args.get('size', '') + converted_size = split_size(size) stored_file = StoredFile.query.filter_by(name=filename).first() - converted_size = convert_size(size) - if not size or is_image(stored_file.name) or not converted_size: + if (not size) and is_image(stored_file.name): return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) - existing_thumbnail = Thumbnail.query.filter_by(size=size, stored_file=stored_file).first() - if existing_thumbnail: - return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], existing_thumbnail.name)) - new_thumbnail = create_thumbnail(stored_file, converted_size) - if new_thumbnail: - return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumbnail.name)) - return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) - + thumbnail = Thumbnail.query.filter_by(size=size, stored_file=stored_file).first() + if not thumbnail: + thumbnail = create_thumbnail(stored_file, converted_size) + return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumbnail.name)) @app.route('/delete', methods=['POST']) @lastuser.resource_handler('imgee/delete') From c2a3cf44cd1b0cecbec83d0632b46fe1a6d34ada Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 29 Mar 2013 08:30:44 +0530 Subject: [PATCH 036/541] fix resize and upload --- imgee/storage.py | 86 +++++++++++++++++++++++++++++++------------- imgee/views/index.py | 27 ++++++-------- 2 files changed, 71 insertions(+), 42 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index 9f6e7ae3..82b87903 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -5,12 +5,14 @@ from boto.s3.bucket import Bucket from boto.s3.key import Key from PIL import Image +import mimetypes +from StringIO import StringIO +from flask.ext.uploads import save as uploads_save + from imgee import app from imgee.models import db, Thumbnail - - -IMAGES = 'jpg jpe jpeg png gif svg bmp'.split() +IMAGES = 'jpg jpe jpeg png gif bmp'.split() def get_s3_bucket(): conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) @@ -24,37 +26,71 @@ def is_image(filename): extension = filename.rsplit('.', 1)[-1] return extension in IMAGES +def save(fp, img_name, remote=True): + local_path = os.path.join(app.config['UPLOADED_FILES_DEST'], img_name) + with open(local_path, 'w') as img: + img.write(fp.read()) -def create_thumbnail(stored_file, size): - """ - Create a thumbnail for a given file and given size - """ - thumbnail = Thumbnail(name=uuid4().hex, size=size, stored_file=stored_file) - db.session.add(thumbnail) + if remote: + fp.seek(0) + uploads_save(fp, img_name) + +def path_for(img_name): + return os.path.join(app.config['UPLOADED_FILES_DEST'], img_name) + +def get_image_name(img, size): + img_name = img.name + size_t = split_size(size) + if size_t: + scaled = Thumbnail.query.filter_by(size=size, stored_file=img).first() + if scaled: + img_name = scaled.name + else: + img_name = resize_and_save(img, size, format) + return img_name + +def get_image_locally(img_name): + local_path = path_for(img_name) + if not os.path.exists(local_path): + bucket = get_s3_bucket() + k = Key(bucket) + k.key = img_name + k.get_contents_to_filename(local_path) + return local_path + +def resize_and_save(img, size, format): + format = os.path.splitext(img.title)[1].lstrip('.') + src_path = get_image_locally(img.name) + scaled_img_name = uuid4().hex + scaled_path = path_for(scaled_img_name) + resize_img(src_path, scaled_path, size, format) + scaled = Thumbnail(name=scaled_img_name, size=size, stored_file=img) + db.session.add(scaled) db.session.commit() - thumbnail_path = os.path.join(app.config['UPLOADED_FILES_DEST'], thumbnail.name) - bucket = get_s3_bucket() - k = Key(bucket) - k.key = stored_file.name - k.get_contents_to_filename(thumbnail_path) - try: - img = Image.open(thumbnail_path) - img.load() - img.thumbnail(size, Image.ANTIALIAS) - img.save(thumbnail_path) - except IOError: - return None - return thumbnail.name + return scaled_img_name +def resize_img(src, dest, size, format): + """ + `size` is a tuple (width, height) or a string 'x'. + resize the image at `path` to the specified `size` and return the resized img. + """ + if isinstance(size, (str, unicode)): + size = split_size(size) + if (not size) or (not os.path.exists(src)): + return + img = Image.open(src) + img.load() + resized = img.resize(size, Image.ANTIALIAS) + resized.save(dest, format=format, quality=100) def split_size(size): - """ return (a, b) if size is 'axb' + """ return (w, h) if size is 'wxh' """ r = r'^(\d+)x(\d+)$' matched = re.match(r, size) if matched: - a, b = matched.group(1, 2) - return int(a), int(b) + w, h = matched.group(1, 2) + return int(w), int(h) def delete_image(stored_file): """ diff --git a/imgee/views/index.py b/imgee/views/index.py index 89a267fd..06abd658 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -2,19 +2,17 @@ import os.path from werkzeug import secure_filename from uuid import uuid4 -from flask import render_template, request, g, jsonify, redirect -from flask.ext.uploads import save +from flask import render_template, request, g, jsonify, redirect, abort, send_from_directory from imgee import app, forms from imgee.models import StoredFile, Thumbnail, db, Profile from imgee.views.login import lastuser, make_profiles, login_required -from imgee.storage import is_image, create_thumbnail, split_size, delete_image +from imgee.storage import split_size, delete_image, resize_and_save, save, get_image_name @app.route('/') def index(): return render_template('index.html') - @app.route('/new', methods=('GET', 'POST')) @lastuser.resource_handler('imgee/upload') @login_required @@ -27,8 +25,7 @@ def upload_files(): upload_form = forms.UploadForm() if upload_form.validate_on_submit(): filename = secure_filename(request.files['uploaded_file'].filename) - extn = os.path.splitext(filename)[1] - uniq_name = uuid4().hex + extn + uniq_name = uuid4().hex profile = Profile.query.filter_by(userid=profileid).first() stored_file = StoredFile(name=uniq_name, title=filename, profile=profile) db.session.add(stored_file) @@ -50,19 +47,15 @@ def list_files(): return jsonify(file_list) return jsonify({'error': 'You do not have permission to access this resource'}) - -@app.route('/file/') -def get_thumbnail(filename): +@app.route('/') +def get_image(img_name): make_profiles() + img = StoredFile.query.filter_by(name=img_name).first() + if not img: abort(404) size = request.args.get('size', '') - converted_size = split_size(size) - stored_file = StoredFile.query.filter_by(name=filename).first() - if (not size) and is_image(stored_file.name): - return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], stored_file.name)) - thumbnail = Thumbnail.query.filter_by(size=size, stored_file=stored_file).first() - if not thumbnail: - thumbnail = create_thumbnail(stored_file, converted_size) - return redirect('%s/%s' % (app.config['MEDIA_DOMAIN'], new_thumbnail.name)) + img_name = get_image_name(img, size) + image_dir = os.path.abspath(app.config['UPLOADED_FILES_DEST']) + return send_from_directory(image_dir, img_name, mimetype='image/jpeg') @app.route('/delete', methods=['POST']) @lastuser.resource_handler('imgee/delete') From 979063dda5c371982c94bb105ecf3e7056c13d3c Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 29 Mar 2013 08:39:51 +0530 Subject: [PATCH 037/541] add cache header --- imgee/views/index.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 06abd658..5c172100 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -55,7 +55,8 @@ def get_image(img_name): size = request.args.get('size', '') img_name = get_image_name(img, size) image_dir = os.path.abspath(app.config['UPLOADED_FILES_DEST']) - return send_from_directory(image_dir, img_name, mimetype='image/jpeg') + year = 60*60*24*365 + return send_from_directory(image_dir, img_name, mimetype='image/jpeg', cache_timeout=year) @app.route('/delete', methods=['POST']) @lastuser.resource_handler('imgee/delete') From 24cc094bf5f41dbaf997d9803067bad4dcffaa3b Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 29 Mar 2013 08:45:28 +0530 Subject: [PATCH 038/541] unclutter imports --- imgee/storage.py | 8 +++++--- imgee/views/index.py | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index 82b87903..4be848c5 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -1,12 +1,14 @@ import os.path from uuid import uuid4 import re -from boto import connect_s3 -from boto.s3.bucket import Bucket -from boto.s3.key import Key from PIL import Image import mimetypes from StringIO import StringIO + +from boto import connect_s3 +from boto.s3.bucket import Bucket +from boto.s3.key import Key + from flask.ext.uploads import save as uploads_save from imgee import app diff --git a/imgee/views/index.py b/imgee/views/index.py index 5c172100..7b934be0 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -2,12 +2,12 @@ import os.path from werkzeug import secure_filename from uuid import uuid4 -from flask import render_template, request, g, jsonify, redirect, abort, send_from_directory +from flask import render_template, request, g, jsonify, abort, send_from_directory from imgee import app, forms -from imgee.models import StoredFile, Thumbnail, db, Profile +from imgee.models import StoredFile, db, Profile from imgee.views.login import lastuser, make_profiles, login_required -from imgee.storage import split_size, delete_image, resize_and_save, save, get_image_name +from imgee.storage import delete_image, save, get_image_name @app.route('/') def index(): From 143210750310d37bddbd6bcc914c113a080a1440 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 1 Apr 2013 15:11:25 +0530 Subject: [PATCH 039/541] move format check to form validation --- imgee/forms.py | 13 +++++++++++-- imgee/storage.py | 9 --------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index bb75ec2d..2cd670bc 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -1,7 +1,16 @@ # -*- coding: utf-8 -*- -from flask.ext.wtf import Form, FileField, Required +import os.path +from flask.ext.wtf import Form, FileField, Required, ValidationError +allowed_extns = 'jpg jpe jpeg png gif bmp'.split() + +def valid_image(form, field): + filename = field.data.filename + extn = os.path.splitext(filename)[1].lstrip('.') + if not extn.lower() in allowed_extns: + raise ValidationError("Sorry, we don't support '%s' images. \ + Please upload images in one of these formats: %s" % (extn, repr(allowed_extns)[1:-1])) class UploadForm(Form): - uploaded_file = FileField("Uploaded File", validators=[Required()]) + uploaded_file = FileField("Uploaded File", validators=[Required(), valid_image]) diff --git a/imgee/storage.py b/imgee/storage.py index 4be848c5..0e92bdc1 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -14,20 +14,11 @@ from imgee import app from imgee.models import db, Thumbnail -IMAGES = 'jpg jpe jpeg png gif bmp'.split() - def get_s3_bucket(): conn = connect_s3(app.config['AWS_ACCESS_KEY'], app.config['AWS_SECRET_KEY']) bucket = Bucket(conn, app.config['AWS_BUCKET']) return bucket -def is_image(filename): - """ - Check if a given filename is an image or not - """ - extension = filename.rsplit('.', 1)[-1] - return extension in IMAGES - def save(fp, img_name, remote=True): local_path = os.path.join(app.config['UPLOADED_FILES_DEST'], img_name) with open(local_path, 'w') as img: From b78e6075f6cb2a84934b6e38a049e689499ca09f Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 1 Apr 2013 15:31:20 +0530 Subject: [PATCH 040/541] preserve aspect ratio --- imgee/storage.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/imgee/storage.py b/imgee/storage.py index 0e92bdc1..e8e30721 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -62,6 +62,14 @@ def resize_and_save(img, size, format): db.session.commit() return scaled_img_name +def get_size((orig_w, orig_h), (w, h)): + # return size which preserves the aspect ratio of the original image. + if w != 0: + size = (w, orig_h*w/orig_w) + else: + size = (orig_w*h/orig_h, h) + return size + def resize_img(src, dest, size, format): """ `size` is a tuple (width, height) or a string 'x'. @@ -69,10 +77,12 @@ def resize_img(src, dest, size, format): """ if isinstance(size, (str, unicode)): size = split_size(size) + if (not size) or (not os.path.exists(src)): return img = Image.open(src) img.load() + size = get_size(img.size, size) resized = img.resize(size, Image.ANTIALIAS) resized.save(dest, format=format, quality=100) From 1ad3d48d78092a0223991636f6e4d4306bf5e1c4 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 1 Apr 2013 16:27:35 +0530 Subject: [PATCH 041/541] take single dimension as request for square --- imgee/storage.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index e8e30721..f453fdf7 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -64,8 +64,13 @@ def resize_and_save(img, size, format): def get_size((orig_w, orig_h), (w, h)): # return size which preserves the aspect ratio of the original image. + # w or h being None means square size if w != 0: size = (w, orig_h*w/orig_w) + elif w == None: + size = (h, h) + elif h == None: + size = (w, w) else: size = (orig_w*h/orig_h, h) return size @@ -89,11 +94,12 @@ def resize_img(src, dest, size, format): def split_size(size): """ return (w, h) if size is 'wxh' """ - r = r'^(\d+)x(\d+)$' + r= r'^(\d+)(x(\d+))?$' matched = re.match(r, size) if matched: w, h = matched.group(1, 2) - return int(w), int(h) + h = int(h.lstrip('x')) if h != None else None + return int(w), h def delete_image(stored_file): """ From 27421c4ea04b37ef96b439c351200c104d9bed00 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 1 Apr 2013 22:01:23 +0530 Subject: [PATCH 042/541] save resized images on s3 --- imgee/storage.py | 12 ++++++++---- imgee/views/index.py | 9 ++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index f453fdf7..db2907ba 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -55,8 +55,9 @@ def resize_and_save(img, size, format): format = os.path.splitext(img.title)[1].lstrip('.') src_path = get_image_locally(img.name) scaled_img_name = uuid4().hex - scaled_path = path_for(scaled_img_name) - resize_img(src_path, scaled_path, size, format) + scaled = resize_img(src_path, size, format) + uploads_save(scaled, scaled_img_name) + scaled = Thumbnail(name=scaled_img_name, size=size, stored_file=img) db.session.add(scaled) db.session.commit() @@ -75,7 +76,7 @@ def get_size((orig_w, orig_h), (w, h)): size = (orig_w*h/orig_h, h) return size -def resize_img(src, dest, size, format): +def resize_img(src, size, format): """ `size` is a tuple (width, height) or a string 'x'. resize the image at `path` to the specified `size` and return the resized img. @@ -89,7 +90,10 @@ def resize_img(src, dest, size, format): img.load() size = get_size(img.size, size) resized = img.resize(size, Image.ANTIALIAS) - resized.save(dest, format=format, quality=100) + imgio = StringIO() + resized.save(imgio, format=format, quality=100) + imgio.seek(0) + return imgio def split_size(size): """ return (w, h) if size is 'wxh' diff --git a/imgee/views/index.py b/imgee/views/index.py index 7b934be0..a0fea9cc 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -2,7 +2,8 @@ import os.path from werkzeug import secure_filename from uuid import uuid4 -from flask import render_template, request, g, jsonify, abort, send_from_directory +from flask import render_template, request, g, jsonify, abort, send_from_directory, redirect +from urlparse import urljoin from imgee import app, forms from imgee.models import StoredFile, db, Profile @@ -47,16 +48,14 @@ def list_files(): return jsonify(file_list) return jsonify({'error': 'You do not have permission to access this resource'}) -@app.route('/') +@app.route('/file/') def get_image(img_name): make_profiles() img = StoredFile.query.filter_by(name=img_name).first() if not img: abort(404) size = request.args.get('size', '') img_name = get_image_name(img, size) - image_dir = os.path.abspath(app.config['UPLOADED_FILES_DEST']) - year = 60*60*24*365 - return send_from_directory(image_dir, img_name, mimetype='image/jpeg', cache_timeout=year) + return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), img_name), code=301) @app.route('/delete', methods=['POST']) @lastuser.resource_handler('imgee/delete') From a67a4803b5a832b18e9dd221090ee9212069a78a Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 2 Apr 2013 12:48:39 +0530 Subject: [PATCH 043/541] get rid of not-so-flexible flask-uploads/storage --- imgee/__init__.py | 3 --- imgee/storage.py | 28 ++++++++++++++++++++-------- imgee/views/index.py | 5 +++-- requirements.txt | 2 -- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/imgee/__init__.py b/imgee/__init__.py index 3e54c535..2c25a5d6 100644 --- a/imgee/__init__.py +++ b/imgee/__init__.py @@ -5,8 +5,6 @@ from flask import Flask from flask.ext.assets import Environment, Bundle from flask.ext.lastuser import LastUser -from flask.ext.uploads import init -from flask.ext.storage import get_default_storage_class from baseframe import baseframe, baseframe_js, baseframe_css import coaster.app @@ -34,4 +32,3 @@ def init_for(env): assets.register('js_all', js) assets.register('css_all', css) lastuser.init_app(app) - init(imgee.models.db, get_default_storage_class(app)) diff --git a/imgee/storage.py b/imgee/storage.py index db2907ba..e9353426 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -9,8 +9,6 @@ from boto.s3.bucket import Bucket from boto.s3.key import Key -from flask.ext.uploads import save as uploads_save - from imgee import app from imgee.models import db, Thumbnail @@ -19,14 +17,27 @@ def get_s3_bucket(): bucket = Bucket(conn, app.config['AWS_BUCKET']) return bucket -def save(fp, img_name, remote=True): +def save(fp, img_name, remote=True, content_type=None): local_path = os.path.join(app.config['UPLOADED_FILES_DEST'], img_name) with open(local_path, 'w') as img: img.write(fp.read()) if remote: fp.seek(0) - uploads_save(fp, img_name) + save_on_s3(fp, img_name, content_type=content_type) + +def get_file_type(filename): + return mimetypes.guess_type(filename)[0] + +def save_on_s3(fp, filename, content_type=''): + b = get_s3_bucket() + k = b.new_key(filename) + content_type = content_type or get_file_type(filename) + headers = { + 'Cache-Control': 'max-age=31536000', #60*60*24*365 + 'Content-Type': content_type, + } + k.set_contents_from_file(fp, policy='public-read', headers=headers) def path_for(img_name): return os.path.join(app.config['UPLOADED_FILES_DEST'], img_name) @@ -39,7 +50,7 @@ def get_image_name(img, size): if scaled: img_name = scaled.name else: - img_name = resize_and_save(img, size, format) + img_name = resize_and_save(img, size) return img_name def get_image_locally(img_name): @@ -51,12 +62,13 @@ def get_image_locally(img_name): k.get_contents_to_filename(local_path) return local_path -def resize_and_save(img, size, format): - format = os.path.splitext(img.title)[1].lstrip('.') +def resize_and_save(img, size): src_path = get_image_locally(img.name) scaled_img_name = uuid4().hex + content_type = get_file_type(img.title) # eg: image/jpeg + format = content_type.split('/')[1] if content_type else None scaled = resize_img(src_path, size, format) - uploads_save(scaled, scaled_img_name) + save_on_s3(scaled, scaled_img_name, content_type) scaled = Thumbnail(name=scaled_img_name, size=size, stored_file=img) db.session.add(scaled) diff --git a/imgee/views/index.py b/imgee/views/index.py index a0fea9cc..1f0a8d14 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -8,7 +8,7 @@ from imgee import app, forms from imgee.models import StoredFile, db, Profile from imgee.views.login import lastuser, make_profiles, login_required -from imgee.storage import delete_image, save, get_image_name +from imgee.storage import delete_image, save, get_image_name, get_file_type @app.route('/') def index(): @@ -31,7 +31,8 @@ def upload_files(): stored_file = StoredFile(name=uniq_name, title=filename, profile=profile) db.session.add(stored_file) db.session.commit() - save(request.files['uploaded_file'], stored_file.name) + content_type = get_file_type(filename) + save(request.files['uploaded_file'], stored_file.name, content_type=content_type) return jsonify({'id': stored_file.name}) # form invalid or request.method == 'GET' return render_template('form.html', form=upload_form) diff --git a/requirements.txt b/requirements.txt index ec2387c0..1445f546 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,4 @@ Flask-SQLAlchemy https://github.com/hasgeek/flask-lastuser/zipball/master Flask-Admin boto --e git+http://github.com/FelixLoether/flask-uploads#egg=Flask-Uploads --e git://github.com/kvesteri/flask-storage.git#egg=Flask-Storage PIL From eee2f71baade310e770139b8911b522452a5b705 Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 2 Apr 2013 16:42:03 +0530 Subject: [PATCH 044/541] thumbnails --- imgee/storage.py | 45 +++++++++++++++++++++++++++++--------------- imgee/views/index.py | 12 ++++++++++-- instance/settings.py | 1 + 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index e9353426..d82fb7df 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -42,15 +42,18 @@ def save_on_s3(fp, filename, content_type=''): def path_for(img_name): return os.path.join(app.config['UPLOADED_FILES_DEST'], img_name) -def get_image_name(img, size): +def get_resized_image(img, size, thumbnail=False): img_name = img.name - size_t = split_size(size) + if isinstance(size, (str, unicode)): + size_t = split_size(size) + elif isinstance(size, tuple): + size_t, size = size, "%sx%s" % size if size_t: scaled = Thumbnail.query.filter_by(size=size, stored_file=img).first() if scaled: img_name = scaled.name else: - img_name = resize_and_save(img, size) + img_name = resize_and_save(img, size_t, thumbnail=thumbnail) return img_name def get_image_locally(img_name): @@ -62,46 +65,58 @@ def get_image_locally(img_name): k.get_contents_to_filename(local_path) return local_path -def resize_and_save(img, size): +def resize_and_save(img, size, thumbnail=False): src_path = get_image_locally(img.name) scaled_img_name = uuid4().hex content_type = get_file_type(img.title) # eg: image/jpeg format = content_type.split('/')[1] if content_type else None - scaled = resize_img(src_path, size, format) + scaled = resize_img(src_path, size, format, thumbnail=thumbnail) save_on_s3(scaled, scaled_img_name, content_type) - scaled = Thumbnail(name=scaled_img_name, size=size, stored_file=img) + size_s = "%sx%s" % size + scaled = Thumbnail(name=scaled_img_name, size=size_s, stored_file=img) db.session.add(scaled) db.session.commit() return scaled_img_name def get_size((orig_w, orig_h), (w, h)): - # return size which preserves the aspect ratio of the original image. # w or h being None means square size - if w != 0: + # w or h being 0 means preserve aspect ratio with that height or width + # else return w, h + if h == 0: size = (w, orig_h*w/orig_w) + elif w == 0: + size = (orig_w*h/orig_h, h) elif w == None: size = (h, h) elif h == None: size = (w, w) else: - size = (orig_w*h/orig_h, h) + size = (w, h) return size -def resize_img(src, size, format): +def resize_img(src, size, format, thumbnail): """ - `size` is a tuple (width, height) or a string 'x'. - resize the image at `path` to the specified `size` and return the resized img. + `size` is a tuple (width, height) + resize the image at `src` to the specified `size` and return the resized img. """ - if isinstance(size, (str, unicode)): - size = split_size(size) - if (not size) or (not os.path.exists(src)): return img = Image.open(src) img.load() + if thumbnail: + # fit the image to the box along the smaller side and preserve aspect ratio. + (ow, oh), (w, h) = img.size, size + size = (0, h) if ow>=oh else (w, 0) + size = get_size(img.size, size) resized = img.resize(size, Image.ANTIALIAS) + + if thumbnail: + # and crop the rest + right, lower = app.config.get('THUMBNAIL_SIZE') + resized = resized.crop((0, 0, right, lower)) + imgio = StringIO() resized.save(imgio, format=format, quality=100) imgio.seek(0) diff --git a/imgee/views/index.py b/imgee/views/index.py index 1f0a8d14..952ab110 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -8,7 +8,7 @@ from imgee import app, forms from imgee.models import StoredFile, db, Profile from imgee.views.login import lastuser, make_profiles, login_required -from imgee.storage import delete_image, save, get_image_name, get_file_type +from imgee.storage import delete_image, save, get_resized_image, get_file_type @app.route('/') def index(): @@ -55,9 +55,17 @@ def get_image(img_name): img = StoredFile.query.filter_by(name=img_name).first() if not img: abort(404) size = request.args.get('size', '') - img_name = get_image_name(img, size) + img_name = get_resized_image(img, size) return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), img_name), code=301) +@app.route('/thumbnail/') +def get_thumbnail(img_name): + img = StoredFile.query.filter_by(name=img_name).first() + if not img: abort(404) + tn_size = app.config.get('THUMBNAIL_SIZE') + thumbnail = get_resized_image(img, tn_size, thumbnail=True) + return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), thumbnail), code=301) + @app.route('/delete', methods=['POST']) @lastuser.resource_handler('imgee/delete') @login_required diff --git a/instance/settings.py b/instance/settings.py index 23753411..d28d7e8a 100644 --- a/instance/settings.py +++ b/instance/settings.py @@ -46,3 +46,4 @@ #: Domain name for files MEDIA_DOMAIN = 'set domain name here' +THUMBNAIL_SIZE=(75, 75) # (w, h) in px \ No newline at end of file From c975c7948cabd2074a49e1152986d253eed17691 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 8 Apr 2013 16:21:25 +0530 Subject: [PATCH 045/541] fix deletion of image --- imgee/forms.py | 3 +++ imgee/storage.py | 2 +- imgee/views/index.py | 28 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index 2cd670bc..1612c378 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -14,3 +14,6 @@ def valid_image(form, field): class UploadForm(Form): uploaded_file = FileField("Uploaded File", validators=[Required(), valid_image]) + +class DeleteForm(Form): + pass diff --git a/imgee/storage.py b/imgee/storage.py index d82fb7df..dafade37 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -132,7 +132,7 @@ def split_size(size): h = int(h.lstrip('x')) if h != None else None return int(w), h -def delete_image(stored_file): +def delete_on_s3(stored_file): """ Delete all the thumbnails and images associated with a file """ diff --git a/imgee/views/index.py b/imgee/views/index.py index 952ab110..c04df430 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -8,7 +8,7 @@ from imgee import app, forms from imgee.models import StoredFile, db, Profile from imgee.views.login import lastuser, make_profiles, login_required -from imgee.storage import delete_image, save, get_resized_image, get_file_type +from imgee.storage import delete_on_s3, save, get_resized_image, get_file_type @app.route('/') def index(): @@ -66,21 +66,21 @@ def get_thumbnail(img_name): thumbnail = get_resized_image(img, tn_size, thumbnail=True) return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), thumbnail), code=301) -@app.route('/delete', methods=['POST']) +@app.route('/delete/', methods=('GET','POST')) @lastuser.resource_handler('imgee/delete') @login_required -def delete_files(callerinfo): - profileid = request.args.get('profileid', g.user.userid) - fileid = request.args.get('fileid', g.user.userid) - if not fileid: - return jsonify({'error': 'No filename given'}) +def delete_files(img_name): + profileid = g.user.userid make_profiles() if profileid in g.user.user_organizations_owned_ids(): - stored_file = StoredFile.query.filter_by(name=fileid).first() - if stored_file: - delete_image(stored_file) - db.session.delete(stored_file) - db.session.commit() - return jsonify({'success': 'File deleted'}) - return jsonify({'error': 'No file found'}) + form = forms.DeleteForm() + if form.validate_on_submit(): + stored_file = StoredFile.query.filter_by(name=img_name).first() + if stored_file: + delete_on_s3(stored_file) + db.session.delete(stored_file) + db.session.commit() + return jsonify({'success': 'File deleted'}) + return jsonify({'error': 'No file found'}) + return render_template('delete.html', form=form, filename=img_name) return jsonify({'error': 'You do not have permission to access this resource'}) From 617bbac1a12e5ca67e898a0854587bae4b638c64 Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 9 Apr 2013 14:49:43 +0530 Subject: [PATCH 046/541] seperate out authorization --- imgee/views/index.py | 40 +++++++++++++++------------------------- imgee/views/login.py | 10 ++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index c04df430..f4c55b7f 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -16,13 +16,10 @@ def index(): @app.route('/new', methods=('GET', 'POST')) @lastuser.resource_handler('imgee/upload') +@authorize @login_required def upload_files(): profileid = g.user.userid - make_profiles() - if profileid not in g.user.user_organizations_owned_ids(): - return jsonify({'error': 'You do not have permission to access this resource'}) - upload_form = forms.UploadForm() if upload_form.validate_on_submit(): filename = secure_filename(request.files['uploaded_file'].filename) @@ -42,16 +39,12 @@ def upload_files(): @login_required def list_files(): profileid = request.args.get('profileid', g.user.userid) - make_profiles() - if profileid in g.user.user_organizations_owned_ids(): - files = StoredFile.query.filter(Profile.userid == profileid).all() - file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} - return jsonify(file_list) - return jsonify({'error': 'You do not have permission to access this resource'}) + files = StoredFile.query.filter(Profile.userid == profileid).all() + file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} + return jsonify(file_list) @app.route('/file/') def get_image(img_name): - make_profiles() img = StoredFile.query.filter_by(name=img_name).first() if not img: abort(404) size = request.args.get('size', '') @@ -68,19 +61,16 @@ def get_thumbnail(img_name): @app.route('/delete/', methods=('GET','POST')) @lastuser.resource_handler('imgee/delete') +@authorize @login_required def delete_files(img_name): - profileid = g.user.userid - make_profiles() - if profileid in g.user.user_organizations_owned_ids(): - form = forms.DeleteForm() - if form.validate_on_submit(): - stored_file = StoredFile.query.filter_by(name=img_name).first() - if stored_file: - delete_on_s3(stored_file) - db.session.delete(stored_file) - db.session.commit() - return jsonify({'success': 'File deleted'}) - return jsonify({'error': 'No file found'}) - return render_template('delete.html', form=form, filename=img_name) - return jsonify({'error': 'You do not have permission to access this resource'}) + form = forms.DeleteForm() + if form.validate_on_submit(): + stored_file = StoredFile.query.filter_by(name=img_name).first() + if stored_file: + delete_on_s3(stored_file) + db.session.delete(stored_file) + db.session.commit() + return jsonify({'success': 'File deleted'}) + return jsonify({'error': 'No file found'}) + return render_template('delete.html', form=form, filename=img_name) diff --git a/imgee/views/login.py b/imgee/views/login.py index 681673b9..b2689429 100644 --- a/imgee/views/login.py +++ b/imgee/views/login.py @@ -19,6 +19,16 @@ def decorated_func(*args, **kwargs): return f(*args, **kwargs) return decorated_func +def authorize(f): + @wraps(f) + def decorated_func(*args, **kwargs): + profileid = g.user.userid + make_profiles() + if profileid in g.user.user_organizations_owned_ids(): + return f(*args, **kwargs) + return jsonify({'error': 'You do not have permission to access this resource'}) + return decorated_func + @app.route('/login') @lastuser.login_handler def login(): From b4c64366d54a1426b8e205d609bd0e35ad6c3d75 Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 9 Apr 2013 16:31:07 +0530 Subject: [PATCH 047/541] show thumbnails on profile page --- imgee/static/css/app.css | 32 ++++++++++++++++++++++++++++++++ imgee/templates/profile.html | 19 +++++++++++++++++++ imgee/views/index.py | 22 +++++++++++++--------- 3 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 imgee/templates/profile.html diff --git a/imgee/static/css/app.css b/imgee/static/css/app.css index e69de29b..1080d253 100644 --- a/imgee/static/css/app.css +++ b/imgee/static/css/app.css @@ -0,0 +1,32 @@ +div.gallery div.image + { + margin:2px; + border:1px solid #b7b7b7; + height:auto; + width:auto; + float:left; + text-align:center; + } +div.gallery div.image img + { + display:inline; + margin:3px; + border:1px solid #ffffff; + } +div.gallery div.image a:hover img + { + border:1px solid #0000ff; + } +div.gallery div.image div.title + { + text-align:center; + font-weight:normal; + width:120px; + margin:2px; + } +div.gallery div.image span.delete +{ + font-weight:bold; + float: right; + padding-right: 2px; +} diff --git a/imgee/templates/profile.html b/imgee/templates/profile.html new file mode 100644 index 00000000..29b1e4fa --- /dev/null +++ b/imgee/templates/profile.html @@ -0,0 +1,19 @@ +{% extends "layout.html" %} +{% block titletags -%} + {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} + +{%- endblock %} + +{% block content %} + +
+{% for img in files %} +
+ X + +
{{img.title}}
+
+{% endfor %} +
+{% endblock %} + diff --git a/imgee/views/index.py b/imgee/views/index.py index f4c55b7f..3dc4a27a 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -7,7 +7,7 @@ from imgee import app, forms from imgee.models import StoredFile, db, Profile -from imgee.views.login import lastuser, make_profiles, login_required +from imgee.views.login import lastuser, authorize, login_required from imgee.storage import delete_on_s3, save, get_resized_image, get_file_type @app.route('/') @@ -34,14 +34,18 @@ def upload_files(): # form invalid or request.method == 'GET' return render_template('form.html', form=upload_form) -@app.route('/list') +@app.route('/') @lastuser.resource_handler('imgee/list') @login_required -def list_files(): - profileid = request.args.get('profileid', g.user.userid) - files = StoredFile.query.filter(Profile.userid == profileid).all() - file_list = {'files': [{'name': x.title, 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name)} for x in files]} - return jsonify(file_list) +@authorize +def profile(profile_name): + files = StoredFile.query.filter(Profile.name == profile_name).all() + data = {'files': [{'title': x.title, + 'name': x.name, + 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name), + 'thumbnail': 'thumbnail/%s' % x.name} + for x in files]} + return render_template('profile.html', files=data['files']) @app.route('/file/') def get_image(img_name): @@ -61,9 +65,9 @@ def get_thumbnail(img_name): @app.route('/delete/', methods=('GET','POST')) @lastuser.resource_handler('imgee/delete') -@authorize @login_required -def delete_files(img_name): +@authorize +def delete_file(img_name): form = forms.DeleteForm() if form.validate_on_submit(): stored_file = StoredFile.query.filter_by(name=img_name).first() From d18c866b32e12c7acc04c5ff65936d6fda011545 Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 9 Apr 2013 16:32:47 +0530 Subject: [PATCH 048/541] delete template --- imgee/templates/delete.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 imgee/templates/delete.html diff --git a/imgee/templates/delete.html b/imgee/templates/delete.html new file mode 100644 index 00000000..e293c7fb --- /dev/null +++ b/imgee/templates/delete.html @@ -0,0 +1,14 @@ +{% extends "layout.html" %} +{% from 'baseframe/forms.html' import renderform %} +{% block titletags -%} + {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} + +{%- endblock %} + +{% block content %} + +Are you sure that you want to delete this image? + +{{ renderform(form, "delete", "Yes, delete it") }} +{% endblock %} + From ecf5dcca328beaa5388a3bd67da8c5a89b2ac4af Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 9 Apr 2013 16:34:21 +0530 Subject: [PATCH 049/541] no resource handlers for now --- imgee/views/index.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 3dc4a27a..ba05de08 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -15,7 +15,6 @@ def index(): return render_template('index.html') @app.route('/new', methods=('GET', 'POST')) -@lastuser.resource_handler('imgee/upload') @authorize @login_required def upload_files(): @@ -35,7 +34,6 @@ def upload_files(): return render_template('form.html', form=upload_form) @app.route('/') -@lastuser.resource_handler('imgee/list') @login_required @authorize def profile(profile_name): @@ -64,7 +62,6 @@ def get_thumbnail(img_name): return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), thumbnail), code=301) @app.route('/delete/', methods=('GET','POST')) -@lastuser.resource_handler('imgee/delete') @login_required @authorize def delete_file(img_name): From a6194435245b86555186f1e5853cdc2b4477d49c Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 9 Apr 2013 17:25:27 +0530 Subject: [PATCH 050/541] link all the pages --- imgee/static/css/app.css | 1 - imgee/templates/profile.html | 3 +++ imgee/views/index.py | 28 ++++++++++++++++++---------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/imgee/static/css/app.css b/imgee/static/css/app.css index 1080d253..1d729913 100644 --- a/imgee/static/css/app.css +++ b/imgee/static/css/app.css @@ -21,7 +21,6 @@ div.gallery div.image div.title { text-align:center; font-weight:normal; - width:120px; margin:2px; } div.gallery div.image span.delete diff --git a/imgee/templates/profile.html b/imgee/templates/profile.html index 29b1e4fa..4260a6af 100644 --- a/imgee/templates/profile.html +++ b/imgee/templates/profile.html @@ -6,6 +6,9 @@ {% block content %} + + Upload images +
{% for img in files %}
diff --git a/imgee/views/index.py b/imgee/views/index.py index ba05de08..1e2d60c9 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -2,7 +2,8 @@ import os.path from werkzeug import secure_filename from uuid import uuid4 -from flask import render_template, request, g, jsonify, abort, send_from_directory, redirect +from flask import (render_template, request, g, jsonify, url_for, + abort, send_from_directory, redirect, flash) from urlparse import urljoin from imgee import app, forms @@ -17,7 +18,7 @@ def index(): @app.route('/new', methods=('GET', 'POST')) @authorize @login_required -def upload_files(): +def upload_file(): profileid = g.user.userid upload_form = forms.UploadForm() if upload_form.validate_on_submit(): @@ -29,7 +30,9 @@ def upload_files(): db.session.commit() content_type = get_file_type(filename) save(request.files['uploaded_file'], stored_file.name, content_type=content_type) - return jsonify({'id': stored_file.name}) + profile_name = Profile.query.filter_by(userid=profileid).one().name + flash('"%s" uploaded successfully.' % filename) + return redirect(url_for('profile', profile_name=profile_name)) # form invalid or request.method == 'GET' return render_template('form.html', form=upload_form) @@ -65,13 +68,18 @@ def get_thumbnail(img_name): @login_required @authorize def delete_file(img_name): - form = forms.DeleteForm() - if form.validate_on_submit(): - stored_file = StoredFile.query.filter_by(name=img_name).first() - if stored_file: + stored_file = StoredFile.query.filter_by(name=img_name).first() + profile_name = Profile.query.filter_by(userid=g.user.userid).one().name + if stored_file: + form = forms.DeleteForm() + if form.validate_on_submit(): delete_on_s3(stored_file) db.session.delete(stored_file) db.session.commit() - return jsonify({'success': 'File deleted'}) - return jsonify({'error': 'No file found'}) - return render_template('delete.html', form=form, filename=img_name) + flash("%s is deleted" % stored_file.title) + else: + return render_template('delete.html', form=form, filename=img_name) + else: + flash("No file found", category="error") # put in appropriate message + return redirect(url_for('profile', profile_name=profile_name)) + From 695d7cf16fd5910c488959f82d137bfbae2ae8cb Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 9 Apr 2013 18:18:02 +0530 Subject: [PATCH 051/541] cancel button in delete page --- imgee/templates/delete.html | 3 ++- imgee/views/index.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/imgee/templates/delete.html b/imgee/templates/delete.html index e293c7fb..4be77674 100644 --- a/imgee/templates/delete.html +++ b/imgee/templates/delete.html @@ -9,6 +9,7 @@ Are you sure that you want to delete this image? -{{ renderform(form, "delete", "Yes, delete it") }} +{% set cancel_url=url_for('profile', profile_name=profile_name) %} +{{ renderform(form, "delete", "Yes, delete it", cancel_url=cancel_url)}} {% endblock %} diff --git a/imgee/views/index.py b/imgee/views/index.py index 1e2d60c9..b787e04d 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -78,7 +78,7 @@ def delete_file(img_name): db.session.commit() flash("%s is deleted" % stored_file.title) else: - return render_template('delete.html', form=form, filename=img_name) + return render_template('delete.html', form=form, filename=img_name, profile_name=profile_name) else: flash("No file found", category="error") # put in appropriate message return redirect(url_for('profile', profile_name=profile_name)) From 0ea140f2490b16498a4f6279ed6b22d7674f1067 Mon Sep 17 00:00:00 2001 From: Devi Date: Tue, 9 Apr 2013 18:19:12 +0530 Subject: [PATCH 052/541] s/profile/profile_name in view name --- imgee/templates/delete.html | 2 +- imgee/views/index.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imgee/templates/delete.html b/imgee/templates/delete.html index 4be77674..4745b2fc 100644 --- a/imgee/templates/delete.html +++ b/imgee/templates/delete.html @@ -9,7 +9,7 @@ Are you sure that you want to delete this image? -{% set cancel_url=url_for('profile', profile_name=profile_name) %} +{% set cancel_url=url_for('show_profile', profile_name=profile_name) %} {{ renderform(form, "delete", "Yes, delete it", cancel_url=cancel_url)}} {% endblock %} diff --git a/imgee/views/index.py b/imgee/views/index.py index b787e04d..4f683561 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -32,14 +32,14 @@ def upload_file(): save(request.files['uploaded_file'], stored_file.name, content_type=content_type) profile_name = Profile.query.filter_by(userid=profileid).one().name flash('"%s" uploaded successfully.' % filename) - return redirect(url_for('profile', profile_name=profile_name)) + return redirect(url_for('show_profile', profile_name=profile_name)) # form invalid or request.method == 'GET' return render_template('form.html', form=upload_form) @app.route('/') @login_required @authorize -def profile(profile_name): +def show_profile(profile_name): files = StoredFile.query.filter(Profile.name == profile_name).all() data = {'files': [{'title': x.title, 'name': x.name, @@ -81,5 +81,5 @@ def delete_file(img_name): return render_template('delete.html', form=form, filename=img_name, profile_name=profile_name) else: flash("No file found", category="error") # put in appropriate message - return redirect(url_for('profile', profile_name=profile_name)) + return redirect(url_for('show_profile', profile_name=profile_name)) From 6a9d2a4de0f9c13ae8c238b891340e7fd5eb6419 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 10 Apr 2013 10:21:00 +0530 Subject: [PATCH 053/541] rename forms --- imgee/forms.py | 5 +++-- imgee/views/index.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index 1612c378..20ed9d58 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -12,8 +12,9 @@ def valid_image(form, field): raise ValidationError("Sorry, we don't support '%s' images. \ Please upload images in one of these formats: %s" % (extn, repr(allowed_extns)[1:-1])) -class UploadForm(Form): +class UploadImageForm(Form): uploaded_file = FileField("Uploaded File", validators=[Required(), valid_image]) -class DeleteForm(Form): +class DeleteImageForm(Form): pass + diff --git a/imgee/views/index.py b/imgee/views/index.py index 4f683561..fa2ca45a 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -3,7 +3,7 @@ from werkzeug import secure_filename from uuid import uuid4 from flask import (render_template, request, g, jsonify, url_for, - abort, send_from_directory, redirect, flash) + abort, redirect, flash) from urlparse import urljoin from imgee import app, forms @@ -20,7 +20,7 @@ def index(): @login_required def upload_file(): profileid = g.user.userid - upload_form = forms.UploadForm() + upload_form = forms.UploadImageForm() if upload_form.validate_on_submit(): filename = secure_filename(request.files['uploaded_file'].filename) uniq_name = uuid4().hex @@ -71,7 +71,7 @@ def delete_file(img_name): stored_file = StoredFile.query.filter_by(name=img_name).first() profile_name = Profile.query.filter_by(userid=g.user.userid).one().name if stored_file: - form = forms.DeleteForm() + form = forms.DeleteImageForm() if form.validate_on_submit(): delete_on_s3(stored_file) db.session.delete(stored_file) From a62b5913ee981be132f6a0b05eede632ce04cfb6 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 10 Apr 2013 14:47:56 +0530 Subject: [PATCH 054/541] view image --- imgee/templates/view_image.html | 19 +++++++++++++++++++ imgee/views/index.py | 21 +++++++++++---------- 2 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 imgee/templates/view_image.html diff --git a/imgee/templates/view_image.html b/imgee/templates/view_image.html new file mode 100644 index 00000000..aa551b39 --- /dev/null +++ b/imgee/templates/view_image.html @@ -0,0 +1,19 @@ +{% extends "layout.html" %} +{% block titletags -%} + {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} + +{%- endblock %} + +{% block content %} +
{{img.title}}
+ {% if labels %} + Labels: + {% endif %} + {% for l in labels %} + {{label}},   + {% endfor %} + +
+ + +{% endblock %} diff --git a/imgee/views/index.py b/imgee/views/index.py index fa2ca45a..23a872c1 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -7,7 +7,7 @@ from urlparse import urljoin from imgee import app, forms -from imgee.models import StoredFile, db, Profile +from imgee.models import StoredFile, db, Profile, Label from imgee.views.login import lastuser, authorize, login_required from imgee.storage import delete_on_s3, save, get_resized_image, get_file_type @@ -41,17 +41,18 @@ def upload_file(): @authorize def show_profile(profile_name): files = StoredFile.query.filter(Profile.name == profile_name).all() - data = {'files': [{'title': x.title, - 'name': x.name, - 'url': '%s/%s' % (app.config['MEDIA_DOMAIN'], x.name), - 'thumbnail': 'thumbnail/%s' % x.name} - for x in files]} - return render_template('profile.html', files=data['files']) + labels = Label.query.filter(Profile.name == profile_name).all() + return render_template('profile.html', files=files, labels=labels, profile_name=profile_name) + +@app.route('/view/') +def view_image(img_name): + img = StoredFile.query.filter_by(name=img_name).first_or_404() + labels = [label.name for label in img.labels] + return render_template('view_image.html', img=img, labels=labels) @app.route('/file/') def get_image(img_name): - img = StoredFile.query.filter_by(name=img_name).first() - if not img: abort(404) + img = StoredFile.query.filter_by(name=img_name).first_or_404() size = request.args.get('size', '') img_name = get_resized_image(img, size) return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), img_name), code=301) @@ -72,7 +73,7 @@ def delete_file(img_name): profile_name = Profile.query.filter_by(userid=g.user.userid).one().name if stored_file: form = forms.DeleteImageForm() - if form.validate_on_submit(): + if form.is_submitted(): delete_on_s3(stored_file) db.session.delete(stored_file) db.session.commit() From 1aee221dd8114157ddd7a563cbb8a983dc0105d3 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 10 Apr 2013 15:37:23 +0530 Subject: [PATCH 055/541] label models --- imgee/models/profile.py | 1 + imgee/models/stored_file.py | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/imgee/models/profile.py b/imgee/models/profile.py index 5f2aedde..f7568bca 100644 --- a/imgee/models/profile.py +++ b/imgee/models/profile.py @@ -23,6 +23,7 @@ class Profile(BaseNameMixin, db.Model): userid = db.Column(db.Unicode(22), nullable=False, unique=True) description = db.Column(db.UnicodeText, default=u'', nullable=False) type = db.Column(db.Integer, default=PROFILE_TYPE.UNDEFINED, nullable=False) + labels = db.relationship('Label', backref=db.backref('profile'), cascade='all, delete-orphan') def type_label(self): return profile_types.get(self.type, profile_types[0]) diff --git a/imgee/models/stored_file.py b/imgee/models/stored_file.py index 6e2bd169..22f24ec8 100644 --- a/imgee/models/stored_file.py +++ b/imgee/models/stored_file.py @@ -1,13 +1,25 @@ # -*- coding: utf-8 -*- -from coaster.sqlalchemy import BaseNameMixin +from coaster.sqlalchemy import BaseNameMixin, BaseMixin from imgee.models import db +image_labels = db.Table('image_labels', + db.Column('label_id', db.Integer, db.ForeignKey('label.id')), + db.Column('stored_file_id', db.Integer, db.ForeignKey('stored_file.id')), +) + +class Label(BaseMixin, db.Model): + __tablename__ = 'label' + name = db.Column(db.String(50), nullable=False, unique=True, index=True) + profile_id = db.Column(db.Integer, db.ForeignKey('profile.id'), nullable=False) + class StoredFile(BaseNameMixin, db.Model): __tablename__ = 'stored_file' - profile_id = db.Column(None, db.ForeignKey('profile.id'), nullable=False) + profile_id = db.Column(db.Integer, db.ForeignKey('profile.id'), nullable=False) profile = db.relationship('Profile', backref='stored_file') thumbnails = db.relationship('Thumbnail', backref='stored_file', cascade='all, delete-orphan') + labels = db.relationship('Label', secondary='image_labels', + backref=db.backref('files', lazy='dynamic'), cascade='all') From 4ddb0f03035d2fc1ee3a58c48033f953866c52d1 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 10 Apr 2013 15:38:02 +0530 Subject: [PATCH 056/541] views and templates for labels --- imgee/forms.py | 15 ++++++++- imgee/static/css/app.css | 11 +++++++ imgee/templates/create_label.html | 14 ++++++++ imgee/templates/profile.html | 37 +++++++++++++++------ imgee/templates/show_label.html | 25 ++++++++++++++ imgee/templates/view_image.html | 10 +++--- imgee/utils.py | 16 +++++++++ imgee/views/__init__.py | 1 + imgee/views/labels.py | 55 +++++++++++++++++++++++++++++++ 9 files changed, 168 insertions(+), 16 deletions(-) create mode 100644 imgee/templates/create_label.html create mode 100644 imgee/templates/show_label.html create mode 100644 imgee/utils.py create mode 100644 imgee/views/labels.py diff --git a/imgee/forms.py b/imgee/forms.py index 20ed9d58..c3925955 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- import os.path -from flask.ext.wtf import Form, FileField, Required, ValidationError +from flask import g +from flask.ext.wtf import (Form, FileField, Required, ValidationError, + TextField, HiddenField, Length) +from imgee.models import Label allowed_extns = 'jpg jpe jpeg png gif bmp'.split() @@ -18,3 +21,13 @@ class UploadImageForm(Form): class DeleteImageForm(Form): pass +def label_doesnt_exist(form, field): + profile_id = form.profile_id.data + label_name = field.data + exists = Label.query.filter_by(profile_id=profile_id, name=label_name).first() + if exists: + raise ValidationError('Label %s already exists. Please try another name' % field.data) + +class CreateLabelForm(Form): + label = TextField('Label', validators=[Required(), Length(max=50), label_doesnt_exist]) + profile_id = HiddenField('profile_id') diff --git a/imgee/static/css/app.css b/imgee/static/css/app.css index 1d729913..04fc5697 100644 --- a/imgee/static/css/app.css +++ b/imgee/static/css/app.css @@ -29,3 +29,14 @@ div.gallery div.image span.delete float: right; padding-right: 2px; } + +div.labels +{ + float: left; + text-decoration: none; +} +div.heading +{ + font-weight: bold; + font-size:16px; +} \ No newline at end of file diff --git a/imgee/templates/create_label.html b/imgee/templates/create_label.html new file mode 100644 index 00000000..9d16755d --- /dev/null +++ b/imgee/templates/create_label.html @@ -0,0 +1,14 @@ +{% extends "layout.html" %} +{% from 'baseframe/forms.html' import renderform %} +{% block titletags -%} + {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} + +{%- endblock %} + +{% block content %} + +

Create Label

+{% set cancel_url=url_for('show_profile', profile_name=profile_name) %} +{{ renderform(form, "Create", cancel_url=cancel_url)}} + +{% endblock %} diff --git a/imgee/templates/profile.html b/imgee/templates/profile.html index 4260a6af..8aee4023 100644 --- a/imgee/templates/profile.html +++ b/imgee/templates/profile.html @@ -6,17 +6,34 @@ {% block content %} +
+ Labels:
+ {% for label in labels %} + {{label.name}} +
+ {% endfor %} +
+ - Upload images + Upload images   |   + New label -
-{% for img in files %} -
- X - -
{{img.title}}
-
-{% endfor %} -
+ +{% if files %} +
+ {% for img in files %} +
+ X + + + +
{{img.title}}
+
+ {% endfor %} +
+{% else %} + There are no images uploaded yet. Upload them. +{% endif %} + {% endblock %} diff --git a/imgee/templates/show_label.html b/imgee/templates/show_label.html new file mode 100644 index 00000000..3b4acfcc --- /dev/null +++ b/imgee/templates/show_label.html @@ -0,0 +1,25 @@ +{% extends "layout.html" %} +{% block titletags -%} + {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} + +{%- endblock %} + +{% block content %} + +
Images with label "{{label}}"
+ +{%if not files %} + There are no images with label "{{label}}" yet. +{% else %} +
+ {% for img in files %} +
+ X + +
{{img.title}}
+
+ {% endfor %} +
+{% endif %} + +{% endblock %} diff --git a/imgee/templates/view_image.html b/imgee/templates/view_image.html index aa551b39..a302fe47 100644 --- a/imgee/templates/view_image.html +++ b/imgee/templates/view_image.html @@ -7,12 +7,12 @@ {% block content %}
{{img.title}}
{% if labels %} - Labels: + Labels: + {% for l in labels %} + {{label}},   + {% endfor %} {% endif %} - {% for l in labels %} - {{label}},   - {% endfor %} - + Add Label
diff --git a/imgee/utils.py b/imgee/utils.py new file mode 100644 index 00000000..0a8ba786 --- /dev/null +++ b/imgee/utils.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from imgee.models import db, Label, Profile + +def save_label(label_name, profile_id): + label = Label(name=label_name, profile_id=profile_id) + db.session.add(label) + db.session.commit() + return label + +def delete_label(label, profile_id): + db.delete(label) + db.delete() + + + diff --git a/imgee/views/__init__.py b/imgee/views/__init__.py index 9b52bfe8..cb6ca58a 100644 --- a/imgee/views/__init__.py +++ b/imgee/views/__init__.py @@ -2,3 +2,4 @@ import imgee.views.index import imgee.views.login +import imgee.views.labels diff --git a/imgee/views/labels.py b/imgee/views/labels.py new file mode 100644 index 00000000..79e5cf38 --- /dev/null +++ b/imgee/views/labels.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- + +from flask import (render_template, request, g, url_for, + abort, redirect, flash) +from imgee import app, forms +from imgee.views.login import authorize, login_required +from imgee.models import Label, StoredFile, Profile +import imgee.utils as utils + +def get_profile_label(profile_name, label_name): + # improve this + profile = Profile.query.filter_by(name=profile_name).first_or_404() + label = Label.query.filter_by(name=label_name, profile_id=profile.userid).first_or_404() + return profile, label + +@app.route('//') +@login_required +@authorize +def show_label(profile_name, label_name): + profile, label = get_profile_label(profile_name, label_name) + files = label.files.filter(Profile.userid==profile.userid).all() + return render_template('show_label.html', label=label.name, files=files) + +@app.route('/labels/new', methods=('GET', 'POST')) +@login_required +@authorize +def create_label(): + profile_id = g.user.userid + form = forms.CreateLabelForm(profile_id=profile_id) + if form.validate_on_submit(): + label = form.label.data + utils.save_label(label, profile_id) + flash('The label "%s" was created.' % label) + return redirect(url_for('show_profile', profile_name=g.user.username)) + return render_template('create_label.html', form=form) + +@app.route('///delete', methods=('POST')) +@login_required +@authorize +def delete_label(profile_name, label_name): + if profile_name != g.user.name: + abort(403) + profile, label = get_profile_label(profile_name, label_name) + utils.delete_label(label, profile) + flash('The label %s was deleted.' % label) + return redirect(url_for('show_profile', profile_name=profile_name)) + +@app.route('//add/', methods=('GET', 'POST')) +def add_label_to(label_name, img_name): + pass + +@app.route('//del/', methods=('GET', 'POST')) +def remove_label_from(img_name): + pass + From 7002e0ec42ff48e60caba8d9d265aa9dac83342a Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 10 Apr 2013 15:38:54 +0530 Subject: [PATCH 057/541] small fixes --- imgee/forms.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index c3925955..f0c340c9 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import os.path -from flask import g from flask.ext.wtf import (Form, FileField, Required, ValidationError, TextField, HiddenField, Length) from imgee.models import Label @@ -26,7 +25,7 @@ def label_doesnt_exist(form, field): label_name = field.data exists = Label.query.filter_by(profile_id=profile_id, name=label_name).first() if exists: - raise ValidationError('Label %s already exists. Please try another name' % field.data) + raise ValidationError('Label "%s" already exists. Please try another name.' % field.data) class CreateLabelForm(Form): label = TextField('Label', validators=[Required(), Length(max=50), label_doesnt_exist]) From b17d941082e9005842d5496754760f671bae6237 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 10 Apr 2013 16:10:20 +0530 Subject: [PATCH 058/541] fix delete label --- imgee/utils.py | 7 +++---- imgee/views/labels.py | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/imgee/utils.py b/imgee/utils.py index 0a8ba786..4b460569 100644 --- a/imgee/utils.py +++ b/imgee/utils.py @@ -8,9 +8,8 @@ def save_label(label_name, profile_id): db.session.commit() return label -def delete_label(label, profile_id): - db.delete(label) - db.delete() - +def delete_label(label): + db.session.delete(label) + db.session.commit() diff --git a/imgee/views/labels.py b/imgee/views/labels.py index 79e5cf38..b3a62551 100644 --- a/imgee/views/labels.py +++ b/imgee/views/labels.py @@ -38,11 +38,11 @@ def create_label(): @login_required @authorize def delete_label(profile_name, label_name): - if profile_name != g.user.name: + if profile_name != g.user.username: abort(403) profile, label = get_profile_label(profile_name, label_name) - utils.delete_label(label, profile) - flash('The label %s was deleted.' % label) + utils.delete_label(label) + flash('The label "%s" was deleted.' % label_name) return redirect(url_for('show_profile', profile_name=profile_name)) @app.route('//add/', methods=('GET', 'POST')) From fcb7970b62bf2c099c84cfdfd817f975fb8e6ba4 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 10 Apr 2013 16:13:41 +0530 Subject: [PATCH 059/541] put margins --- imgee/static/css/app.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/imgee/static/css/app.css b/imgee/static/css/app.css index 04fc5697..9124165d 100644 --- a/imgee/static/css/app.css +++ b/imgee/static/css/app.css @@ -34,9 +34,11 @@ div.labels { float: left; text-decoration: none; + margin-right: 40px; } div.heading { font-weight: bold; - font-size:16px; -} \ No newline at end of file + font-size: 16px; + margin-bottom: 2px 0px 2px 0px; +} From a9572dd85a3ea78e7bcb3220896df2cb05c1aa34 Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 12 Apr 2013 15:29:35 +0530 Subject: [PATCH 060/541] fix profile-stored_file relationship --- imgee/models/profile.py | 1 + imgee/models/stored_file.py | 1 - imgee/views/index.py | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/imgee/models/profile.py b/imgee/models/profile.py index f7568bca..e84200d5 100644 --- a/imgee/models/profile.py +++ b/imgee/models/profile.py @@ -23,6 +23,7 @@ class Profile(BaseNameMixin, db.Model): userid = db.Column(db.Unicode(22), nullable=False, unique=True) description = db.Column(db.UnicodeText, default=u'', nullable=False) type = db.Column(db.Integer, default=PROFILE_TYPE.UNDEFINED, nullable=False) + stored_files = db.relationship('StoredFile', backref=db.backref('owner'), lazy='dynamic', cascade='all, delete-orphan') labels = db.relationship('Label', backref=db.backref('profile'), cascade='all, delete-orphan') def type_label(self): diff --git a/imgee/models/stored_file.py b/imgee/models/stored_file.py index 22f24ec8..c92fb19b 100644 --- a/imgee/models/stored_file.py +++ b/imgee/models/stored_file.py @@ -18,7 +18,6 @@ class StoredFile(BaseNameMixin, db.Model): __tablename__ = 'stored_file' profile_id = db.Column(db.Integer, db.ForeignKey('profile.id'), nullable=False) - profile = db.relationship('Profile', backref='stored_file') thumbnails = db.relationship('Thumbnail', backref='stored_file', cascade='all, delete-orphan') labels = db.relationship('Label', secondary='image_labels', diff --git a/imgee/views/index.py b/imgee/views/index.py index 23a872c1..1de69283 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -40,7 +40,8 @@ def upload_file(): @login_required @authorize def show_profile(profile_name): - files = StoredFile.query.filter(Profile.name == profile_name).all() + p = Profile.query.filter_by(name=profile_name).first_or_404() + files = p.stored_files.all() labels = Label.query.filter(Profile.name == profile_name).all() return render_template('profile.html', files=files, labels=labels, profile_name=profile_name) From fe09905162a52e215527a99243691e77533d8b0c Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 12 Apr 2013 15:57:46 +0530 Subject: [PATCH 061/541] fix query in image delete --- imgee/views/index.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 1de69283..3f244462 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -5,6 +5,7 @@ from flask import (render_template, request, g, jsonify, url_for, abort, redirect, flash) from urlparse import urljoin +from sqlalchemy import and_ from imgee import app, forms from imgee.models import StoredFile, db, Profile, Label @@ -25,7 +26,7 @@ def upload_file(): filename = secure_filename(request.files['uploaded_file'].filename) uniq_name = uuid4().hex profile = Profile.query.filter_by(userid=profileid).first() - stored_file = StoredFile(name=uniq_name, title=filename, profile=profile) + stored_file = StoredFile(name=uniq_name, title=filename, owner=profile) db.session.add(stored_file) db.session.commit() content_type = get_file_type(filename) @@ -60,28 +61,25 @@ def get_image(img_name): @app.route('/thumbnail/') def get_thumbnail(img_name): - img = StoredFile.query.filter_by(name=img_name).first() - if not img: abort(404) + img = StoredFile.query.filter_by(name=img_name).first_or_404() tn_size = app.config.get('THUMBNAIL_SIZE') thumbnail = get_resized_image(img, tn_size, thumbnail=True) return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), thumbnail), code=301) -@app.route('/delete/', methods=('GET','POST')) +@app.route('/delete/', methods=('POST')) @login_required @authorize def delete_file(img_name): - stored_file = StoredFile.query.filter_by(name=img_name).first() - profile_name = Profile.query.filter_by(userid=g.user.userid).one().name - if stored_file: - form = forms.DeleteImageForm() - if form.is_submitted(): - delete_on_s3(stored_file) - db.session.delete(stored_file) - db.session.commit() - flash("%s is deleted" % stored_file.title) - else: - return render_template('delete.html', form=form, filename=img_name, profile_name=profile_name) + q = and_(StoredFile.name==img_name, Profile.userid==g.user.userid) + stored_file = StoredFile.query.filter(q).first_or_404() + profile_name = g.user.username + + form = forms.DeleteImageForm() + if form.is_submitted(): + delete_on_s3(stored_file) + db.session.delete(stored_file) + db.session.commit() + flash("%s is deleted" % stored_file.title) else: - flash("No file found", category="error") # put in appropriate message + return render_template('delete.html', form=form, filename=img_name, profile_name=profile_name) return redirect(url_for('show_profile', profile_name=profile_name)) - From eb7f7836aada18df4cdc473cdd446eb7a599a213 Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 12 Apr 2013 16:52:49 +0530 Subject: [PATCH 062/541] be consistent in naming --- imgee/models/profile.py | 2 +- imgee/models/stored_file.py | 2 +- imgee/views/index.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imgee/models/profile.py b/imgee/models/profile.py index e84200d5..ae39dc82 100644 --- a/imgee/models/profile.py +++ b/imgee/models/profile.py @@ -23,7 +23,7 @@ class Profile(BaseNameMixin, db.Model): userid = db.Column(db.Unicode(22), nullable=False, unique=True) description = db.Column(db.UnicodeText, default=u'', nullable=False) type = db.Column(db.Integer, default=PROFILE_TYPE.UNDEFINED, nullable=False) - stored_files = db.relationship('StoredFile', backref=db.backref('owner'), lazy='dynamic', cascade='all, delete-orphan') + stored_files = db.relationship('StoredFile', backref=db.backref('profile'), lazy='dynamic', cascade='all, delete-orphan') labels = db.relationship('Label', backref=db.backref('profile'), cascade='all, delete-orphan') def type_label(self): diff --git a/imgee/models/stored_file.py b/imgee/models/stored_file.py index c92fb19b..cf6112be 100644 --- a/imgee/models/stored_file.py +++ b/imgee/models/stored_file.py @@ -21,4 +21,4 @@ class StoredFile(BaseNameMixin, db.Model): thumbnails = db.relationship('Thumbnail', backref='stored_file', cascade='all, delete-orphan') labels = db.relationship('Label', secondary='image_labels', - backref=db.backref('files', lazy='dynamic'), cascade='all') + backref=db.backref('stored_files', lazy='dynamic'), cascade='all') diff --git a/imgee/views/index.py b/imgee/views/index.py index 3f244462..32db7900 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -26,7 +26,7 @@ def upload_file(): filename = secure_filename(request.files['uploaded_file'].filename) uniq_name = uuid4().hex profile = Profile.query.filter_by(userid=profileid).first() - stored_file = StoredFile(name=uniq_name, title=filename, owner=profile) + stored_file = StoredFile(name=uniq_name, title=filename, profile=profile) db.session.add(stored_file) db.session.commit() content_type = get_file_type(filename) From ddb0820c31348177027ca2e61dfac2828de56342 Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 12 Apr 2013 17:04:24 +0530 Subject: [PATCH 063/541] fix label queries --- imgee/forms.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/imgee/forms.py b/imgee/forms.py index f0c340c9..136335d3 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -2,7 +2,7 @@ import os.path from flask.ext.wtf import (Form, FileField, Required, ValidationError, - TextField, HiddenField, Length) + TextField, HiddenField, Length, SelectField) from imgee.models import Label allowed_extns = 'jpg jpe jpeg png gif bmp'.split() @@ -30,3 +30,10 @@ def label_doesnt_exist(form, field): class CreateLabelForm(Form): label = TextField('Label', validators=[Required(), Length(max=50), label_doesnt_exist]) profile_id = HiddenField('profile_id') + +class AddLabelForm(Form): + label = SelectField('Label', validators=[Required()]) + profile_id = HiddenField('profile_id') + +class RemoveLabelForm(Form): + pass From 0fbbc927000216368d52fd40365a6f9235f166e6 Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 12 Apr 2013 17:05:16 +0530 Subject: [PATCH 064/541] improve label queries --- imgee/utils.py | 3 ++- imgee/views/index.py | 3 +-- imgee/views/labels.py | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/imgee/utils.py b/imgee/utils.py index 4b460569..6065f300 100644 --- a/imgee/utils.py +++ b/imgee/utils.py @@ -3,7 +3,8 @@ from imgee.models import db, Label, Profile def save_label(label_name, profile_id): - label = Label(name=label_name, profile_id=profile_id) + profile = Profile.query.filter_by(userid=profile_id).one() + label = Label(name=label_name, profile=profile) db.session.add(label) db.session.commit() return label diff --git a/imgee/views/index.py b/imgee/views/index.py index 32db7900..e157b5ed 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -43,8 +43,7 @@ def upload_file(): def show_profile(profile_name): p = Profile.query.filter_by(name=profile_name).first_or_404() files = p.stored_files.all() - labels = Label.query.filter(Profile.name == profile_name).all() - return render_template('profile.html', files=files, labels=labels, profile_name=profile_name) + return render_template('profile.html', files=files, labels=p.labels, profile_name=profile_name) @app.route('/view/') def view_image(img_name): diff --git a/imgee/views/labels.py b/imgee/views/labels.py index b3a62551..9a8b4443 100644 --- a/imgee/views/labels.py +++ b/imgee/views/labels.py @@ -8,10 +8,8 @@ import imgee.utils as utils def get_profile_label(profile_name, label_name): - # improve this - profile = Profile.query.filter_by(name=profile_name).first_or_404() - label = Label.query.filter_by(name=label_name, profile_id=profile.userid).first_or_404() - return profile, label + p = Profile.query.filter(Profile.name==profile_name, Label.name==label_name).first_or_404() + return p, p.labels[0] @app.route('//') @login_required From 85faa69e7d8ad435928e7b8545c6e86d63ac3193 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 15 Apr 2013 14:44:35 +0530 Subject: [PATCH 065/541] bug fix in renaming --- imgee/views/labels.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgee/views/labels.py b/imgee/views/labels.py index 9a8b4443..899de54a 100644 --- a/imgee/views/labels.py +++ b/imgee/views/labels.py @@ -16,7 +16,7 @@ def get_profile_label(profile_name, label_name): @authorize def show_label(profile_name, label_name): profile, label = get_profile_label(profile_name, label_name) - files = label.files.filter(Profile.userid==profile.userid).all() + files = label.stored_files.filter(Profile.userid==profile.userid).all() return render_template('show_label.html', label=label.name, files=files) @app.route('/labels/new', methods=('GET', 'POST')) From 6d63d42f8d4e5ed9c29a270d904ac2e9557f26fe Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 15 Apr 2013 16:59:35 +0530 Subject: [PATCH 066/541] preserve aspect ratio always --- imgee/storage.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index dafade37..5f72c4f1 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -80,20 +80,16 @@ def resize_and_save(img, size, thumbnail=False): return scaled_img_name def get_size((orig_w, orig_h), (w, h)): - # w or h being None means square size + # fit the image to the box along the smaller side and preserve aspect ratio. # w or h being 0 means preserve aspect ratio with that height or width - # else return w, h - if h == 0: - size = (w, orig_h*w/orig_w) - elif w == 0: - size = (orig_w*h/orig_h, h) - elif w == None: - size = (h, h) - elif h == None: - size = (w, w) + + if (h == 0) or (orig_w <= orig_h): + size = (w, w*orig_h/orig_w) else: - size = (w, h) - return size + size = (h*orig_w/orig_h, h) + + size = map(lambda x: max(x, 1), size) # let the width or height be atleast 1px. + return map(int, size) def resize_img(src, size, format, thumbnail): """ @@ -104,10 +100,6 @@ def resize_img(src, size, format, thumbnail): return img = Image.open(src) img.load() - if thumbnail: - # fit the image to the box along the smaller side and preserve aspect ratio. - (ow, oh), (w, h) = img.size, size - size = (0, h) if ow>=oh else (w, 0) size = get_size(img.size, size) resized = img.resize(size, Image.ANTIALIAS) From 20834e09a1434873373b8797763759ab4a982f90 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 15 Apr 2013 17:06:26 +0530 Subject: [PATCH 067/541] upload any file, not just images --- imgee/forms.py | 13 +++++-------- imgee/views/index.py | 16 ++++++++++++---- instance/settings.py | 3 ++- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index 136335d3..94cafd71 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -5,17 +5,14 @@ TextField, HiddenField, Length, SelectField) from imgee.models import Label -allowed_extns = 'jpg jpe jpeg png gif bmp'.split() - -def valid_image(form, field): +def valid_file(form, field): filename = field.data.filename - extn = os.path.splitext(filename)[1].lstrip('.') - if not extn.lower() in allowed_extns: - raise ValidationError("Sorry, we don't support '%s' images. \ - Please upload images in one of these formats: %s" % (extn, repr(allowed_extns)[1:-1])) + name, extn = os.path.splitext(filename) + if not extn: + raise ValidationError("Sorry, file format unknown. Please try uploading another file.") class UploadImageForm(Form): - uploaded_file = FileField("Uploaded File", validators=[Required(), valid_image]) + uploaded_file = FileField("Uploaded File", validators=[Required(), valid_file]) class DeleteImageForm(Form): pass diff --git a/imgee/views/index.py b/imgee/views/index.py index e157b5ed..342f104b 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -12,6 +12,8 @@ from imgee.views.login import lastuser, authorize, login_required from imgee.storage import delete_on_s3, save, get_resized_image, get_file_type +image_formats = 'jpg jpe jpeg png gif bmp'.split() + @app.route('/') def index(): return render_template('index.html') @@ -54,15 +56,21 @@ def view_image(img_name): @app.route('/file/') def get_image(img_name): img = StoredFile.query.filter_by(name=img_name).first_or_404() - size = request.args.get('size', '') - img_name = get_resized_image(img, size) + name, extn = os.path.splitext(img.title) + if extn and extn.lstrip('.') in image_formats: + size = request.args.get('size', '') + img_name = get_resized_image(img, size) return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), img_name), code=301) @app.route('/thumbnail/') def get_thumbnail(img_name): img = StoredFile.query.filter_by(name=img_name).first_or_404() - tn_size = app.config.get('THUMBNAIL_SIZE') - thumbnail = get_resized_image(img, tn_size, thumbnail=True) + name, extn = os.path.splitext(img.title) + if extn and extn.lstrip('.') in image_formats: + tn_size = app.config.get('THUMBNAIL_SIZE') + thumbnail = get_resized_image(img, tn_size, thumbnail=True) + else: + thumbnail = app.config.get('UNKNOWN_FILE_THUMBNAIL') return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), thumbnail), code=301) @app.route('/delete/', methods=('POST')) diff --git a/instance/settings.py b/instance/settings.py index d28d7e8a..36897e48 100644 --- a/instance/settings.py +++ b/instance/settings.py @@ -46,4 +46,5 @@ #: Domain name for files MEDIA_DOMAIN = 'set domain name here' -THUMBNAIL_SIZE=(75, 75) # (w, h) in px \ No newline at end of file +THUMBNAIL_SIZE=(75, 75) # (w, h) in px +UNKNOWN_FILE_THUMBNAIL = 'set path to unknown file thumbnail on media_domain' From 23d774037c2408883a80db4c7a907589cca3c578 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 15 Apr 2013 17:07:25 +0530 Subject: [PATCH 068/541] confirm deletion on GET to /delete --- imgee/views/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgee/views/index.py b/imgee/views/index.py index 342f104b..91888973 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -73,7 +73,7 @@ def get_thumbnail(img_name): thumbnail = app.config.get('UNKNOWN_FILE_THUMBNAIL') return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), thumbnail), code=301) -@app.route('/delete/', methods=('POST')) +@app.route('/delete/', methods=('GET', 'POST')) @login_required @authorize def delete_file(img_name): From e7d4e1a7f98ee8c98752971678d60b4ac4e2bea8 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 15 Apr 2013 17:12:00 +0530 Subject: [PATCH 069/541] show file name in delete page --- imgee/templates/delete.html | 4 ++-- imgee/views/index.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imgee/templates/delete.html b/imgee/templates/delete.html index 4745b2fc..a1de34d3 100644 --- a/imgee/templates/delete.html +++ b/imgee/templates/delete.html @@ -7,8 +7,8 @@ {% block content %} -Are you sure that you want to delete this image? - +Are you sure that you want to delete "{{file.title}}"? + {% set cancel_url=url_for('show_profile', profile_name=profile_name) %} {{ renderform(form, "delete", "Yes, delete it", cancel_url=cancel_url)}} {% endblock %} diff --git a/imgee/views/index.py b/imgee/views/index.py index 91888973..a6fedbf6 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -88,5 +88,5 @@ def delete_file(img_name): db.session.commit() flash("%s is deleted" % stored_file.title) else: - return render_template('delete.html', form=form, filename=img_name, profile_name=profile_name) + return render_template('delete.html', form=form, file=stored_file, profile_name=profile_name) return redirect(url_for('show_profile', profile_name=profile_name)) From 1e08702ad01c0369059eb4c2faa9983c7f9cb180 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 15 Apr 2013 17:31:12 +0530 Subject: [PATCH 070/541] crop to the center --- imgee/storage.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index 5f72c4f1..19017b9d 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -105,9 +105,11 @@ def resize_img(src, size, format, thumbnail): resized = img.resize(size, Image.ANTIALIAS) if thumbnail: - # and crop the rest - right, lower = app.config.get('THUMBNAIL_SIZE') - resized = resized.crop((0, 0, right, lower)) + # and crop the rest, keeping the center. + w, h = resized.size + tw, th = app.config.get('THUMBNAIL_SIZE') + left, top = int((w-tw)/2), int((h-th)/2) + resized = resized.crop((left, top, left+tw, top+th)) imgio = StringIO() resized.save(imgio, format=format, quality=100) From 6751a5222995e2481cac4eb8104e85873c834606 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 17 Apr 2013 15:54:03 +0530 Subject: [PATCH 071/541] move title to layout and other fixes --- imgee/templates/create_label.html | 7 +------ imgee/templates/delete.html | 4 ---- imgee/templates/form.html | 5 ----- imgee/templates/index.html | 4 ---- imgee/templates/profile.html | 11 ++++++----- imgee/templates/show_label.html | 8 +++----- imgee/templates/view_image.html | 22 ++++++++++++++-------- 7 files changed, 24 insertions(+), 37 deletions(-) diff --git a/imgee/templates/create_label.html b/imgee/templates/create_label.html index 9d16755d..9cd9d043 100644 --- a/imgee/templates/create_label.html +++ b/imgee/templates/create_label.html @@ -1,13 +1,8 @@ {% extends "layout.html" %} {% from 'baseframe/forms.html' import renderform %} -{% block titletags -%} - {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} - -{%- endblock %} {% block content %} - -

Create Label

+
Create Label
{% set cancel_url=url_for('show_profile', profile_name=profile_name) %} {{ renderform(form, "Create", cancel_url=cancel_url)}} diff --git a/imgee/templates/delete.html b/imgee/templates/delete.html index a1de34d3..2424ec48 100644 --- a/imgee/templates/delete.html +++ b/imgee/templates/delete.html @@ -1,9 +1,5 @@ {% extends "layout.html" %} {% from 'baseframe/forms.html' import renderform %} -{% block titletags -%} - {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} - -{%- endblock %} {% block content %} diff --git a/imgee/templates/form.html b/imgee/templates/form.html index 92c356d1..8aaa3dc7 100644 --- a/imgee/templates/form.html +++ b/imgee/templates/form.html @@ -1,12 +1,7 @@ {% extends "layout.html" %} {% from 'baseframe/forms.html' import renderform %} -{% block titletags -%} - {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} - -{%- endblock %} {% block content %} - {{ renderform(form, "upload", multipart=True) }} {% endblock %} diff --git a/imgee/templates/index.html b/imgee/templates/index.html index 75ee0b9e..0b986689 100644 --- a/imgee/templates/index.html +++ b/imgee/templates/index.html @@ -1,8 +1,4 @@ {% extends "layout.html" %} -{% block titletags -%} - {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} - -{%- endblock %} {% block content %} diff --git a/imgee/templates/profile.html b/imgee/templates/profile.html index 8aee4023..65a4a121 100644 --- a/imgee/templates/profile.html +++ b/imgee/templates/profile.html @@ -1,8 +1,4 @@ {% extends "layout.html" %} -{% block titletags -%} - {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} - -{%- endblock %} {% block content %} @@ -24,10 +20,15 @@ {% for img in files %}
X - +
{{img.title}}
+
+ {% for label in img.labels %} + {{label.name}},   + {% endfor %} +
{% endfor %}
diff --git a/imgee/templates/show_label.html b/imgee/templates/show_label.html index 3b4acfcc..6fb90055 100644 --- a/imgee/templates/show_label.html +++ b/imgee/templates/show_label.html @@ -1,8 +1,4 @@ {% extends "layout.html" %} -{% block titletags -%} - {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} - -{%- endblock %} {% block content %} @@ -15,7 +11,9 @@ {% for img in files %}
X - + + +
{{img.title}}
{% endfor %} diff --git a/imgee/templates/view_image.html b/imgee/templates/view_image.html index a302fe47..92cf5f52 100644 --- a/imgee/templates/view_image.html +++ b/imgee/templates/view_image.html @@ -1,18 +1,24 @@ {% extends "layout.html" %} -{% block titletags -%} - {% block title %}{{ config['SITE_TITLE'] }}{% endblock %} - -{%- endblock %} +{% from 'baseframe/forms.html' import renderform %} {% block content %}
{{img.title}}
- {% if labels %} + + {% if img.labels %} Labels: - {% for l in labels %} - {{label}},   + {% for label in img.labels %} + {{label.name}},   {% endfor %} {% endif %} - Add Label + + {% set action_url=url_for('add_label_to', img_name=img.name, profile_name=img.profile.name) %} +
+ Delete Image +

+ Add label: + {{ renderform(form, 'Add Label', action=action_url)}} +
+

From 2cbddf541e0f4ecfc02c38ce3fc461edd09e1353 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 17 Apr 2013 16:09:15 +0530 Subject: [PATCH 072/541] don't delete labels on deletion of files --- imgee/models/stored_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgee/models/stored_file.py b/imgee/models/stored_file.py index cf6112be..a810aaac 100644 --- a/imgee/models/stored_file.py +++ b/imgee/models/stored_file.py @@ -21,4 +21,4 @@ class StoredFile(BaseNameMixin, db.Model): thumbnails = db.relationship('Thumbnail', backref='stored_file', cascade='all, delete-orphan') labels = db.relationship('Label', secondary='image_labels', - backref=db.backref('stored_files', lazy='dynamic'), cascade='all') + backref=db.backref('stored_files', lazy='dynamic')) From 564065da3e51add2b9ee4105f076511bb5f0da79 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 17 Apr 2013 16:10:09 +0530 Subject: [PATCH 073/541] add label, remove label to images --- imgee/forms.py | 4 ++-- imgee/utils.py | 12 ++++++++++++ imgee/views/index.py | 18 +++++++++++------- imgee/views/labels.py | 43 +++++++++++++++++++++++++++++++++++-------- 4 files changed, 60 insertions(+), 17 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index 94cafd71..5de84efb 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -29,8 +29,8 @@ class CreateLabelForm(Form): profile_id = HiddenField('profile_id') class AddLabelForm(Form): - label = SelectField('Label', validators=[Required()]) - profile_id = HiddenField('profile_id') + label = SelectField('Label', validators=[Required()], coerce=int) + stored_file_id = HiddenField('stored_file_id') class RemoveLabelForm(Form): pass diff --git a/imgee/utils.py b/imgee/utils.py index 6065f300..6547ef9f 100644 --- a/imgee/utils.py +++ b/imgee/utils.py @@ -13,4 +13,16 @@ def delete_label(label): db.session.delete(label) db.session.commit() +def save_label_to(stored_file, label): + if label not in stored_file.labels: + stored_file.labels.append(label) + db.session.commit() + return True + return False +def remove_label_from(stored_file, label): + if label in stored_file.labels: + stored_file.labels.remove(label) + db.session.commit() + return True + return False diff --git a/imgee/views/index.py b/imgee/views/index.py index a6fedbf6..8831f25a 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -47,17 +47,21 @@ def show_profile(profile_name): files = p.stored_files.all() return render_template('profile.html', files=files, labels=p.labels, profile_name=profile_name) -@app.route('/view/') -def view_image(img_name): - img = StoredFile.query.filter_by(name=img_name).first_or_404() - labels = [label.name for label in img.labels] - return render_template('view_image.html', img=img, labels=labels) +@app.route('//view/') +@login_required +@authorize +def view_image(profile_name, img_name): + img = StoredFile.query.filter(StoredFile.name==img_name, Profile.name==profile_name).first_or_404() + img_labels = [label.name for label in img.labels] + form = forms.AddLabelForm(img_name=img_name) + form.label.choices = [(l.id, l.name) for l in img.profile.labels] + return render_template('view_image.html', form=form, img=img, labels=img_labels) @app.route('/file/') def get_image(img_name): img = StoredFile.query.filter_by(name=img_name).first_or_404() name, extn = os.path.splitext(img.title) - if extn and extn.lstrip('.') in image_formats: + if extn and extn.lstrip('.').lower() in image_formats: size = request.args.get('size', '') img_name = get_resized_image(img, size) return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), img_name), code=301) @@ -66,7 +70,7 @@ def get_image(img_name): def get_thumbnail(img_name): img = StoredFile.query.filter_by(name=img_name).first_or_404() name, extn = os.path.splitext(img.title) - if extn and extn.lstrip('.') in image_formats: + if extn and extn.lstrip('.').lower() in image_formats: tn_size = app.config.get('THUMBNAIL_SIZE') thumbnail = get_resized_image(img, tn_size, thumbnail=True) else: diff --git a/imgee/views/labels.py b/imgee/views/labels.py index 899de54a..aa10e167 100644 --- a/imgee/views/labels.py +++ b/imgee/views/labels.py @@ -8,8 +8,9 @@ import imgee.utils as utils def get_profile_label(profile_name, label_name): - p = Profile.query.filter(Profile.name==profile_name, Label.name==label_name).first_or_404() - return p, p.labels[0] + profile = Profile.query.filter(Profile.name==profile_name, Label.name==label_name).first_or_404() + label = [l for l in profile.labels if l.name == label_name][0] + return profile, label @app.route('//') @login_required @@ -32,7 +33,7 @@ def create_label(): return redirect(url_for('show_profile', profile_name=g.user.username)) return render_template('create_label.html', form=form) -@app.route('///delete', methods=('POST')) +@app.route('///delete', methods=['POST']) @login_required @authorize def delete_label(profile_name, label_name): @@ -43,11 +44,37 @@ def delete_label(profile_name, label_name): flash('The label "%s" was deleted.' % label_name) return redirect(url_for('show_profile', profile_name=profile_name)) -@app.route('//add/', methods=('GET', 'POST')) -def add_label_to(label_name, img_name): - pass +@app.route('//add_label/', methods=['POST']) +@login_required +@authorize +def add_label_to(profile_name, img_name): + if profile_name != g.user.username: + abort(403) + profile = Profile.query.filter(Profile.name==profile_name, StoredFile.name==img_name).first_or_404() + stored_file = [s for s in profile.stored_files if s.name == img_name][0] + image_labels = [l.name for l in stored_file.labels] + form = forms.AddLabelForm() + form.label.choices = [(l.id, l.name) for l in profile.labels] + if form.validate_on_submit(): + label_id = form.label.data + label = [l for l in profile.labels if l.id == label_id][0] + if utils.save_label_to(stored_file, label): + flash('Added label "%s" to "%s".' % (label.name, stored_file.title)) + return redirect(url_for('view_image', img_name=img_name, profile_name=profile_name)) + return render_template('view_image.html', form=form, img=stored_file, labels=image_labels) -@app.route('//del/', methods=('GET', 'POST')) +@app.route('//del_label/', methods=['POST']) def remove_label_from(img_name): - pass + if profile_name != g.user.username: + abort(403) + profile = Profile.query.filter(Profile.name==profile_name, StoredFile.name==img_name).first_or_404() + stored_file = [s for s in profile.stored_files if s.name == img_name][0] + form = forms.RemoveLabelForm() + if form.validate_on_submit(): + label_id = form.label.data + label = [l for l in profile.labels if l.id == label_id][0] + if utils.remove_label_from(stored_file, label): + flash('Removed label "%s" from "%s".' % (label.name, stored_file.title)) + return redirect(url_for('view_image', img_name=img_name, profile_name=profile_name)) + return render_template('view_image.html', form=form, img=stored_file, labels=image_labels) From 03dfd196328d58185fa22710a274d57bf78abe79 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 17 Apr 2013 17:14:00 +0530 Subject: [PATCH 074/541] add/remove multiple labels at once --- imgee/forms.py | 4 ++-- imgee/utils.py | 20 +++++++++++--------- imgee/views/labels.py | 16 ++++++++-------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/imgee/forms.py b/imgee/forms.py index 5de84efb..3e40b8bd 100644 --- a/imgee/forms.py +++ b/imgee/forms.py @@ -2,7 +2,7 @@ import os.path from flask.ext.wtf import (Form, FileField, Required, ValidationError, - TextField, HiddenField, Length, SelectField) + TextField, HiddenField, Length, SelectField, SelectMultipleField) from imgee.models import Label def valid_file(form, field): @@ -29,7 +29,7 @@ class CreateLabelForm(Form): profile_id = HiddenField('profile_id') class AddLabelForm(Form): - label = SelectField('Label', validators=[Required()], coerce=int) + label = SelectMultipleField('Labels', validators=[Required()], coerce=int) stored_file_id = HiddenField('stored_file_id') class RemoveLabelForm(Form): diff --git a/imgee/utils.py b/imgee/utils.py index 6547ef9f..56a0dd09 100644 --- a/imgee/utils.py +++ b/imgee/utils.py @@ -13,16 +13,18 @@ def delete_label(label): db.session.delete(label) db.session.commit() -def save_label_to(stored_file, label): - if label not in stored_file.labels: - stored_file.labels.append(label) +def save_labels_to(stored_file, labels): + new_labels = [l for l in labels if not l in stored_file.labels] + if new_labels: + stored_file.labels.extend(new_labels) db.session.commit() - return True - return False + return new_labels -def remove_label_from(stored_file, label): - if label in stored_file.labels: +def remove_labels_from(stored_file, labels): + # improve this + to_remove = [l for l in labels if l in stored_file.labels] + for label in to_remove: stored_file.labels.remove(label) + if to_remove: db.session.commit() - return True - return False + return to_remove diff --git a/imgee/views/labels.py b/imgee/views/labels.py index aa10e167..46957dd2 100644 --- a/imgee/views/labels.py +++ b/imgee/views/labels.py @@ -56,10 +56,10 @@ def add_label_to(profile_name, img_name): form = forms.AddLabelForm() form.label.choices = [(l.id, l.name) for l in profile.labels] if form.validate_on_submit(): - label_id = form.label.data - label = [l for l in profile.labels if l.id == label_id][0] - if utils.save_label_to(stored_file, label): - flash('Added label "%s" to "%s".' % (label.name, stored_file.title)) + labels = [l for l in profile.labels if l.id in form.label.data] + added = utils.save_labels_to(stored_file, labels) + if added: + flash('Added label(s) %s to "%s".' % (', '.join(l.name for l in added), stored_file.title)) return redirect(url_for('view_image', img_name=img_name, profile_name=profile_name)) return render_template('view_image.html', form=form, img=stored_file, labels=image_labels) @@ -72,9 +72,9 @@ def remove_label_from(img_name): form = forms.RemoveLabelForm() if form.validate_on_submit(): - label_id = form.label.data - label = [l for l in profile.labels if l.id == label_id][0] - if utils.remove_label_from(stored_file, label): - flash('Removed label "%s" from "%s".' % (label.name, stored_file.title)) + labels = [l for l in profile.labels if l.id == form.label.data] + removed = utils.remove_labels_from(stored_file, labels) + if removed: + flash('Removed label(s) %s from "%s".' % (', '.join(l.name for l in removed), stored_file.title)) return redirect(url_for('view_image', img_name=img_name, profile_name=profile_name)) return render_template('view_image.html', form=form, img=stored_file, labels=image_labels) From 8f19913475bcc2dc1b301eff711ea573c8cae197 Mon Sep 17 00:00:00 2001 From: Devi Date: Wed, 17 Apr 2013 17:24:38 +0530 Subject: [PATCH 075/541] removing trailing comma --- imgee/templates/view_image.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/imgee/templates/view_image.html b/imgee/templates/view_image.html index 92cf5f52..4e3c953d 100644 --- a/imgee/templates/view_image.html +++ b/imgee/templates/view_image.html @@ -7,7 +7,10 @@ {% if img.labels %} Labels: {% for label in img.labels %} - {{label.name}},   + {{label.name}} + {% if not loop.last %} + ,   + {% endif %} {% endfor %} {% endif %} @@ -15,8 +18,8 @@
Delete Image

- Add label: - {{ renderform(form, 'Add Label', action=action_url)}} + Add labels: + {{ renderform(form, 'Add Labels', action=action_url)}}


From 8f2652583ec6dd48aa2af0b5c181491dcc076366 Mon Sep 17 00:00:00 2001 From: Devi Date: Thu, 18 Apr 2013 14:20:48 +0530 Subject: [PATCH 076/541] upload to a folder on s3 --- imgee/storage.py | 15 +++++++++++---- imgee/views/index.py | 4 +++- instance/settings.py | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/imgee/storage.py b/imgee/storage.py index 19017b9d..950ffca2 100644 --- a/imgee/storage.py +++ b/imgee/storage.py @@ -29,9 +29,16 @@ def save(fp, img_name, remote=True, content_type=None): def get_file_type(filename): return mimetypes.guess_type(filename)[0] -def save_on_s3(fp, filename, content_type=''): +def get_s3_folder(f=''): + f = f or app.config['AWS_FOLDER'] + if f and not f.endswith('/'): + f = f+'/' + return f or '' + +def save_on_s3(fp, filename, content_type='', folder=''): b = get_s3_bucket() - k = b.new_key(filename) + folder = get_s3_folder(folder) + k = b.new_key(folder+filename) content_type = content_type or get_file_type(filename) headers = { 'Cache-Control': 'max-age=31536000', #60*60*24*365 @@ -130,7 +137,7 @@ def delete_on_s3(stored_file): """ Delete all the thumbnails and images associated with a file """ - keys = [thumbnail.name for thumbnail in stored_file.thumbnails] - keys.append(stored_file.name) + keys = [get_s3_folder()+thumbnail.name for thumbnail in stored_file.thumbnails] + keys.append(get_s3_folder()+stored_file.name) bucket = get_s3_bucket() bucket.delete_keys(keys) diff --git a/imgee/views/index.py b/imgee/views/index.py index 8831f25a..19d3d843 100644 --- a/imgee/views/index.py +++ b/imgee/views/index.py @@ -10,7 +10,7 @@ from imgee import app, forms from imgee.models import StoredFile, db, Profile, Label from imgee.views.login import lastuser, authorize, login_required -from imgee.storage import delete_on_s3, save, get_resized_image, get_file_type +from imgee.storage import delete_on_s3, save, get_resized_image, get_file_type, get_s3_folder image_formats = 'jpg jpe jpeg png gif bmp'.split() @@ -64,6 +64,7 @@ def get_image(img_name): if extn and extn.lstrip('.').lower() in image_formats: size = request.args.get('size', '') img_name = get_resized_image(img, size) + img_name = get_s3_folder() + img_name return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), img_name), code=301) @app.route('/thumbnail/') @@ -73,6 +74,7 @@ def get_thumbnail(img_name): if extn and extn.lstrip('.').lower() in image_formats: tn_size = app.config.get('THUMBNAIL_SIZE') thumbnail = get_resized_image(img, tn_size, thumbnail=True) + thumbnail = get_s3_folder() + thumbnail else: thumbnail = app.config.get('UNKNOWN_FILE_THUMBNAIL') return redirect(urljoin(app.config.get('MEDIA_DOMAIN'), thumbnail), code=301) diff --git a/instance/settings.py b/instance/settings.py index 36897e48..cb20b293 100644 --- a/instance/settings.py +++ b/instance/settings.py @@ -37,6 +37,7 @@ AWS_ACCESS_KEY = 'Set aws access key here' AWS_SECRET_KEY = 'Set aws secret key here' AWS_BUCKET = 'set your bucketname here' +AWS_FOLDER = '' # set this if you want all files to be uploaded to a particular folder eg., 'test/' # bear with the non-standard aws key names used in flask-storage From 289033fdf2be0174620e6e0e14d31e64bba0af2c Mon Sep 17 00:00:00 2001 From: Devi Date: Thu, 18 Apr 2013 14:24:44 +0530 Subject: [PATCH 077/541] remove stale settings of flask-storage --- instance/settings.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/instance/settings.py b/instance/settings.py index cb20b293..7ab6b145 100644 --- a/instance/settings.py +++ b/instance/settings.py @@ -38,13 +38,6 @@ AWS_SECRET_KEY = 'Set aws secret key here' AWS_BUCKET = 'set your bucketname here' AWS_FOLDER = '' # set this if you want all files to be uploaded to a particular folder eg., 'test/' - -# bear with the non-standard aws key names used in flask-storage - -AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY -AWS_SECRET_ACCESS_KEY=AWS_SECRET_KEY -AWS_STORAGE_BUCKET_NAME=AWS_BUCKET - #: Domain name for files MEDIA_DOMAIN = 'set domain name here' THUMBNAIL_SIZE=(75, 75) # (w, h) in px From f55318d07f6a22d07adc89381c786e5cd69ccb8a Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 19 Apr 2013 18:23:11 +0530 Subject: [PATCH 078/541] no labels --- imgee/templates/profile.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/imgee/templates/profile.html b/imgee/templates/profile.html index 65a4a121..5b1c06bc 100644 --- a/imgee/templates/profile.html +++ b/imgee/templates/profile.html @@ -3,11 +3,15 @@ {% block content %}
- Labels:
- {% for label in labels %} - {{label.name}} -
- {% endfor %} + {% if labels %} + Labels:
+ {% for label in labels %} + {{label.name}} +
+ {% endfor %} + {% else %} + No Labels yet. Create a one. + {% endif %}
From 013c52f3acaea04807bee39fcbe985f49b8e3add Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 19 Apr 2013 18:35:35 +0530 Subject: [PATCH 079/541] setup test base --- imgee/tests/__init__.py | 1 - imgee/tests/fixtures.py | 10 -------- imgee/tests/test_listing.py | 28 -------------------- imgee/views/login.py | 10 +++++--- instance/settings.py | 3 ++- tests/__init__.py | 0 tests/fixtures.py | 36 ++++++++++++++++++++++++++ tests/test_listing.py | 51 +++++++++++++++++++++++++++++++++++++ tests/test_utils.py | 24 +++++++++++++++++ 9 files changed, 120 insertions(+), 43 deletions(-) delete mode 100644 imgee/tests/__init__.py delete mode 100644 imgee/tests/fixtures.py delete mode 100644 imgee/tests/test_listing.py create mode 100644 tests/__init__.py create mode 100644 tests/fixtures.py create mode 100644 tests/test_listing.py create mode 100644 tests/test_utils.py diff --git a/imgee/tests/__init__.py b/imgee/tests/__init__.py deleted file mode 100644 index 8a7593ae..00000000 --- a/imgee/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from test_listing import * diff --git a/imgee/tests/fixtures.py b/imgee/tests/fixtures.py deleted file mode 100644 index 1dbcde99..00000000 --- a/imgee/tests/fixtures.py +++ /dev/null @@ -1,10 +0,0 @@ -from imgee.models import db, User - -def create_user(self): - user = User(username=u'nigelb', userid=u'WzTwFMKEQ5yozIkDj7feCw', - lastuser_token_scope=u'id', lastuser_token_type=u'bearer', - lastuser_token=u'-zhQm-NRSRaVfLQnebR3Mw', - fullname=u'Nigel Babu', id=1) - db.session.add(user) - db.session.commit() - return user diff --git a/imgee/tests/test_listing.py b/imgee/tests/test_listing.py deleted file mode 100644 index aaab42a3..00000000 --- a/imgee/tests/test_listing.py +++ /dev/null @@ -1,28 +0,0 @@ -import os -from imgee import init_for, app -from imgee.models import db, User -import unittest -import tempfile - -class UploadTestCase(unittest.TestCase): - - def setUp(self): - init_for('testing') - app.config['TESTING'] = True - self.app = app.test_client() - db.create_all() - - def tearDown(self): - db.drop_all() - - def create_user(self): - user = User(username=u'nigelb', userid=u'WzTwFMKEQ5yozIkDj7feCw', - lastuser_token_scope=u'id', lastuser_token_type=u'bearer', - lastuser_token=u'-zhQm-NRSRaVfLQnebR3Mw', - fullname=u'Nigel Babu', id=1) - db.session.add(user) - db.session.commit() - - def test_listing_without_login(self): - rv = self.app.get('/list') - assert "You should be redirected automatically to target URL" in rv.data diff --git a/imgee/views/login.py b/imgee/views/login.py index b2689429..23349ebc 100644 --- a/imgee/views/login.py +++ b/imgee/views/login.py @@ -2,7 +2,7 @@ from functools import wraps -from flask import Response, redirect, flash, g, url_for, request +from flask import Response, redirect, flash, g, url_for, request, abort from flask.ext.lastuser.sqlalchemy import UserManager from coaster.views import get_next_url @@ -15,18 +15,22 @@ def login_required(f): @wraps(f) def decorated_func(*args, **kwargs): if g.user is None: - return redirect(url_for('login', next=request.url)) + if app.testing: + g.user = app.test_user + else: + return redirect(url_for('login', next=request.url)) return f(*args, **kwargs) return decorated_func def authorize(f): @wraps(f) def decorated_func(*args, **kwargs): + if app.testing: g.user = app.test_user profileid = g.user.userid make_profiles() if profileid in g.user.user_organizations_owned_ids(): return f(*args, **kwargs) - return jsonify({'error': 'You do not have permission to access this resource'}) + return abort(403) return decorated_func @app.route('/login') diff --git a/instance/settings.py b/instance/settings.py index 7ab6b145..f7792035 100644 --- a/instance/settings.py +++ b/instance/settings.py @@ -4,7 +4,7 @@ #: Site id (for network bar) SITE_ID = '' #: Database backend -SQLALCHEMY_DATABASE_URI = 'sqlite:///test.db' +SQLALCHEMY_DATABASE_URI = 'sqlite:///imgee.db' #: Secret key SECRET_KEY = 'make this something random' #: Timezone @@ -42,3 +42,4 @@ MEDIA_DOMAIN = 'set domain name here' THUMBNAIL_SIZE=(75, 75) # (w, h) in px UNKNOWN_FILE_THUMBNAIL = 'set path to unknown file thumbnail on media_domain' + diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/fixtures.py b/tests/fixtures.py new file mode 100644 index 00000000..ace0603d --- /dev/null +++ b/tests/fixtures.py @@ -0,0 +1,36 @@ +import unittest +import random, string + +from flask import g +from imgee import init_for, app +from imgee.models import db, User + +def get_test_user(name, id=1): + if not name: + name = 'testuser_%d' % id + userid = ''.join(random.sample(string.letters, 22)) + u = User(username=unicode(name), userid=unicode(userid), + lastuser_token_scope=u'id email organizations', lastuser_token_type=u'bearer', + lastuser_token=u'last-user-token', + fullname=name.capitalize(), id=id) + return u + +class ImgeeTestCase(unittest.TestCase): + def setUp(self): + init_for('testing') + app.config['TESTING'] = True + app.testing = True + self.test_user_name = 'testuser' + app.test_user = get_test_user(name=self.test_user_name) + self.client = app.test_client() + db.create_all() + + def tearDown(self): + db.drop_all() + +class DummyUser(object): + def __init__(self, username): + self.username = username + + def __enter__(self): + g.user = get_test_user(name=username) diff --git a/tests/test_listing.py b/tests/test_listing.py new file mode 100644 index 00000000..ac3911c6 --- /dev/null +++ b/tests/test_listing.py @@ -0,0 +1,51 @@ +import unittest +import os, requests +from StringIO import StringIO + +from imgee import storage +from imgee.models import db, User, StoredFile +from fixtures import get_test_user, ImgeeTestCase + +import test_utils + +class UploadTestCase(ImgeeTestCase): + def setUp(self): + super(UploadTestCase, self).setUp() + self.img_id = None + + def test_empty(self): + r = self.client.get('/%s' % self.test_user_name) + assert r.status_code == 200 + assert 'no images uploaded yet.' in r.data + assert 'No Labels yet.' in r.data + + def exists_on_media_domain(self, img_id): + r = self.client.get('/file/%s' % img_id) + assert r.status_code == 301 + return requests.get(r.location).ok + + def thumbnais_exists_on_media_domain(self, img_id): + r = self.client.get('/thumbnail/%s' % img_id) + assert r.status_code == 301 + return requests.get(r.location).ok + + def test_upload(self): + test_file = 'imgee/static/images/earth_moon_4test.gif' + content = open(test_file).read() + filename = os.path.basename(test_file) + d = {'uploaded_file': (StringIO(content), filename)} + r = self.client.post('/new', data=d, follow_redirects=True) + assert r.status_code == 200 + assert filename in r.data + assert "uploaded successfully." in r.data + self.img_id = test_utils.get_img_id(r.data, filename) + assert self.exists_on_media_domain(self.img_id) == True + assert self.thumbnais_exists_on_media_domain(self.img_id) == True + + def tearDown(self): + s = StoredFile.query.filter_by(name=self.img_id).first() + if s: storage.delete_on_s3(s) + super(UploadTestCase, self).tearDown() + +if __name__ == '__main__': + unittest.main() diff --git a/tests/test_utils.py b/tests/test_utils.py new file mode 100644 index 00000000..d2f8d87c --- /dev/null +++ b/tests/test_utils.py @@ -0,0 +1,24 @@ +from bs4 import BeautifulSoup + +def get_img_id(r, img_title): + """ + >>> r = r'''
+ ... X + ... + ... + ... + ...
earth_moon_4test.gif
+ ...
+ ...
''' + ... + >>> get_img_id(r, 'earth_moon_4test.gif') + u'abcd' + """ + soup = BeautifulSoup(r) + img_div = soup.find(text=img_title).findParent('div', attrs={'class': 'image'}) + x = img_div.find('a')['href'] + return x.split('/')[-1] + +if __name__ == '__main__': + import doctest + doctest.testmod() From fd520598c288c59d8c3dfafb2e80863ace0d8fb8 Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 19 Apr 2013 18:43:37 +0530 Subject: [PATCH 080/541] add test image --- imgee/static/images/earth_moon_4test.gif | Bin 0 -> 1988 bytes tests/{test_listing.py => test_uploads.py} | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 imgee/static/images/earth_moon_4test.gif rename tests/{test_listing.py => test_uploads.py} (100%) diff --git a/imgee/static/images/earth_moon_4test.gif b/imgee/static/images/earth_moon_4test.gif new file mode 100644 index 0000000000000000000000000000000000000000..0d3e0a2c28b60c69d83b1689fa48e0603e148ff8 GIT binary patch literal 1988 zcmV;#2RryjNk%w1VK4wN0Qdg@00025%Wotn8#OvLdXa_I$dzVnQ;C&vEHWvSgIRcj zVpoTUw92xWq-=S5c`G$Cc56jCLOTf(6Di=#!puMp}OEfz?F9un4O;to% zV^yrct%H_^;^s<|wlK}w%&?0|Ns|bab+{l0$G_b+dzF zT1U3GrSZy)3nVHIF*;{tK!lHVe|1lil3~Wl!W3M3vc-}DPGtp9X1BPvu)Mw5*uAg7 zsbqUiij;tGhhQx#AiKnJy3V(1k$l+Hd|;4nJv1gmQ$b>FUhL}8(dyC?LsF=&tMux@ zwXuQF;>X9yl!~jLL0)2ie|}VTQ~CGY009ChUvy)FTunePKSV2)uAWd)I-sGS0Spix zUTklvan#h*A^8LW00930EC2ui05AYB000R80RIUbNU)&6g9sBY@v$VK!-o(DN-MJ> zqQ#2?eb5?)v17!B9z%*8NwTELlPFWF97w{)h+%4Ij3@zeWkG4f9OxK;0Kt_I7cM-A zv4Vune?BzTcoqiCoCrLBR+y!0lOYE_Qj$<61yYS12Rz9F!&8f)3xBEr0D!B4h?*l+ zxNF1iKoCfff*4>C$IBG~A*SkDyB0?YlIn8sD$pQ^;~)yk$eJ_>0US6LEJPyAHpB># zJB&E8(cli)0|z1-nA8OfmB4>uab63HhQ~+mzVtgL&x)08(G&>x#G(rzK>{lLIW?Ot ztgIJFxH{2GQMGP8y4lN8PL?xIs|8*E`MF$Ja{xHtI$V-OhO1h(7F5gd0>}{#2@*hn zP)85~D#^`aUUQqoW6>ir$RLU+O`MPeBu-2LgdYav2SF5GP;rT6RGkNa1<*Z|O@imt z;)*K;wBUpgjN}3hH2UEK$Z?l|qQPd(;j)P(5Rvc#DorHV;0LV;F$Fg*=m!B0&d?D> zDK%;!n}-^x@DMg~5Wz}W4kbpB2BooCwjdIwwLqh*94+-}LZJ4g`>rPd)^=K*1P&&=ST@7zhB$ADgJU zi38}qgUSnL^l%6!;V5DR1K#{&o$ zA_1eS+J+DbVrU}=2pKH@z{NKW+;T<=9;A~_2OW%Z@f-*w$6TYhSYTyBFzms}9$(aB z1T~+e&@>@~_<=$*D9}6y7CFDE>Hz8$bPYJ1prgnTix@%53@|@23LdK5(2Oc`Jn(}A z7IX}G&k2!`MjCFwkO2jW+&cpzPwXrT~NNqdm3*0|9xAfqox}c*PptH-`aW;bsz`-+(++g=<)(1a4pe`o{1E zG&DkhY0`1|4YdCl~Ob>O7={R#}7uN@#~R z^3Vq~SdbPRzyVaDun>a4Xr@uH5FbWJkc4)0f*VCZgC)#C3mrrt0^@=OEM{T6=2XCL z9>HN6DxtzDhG7lxd%y*hL$}#zL0KYMf(pRV2}($@h48z=8c)$h&fs8jCGmkeG{Fr@ zn8S)xxB@JS*BmXZpmifzLJ2fM2}`U22Lm8i8v&pN5!i4gKG;V*Hjv3v;NlO47=Qz4 W07;vW;2PJU0S&GpjaFVHAOJh(q(A@w literal 0 HcmV?d00001 diff --git a/tests/test_listing.py b/tests/test_uploads.py similarity index 100% rename from tests/test_listing.py rename to tests/test_uploads.py From 4b08b949a2fe536e2cb33ea3436440ecfc351c13 Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 19 Apr 2013 19:27:09 +0530 Subject: [PATCH 081/541] more tests --- tests/test_uploads.py | 47 ++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/tests/test_uploads.py b/tests/test_uploads.py index ac3911c6..08840c7b 100644 --- a/tests/test_uploads.py +++ b/tests/test_uploads.py @@ -3,7 +3,7 @@ from StringIO import StringIO from imgee import storage -from imgee.models import db, User, StoredFile +from imgee.models import db, User, StoredFile, Profile from fixtures import get_test_user, ImgeeTestCase import test_utils @@ -12,35 +12,54 @@ class UploadTestCase(ImgeeTestCase): def setUp(self): super(UploadTestCase, self).setUp() self.img_id = None - - def test_empty(self): - r = self.client.get('/%s' % self.test_user_name) - assert r.status_code == 200 - assert 'no images uploaded yet.' in r.data - assert 'No Labels yet.' in r.data + self.test_file = 'imgee/static/images/earth_moon_4test.gif' def exists_on_media_domain(self, img_id): r = self.client.get('/file/%s' % img_id) assert r.status_code == 301 return requests.get(r.location).ok - def thumbnais_exists_on_media_domain(self, img_id): + def thumbnails_exists_on_media_domain(self, img_id): r = self.client.get('/thumbnail/%s' % img_id) assert r.status_code == 301 return requests.get(r.location).ok - def test_upload(self): - test_file = 'imgee/static/images/earth_moon_4test.gif' - content = open(test_file).read() - filename = os.path.basename(test_file) + def upload(self, path=None): + path = path or self.test_file + content = open(path).read() + filename = os.path.basename(path) d = {'uploaded_file': (StringIO(content), filename)} - r = self.client.post('/new', data=d, follow_redirects=True) + response = self.client.post('/new', data=d, follow_redirects=True) + return filename, response + + def test_empty(self): + r = self.client.get('/%s' % self.test_user_name) + assert r.status_code == 200 + assert 'no images uploaded yet.' in r.data + assert 'No Labels yet.' in r.data + + def test_upload(self): + filename, r = self.upload() assert r.status_code == 200 assert filename in r.data assert "uploaded successfully." in r.data + + def test_view_image(self): + filename, r = self.upload() + self.img_id = test_utils.get_img_id(r.data, filename) + view_url = '/%s/view/%s' % (self.test_user_name, self.img_id) + r = self.client.get(view_url) + assert r.status_code == 200 + + def test_file(self): + filename, r = self.upload() self.img_id = test_utils.get_img_id(r.data, filename) assert self.exists_on_media_domain(self.img_id) == True - assert self.thumbnais_exists_on_media_domain(self.img_id) == True + + def test_thumbnail(self): + filename, r = self.upload() + self.img_id = test_utils.get_img_id(r.data, filename) + assert self.thumbnails_exists_on_media_domain(self.img_id) == True def tearDown(self): s = StoredFile.query.filter_by(name=self.img_id).first() From 925a3e8b26c900013d4bdda49747b036b3e250ca Mon Sep 17 00:00:00 2001 From: Devi Date: Fri, 19 Apr 2013 20:06:16 +0530 Subject: [PATCH 082/541] appropriate assert calls --- tests/test_uploads.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/test_uploads.py b/tests/test_uploads.py index 08840c7b..9f8bbe57 100644 --- a/tests/test_uploads.py +++ b/tests/test_uploads.py @@ -16,12 +16,12 @@ def setUp(self): def exists_on_media_domain(self, img_id): r = self.client.get('/file/%s' % img_id) - assert r.status_code == 301 + self.assertEquals(r.status_code, 301) return requests.get(r.location).ok def thumbnails_exists_on_media_domain(self, img_id): r = self.client.get('/thumbnail/%s' % img_id) - assert r.status_code == 301 + self.assertEquals(r.status_code, 301) return requests.get(r.location).ok def upload(self, path=None): @@ -34,32 +34,32 @@ def upload(self, path=None): def test_empty(self): r = self.client.get('/%s' % self.test_user_name) - assert r.status_code == 200 - assert 'no images uploaded yet.' in r.data - assert 'No Labels yet.' in r.data + self.assertEquals(r.status_code, 200) + self.assertTrue('no images uploaded yet.' in r.data) + self.assertTrue('No Labels yet.' in r.data) def test_upload(self): filename, r = self.upload() - assert r.status_code == 200 - assert filename in r.data - assert "uploaded successfully." in r.data + self.assertEquals(r.status_code, 200) + self.assertTrue(filename in r.data) + self.assertTrue("uploaded successfully." in r.data) def test_view_image(self): filename, r = self.upload() self.img_id = test_utils.get_img_id(r.data, filename) view_url = '/%s/view/%s' % (self.test_user_name, self.img_id) r = self.client.get(view_url) - assert r.status_code == 200 + self.assertEquals(r.status_code, 200) def test_file(self): filename, r = self.upload() self.img_id = test_utils.get_img_id(r.data, filename) - assert self.exists_on_media_domain(self.img_id) == True + self.assertTrue(self.exists_on_media_domain(self.img_id)) def test_thumbnail(self): filename, r = self.upload() self.img_id = test_utils.get_img_id(r.data, filename) - assert self.thumbnails_exists_on_media_domain(self.img_id) == True + self.assertTrue(self.thumbnails_exists_on_media_domain(self.img_id)) def tearDown(self): s = StoredFile.query.filter_by(name=self.img_id).first() From e52fe20cfe84e72e784740d42b399d4be3cc09c9 Mon Sep 17 00:00:00 2001 From: Praseetha-KR Date: Sun, 21 Apr 2013 15:00:36 +0530 Subject: [PATCH 083/541] Added style --- imgee/static/css/app.css | 292 ++++++++++++++++++++++++++---- imgee/static/img/bedge_grunge.png | Bin 0 -> 87444 bytes imgee/static/img/creampaper.png | Bin 0 -> 12618 bytes imgee/static/img/imgee.png | Bin 0 -> 9920 bytes imgee/static/img/shl.png | Bin 0 -> 106 bytes imgee/static/sass/app.sass | 217 ++++++++++++++++++++++ imgee/templates/create_label.html | 23 ++- imgee/templates/delete.html | 24 ++- imgee/templates/form.html | 20 +- imgee/templates/index.html | 22 ++- imgee/templates/layout1.html | 134 ++++++++++++++ imgee/templates/profile.html | 80 ++++---- imgee/templates/show_label.html | 57 ++++-- imgee/templates/view_image.html | 37 ++-- 14 files changed, 788 insertions(+), 118 deletions(-) create mode 100644 imgee/static/img/bedge_grunge.png create mode 100644 imgee/static/img/creampaper.png create mode 100644 imgee/static/img/imgee.png create mode 100644 imgee/static/img/shl.png create mode 100644 imgee/static/sass/app.sass create mode 100644 imgee/templates/layout1.html diff --git a/imgee/static/css/app.css b/imgee/static/css/app.css index 9124165d..6f469ade 100644 --- a/imgee/static/css/app.css +++ b/imgee/static/css/app.css @@ -1,44 +1,264 @@ -div.gallery div.image - { - margin:2px; - border:1px solid #b7b7b7; - height:auto; - width:auto; - float:left; - text-align:center; +body { + background-image: url('../img/bedge_grunge.png?1349097746'); +} + +.logo { + margin-top: 25px; +} + +.home-logo { + margin-left: auto; + margin-right: auto; + width: 400px; + margin-top: 80px; + text-align: center; +} +.home-logo a { + margin-left: auto; + margin-right: auto; +} +.home-logo .btn { + margin-top: 20px; +} +.home-logo h4 { + margin-top: 15px; +} + +.album { + min-height: 550px; +} + +.sidebar { + background-color: black; + border-radius: 5px; + border-right: 2px solid white; + border-bottom: 2px solid white; + box-shadow: 1px 1px 1px black; +} +.sidebar .nav-list li { + text-shadow: none; +} +.sidebar .nav-list a { + text-shadow: none; +} +.sidebar .btn { + width: 83%; + margin-bottom: 10px; +} +.sidebar .options { + text-align: left; +} +.sidebar .photostream-profile { + padding-bottom: 12px; +} +.sidebar .photostream-profile a { + font-size: 18px; +} +.sidebar .photostream-profile a:hover { + text-decoration: none; + color: #cccccc; +} + +.albumpage { + background-color: #cccccc; + background-image: url('../img/shl.png?1350031287'); + padding-left: 50px; + padding-right: 30px; + padding-top: 20px; + padding-bottom: 20px; + box-shadow: 2px 2px 2px #999999; + border: 10px solid #f0f0f0; +} + +.form-box { + background-color: #cccccc; + background-image: url('../img/shl.png?1350031287'); + padding-left: 20px; + padding-right: 20px; + padding-top: 20px; + padding-bottom: 20px; + box-shadow: 2px 2px 2px #999999; + border: 10px solid #f0f0f0; +} +.form-box .btn-danger { + margin-bottom: 30px; +} +.form-box .form-header { + text-transform: uppercase; +} + +.image { + width: 150px; + height: 210px; + display: block; + float: left; + padding-left: 15px; + padding-right: 15px; + margin-top: 20px; +} +.image .title, .image .labels { + text-align: center; +} + +.thumbnail { + background-color: white; + width: 80%; + height: auto; + margin-right: auto; + margin-left: auto; +} +.thumbnail img { + width: 140px; + height: 120px; +} + +.delete { + position: relative; + right: 0; + display: none; + font-size: 18px; + color: red; + background-color: black; + padding: 0; + padding-left: 7px; + padding-right: 7px; + position: relative; + left: 15px; + top: 8px; +} +.delete a { + color: red; +} +.delete a:hover { + text-decoration: none; +} + +.label { + background-color: white; + border: 1px solid #e7e7e7; + border-radius: 0; + padding: 0; + padding-left: 5px; + padding-right: 5px; + margin-right: 2px; + margin-left: 2px; + font-size: 10px; + text-shadow: none; +} + +.heading { + font-size: 20px; + margin-bottom: 20px; +} + +.image-display { + background-color: black; + text-align: center; + border: 1px solid #c0bcb4; + padding-bottom: 0px; + margin-bottom: 30px; +} + +.form-horizontal .controls { + margin-left: 0px; + float: right; +} +.form-horizontal .control-label { + text-align: left; + width: 45px; +} +.form-horizontal span.help-required { + float: left; +} + +form { + margin: 0px; +} + +.form-actions { + margin: -20px; + margin-top: 20px; + padding: 0px; +} +.form-actions button { + float: right; + margin: 10px; +} + +.delete-box, .create-box, .upload-box { + margin-left: auto; + margin-right: auto; + display: block; + width: 430px; + padding-left: 10px; + padding-right: 10px; + min-height: 270px; + border-radius: 5px; +} +.delete-box p, .create-box p, .upload-box p { + font-size: 14px; + margin-top: 20px; +} +.delete-box .cancel, .create-box .cancel, .upload-box .cancel { + margin-top: 10px; + margin-left: -150px; +} + +.form-submit { + position: relative; + bottom: 0; +} + +.create-box, .upload-box { + background-color: #d9edf7; + border: 1px solid #bce8f1; +} + +.upload-box { + padding-top: 20px; +} +.upload-box label { + padding-left: 20px; +} +.upload-box .form-horizontal .controls { + margin-top: 3px; +} +.upload-box .form-horizontal label { + width: 100px; + margin-left: -15px; +} +.upload-box .form-horizontal span.help-required { + float: left; +} + +.form-actions { + margin: 0; +} + +@media screen and (max-width: 767px) { + .home-logo { + width: 60%; } -div.gallery div.image img - { - display:inline; - margin:3px; - border:1px solid #ffffff; + + .delete-box, .create-box, .upload-box { + width: 80%; } -div.gallery div.image a:hover img - { - border:1px solid #0000ff; + + .create-box .form-horizontal .controls { + margin-top: 20px; } -div.gallery div.image div.title - { - text-align:center; - font-weight:normal; - margin:2px; + .create-box .form-horizontal label { + width: 50px; } -div.gallery div.image span.delete -{ - font-weight:bold; + + .cancel { float: right; - padding-right: 2px; + } } - -div.labels -{ +@media (min-width: 768px) and (max-width: 979px) { + .form-box .form-horizontal .controls { + margin-top: 10px; float: left; - text-decoration: none; - margin-right: 40px; -} -div.heading -{ - font-weight: bold; - font-size: 16px; - margin-bottom: 2px 0px 2px 0px; + margin-left: -15px; + } } diff --git a/imgee/static/img/bedge_grunge.png b/imgee/static/img/bedge_grunge.png new file mode 100644 index 0000000000000000000000000000000000000000..a63d372e8db4eab301761cd23d9641a95c9f4ca7 GIT binary patch literal 87444 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�LWJrOXA}YJ7MZKW<8oW62B4 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

O(?rI{uoHiWQl0|ss_$-A_d~l( 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 s+>1NnDn-HVP03M6Ia-H3WeO5cqZ+*)9Av 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 CVCreate Label

-{% set cancel_url=url_for('show_profile', profile_name=profile_name) %} -{{ renderform(form, "Create", cancel_url=cancel_url)}} +{% macro renderformcreate(form, formid, submit, message='', action='', cancel_url='', multipart=False) %} +
+ {{ renderform_inner(form, formid) }} + {{ rendersubmit([(None, submit or "Submit", 'btn-primary')], cancel_url=cancel_url) }} +
+{% endmacro %} +{% block basecontent %} + {% block sidebar %} + {% endblock %} + {% block albumcontent %} + {% endblock %} + +
+

Create Label

+ {% set cancel_url=url_for('show_profile', profile_name=profile_name) %} + {{ renderformcreate(form, "Create", cancel_url=cancel_url)}} +
{% endblock %} diff --git a/imgee/templates/delete.html b/imgee/templates/delete.html index 2424ec48..c79f6459 100644 --- a/imgee/templates/delete.html +++ b/imgee/templates/delete.html @@ -1,11 +1,23 @@ -{% extends "layout.html" %} +{% extends "layout1.html" %} {% from 'baseframe/forms.html' import renderform %} -{% block content %} +{% macro renderformdelete(form, formid, submit, message='', action='', cancel_url='', multipart=False) %} +
+ {{ renderform_inner(form, formid) }} + {{ rendersubmit([(None, submit or "Submit", 'btn-danger')], cancel_url=cancel_url) }} +
+{% endmacro %} -Are you sure that you want to delete "{{file.title}}"? - -{% set cancel_url=url_for('show_profile', profile_name=profile_name) %} -{{ renderform(form, "delete", "Yes, delete it", cancel_url=cancel_url)}} +{% block basecontent %} + {% block sidebar %} + {% endblock %} + {% block albumcontent %} + {% endblock %} +
+

Are you sure you want to delete "{{file.title}}"?
Warning: If you delete it, you will loss all the links to this image.

+ + {% set cancel_url=url_for('show_profile', profile_name=profile_name) %} +
{{ renderformdelete(form, "delete", "Yes, delete it", cancel_url=cancel_url)}}
+
{% endblock %} diff --git a/imgee/templates/form.html b/imgee/templates/form.html index 8aaa3dc7..a3d9f23e 100644 --- a/imgee/templates/form.html +++ b/imgee/templates/form.html @@ -1,7 +1,19 @@ -{% extends "layout.html" %} +{% extends "layout1.html" %} {% from 'baseframe/forms.html' import renderform %} -{% block content %} -{{ renderform(form, "upload", multipart=True) }} -{% endblock %} +{% macro renderformcreate(form, formid, submit, message='', action='', cancel_url='', multipart=False) %} +
+ {{ renderform_inner(form, formid) }} + {{ rendersubmit([(None, submit or "Submit", 'btn-primary')], cancel_url=cancel_url) }} +
+{% endmacro %} +{% block basecontent %} + {% block sidebar %} + {% endblock %} + {% block albumcontent %} + {% endblock %} +
+ {{ renderformcreate(form, "upload", multipart=True) }} +
+{% endblock %} \ No newline at end of file diff --git a/imgee/templates/index.html b/imgee/templates/index.html index 0b986689..bc08ed0f 100644 --- a/imgee/templates/index.html +++ b/imgee/templates/index.html @@ -1,7 +1,21 @@ -{% extends "layout.html" %} +{% extends "layout1.html" %} -{% block content %} - -

The HasGeek Image Hosting Website.

+{% block headerbox %} +
+ {{ networkbar(siteid=config['SITE_ID'], login=true) }} + +
+{% endblock %} +{% block basecontent %} {% endblock %} diff --git a/imgee/templates/layout1.html b/imgee/templates/layout1.html new file mode 100644 index 00000000..ec8d3907 --- /dev/null +++ b/imgee/templates/layout1.html @@ -0,0 +1,134 @@ +{% extends "baseframe.html" %} +{% from "baseframe/components.html" import networkbar with context %} + +{% macro renderfield(field, css_class="", widget_css_class=None, sidetext=None, tabindex='', autofocus=False) -%} +
+ {%- if field.widget.input_type == 'checkbox' %} +
{% if widget_css_class %}{{ field(class=widget_css_class, tabindex=tabindex) }}{% else %}{{ field(tabindex=tabindex) }}{% endif %} {{ field.label }} + {%- if sidetext %} + {{ sidetext }} + {%- endif %} + {%- if field.description %} + {%- if field.errors -%} + {%- for error in field.errors %} +

{{ error }}

+ {%- endfor %} + {%- endif %} +

{{ field.description }}

+ {%- endif %} +
+ {%- else %} + +
+ {%- if autofocus %} + {%- if widget_css_class %} + {%- if tabindex %} + {{ field(autofocus="autofocus", class=widget_css_class, tabindex=tabindex) }} + {%- else %} + {{ field(autofocus="autofocus", class=widget_css_class) }} + {%- endif %} + {%- else %} + {%- if tabindex %} + {{ field(autofocus="autofocus", tabindex=tabindex) }} + {%- else %} + {{ field(autofocus="autofocus") }} + {%- endif %} + {%- endif %} + {%- else %} + {%- if widget_css_class %} + {%- if tabindex %} + {{ field(class=widget_css_class, tabindex=tabindex) }} + {%- else %} + {{ field(class=widget_css_class) }} + {%- endif %} + {%- elif (field.widget.input_type or "") == "" %} + {{ field() }} + {%- else %} + {%- if tabindex %} + {{ field(tabindex=tabindex) }} + {%- else %} + {{ field() }} + {%- endif %} + {%- endif %} + {%- endif %} + {%- if sidetext %} + {{ sidetext }} + {%- endif %} + {%- if field.errors -%} + {% for error in field.errors -%} +

{{ error }}

+ {% endfor %} + {%- endif %} + {% if field.description %}

{{ field.description }}

{% endif %} +
+ {%- endif %} +
+{%- endmacro %} + + +{% macro rendersubmit(buttons=[], css_class="", tabindex='', cancel_url='') -%} +
+ {% for name, value, widget_class in buttons -%} + + {% endfor %} + {% if cancel_url %}Cancel{% endif %} + +
+{%- endmacro %} + +{% macro renderform_inner(form, formid) -%} + {%- if form.errors %} +
+ × + Please correct the indicated errors. +
+ {%- endif %} + {% if message %}

{{ message }}

{% endif %} +
+ {{ form.hidden_tag() }} + {%- if form.csrf_token.errors %} + {% for error in form.csrf_token.errors %}
{{ error }}
{% endfor %} + {% endif %} + {%- set autofocus = true %} + {% for field in form -%} + {%- if field.widget.input_type and field.widget.input_type == 'hidden' -%} + {# Don't show hidden #} + {%- else -%} + {{ renderfield(field, widget_css_class="field-" + field.id, autofocus=autofocus) }} + {%- if autofocus %}{% set autofocus = false %}{% endif %} + {%- endif %} + {% endfor %} +{%- endmacro %} + +{% block headerbox %} +
+ {{ networkbar(siteid=config['SITE_ID'], login=true) }} +
+
+ +
+
+
+{% endblock %} + +{% block basecontent %} +
+
+ {% block content %} + {% block sidebar %} + {% endblock %} + {% block albumcontent %} + {% endblock %} + {% endblock %} +
+
+{% endblock %} + diff --git a/imgee/templates/profile.html b/imgee/templates/profile.html index 65a4a121..6e701720 100644 --- a/imgee/templates/profile.html +++ b/imgee/templates/profile.html @@ -1,40 +1,58 @@ -{% extends "layout.html" %} +{% extends "layout1.html" %} -{% block content %} +{% block sidebar %} +
+
+
+
+ My Album +
+
-
- Labels:
- {% for label in labels %} - {{label.name}} -
- {% endfor %} -
+
+ Upload images + New label +
- - Upload images   |   - New label - +
    +
  • Labels
    • + {% for label in labels %} +
  • {{label.name}} +
    • + {% endfor %} +
+
+
+{% endblock %} -{% if files %} -
- {% for img in files %} -
- X - - - -
{{img.title}}
-
- {% for label in img.labels %} - {{label.name}},   +{% block albumcontent %} +
+
+ {% if files %} +
+ {% for img in files %} +
+
+ + + +
+
{{img.title}}
+
+ {% for label in img.labels %} + + {{label.name}} + + {% endfor %} +
+
{% endfor %}
-
- {% endfor %} + {% else %} + There are no images uploaded yet. Upload them. + {% endif %}
-{% else %} - There are no images uploaded yet. Upload them. -{% endif %} - +
{% endblock %} + diff --git a/imgee/templates/show_label.html b/imgee/templates/show_label.html index 6fb90055..052013b6 100644 --- a/imgee/templates/show_label.html +++ b/imgee/templates/show_label.html @@ -1,23 +1,42 @@ -{% extends "layout.html" %} - -{% block content %} +{% extends "layout1.html" %} +{% block sidebar %} +
+
+
+
+ My Album +
+
-
Images with label "{{label}}"
+
+ Upload images + New label +
+
+
+{% endblock %} -{%if not files %} - There are no images with label "{{label}}" yet. -{% else %} -
- {% for img in files %} -
- X - - - -
{{img.title}}
+{% block albumcontent %} +
+
Images with label "{{label}}" +
+
+ {%if not files %} + There are no images with label "{{label}}" yet. + {% else %} +
+ {% for img in files %} +
+
+ + + +
+
{{img.title}}
+
+ {% endfor %} +
+ {% endif %}
- {% endfor %}
-{% endif %} - -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/imgee/templates/view_image.html b/imgee/templates/view_image.html index 4e3c953d..acacb2c9 100644 --- a/imgee/templates/view_image.html +++ b/imgee/templates/view_image.html @@ -1,28 +1,39 @@ -{% extends "layout.html" %} +{% extends "layout1.html" %} {% from 'baseframe/forms.html' import renderform %} -{% block content %} +{% block sidebar %} +
+ +
+ +
{{img.title}}
{% if img.labels %} Labels: {% for label in img.labels %} - {{label.name}} - {% if not loop.last %} - ,   - {% endif %} + + {{label.name}} + {% endfor %} {% endif %} {% set action_url=url_for('add_label_to', img_name=img.name, profile_name=img.profile.name) %} -
- Delete Image -

- Add labels: - {{ renderform(form, 'Add Labels', action=action_url)}} -
+

- +
+{% endblock %} + +{% block albumcontent %} +
+
+  Delete Image +
+
Add labels:
+
+
{{ renderform(form, 'Add Labels', action=action_url)}}
+
+
{% endblock %} From 26822d4ae1e0321249bf7d958e87fd24f2237b73 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 22 Apr 2013 17:56:24 +0530 Subject: [PATCH 084/541] more tests for upload and a bug fix --- imgee/static/images/saturn_4test.gif | Bin 0 -> 2547 bytes imgee/views/index.py | 2 +- tests/test_uploads.py | 88 ++++++++++++++++++++++++++- tests/test_utils.py | 21 +++++++ 4 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 imgee/static/images/saturn_4test.gif diff --git a/imgee/static/images/saturn_4test.gif b/imgee/static/images/saturn_4test.gif new file mode 100644 index 0000000000000000000000000000000000000000..3bf1a0a41430e6768b720d69dfb477c91233bed3 GIT binary patch literal 2547 zcmWmDi(k?Q0s!#e4-ipNKv5|%$yfM{logpJh!0A;VVOB=8$K#)t*Kd8*)0$eOe=h3 zXfIG}sQE%fL_$C?L^FKcU2AQpUMu!lpUs-r+0_s3?)yJ{(|4!Qw&zm-3h-|yU^0xH zE8REL-&S#iGSqi#u9bN0%$|F#m8vd@xohvZe%Nf(RUPt#9P`k}7QJpnHE?Hg!q9WC zez_+EdY?97(#<@c9=aTE98*o041>LG2k9Q;V=A*z^ZBQ-qgMhT=*ntmz^x;mhcg4! z&0Bv_QB6%m`E9|?KZk3EP4T-5oz2nj#mFA z_Q}xT1FgFEd3#XTy%y+0ULTiW&?=^_<}r<8$~vLp;+;SKX>M*7dRquNzS3#>98>Wl zsy^N5;JD#o?NOY?JT}nT3@wB@7O2o$>is)4kR|xZ%+$=|N&RSl$HfrKgvmIj86AEA z=|W7#k;ip@&8PgPEJnwV34=X19rGy=l614rtX1$3Ttn?c)R{WpS+1*QLN~>4ZYrb=SHn|xbyM!`xPV4 zrJ@`?(AVA7R`*^{8&wZz)q@W;ipCSc$^rRk@9}}|n=_hY{F6x)1wq%&#*UAv@7HE@ zeJ8!bJ#i|_|IB{$uci#0rpGj8bXlbpuWwpOZ_*`?SMx^k@YSi#$db5bcx$OYObWy)2_O>v!mqLcJ&trPY3JU zp0oOhGy5|0I7V3Vy|9eRq-J6Wf1STx13Eu2qQy}Me});lNcWSw#k80l8VDx4C;AeT zUgGyOxg%QSBu@AaQyC`e8!hfykZ;M*-klx@m3Z4G*7&L4?=GtwFLs7eFQn-`V|s8KFz{RhWQ_+@I%qqfn>@R zQW-yF!6p$C_tH7zu!LO`W^xDc^vd;WZoPgz)y7Ws4Zp~)L#3X4>$%BKKQ{%-*`Nge za_H>$jJV%y-iv;)<5=YOQMTNTYSOnGp3)!B^o1?64sCJu4R*oQX=N2j$V;z4B{M+t{($te(9F zKgJnw_p6e>VZ~m1*814}aXFS5a69xU+e^*@c*vY=EYbfn8Y2>OF571}ib)ke^0i-N zV8V`t^1cR30RD6FVQ!AL1uB7jVd*Wfj4JDaB^zA$) zp)j{@NGTZ)+R~wCkdZN^m7dqR>kqpsN^nxj)B{7M7=A4J{&Tw#Ra zIC@b9VKK)R|L9h?KobyN=mASg97M)#Oe_GrI0Ptq;EOVC>O8wMeue_u2*V`0!0 zKpt?G0AO@g+vIUEn}LSuC2wJg8asux(Tgg57nWXF36C4na*e3JuduJe?nd)cc5cB} z2@x+9ptbB$I5T6pG?SO=Eo_3FhkwGRgG5RB8-(XqmUvifM<~nlWWC9}wzfpDiTyL*?X9K?dvx4v@u0H6z} zF*^u6qmN`wfSF-mKJ!B6x)Wgd&+)cBc4d&@@PX=6RA_hAc<7MZ;t^Jr|2>tq2Hb^-<3%Y#dxyBYVe{s4m*T8ch`SRgF zbde0bsRQ) z8bbF=#b4M4F*)S)!UQh3b(MirJq0OT9^fY_r?=3#9tA*405!SoYq~KRKN~^l=b>xF zb-SR&tSnl-YXpQN#OEW^sL4ABShvm37GbsJ1xFF=RI-H)dOasGr#SF{28QcCn!!(5 z0t)#O@3#$=_rECe zlG8vm$5vNbEF<=16<~x0f%UiI9plnS^tUVU(-H(ef(AsAR?zFBL0qGK=|~p5Wm05- zX^#sKabllb+gh93b&@__(T|8z2V=``*Odq=_&0KN') diff --git a/tests/test_uploads.py b/tests/test_uploads.py index 9f8bbe57..b44ea9ba 100644 --- a/tests/test_uploads.py +++ b/tests/test_uploads.py @@ -1,10 +1,11 @@ import unittest import os, requests from StringIO import StringIO +from PIL import Image from imgee import storage from imgee.models import db, User, StoredFile, Profile -from fixtures import get_test_user, ImgeeTestCase +from fixtures import get_test_user, ImgeeTestCase, app import test_utils @@ -32,6 +33,9 @@ def upload(self, path=None): response = self.client.post('/new', data=d, follow_redirects=True) return filename, response + def get_image_size(self, img_path=None): + return test_utils.get_image_size(img_path or self.test_file) + def test_empty(self): r = self.client.get('/%s' % self.test_user_name) self.assertEquals(r.status_code, 200) @@ -61,6 +65,88 @@ def test_thumbnail(self): self.img_id = test_utils.get_img_id(r.data, filename) self.assertTrue(self.thumbnails_exists_on_media_domain(self.img_id)) + def test_delete(self): + filename, r = self.upload() + self.img_id = test_utils.get_img_id(r.data, filename) + self.assertEquals(test_utils.get_image_count(r.data), 1) + + r = self.client.post('/delete/%s' % self.img_id) + self.assertEquals(test_utils.get_image_count(r.data), 0) + + r = self.client.get('/file/%s' % self.img_id) + self.assertEquals(r.status_code, 404) + + r = self.client.get('/thumbnail/%s' % self.img_id) + self.assertEquals(r.status_code, 404) + + def test_file_count(self): + filename1, r1 = self.upload() + self.assertEquals(test_utils.get_image_count(r1.data), 1) + + # if the same file is uploaded twice, imgee should treat them as different + filename2, r2 = self.upload() + self.assertEquals(test_utils.get_image_count(r2.data), 2) + + filename3, r3 = self.upload('imgee/static/images/saturn_4test.gif') + self.assertEquals(test_utils.get_image_count(r3.data), 3) + + def test_thumbnail_size(self): + img_name, r = self.upload() + # get the thumbnail link + self.img_id = test_utils.get_img_id(r.data, img_name) + r = self.client.get('/thumbnail/%s' % self.img_id) + self.assertEquals(r.status_code, 301) + imgio = test_utils.download_image(r.location) + img = Image.open(imgio) + self.assertEquals(img.size, app.config['THUMBNAIL_SIZE']) + + def test_resize(self): + img_name, r = self.upload() + img_w, img_h = self.get_image_size() + + self.img_id = test_utils.get_img_id(r.data, img_name) + r = self.client.get('/file/%s?size=100x0' % self.img_id) + self.assertEquals(r.status_code, 301) + resized_img = test_utils.download_image(r.location) + resized_w, resized_h = self.get_image_size(resized_img) + + self.assertEquals(resized_w, 100) + # check aspect ratio + self.assertAlmostEquals(float(img_w)/resized_w, float(img_h)/resized_h) + + def test_resize2(self): + img_name, r = self.upload() + img_w, img_h = self.get_image_size() + + self.img_id = test_utils.get_img_id(r.data, img_name) + r = self.client.get('/file/%s?size=100x150' % self.img_id) + self.assertEquals(r.status_code, 301) + resized_img = test_utils.download_image(r.location) + resized_w, resized_h = self.get_image_size(resized_img) + + self.assertEquals(resized_w, 100) + # check aspect ratio + self.assertAlmostEquals(float(img_w)/resized_w, float(img_h)/resized_h) + + def test_non_image_file(self): + file_name, r = self.upload('imgee/static/css/app.css') + self.assertEquals(r.status_code, 200) + file_id = test_utils.get_img_id(r.data, file_name) + r = self.client.get('/file/%s' % file_id) + self.assertEquals(r.status_code, 301) + r = requests.get(r.location) + self.assertEquals(r.status_code, 200) + + def test_resize_non_image_file(self): + file_name, r = self.upload('imgee/static/css/app.css') + file_id = test_utils.get_img_id(r.data, file_name) + r1 = self.client.get('/file/%s' % file_id) + r2 = self.client.get('/file/%s?size=100x200' % file_id) + self.assertEquals(r1.status_code, 301) + self.assertEquals(r2.status_code, 301) + self.assertEquals(r1.location, r2.location) + self.assertTrue(file_id in r.location) + def tearDown(self): s = StoredFile.query.filter_by(name=self.img_id).first() if s: storage.delete_on_s3(s) diff --git a/tests/test_utils.py b/tests/test_utils.py index d2f8d87c..a2f947a6 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,4 +1,7 @@ from bs4 import BeautifulSoup +from StringIO import StringIO +import requests +from PIL import Image def get_img_id(r, img_title): """ @@ -19,6 +22,24 @@ def get_img_id(r, img_title): x = img_div.find('a')['href'] return x.split('/')[-1] +def get_image_count(html): + soup = BeautifulSoup(html) + imgs = soup.findAll('div', attrs={'class': 'image'}) + return len(imgs) + +def download_image(url): + r = requests.get(url) + assert r.status_code == 200 + imgio = StringIO() + for chunk in r.iter_content(1024): + imgio.write(chunk) + imgio.seek(0) + return imgio + +def get_image_size(path): + img = Image.open(path) + return img.size + if __name__ == '__main__': import doctest doctest.testmod() From cb508c8ec3c8479e24b4727fc3366d5d3ffeb4f3 Mon Sep 17 00:00:00 2001 From: Devi Date: Mon, 22 Apr 2013 18:35:42 +0530 Subject: [PATCH 085/541] test with a non-square sized image --- imgee/static/images/earth_moon_4test.gif | Bin 1988 -> 0 bytes imgee/static/images/saturn_4test.gif | Bin 2547 -> 0 bytes tests/test_uploads.py | 16 +++++++++------- 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 imgee/static/images/earth_moon_4test.gif delete mode 100644 imgee/static/images/saturn_4test.gif diff --git a/imgee/static/images/earth_moon_4test.gif b/imgee/static/images/earth_moon_4test.gif deleted file mode 100644 index 0d3e0a2c28b60c69d83b1689fa48e0603e148ff8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1988 zcmV;#2RryjNk%w1VK4wN0Qdg@00025%Wotn8#OvLdXa_I$dzVnQ;C&vEHWvSgIRcj zVpoTUw92xWq-=S5c`G$Cc56jCLOTf(6Di=#!puMp}OEfz?F9un4O;to% zV^yrct%H_^;^s<|wlK}w%&?0|Ns|bab+{l0$G_b+dzF zT1U3GrSZy)3nVHIF*;{tK!lHVe|1lil3~Wl!W3M3vc-}DPGtp9X1BPvu)Mw5*uAg7 zsbqUiij;tGhhQx#AiKnJy3V(1k$l+Hd|;4nJv1gmQ$b>FUhL}8(dyC?LsF=&tMux@ zwXuQF;>X9yl!~jLL0)2ie|}VTQ~CGY009ChUvy)FTunePKSV2)uAWd)I-sGS0Spix zUTklvan#h*A^8LW00930EC2ui05AYB000R80RIUbNU)&6g9sBY@v$VK!-o(DN-MJ> zqQ#2?eb5?)v17!B9z%*8NwTELlPFWF97w{)h+%4Ij3@zeWkG4f9OxK;0Kt_I7cM-A zv4Vune?BzTcoqiCoCrLBR+y!0lOYE_Qj$<61yYS12Rz9F!&8f)3xBEr0D!B4h?*l+ zxNF1iKoCfff*4>C$IBG~A*SkDyB0?YlIn8sD$pQ^;~)yk$eJ_>0US6LEJPyAHpB># zJB&E8(cli)0|z1-nA8OfmB4>uab63HhQ~+mzVtgL&x)08(G&>x#G(rzK>{lLIW?Ot ztgIJFxH{2GQMGP8y4lN8PL?xIs|8*E`MF$Ja{xHtI$V-OhO1h(7F5gd0>}{#2@*hn zP)85~D#^`aUUQqoW6>ir$RLU+O`MPeBu-2LgdYav2SF5GP;rT6RGkNa1<*Z|O@imt z;)*K;wBUpgjN}3hH2UEK$Z?l|qQPd(;j)P(5Rvc#DorHV;0LV;F$Fg*=m!B0&d?D> zDK%;!n}-^x@DMg~5Wz}W4kbpB2BooCwjdIwwLqh*94+-}LZJ4g`>rPd)^=K*1P&&=ST@7zhB$ADgJU zi38}qgUSnL^l%6!;V5DR1K#{&o$ zA_1eS+J+DbVrU}=2pKH@z{NKW+;T<=9;A~_2OW%Z@f-*w$6TYhSYTyBFzms}9$(aB z1T~+e&@>@~_<=$*D9}6y7CFDE>Hz8$bPYJ1prgnTix@%53@|@23LdK5(2Oc`Jn(}A z7IX}G&k2!`MjCFwkO2jW+&cpzPwXrT~NNqdm3*0|9xAfqox}c*PptH-`aW;bsz`-+(++g=<)(1a4pe`o{1E zG&DkhY0`1|4YdCl~Ob>O7={R#}7uN@#~R z^3Vq~SdbPRzyVaDun>a4Xr@uH5FbWJkc4)0f*VCZgC)#C3mrrt0^@=OEM{T6=2XCL z9>HN6DxtzDhG7lxd%y*hL$}#zL0KYMf(pRV2}($@h48z=8c)$h&fs8jCGmkeG{Fr@ zn8S)xxB@JS*BmXZpmifzLJ2fM2}`U22Lm8i8v&pN5!i4gKG;V*Hjv3v;NlO47=Qz4 W07;vW;2PJU0S&GpjaFVHAOJh(q(A@w diff --git a/imgee/static/images/saturn_4test.gif b/imgee/static/images/saturn_4test.gif deleted file mode 100644 index 3bf1a0a41430e6768b720d69dfb477c91233bed3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2547 zcmWmDi(k?Q0s!#e4-ipNKv5|%$yfM{logpJh!0A;VVOB=8$K#)t*Kd8*)0$eOe=h3 zXfIG}sQE%fL_$C?L^FKcU2AQpUMu!lpUs-r+0_s3?)yJ{(|4!Qw&zm-3h-|yU^0xH zE8REL-&S#iGSqi#u9bN0%$|F#m8vd@xohvZe%Nf(RUPt#9P`k}7QJpnHE?Hg!q9WC zez_+EdY?97(#<@c9=aTE98*o041>LG2k9Q;V=A*z^ZBQ-qgMhT=*ntmz^x;mhcg4! z&0Bv_QB6%m`E9|?KZk3EP4T-5oz2nj#mFA z_Q}xT1FgFEd3#XTy%y+0ULTiW&?=^_<}r<8$~vLp;+;SKX>M*7dRquNzS3#>98>Wl zsy^N5;JD#o?NOY?JT}nT3@wB@7O2o$>is)4kR|xZ%+$=|N&RSl$HfrKgvmIj86AEA z=|W7#k;ip@&8PgPEJnwV34=X19rGy=l614rtX1$3Ttn?c)R{WpS+1*QLN~>4ZYrb=SHn|xbyM!`xPV4 zrJ@`?(AVA7R`*^{8&wZz)q@W;ipCSc$^rRk@9}}|n=_hY{F6x)1wq%&#*UAv@7HE@ zeJ8!bJ#i|_|IB{$uci#0rpGj8bXlbpuWwpOZ_*`?SMx^k@YSi#$db5bcx$OYObWy)2_O>v!mqLcJ&trPY3JU zp0oOhGy5|0I7V3Vy|9eRq-J6Wf1STx13Eu2qQy}Me});lNcWSw#k80l8VDx4C;AeT zUgGyOxg%QSBu@AaQyC`e8!hfykZ;M*-klx@m3Z4G*7&L4?=GtwFLs7eFQn-`V|s8KFz{RhWQ_+@I%qqfn>@R zQW-yF!6p$C_tH7zu!LO`W^xDc^vd;WZoPgz)y7Ws4Zp~)L#3X4>$%BKKQ{%-*`Nge za_H>$jJV%y-iv;)<5=YOQMTNTYSOnGp3)!B^o1?64sCJu4R*oQX=N2j$V;z4B{M+t{($te(9F zKgJnw_p6e>VZ~m1*814}aXFS5a69xU+e^*@c*vY=EYbfn8Y2>OF571}ib)ke^0i-N zV8V`t^1cR30RD6FVQ!AL1uB7jVd*Wfj4JDaB^zA$) zp)j{@NGTZ)+R~wCkdZN^m7dqR>kqpsN^nxj)B{7M7=A4J{&Tw#Ra zIC@b9VKK)R|L9h?KobyN=mASg97M)#Oe_GrI0Ptq;EOVC>O8wMeue_u2*V`0!0 zKpt?G0AO@g+vIUEn}LSuC2wJg8asux(Tgg57nWXF36C4na*e3JuduJe?nd)cc5cB} z2@x+9ptbB$I5T6pG?SO=Eo_3FhkwGRgG5RB8-(XqmUvifM<~nlWWC9}wzfpDiTyL*?X9K?dvx4v@u0H6z} zF*^u6qmN`wfSF-mKJ!B6x)Wgd&+)cBc4d&@@PX=6RA_hAc<7MZ;t^Jr|2>tq2Hb^-<3%Y#dxyBYVe{s4m*T8ch`SRgF zbde0bsRQ) z8bbF=#b4M4F*)S)!UQh3b(MirJq0OT9^fY_r?=3#9tA*405!SoYq~KRKN~^l=b>xF zb-SR&tSnl-YXpQN#OEW^sL4ABShvm37GbsJ1xFF=RI-H)dOasGr#SF{28QcCn!!(5 z0t)#O@3#$=_rECe zlG8vm$5vNbEF<=16<~x0f%UiI9plnS^tUVU(-H(ef(AsAR?zFBL0qGK=|~p5Wm05- zX^#sKabllb+gh93b&@__(T|8z2V=``*Odq=_&0KN Date: Tue, 23 Apr 2013 18:00:52 +0530 Subject: [PATCH 086/541] edit file title in place --- imgee/static/js/edit_in_place.js | 10 + imgee/static/js/jquery.jeditable.js | 543 ++++++++++++++++++++++++ imgee/static/js/jquery.jeditable.min.js | 38 ++ imgee/templates/profile.html | 7 +- imgee/templates/view_image.html | 7 +- imgee/views/index.py | 11 + 6 files changed, 614 insertions(+), 2 deletions(-) create mode 100644 imgee/static/js/edit_in_place.js create mode 100644 imgee/static/js/jquery.jeditable.js create mode 100644 imgee/static/js/jquery.jeditable.min.js diff --git a/imgee/static/js/edit_in_place.js b/imgee/static/js/edit_in_place.js new file mode 100644 index 00000000..c40a539e --- /dev/null +++ b/imgee/static/js/edit_in_place.js @@ -0,0 +1,10 @@ +$(".editable_text").editable("/edit_title", { + indicator : 'Saving...', + submitdata: { _method: "POST" }, + select : true, + submit : 'OK', + cancel : 'Cancel', + tooltip : 'Click to edit', + id: 'img_name', + name: 'img_title' +}); diff --git a/imgee/static/js/jquery.jeditable.js b/imgee/static/js/jquery.jeditable.js new file mode 100644 index 00000000..003000ed --- /dev/null +++ b/imgee/static/js/jquery.jeditable.js @@ -0,0 +1,543 @@ +/* + * Jeditable - jQuery in place edit plugin + * + * Copyright (c) 2006-2009 Mika Tuupola, Dylan Verheul + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/mit-license.php + * + * Project home: + * http://www.appelsiini.net/projects/jeditable + * + * Based on editable by Dylan Verheul : + * http://www.dyve.net/jquery/?editable + * + */ + +/** + * Version 1.7.1 + * + * ** means there is basic unit tests for this parameter. + * + * @name Jeditable + * @type jQuery + * @param String target (POST) URL or function to send edited content to ** + * @param Hash options additional options + * @param String options[method] method to use to send edited content (POST or PUT) ** + * @param Function options[callback] Function to run after submitting edited content ** + * @param String options[name] POST parameter name of edited content + * @param String options[id] POST parameter name of edited div id + * @param Hash options[submitdata] Extra parameters to send when submitting edited content. + * @param String options[type] text, textarea or select (or any 3rd party input type) ** + * @param Integer options[rows] number of rows if using textarea ** + * @param Integer options[cols] number of columns if using textarea ** + * @param Mixed options[height] 'auto', 'none' or height in pixels ** + * @param Mixed options[width] 'auto', 'none' or width in pixels ** + * @param String options[loadurl] URL to fetch input content before editing ** + * @param String options[loadtype] Request type for load url. Should be GET or POST. + * @param String options[loadtext] Text to display while loading external content. + * @param Mixed options[loaddata] Extra parameters to pass when fetching content before editing. + * @param Mixed options[data] Or content given as paramameter. String or function.** + * @param String options[indicator] indicator html to show when saving + * @param String options[tooltip] optional tooltip text via title attribute ** + * @param String options[event] jQuery event such as 'click' of 'dblclick' ** + * @param String options[submit] submit button value, empty means no button ** + * @param String options[cancel] cancel button value, empty means no button ** + * @param String options[cssclass] CSS class to apply to input form. 'inherit' to copy from parent. ** + * @param String options[style] Style to apply to input form 'inherit' to copy from parent. ** + * @param String options[select] true or false, when true text is highlighted ?? + * @param String options[placeholder] Placeholder text or html to insert when element is empty. ** + * @param String options[onblur] 'cancel', 'submit', 'ignore' or function ?? + * + * @param Function options[onsubmit] function(settings, original) { ... } called before submit + * @param Function options[onreset] function(settings, original) { ... } called before reset + * @param Function options[onerror] function(settings, original, xhr) { ... } called on error + * + * @param Hash options[ajaxoptions] jQuery Ajax options. See docs.jquery.com. + * + */ + +(function($) { + + $.fn.editable = function(target, options) { + + if ('disable' == target) { + $(this).data('disabled.editable', true); + return; + } + if ('enable' == target) { + $(this).data('disabled.editable', false); + return; + } + if ('destroy' == target) { + $(this) + .unbind($(this).data('event.editable')) + .removeData('disabled.editable') + .removeData('event.editable'); + return; + } + + var settings = $.extend({}, $.fn.editable.defaults, {target:target}, options); + + /* setup some functions */ + var plugin = $.editable.types[settings.type].plugin || function() { }; + var submit = $.editable.types[settings.type].submit || function() { }; + var buttons = $.editable.types[settings.type].buttons + || $.editable.types['defaults'].buttons; + var content = $.editable.types[settings.type].content + || $.editable.types['defaults'].content; + var element = $.editable.types[settings.type].element + || $.editable.types['defaults'].element; + var reset = $.editable.types[settings.type].reset + || $.editable.types['defaults'].reset; + var callback = settings.callback || function() { }; + var onedit = settings.onedit || function() { }; + var onsubmit = settings.onsubmit || function() { }; + var onreset = settings.onreset || function() { }; + var onerror = settings.onerror || reset; + + /* show tooltip */ + if (settings.tooltip) { + $(this).attr('title', settings.tooltip); + } + + settings.autowidth = 'auto' == settings.width; + settings.autoheight = 'auto' == settings.height; + + return this.each(function() { + + /* save this to self because this changes when scope changes */ + var self = this; + + /* inlined block elements lose their width and height after first edit */ + /* save them for later use as workaround */ + var savedwidth = $(self).width(); + var savedheight = $(self).height(); + + /* save so it can be later used by $.editable('destroy') */ + $(this).data('event.editable', settings.event); + + /* if element is empty add something clickable (if requested) */ + if (!$.trim($(this).html())) { + $(this).html(settings.placeholder); + } + + $(this).bind(settings.event, function(e) { + + /* abort if disabled for this element */ + if (true === $(this).data('disabled.editable')) { + return; + } + + /* prevent throwing an exeption if edit field is clicked again */ + if (self.editing) { + return; + } + + /* abort if onedit hook returns false */ + if (false === onedit.apply(this, [settings, self])) { + return; + } + + /* prevent default action and bubbling */ + e.preventDefault(); + e.stopPropagation(); + + /* remove tooltip */ + if (settings.tooltip) { + $(self).removeAttr('title'); + } + + /* figure out how wide and tall we are, saved width and height */ + /* are workaround for http://dev.jquery.com/ticket/2190 */ + if (0 == $(self).width()) { + //$(self).css('visibility', 'hidden'); + settings.width = savedwidth; + settings.height = savedheight; + } else { + if (settings.width != 'none') { + settings.width = + settings.autowidth ? $(self).width() : settings.width; + } + if (settings.height != 'none') { + settings.height = + settings.autoheight ? $(self).height() : settings.height; + } + } + //$(this).css('visibility', ''); + + /* remove placeholder text, replace is here because of IE */ + if ($(this).html().toLowerCase().replace(/(;|")/g, '') == + settings.placeholder.toLowerCase().replace(/(;|")/g, '')) { + $(this).html(''); + } + + self.editing = true; + self.revert = $(self).html(); + $(self).html(''); + + /* create the form object */ + var form = $('
'); + + /* apply css or style or both */ + if (settings.cssclass) { + if ('inherit' == settings.cssclass) { + form.attr('class', $(self).attr('class')); + } else { + form.attr('class', settings.cssclass); + } + } + + if (settings.style) { + if ('inherit' == settings.style) { + form.attr('style', $(self).attr('style')); + /* IE needs the second line or display wont be inherited */ + form.css('display', $(self).css('display')); + } else { + form.attr('style', settings.style); + } + } + + /* add main input element to form and store it in input */ + var input = element.apply(form, [settings, self]); + + /* set input content via POST, GET, given data or existing value */ + var input_content; + + if (settings.loadurl) { + var t = setTimeout(function() { + input.disabled = true; + content.apply(form, [settings.loadtext, settings, self]); + }, 100); + + var loaddata = {}; + loaddata[settings.id] = self.id; + if ($.isFunction(settings.loaddata)) { + $.extend(loaddata, settings.loaddata.apply(self, [self.revert, settings])); + } else { + $.extend(loaddata, settings.loaddata); + } + $.ajax({ + type : settings.loadtype, + url : settings.loadurl, + data : loaddata, + async : false, + success: function(result) { + window.clearTimeout(t); + input_content = result; + input.disabled = false; + } + }); + } else if (settings.data) { + input_content = settings.data; + if ($.isFunction(settings.data)) { + input_content = settings.data.apply(self, [self.revert, settings]); + } + } else { + input_content = self.revert; + } + content.apply(form, [input_content, settings, self]); + + input.attr('name', settings.name); + + /* add buttons to the form */ + buttons.apply(form, [settings, self]); + + /* add created form to self */ + $(self).append(form); + + /* attach 3rd party plugin if requested */ + plugin.apply(form, [settings, self]); + + /* focus to first visible form element */ + $(':input:visible:enabled:first', form).focus(); + + /* highlight input contents when requested */ + if (settings.select) { + input.select(); + } + + /* discard changes if pressing esc */ + input.keydown(function(e) { + if (e.keyCode == 27) { + e.preventDefault(); + //self.reset(); + reset.apply(form, [settings, self]); + } + }); + + /* discard, submit or nothing with changes when clicking outside */ + /* do nothing is usable when navigating with tab */ + var t; + if ('cancel' == settings.onblur) { + input.blur(function(e) { + /* prevent canceling if submit was clicked */ + t = setTimeout(function() { + reset.apply(form, [settings, self]); + }, 500); + }); + } else if ('submit' == settings.onblur) { + input.blur(function(e) { + /* prevent double submit if submit was clicked */ + t = setTimeout(function() { + form.submit(); + }, 200); + }); + } else if ($.isFunction(settings.onblur)) { + input.blur(function(e) { + settings.onblur.apply(self, [input.val(), settings]); + }); + } else { + input.blur(function(e) { + /* TODO: maybe something here */ + }); + } + + form.submit(function(e) { + + if (t) { + clearTimeout(t); + } + + /* do no submit */ + e.preventDefault(); + + /* call before submit hook. */ + /* if it returns false abort submitting */ + if (false !== onsubmit.apply(form, [settings, self])) { + /* custom inputs call before submit hook. */ + /* if it returns false abort submitting */ + if (false !== submit.apply(form, [settings, self])) { + + /* check if given target is function */ + if ($.isFunction(settings.target)) { + var str = settings.target.apply(self, [input.val(), settings]); + $(self).html(str); + self.editing = false; + callback.apply(self, [self.innerHTML, settings]); + /* TODO: this is not dry */ + if (!$.trim($(self).html())) { + $(self).html(settings.placeholder); + } + } else { + /* add edited content and id of edited element to POST */ + var submitdata = {}; + submitdata[settings.name] = input.val(); + submitdata[settings.id] = self.id; + /* add extra data to be POST:ed */ + if ($.isFunction(settings.submitdata)) { + $.extend(submitdata, settings.submitdata.apply(self, [self.revert, settings])); + } else { + $.extend(submitdata, settings.submitdata); + } + + /* quick and dirty PUT support */ + if ('PUT' == settings.method) { + submitdata['_method'] = 'put'; + } + + /* show the saving indicator */ + $(self).html(settings.indicator); + + /* defaults for ajaxoptions */ + var ajaxoptions = { + type : 'POST', + data : submitdata, + dataType: 'html', + url : settings.target, + success : function(result, status) { + if (ajaxoptions.dataType == 'html') { + $(self).html(result); + } + self.editing = false; + callback.apply(self, [result, settings]); + if (!$.trim($(self).html())) { + $(self).html(settings.placeholder); + } + }, + error : function(xhr, status, error) { + onerror.apply(form, [settings, self, xhr]); + } + }; + + /* override with what is given in settings.ajaxoptions */ + $.extend(ajaxoptions, settings.ajaxoptions); + $.ajax(ajaxoptions); + + } + } + } + + /* show tooltip again */ + $(self).attr('title', settings.tooltip); + + return false; + }); + }); + + /* privileged methods */ + this.reset = function(form) { + /* prevent calling reset twice when blurring */ + if (this.editing) { + /* before reset hook, if it returns false abort reseting */ + if (false !== onreset.apply(form, [settings, self])) { + $(self).html(self.revert); + self.editing = false; + if (!$.trim($(self).html())) { + $(self).html(settings.placeholder); + } + /* show tooltip again */ + if (settings.tooltip) { + $(self).attr('title', settings.tooltip); + } + } + } + }; + }); + + }; + + + $.editable = { + types: { + defaults: { + element : function(settings, original) { + var input = $(''); + $(this).append(input); + return(input); + }, + content : function(string, settings, original) { + $(':input:first', this).val(string); + }, + reset : function(settings, original) { + original.reset(this); + }, + buttons : function(settings, original) { + var form = this; + if (settings.submit) { + /* if given html string use that */ + if (settings.submit.match(/>$/)) { + var submit = $(settings.submit).click(function() { + if (submit.attr("type") != "submit") { + form.submit(); + } + }); + /* otherwise use button with given string as text */ + } else { + var submit = $('