2 files changed, 50 insertions, 12 deletions

diff --git a/mediagoblin/db/sql/migrations.py b/mediagoblin/db/sql/migrations.py
index fb178285..1d822cd9 100644
--- a/mediagoblin/db/sql/migrations.py
+++ b/mediagoblin/db/sql/migrations.py
@@ -16,14 +16,12 @@
 
 import datetime
 
-from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger, 
+from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger,
                         Integer, Unicode, UnicodeText, DateTime, ForeignKey)
-                       
-                       
 
 from mediagoblin.db.sql.util import RegisterMigration
-from mediagoblin.db.sql.models import MediaEntry, Collection, User
-
+from mediagoblin.db.sql.models import MediaEntry, Collection, User, \
+        ProcessingMetaData
 
 MIGRATIONS = {}
 
@@ -66,6 +64,7 @@ def add_transcoding_progress(db_conn):
     col.create(media_entry)
     db_conn.commit()
 
+
 @RegisterMigration(4, MIGRATIONS)
 def add_collection_tables(db_conn):
     metadata = MetaData(bind=db_conn.bind)
@@ -92,6 +91,7 @@ def add_collection_tables(db_conn):
 
     db_conn.commit()
 
+
 @RegisterMigration(5, MIGRATIONS)
 def add_mediaentry_collected(db_conn):
     metadata = MetaData(bind=db_conn.bind)
@@ -103,3 +103,16 @@ def add_mediaentry_collected(db_conn):
     col.create(media_entry)
     db_conn.commit()
 
+
+@RegisterMigration(6, MIGRATIONS)
+def create_processing_metadata_table(db):
+    metadata = MetaData(bind=db.bind)
+
+    metadata_table = Table('core__processing_metadata', metadata,
+            Column('id', Integer, primary_key=True),
+            Column('media_entry_id', Integer, ForeignKey(MediaEntry.id),
+                nullable=False, index=True),
+            Column('callback_url', Unicode))
+
+    metadata_table.create()
+    db.commit()
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index 5862f722..b48c1fbe 100644
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -22,10 +22,10 @@ TODO: indexes on foreignkeys, where useful.
 import datetime
 import sys
 
-from sqlalchemy import (
-    Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
-    UniqueConstraint, PrimaryKeyConstraint, SmallInteger)
-from sqlalchemy.orm import relationship
+from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \
+        Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \
+        SmallInteger
+from sqlalchemy.orm import relationship, backref
 from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.sql.expression import desc
 from sqlalchemy.ext.associationproxy import association_proxy
@@ -85,6 +85,14 @@ class User(Base, UserMixin):
 
     _id = SimpleFieldAlias("id")
 
+    def __repr__(self):
+        return '<{0} #{1} {2} {3} "{4}">'.format(
+                self.__class__.__name__,
+                self.id,
+                'verified' if self.email_verified else 'non-verified',
+                'admin' if self.is_admin else 'user',
+                self.username)
+
 
 class MediaEntry(Base, MediaEntryMixin):
     """
@@ -362,12 +370,12 @@ class Collection(Base, CollectionMixin):
     slug = Column(Unicode)
     created = Column(DateTime, nullable=False, default=datetime.datetime.now,
         index=True)
-    description = Column(UnicodeText) 
+    description = Column(UnicodeText)
     creator = Column(Integer, ForeignKey(User.id), nullable=False)
     items = Column(Integer, default=0)
 
     get_creator = relationship(User)
-    
+
     def get_collection_items(self, ascending=False):
         order_col = CollectionItem.position
         if not ascending:
@@ -404,9 +412,26 @@ class CollectionItem(Base, CollectionItemMixin):
         return DictReadAttrProxy(self)
 
 
+class ProcessingMetaData(Base):
+    __tablename__ = 'core__processing_metadata'
+
+    id = Column(Integer, primary_key=True)
+    media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False,
+            index=True)
+    media_entry = relationship(MediaEntry,
+            backref=backref('processing_metadata',
+                cascade='all, delete-orphan'))
+    callback_url = Column(Unicode)
+
+    @property
+    def dict_view(self):
+        """A dict like view on this object"""
+        return DictReadAttrProxy(self)
+
+
 MODELS = [
     User, MediaEntry, Tag, MediaTag, MediaComment, Collection, CollectionItem, MediaFile, FileKeynames,
-    MediaAttachmentFile]
+    MediaAttachmentFile, ProcessingMetaData]
 
 
 ######################################################