Adds fs storage in addition to db storage for files

tracim/migration/versions/69fb10c3d6f0_files_on_disk.py

@@ -0,0 +1,23 @@
+"""files on disk
+
+Revision ID: 69fb10c3d6f0
+Revises: c1cea4bbae16
+Create Date: 2017-06-07 17:25:47.306472
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '69fb10c3d6f0'
+down_revision = 'c1cea4bbae16'
+
+from alembic import op
+import sqlalchemy as sa
+from depot.fields.sqlalchemy import UploadedFileField
+
+
+def upgrade():
+    op.add_column('content_revisions', sa.Column('depot_file_uid', UploadedFileField))
+
+
+def downgrade():
+    op.drop_column('content_revisions', 'depot_file_uid')

tracim/setup.py

@@ -52,6 +52,7 @@ install_requires=[
     "unicode-slugify==0.1.3",
     "pytz==2014.7",
     'rq==0.7.1',
+    'filedepot>=0.5.0',
     ]
 
 setup(

tracim/tracim/config/app_cfg.py

@@ -38,6 +38,12 @@ from tracim.lib.daemons import WsgiDavDaemon
 from tracim.model.data import ActionDescription
 from tracim.model.data import ContentType
 
+from depot.manager import DepotManager
+DepotManager.configure(
+    'default',
+    {'depot.storage_path': '/tmp/depot_storage_path/'}
+)
+
 base_config = TracimAppConfig()
 base_config.renderers = []
 base_config.use_toscawidgets = False

tracim/tracim/controllers/content.py

@@ -14,6 +14,8 @@ from tg.predicates import not_anonymous
 from sqlalchemy.orm.exc import NoResultFound
 from tg import abort
 
+from depot.manager import DepotManager
+
 from tracim.controllers import TIMRestController
 from tracim.controllers import StandardController
 from tracim.controllers import TIMRestPathContextSetup
@@ -249,7 +251,7 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
         file_name = get_valid_header_file_name(revision_to_send.file_name)
         tg.response.headers['Content-Disposition'] = \
             str('attachment; filename="{}"'.format(file_name))
-        return revision_to_send.file_content
+        return DepotManager.get().get(revision_to_send.depot_file_uid)
 
 
     def get_all_fake(self, context_workspace: Workspace, context_folder: Content):

tracim/tracim/lib/content.py

@@ -850,6 +850,7 @@ class ContentApi(object):
         item.file_name = new_filename
         item.file_mimetype = new_mimetype
         item.file_content = new_file_content
+        item.revision.depot_file_uid = new_file_content
         item.revision_type = ActionDescription.REVISION
         return item
 

tracim/tracim/model/data.py

@@ -25,6 +25,9 @@ from sqlalchemy.types import LargeBinary
 from sqlalchemy.types import Text
 from sqlalchemy.types import Unicode
 
+from depot.manager import DepotManager
+from depot.fields.sqlalchemy import UploadedFileField
+
 from tracim.lib.utils import lazy_ugettext as l_
 from tracim.lib.exception import ContentRevisionUpdateError
 from tracim.model import DeclarativeBase, RevisionsIntegrity
@@ -544,6 +547,7 @@ class ContentRevisionRO(DeclarativeBase):
     )
     file_mimetype = Column(Unicode(255),  unique=False, nullable=False, default='')
     file_content = deferred(Column(LargeBinary(), unique=False, nullable=True))
+    depot_file_uid = Column(UploadedFileField, unique=False, nullable=True)
     properties = Column('properties', Text(), unique=False, nullable=False, default='')
 
     type = Column(Unicode(32), unique=False, nullable=False)
@@ -626,6 +630,10 @@ class ContentRevisionRO(DeclarativeBase):
             setattr(new_rev, column_name, column_value)
 
         new_rev.updated = datetime.utcnow()
+        # TODO APY tweaks here depot_file_uid
+        # import pudb; pu.db
+        # new_rev.depot_file_uid = DepotManager.get().get(revision.depot_file_uid)
+        new_rev.depot_file_uid = revision.file_content
 
         return new_rev
 
@@ -1364,4 +1372,4 @@ class VirtualEvent(object):
             else:
                 aff = '%d hour%s ago' % (delta.seconds/3600, 's' if delta.seconds/3600>=2 else '')
 
-        return aff
+        return aff

tracim/tracim/model/serializers.py

@@ -12,6 +12,9 @@ from datetime import datetime
 import tg
 from tg.i18n import ugettext as _
 from tg.util import LazyString
+
+from depot.manager import DepotManager
+
 from tracim.lib.base import logger
 from tracim.lib.user import CurrentUserGetterApi
 from tracim.model.auth import Profile
@@ -411,7 +414,7 @@ def serialize_node_for_page(content: Content, context: Context):
             result.label = content.label
             result['file'] = DictLikeClass(
                 name = data_container.file_name,
-                size = len(data_container.file_content),
+                size = DepotManager.get().get(data_container.revision.depot_file_uid).content_length,
                 mimetype = data_container.file_mimetype)
         return result