Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'

Conflicts:
	mediagoblin/db/migrations.py

diff --cc mediagoblin/db/migrations.py
index e2a0bf260647bf5b594e4e366e899f470d99bb13,508fcbab9f98acc0952024012a5d41d23fb4bf0a..a88518f45c8b38d918c2d6f5df75cc5cd32e5e32
--- 1/mediagoblin/db/migrations.py
--- 2/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@@ -465,32 -463,11 +465,44 @@@ def create_oauth1_tables(db)
  
  
  @RegisterMigration(15, MIGRATIONS)
 +def wants_notifications(db):
 +    """Add a wants_notifications field to User model"""
 +    metadata = MetaData(bind=db.bind)
 +    user_table = inspect_table(metadata, "core__users")
 +
 +    col = Column('wants_notifications', Boolean, default=True)
 +    col.create(user_table)
 +
 +    db.commit()
 +
 +
 +@RegisterMigration(16, MIGRATIONS)
 +def upload_limits(db):
 +    """Add user upload limit columns"""
 +    metadata = MetaData(bind=db.bind)
 +
 +    user_table = inspect_table(metadata, 'core__users')
 +    media_entry_table = inspect_table(metadata, 'core__media_entries')
 +
 +    col = Column('uploaded', Integer, default=0)
 +    col.create(user_table)
 +
 +    col = Column('upload_limit', Integer)
 +    col.create(user_table)
 +
 +    col = Column('file_size', Integer, default=0)
 +    col.create(media_entry_table)
 +
 +    db.commit()
++
++
++@RegisterMigration(17, MIGRATIONS)
+ def add_file_metadata(db):
+     """Add file_metadata to MediaFile"""
+     metadata = MetaData(bind=db.bind)
+     media_file_table = inspect_table(metadata, "core__mediafiles")
+ 
+     col = Column('file_metadata', JSONEncoded)
+     col.create(media_file_table)
++
+     db.commit()

diff --cc mediagoblin/db/models.py
Simple merge

diff --cc mediagoblin/media_types/ascii/processing.py
Simple merge

diff --cc mediagoblin/media_types/image/processing.py
Simple merge