projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
[mediagoblin.git]
/
mediagoblin
/
db
/
models.py
diff --git
a/mediagoblin/db/models.py
b/mediagoblin/db/models.py
index 4341e086fe922782cf2c39beae662e1332b3688e..a26756786a67ecc9768edd26b79fc5b12656d066 100644
(file)
--- a/
mediagoblin/db/models.py
+++ b/
mediagoblin/db/models.py
@@
-74,6
+74,8
@@
class User(Base, UserMixin):
is_admin = Column(Boolean, default=False, nullable=False)
url = Column(Unicode)
bio = Column(UnicodeText) # ??
is_admin = Column(Boolean, default=False, nullable=False)
url = Column(Unicode)
bio = Column(UnicodeText) # ??
+ uploaded = Column(Integer, default=0)
+ upload_limit = Column(Integer)
## TODO
# plugin data would be in a separate model
## TODO
# plugin data would be in a separate model
@@
-190,6
+192,7
@@
class MediaEntry(Base, MediaEntryMixin):
# or use sqlalchemy.types.Enum?
license = Column(Unicode)
collected = Column(Integer, default=0)
# or use sqlalchemy.types.Enum?
license = Column(Unicode)
collected = Column(Integer, default=0)
+ file_size = Column(Integer, default=0)
fail_error = Column(Unicode)
fail_metadata = Column(JSONEncoded)
fail_error = Column(Unicode)
fail_metadata = Column(JSONEncoded)