diff options
| -rw-r--r-- | mediagoblin/db/migrations.py | 5 | ||||
| -rw-r--r-- | mediagoblin/db/models.py | 2 | ||||
| -rw-r--r-- | mediagoblin/user_pages/lib.py | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 339bc963..426080a2 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -713,11 +713,10 @@ def drop_MediaEntry_collected(db): Drop unused MediaEntry.collected column """ metadata = MetaData(bind=db.bind) - media_collected= inspect_table(metadata, 'core__media_entries') + media_collected= inspect_table(metadata, 'core__media_entries') media_collected = media_collected.columns['collected'] - media_collected.drop() - + db.commit() diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 079578a2..b750375d 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -219,11 +219,11 @@ class MediaEntry(Base, MediaEntryMixin): state = Column(Unicode, default=u'unprocessed', nullable=False) # or use sqlalchemy.types.Enum? license = Column(Unicode) - file_size = Column(Integer, default=0) fail_error = Column(Unicode) fail_metadata = Column(JSONEncoded) + transcoding_progress = Column(SmallInteger) queued_media_file = Column(PathTupleWithSlashes) diff --git a/mediagoblin/user_pages/lib.py b/mediagoblin/user_pages/lib.py index 16da89d6..e5c8defc 100644 --- a/mediagoblin/user_pages/lib.py +++ b/mediagoblin/user_pages/lib.py @@ -1,4 +1,4 @@ -# GNU MediaGobli:n -- federated, autonomous media hosting +# GNU MediaGoblin -- federated, autonomous media hosting # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # # This program is free software: you can redistribute it and/or modify @@ -71,8 +71,6 @@ def add_media_to_collection(collection, media, note=None, commit=True): collection.items = collection.items + 1 Session.add(collection) - - Session.add(media) if commit: |