diff options
Diffstat (limited to 'cli/app/sql/models/upload.py')
| -rw-r--r-- | cli/app/sql/models/upload.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cli/app/sql/models/upload.py b/cli/app/sql/models/upload.py index f1e8108..5863b07 100644 --- a/cli/app/sql/models/upload.py +++ b/cli/app/sql/models/upload.py @@ -4,8 +4,6 @@ from sqlalchemy_utc import UtcDateTime, utcnow from wtforms_alchemy import ModelForm from app.sql.common import db, Base, Session -from app.sql.columns.hash_column import HashColumn -from app.sql.columns.media_type_column import MediaTypeColumn from app.utils.file_utils import sha256_tree from app.settings import app_cfg @@ -14,9 +12,10 @@ from os.path import join class Upload(Base): """Table for storing references to various media""" - __tablename__ = 'uploads' + __tablename__ = 'upload' id = Column(Integer, primary_key=True) - sha256 = Column(HashColumn(32), nullable=False) + sha256 = Column(String(256), nullable=False) + fn = Column(String(256), nullable=False) ext = Column(String(4, convert_unicode=True), nullable=False) username = Column(String(16, convert_unicode=True), nullable=False) created_at = Column(UtcDateTime(), default=utcnow()) @@ -25,6 +24,7 @@ class Upload(Base): return { 'id': self.id, 'sha256': self.sha256, + 'fn': self.fn, 'ext': self.ext, 'username': self.username, 'url': self.url(), @@ -32,7 +32,7 @@ class Upload(Base): } def filename(self): - return "{}{}".format(self.sha256, self.ext) + return "{}{}".format(self.fn) def filepath(self): return join(app_cfg.DIR_UPLOADS, sha256_tree(self.sha256)) |