Disables fully the feature of files in database

tracim/tracim/fixtures/content.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from depot.io.utils import FileIntent
+
 from tracim import model
 from tracim.fixtures import Fixture
 from tracim.fixtures.users_and_groups import Test
@@ -96,7 +98,11 @@ class Content(Fixture):
             do_save=False,
         )
         w1f1d1_txt.file_extension = '.txt'
-        w1f1d1_txt.file_content = b'w1f1d1 content'
+        w1f1d1_txt.depot_file = FileIntent(
+            b'w1f1d1 content',
+            'w1f1d1.txt',
+            'text/plain',
+        )
         self._session.add(w1f1d1_txt)
         w1f1d2_html = content_api.create(
             content_type=ContentType.File,
@@ -106,7 +112,11 @@ class Content(Fixture):
             do_save=False,
         )
         w1f1d2_html.file_extension = '.html'
-        w1f1d2_html.file_content = b'<p>w1f1d2 content</p>'
+        w1f1d2_html.depot_file = FileIntent(
+            b'<p>w1f1d2 content</p>',
+            'w1f1d2.html',
+            'text/html',
+        )
         self._session.add(w1f1d2_html)
         w1f1f1 = content_api.create(
             content_type=ContentType.Folder,

tracim/tracim/lib/content.py

@@ -16,6 +16,7 @@ import tg
 from tg.i18n import ugettext as _
 
 from depot.manager import DepotManager
+from depot.io.utils import FileIntent
 
 import sqlalchemy
 from sqlalchemy.orm import aliased
@@ -873,12 +874,15 @@ class ContentApi(object):
         item.revision_type = ActionDescription.EDITION
         return item
 
-    def update_file_data(self, item: Content, new_filename: str, new_mimetype: str, new_file_content) -> Content:
+    def update_file_data(self, item: Content, new_filename: str, new_mimetype: str, new_content) -> Content:
         item.owner = self._user
         item.file_name = new_filename
         item.file_mimetype = new_mimetype
-        item.file_content = new_file_content
-        item.depot_file = new_file_content
+        item.depot_file = FileIntent(
+            new_content,
+            new_filename,
+            new_mimetype,
+        )
         item.revision_type = ActionDescription.REVISION
         return item
 

tracim/tracim/lib/webdav/sql_resources.py

@@ -883,7 +883,7 @@ class File(DAVNonCollection):
         return "<DAVNonCollection: File (%d)>" % self.content.revision_id
 
     def getContentLength(self) -> int:
-        return len(self.content.file_content)
+        return self.content.depot_file.file.content_length
 
     def getContentType(self) -> str:
         return self.content.file_mimetype
@@ -899,7 +899,7 @@ class File(DAVNonCollection):
 
     def getContent(self):
         filestream = compat.BytesIO()
-        filestream.write(self.content.file_content)
+        filestream.write(self.content.depot_file.file.read())
         filestream.seek(0)
 
         return filestream
@@ -1028,13 +1028,13 @@ class HistoryFile(File):
 
     def getContent(self):
         filestream = compat.BytesIO()
-        filestream.write(self.content_revision.file_content)
+        filestream.write(self.content_revision.depot_file.file.read())
         filestream.seek(0)
 
         return filestream
 
     def getContentLength(self):
-        return len(self.content_revision.file_content)
+        return self.content_revision.depot_file.file.content_length
 
     def getContentType(self) -> str:
         return self.content_revision.file_mimetype

tracim/tracim/model/data.py

@@ -26,6 +26,7 @@ from sqlalchemy.types import Text
 from sqlalchemy.types import Unicode
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.upload import UploadedFile
+from depot.io.utils import FileIntent
 
 from tracim.lib.utils import lazy_ugettext as l_
 from tracim.lib.exception import ContentRevisionUpdateError
@@ -545,23 +546,6 @@ class ContentRevisionRO(DeclarativeBase):
         server_default='',
     )
     file_mimetype = Column(Unicode(255),  unique=False, nullable=False, default='')
-    # TODO - A.P - 2017-07-03 - future removal planned
-    # file_content is to be replaced by depot_file, for now both coexist as
-    # this:
-    # - file_content data is still setted
-    # - newly created revision also gets depot_file data setted
-    # - access to the file of a revision from depot_file exclusively
-    # Here is the tasks workflow of the DB to OnDisk Switch :
-    # - Add depot_file "prototype style"
-    #   https://github.com/tracim/tracim/issues/233 - DONE
-    # - Integrate preview generator feature "prototype style"
-    #   https://github.com/tracim/tracim/issues/232 - DONE
-    # - Write migrations
-    #   https://github.com/tracim/tracim/issues/245
-    #   https://github.com/tracim/tracim/issues/246
-    # - Stabilize preview generator integration
-    #   includes dropping DB file content
-    #   https://github.com/tracim/tracim/issues/249
     file_content = deferred(Column(LargeBinary(), unique=False, nullable=True))
     # INFO - A.P - 2017-07-03 - Depot Doc
     # http://depot.readthedocs.io/en/latest/#attaching-files-to-models
@@ -592,7 +576,6 @@ class ContentRevisionRO(DeclarativeBase):
         'content_id',
         'created',
         'description',
-        'file_content',
         'file_mimetype',
         'file_extension',
         'is_archived',
@@ -649,10 +632,12 @@ class ContentRevisionRO(DeclarativeBase):
             setattr(new_rev, column_name, column_value)
 
         new_rev.updated = datetime.utcnow()
-        # TODO APY tweaks here depot_file
-        # import pudb; pu.db
-        # new_rev.depot_file = DepotManager.get().get(revision.depot_file)
-        new_rev.depot_file = revision.file_content
+        if revision.depot_file:
+            new_rev.depot_file = FileIntent(
+                revision.depot_file.file.read(),
+                revision.file_name,
+                revision.file_mimetype,
+            )
 
         return new_rev
 
@@ -861,18 +846,6 @@ class Content(DeclarativeBase):
         return ContentRevisionRO.file_mimetype
 
     @hybrid_property
-    def file_content(self):
-        return self.revision.file_content
-
-    @file_content.setter
-    def file_content(self, value):
-        self.revision.file_content = value
-
-    @file_content.expression
-    def file_content(cls) -> InstrumentedAttribute:
-        return ContentRevisionRO.file_content
-
-    @hybrid_property
     def _properties(self) -> str:
         return self.revision.properties
 

tracim/tracim/tests/library/test_content_api.py

@@ -631,7 +631,7 @@ class TestContentApi(BaseTest, TestStandard):
                                                           updated.owner_id))
         eq_('this_is_a_page.html', updated.file_name)
         eq_('text/html', updated.file_mimetype)
-        eq_(b'<html>hello world</html>', updated.file_content)
+        eq_(b'<html>hello world</html>', updated.depot_file.file.read())
         eq_(ActionDescription.REVISION, updated.revision_type)
 
     def test_archive_unarchive(self):

tracim/tracim/tests/library/test_webdav.py

@@ -307,9 +307,9 @@ class TestWebDav(TestStandard):
         ))
         eq_(
             b'hello\n',
-            result.content.file_content,
+            result.content.depot_file.file.read(),
             msg='fiel content should be "hello\n" but it is {0}'.format(
-                result.content.file_content
+                result.content.depot_file.file.read()
             )
         )
 
@@ -550,9 +550,9 @@ class TestWebDav(TestStandard):
         ))
         eq_(
             b'hello\n',
-            result.content.file_content,
+            result.content.depot_file.file.read(),
             msg='fiel content should be "hello\n" but it is {0}'.format(
-                result.content.file_content
+                result.content.depot_file.file.read()
             )
         )