diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-12 18:49:35 +0200 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2018-07-12 18:49:35 +0200 |
| commit | 23af1d8cbc188c85d9f6ee9274af5b0102c48d24 (patch) | |
| tree | 0135ecc29f3322cc7ef24a033e1150f4eebd0f5b /mediagoblin/db/models.py | |
| parent | 8e5b7f633910de7e1429f02f0661fcbe311600fb (diff) | |
| parent | 4551a808beb8aa0dab3f1a331d022bfa84ee933c (diff) | |
| download | mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.tar.lz mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.tar.xz mediagoblin-23af1d8cbc188c85d9f6ee9274af5b0102c48d24.zip | |
Merge branch 'transcoding_progress'
This probably broke stuff
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index c19fe4da..0974676a 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -25,7 +25,7 @@ import datetime from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \ Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \ - SmallInteger, Date, types + SmallInteger, Date, types, Float from sqlalchemy.orm import relationship, backref, with_polymorphic, validates, \ class_mapper from sqlalchemy.orm.collections import attribute_mapped_collection @@ -543,7 +543,8 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin): fail_error = Column(Unicode) fail_metadata = Column(JSONEncoded) - transcoding_progress = Column(SmallInteger) + transcoding_progress = Column(Float, default=0) + main_transcoding_progress = Column(Float, default=0) queued_media_file = Column(PathTupleWithSlashes) |