Imgee V2

.gitignore

@@ -20,3 +20,7 @@ baseframe-packed.css
 baseframe-packed.js
 error.log
 imgee/static/uploads
+*.bak
+instance/production.env.sh
+imgee/static/gen
+tests/imgee/

alembic/versions/2122dff4c223_change_tn_size_to_width_height.py

@@ -21,13 +21,14 @@
 def upgrade():
     op.add_column('thumbnail', sa.Column('width', sa.Integer(), nullable=True))
     op.add_column('thumbnail', sa.Column('height', sa.Integer(), nullable=True))
-    
+
     connection = op.get_bind()
     tn = Thumbnail.__table__
     result = connection.execute(select([column('id'), column('size')], from_obj=tn))
     w_h = [dict(tnid=r.id, w=int(r.size.split('x')[0]), h=int(r.size.split('x')[1])) for r in result]
-    updt_stmt = tn.update().where(tn.c.id == bindparam('tnid')).values(width=bindparam('w'), height=bindparam('h'))
-    connection.execute(updt_stmt, w_h)
+    if len(w_h) > 0:
+        updt_stmt = tn.update().where(tn.c.id == bindparam('tnid')).values(width=bindparam('w'), height=bindparam('h'))
+        connection.execute(updt_stmt, w_h)
 
 
 def downgrade():

alembic/versions/2c7e25599132_add_mimetype.py

@@ -32,8 +32,9 @@ def upgrade():
     sf = StoredFile.__table__
     result = connection.execute(select([sf.c.id, sf.c.title]))
     mimetypes = [dict(sfid=r[0], mimetype=guess_type(r[1])[0]) for r in result]
-    updt_stmt = sf.update().where(sf.c.id == bindparam('sfid')).values(mimetype=bindparam('mimetype'))
-    connection.execute(updt_stmt, mimetypes)
+    if len(mimetypes) > 0:
+        updt_stmt = sf.update().where(sf.c.id == bindparam('sfid')).values(mimetype=bindparam('mimetype'))
+        connection.execute(updt_stmt, mimetypes)
 
 
 def downgrade():

alembic/versions/2d5db2a698f6_init.py

@@ -39,8 +39,6 @@ def upgrade():
     sa.Column('created_at', sa.DateTime(), nullable=False),
     sa.Column('updated_at', sa.DateTime(), nullable=False),
     sa.Column('userid', sa.Unicode(length=22), nullable=False),
-    sa.Column('description', sa.UnicodeText(), nullable=False),
-    sa.Column('type', sa.Integer(), nullable=False),
     sa.Column('name', sa.Unicode(length=250), nullable=False),
     sa.Column('title', sa.Unicode(length=250), nullable=False),
     sa.PrimaryKeyConstraint('id'),
@@ -63,6 +61,7 @@ def upgrade():
     sa.Column('created_at', sa.DateTime(), nullable=False),
     sa.Column('updated_at', sa.DateTime(), nullable=False),
     sa.Column('name', sa.String(length=50), nullable=False),
+    sa.Column('title', sa.String(length=50), nullable=False),
     sa.Column('profile_id', sa.Integer(), nullable=False),
     sa.ForeignKeyConstraint(['profile_id'], ['profile.id'], ),
     sa.PrimaryKeyConstraint('id')

alembic/versions/347ba3ac054f_update_image_attrs.py

@@ -14,6 +14,10 @@
 import os.path
 import sys
 from glob import glob
+from alembic import op
+from sqlalchemy.sql import select
+from sqlalchemy.orm.session import sessionmaker
+from sqlalchemy.orm import load_only
 
 sys.path.append('../../')
 from imgee import db
@@ -22,7 +26,10 @@
 
 
 def upgrade():
-    imgs = StoredFile.query.filter_by(size=None)
+    connection = op.get_bind()
+    Session = sessionmaker(bind=connection.engine)
+    session = Session(bind=connection)
+    imgs = session.query(StoredFile).filter_by(size=None).options(load_only("id", "name", "title"))
 
     for img in imgs:
         path = path_for(img.name) + '.*'
@@ -34,7 +41,7 @@ def upgrade():
             print 'updated attributes of %s\n' % img.title,
         else:
             print 'local file not found for %s\n' % img.title,
-    db.session.commit()
+    session.commit()
 
 
 def downgrade():

imgee/__init__.py

@@ -3,7 +3,6 @@
 # The imports in this file are order-sensitive
 
 import os
-from celery import Celery
 
 from flask import Flask, redirect, url_for
 from flask.ext.lastuser import Lastuser
@@ -12,20 +11,18 @@
 import coaster.app
 from ._version import __version__
 
-
 version = Version(__version__)
 app = Flask(__name__, instance_relative_config=True)
 lastuser = Lastuser()
-celery = Celery()
 
 assets['imgee.css'][version] = 'css/app.css'
 
 from . import models, views
 from .models import db
-from .api import api
-from .async import TaskRegistry
+from .tasks import TaskRegistry
+
+registry = TaskRegistry(os.getenv('ENV', 'production'))
 
-registry = TaskRegistry()
 
 def mkdir_p(dirname):
     if not os.path.exists(dirname):
@@ -40,14 +37,12 @@ def error403(error):
 def init_for(env):
     coaster.app.init_app(app, env)
     baseframe.init_app(app, requires=['baseframe', 'picturefill', 'imgee'])
-    app.error_handlers[403] =  error403
+    app.error_handlers[403] = error403
     lastuser.init_app(app)
     lastuser.init_usermanager(UserManager(db, models.User))
     if app.config.get('MEDIA_DOMAIN') and (
             app.config['MEDIA_DOMAIN'].startswith('http:') or
             app.config['MEDIA_DOMAIN'].startswith('https:')):
         app.config['MEDIA_DOMAIN'] = app.config['MEDIA_DOMAIN'].split(':', 1)[1]
     mkdir_p(app.config['UPLOADED_FILES_DEST'])
-    celery.conf.add_defaults(app.config)
     registry.set_connection()
-    app.register_blueprint(api, url_prefix='/api/1')

imgee/forms.py

@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 
-import os.path
 from coaster import make_name
-from flask.ext.wtf import Form
+from baseframe.forms import Form
 from wtforms.validators import Required, ValidationError, Length
-from wtforms import (FileField, TextField, HiddenField,
-        SelectMultipleField, SelectField)
+from wtforms import (FileField, TextField, HiddenField, SelectField)
 
 from imgee import app
 from imgee.models import Label
-from imgee.utils import get_file_type, is_file_allowed
+from imgee.utils import is_file_allowed
 
 
 def valid_file(form, field):
-    if not is_file_allowed(field.data.stream):
+    if not is_file_allowed(field.data.stream, field.data.mimetype, field.data.filename):
         raise ValidationError("Sorry, unknown image format. Please try uploading another file.")
 
 
@@ -28,6 +26,7 @@ class DeleteImageForm(Form):
 class PurgeCacheForm(Form):
     pass
 
+
 def reserved_words():
     """get all words which can't be used as labels"""
     words = []
@@ -67,6 +66,7 @@ class EditTitleForm(Form):
     file_name = HiddenField('file_name')
     file_title = TextField('title', validators=[Required(), Length(max=250)])
 
+
 class UpdateTitle(Form):
     title = TextField('Title', validators=[Required(), Length(max=250)])
 

imgee/models/stored_file.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from coaster.sqlalchemy import BaseNameMixin, BaseScopedNameMixin
-import imgee
+from imgee import app, url_for
 from imgee.models import db
 from imgee.utils import newid, guess_extension
 
@@ -58,7 +58,29 @@ def __repr__(self):
     def extn(self):
         return guess_extension(self.mimetype, self.orig_extn) or ''
 
-    def is_queued_for_deletion(self):
-        if imgee.app.config.get('CELERY_ALWAYS_EAGER'):
-            return False
-        return imgee.registry.is_queued_for_deletion(self.name+self.extn)
+    def dict_data(self):
+        return dict(
+            title=self.title,
+            uploaded=self.created_at.strftime('%B %d, %Y'),
+            filesize=app.jinja_env.filters['filesizeformat'](self.size),
+            imgsize='%s x %s' % (self.width, self.height),
+            url=url_for('view_image', profile=self.profile.name, image=self.name),
+            thumb_url=url_for('get_image', image=self.name, size=app.config.get('THUMBNAIL_SIZE'))
+        )
+
+    def add_labels(self, labels):
+        new_labels = set(labels)
+        old_labels = set(self.labels)
+        if new_labels != old_labels:
+            self.labels = labels
+
+        if (new_labels == old_labels):
+            status, diff = '0', []
+        elif (new_labels > old_labels):
+            status, diff = '+', (new_labels - old_labels)
+        elif (old_labels > new_labels):
+            status, diff = '-', (old_labels - new_labels)
+        else:
+            status, diff = '', new_labels
+
+        return status, list(diff)