Merge branch 'dev/233/files_on_disk' into dev/232/preview_generator

tracim/migration/versions/69fb10c3d6f0_files_on_disk.py

@@ -6,18 +6,20 @@ Create Date: 2017-06-07 17:25:47.306472
 
 """
 
+from alembic import op
+from depot.fields.sqlalchemy import UploadedFileField
+import sqlalchemy as sa
+
 # 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))
+    op.add_column('content_revisions',
+                  sa.Column('depot_file',
+                            UploadedFileField))
 
 
 def downgrade():
-    op.drop_column('content_revisions', 'depot_file_uid')
+    op.drop_column('content_revisions', 'depot_file')

tracim/tracim/controllers/content.py

@@ -282,7 +282,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 DepotManager.get().get(revision_to_send.depot_file_uid)
+        return DepotManager.get().get(revision_to_send.depot_file)
 
     def get_all_fake(self,
                      context_workspace: Workspace,

tracim/tracim/lib/content.py

@@ -460,7 +460,7 @@ class ContentApi(object):
     #     :return: The corresponding Python file object
     #     """
     #     revision = self.get_one_revision(revision_id)
-    #     return DepotManager.get().get(revision.depot_file_uid)
+    #     return DepotManager.get().get(revision.depot_file)
 
     def get_one_revision_filepath(self, revision_id: int = None) -> str:
         """
@@ -475,7 +475,7 @@ class ContentApi(object):
         # python 3.6 PEP 526 -- Syntax for Variable Annotations
         # https://www.python.org/dev/peps/pep-0526/
         # dpt_file_path: str = dpt.get(dpt_stored_file)._file_path
-        dpt_stored_file = dpt.get(revision.depot_file_uid)
+        dpt_stored_file = dpt.get(revision.depot_file)
         dpt_file_path = dpt.get(dpt_stored_file)._file_path
 
         return dpt_file_path
@@ -880,7 +880,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.depot_file = new_file_content
         item.revision_type = ActionDescription.REVISION
         return item
 

tracim/tracim/model/data.py

@@ -546,7 +546,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)
+    depot_file = Column(UploadedFileField, unique=False, nullable=True)
     properties = Column('properties', Text(), unique=False, nullable=False, default='')
 
     type = Column(Unicode(32), unique=False, nullable=False)
@@ -629,10 +629,10 @@ class ContentRevisionRO(DeclarativeBase):
             setattr(new_rev, column_name, column_value)
 
         new_rev.updated = datetime.utcnow()
-        # TODO APY tweaks here depot_file_uid
+        # TODO APY tweaks here depot_file
         # import pudb; pu.db
-        # new_rev.depot_file_uid = DepotManager.get().get(revision.depot_file_uid)
-        new_rev.depot_file_uid = revision.file_content
+        # new_rev.depot_file = DepotManager.get().get(revision.depot_file)
+        new_rev.depot_file = revision.file_content
 
         return new_rev
 
@@ -1058,12 +1058,12 @@ class Content(DeclarativeBase):
         return not self.is_archived and not self.is_deleted
 
     @property
-    def depot_file_uid(self) -> UploadedFile:
-        return self.revision.depot_file_uid
+    def depot_file(self) -> UploadedFile:
+        return self.revision.depot_file
 
-    @depot_file_uid.setter
-    def depot_file_uid(self, value):
-        self.revision.depot_file_uid = value
+    @depot_file.setter
+    def depot_file(self, value):
+        self.revision.depot_file = value
 
     def get_current_revision(self) -> ContentRevisionRO:
         if not self.revisions:

tracim/tracim/model/serializers.py

@@ -410,7 +410,7 @@ def serialize_node_for_page(content: Content, context: Context):
 
         if content.type == ContentType.File:
             dpt = DepotManager.get()
-            dpt_file = dpt.get(data_container.depot_file_uid)
+            dpt_file = dpt.get(data_container.depot_file)
             result.label = content.label
             result['file'] = DictLikeClass(
                 name=data_container.file_name,

tracim/tracim/tests/models/test_content.py

@@ -198,16 +198,16 @@ class TestContent(TestStandard):
         )
         return content
 
-    def test_unit__content_depot_file_uid(self):
+    def test_unit__content_depot_file(self):
         """ Depot file access thought content property methods. """
         content = self._create_content_from_nothing()
         # tests uninitialized depot file
-        eq_(content.depot_file_uid, None)
+        eq_(content.depot_file, None)
         # initializes depot file
-        content.depot_file_uid = b'test'
+        content.depot_file = b'test'
         # tests initialized depot file
-        ok_(content.depot_file_uid)
+        ok_(content.depot_file)
         # tests type of initialized depot file
-        eq_(type(content.depot_file_uid), UploadedFile)
+        eq_(type(content.depot_file), UploadedFile)
         # tests content of initialized depot file
-        eq_(content.depot_file_uid.file.read(), b'test')
+        eq_(content.depot_file.file.read(), b'test')