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

tracim/tracim/model/data.py

@@ -24,9 +24,8 @@ from sqlalchemy.types import Integer
 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 depot.fields.upload import UploadedFile
 
 from tracim.lib.utils import lazy_ugettext as l_
 from tracim.lib.exception import ContentRevisionUpdateError
@@ -1058,6 +1057,14 @@ class Content(DeclarativeBase):
     def is_editable(self) -> bool:
         return not self.is_archived and not self.is_deleted
 
+    @property
+    def depot_file_uid(self) -> UploadedFile:
+        return self.revision.depot_file_uid
+
+    @depot_file_uid.setter
+    def depot_file_uid(self, value):
+        self.revision.depot_file_uid = value
+
     def get_current_revision(self) -> ContentRevisionRO:
         if not self.revisions:
             return self.new_revision()

tracim/tracim/model/serializers.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 import cherrypy
-import os
 
 import types
 
-from bs4 import BeautifulSoup
 from babel.dates import format_timedelta
 from babel.dates import format_datetime
 
@@ -410,12 +408,14 @@ def serialize_node_for_page(content: Content, context: Context):
             })
         )
 
-        if content.type==ContentType.File:
+        if content.type == ContentType.File:
+            dpt = DepotManager.get()
+            dpt_file = dpt.get(data_container.depot_file_uid)
             result.label = content.label
             result['file'] = DictLikeClass(
-                name = data_container.file_name,
-                size = DepotManager.get().get(data_container.revision.depot_file_uid).content_length,
-                mimetype = data_container.file_mimetype)
+                name=data_container.file_name,
+                size=dpt_file.content_length,
+                mimetype=data_container.file_mimetype)
         return result
 
     if content.type==ContentType.Folder:

tracim/tracim/tests/models/test_content.py

@@ -1,13 +1,22 @@
 # -*- coding: utf-8 -*-
 import time
-from nose.tools import raises, ok_
+
+from nose.tools import ok_
+from nose.tools import raises
 from sqlalchemy.sql.elements import and_
 from sqlalchemy.testing import eq_
+from depot.fields.upload import UploadedFile
 
 from tracim.lib.content import ContentApi
 from tracim.lib.exception import ContentRevisionUpdateError
-from tracim.model import DBSession, User, Content, new_revision
-from tracim.model.data import ContentRevisionRO, Workspace, ActionDescription, ContentType
+from tracim.model import Content
+from tracim.model import DBSession
+from tracim.model import new_revision
+from tracim.model import User
+from tracim.model.data import ActionDescription
+from tracim.model.data import ContentRevisionRO
+from tracim.model.data import ContentType
+from tracim.model.data import Workspace
 from tracim.tests import TestStandard
 
 
@@ -111,7 +120,7 @@ class TestContent(TestStandard):
             revision_type=ActionDescription.CREATION,
             is_deleted=False,  # TODO: pk ?
             is_archived=False,  # TODO: pk ?
-            #file_content=None,  # TODO: pk ? (J'ai du mettre nullable=True)
+            # file_content=None,  # TODO: pk ? (J'ai du mettre nullable=True)
         )
 
         eq_(1, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1').count())
@@ -163,9 +172,42 @@ class TestContent(TestStandard):
 
         return created_content
 
+    def _get_user(self):
+        email = 'admin@admin.admin'
+        user_query = DBSession.query(User)
+        user_filter = user_query.filter(User.email == email)
+        user = user_filter.one()
+        return user
+
     def _create_content(self, *args, **kwargs):
         content = Content(*args, **kwargs)
         DBSession.add(content)
         DBSession.flush()
+        return content
 
+    def _create_content_from_nothing(self):
+        user_admin = self._get_user()
+        workspace = Workspace(label="TEST_WORKSPACE_1")
+        content = self._create_content(
+            owner=user_admin,
+            workspace=workspace,
+            type=ContentType.File,
+            label='TEST_CONTENT_1',
+            description='TEST_CONTENT_DESCRIPTION_1',
+            revision_type=ActionDescription.CREATION,
+        )
         return content
+
+    def test_unit__content_depot_file_uid(self):
+        """ Depot file access thought content property methods. """
+        content = self._create_content_from_nothing()
+        # tests uninitialized depot file
+        eq_(content.depot_file_uid, None)
+        # initializes depot file
+        content.depot_file_uid = b'test'
+        # tests initialized depot file
+        ok_(content.depot_file_uid)
+        # tests type of initialized depot file
+        eq_(type(content.depot_file_uid), UploadedFile)
+        # tests content of initialized depot file
+        eq_(content.depot_file_uid.file.read(), b'test')