repair config + tests for revision jpg preview

tracim/config.py

@@ -411,25 +411,26 @@ class CFG(object):
         #     self.RADICALE_CLIENT_BASE_URL_HOST,
         #     self.RADICALE_CLIENT_BASE_URL_PREFIX,
         # )
-        preview_jpg_allowed_sizes = settings.get('preview.jpg.allowed_sizes', '')  # nopep8
-        self.PREVIEW_JPG_ALLOWED_SIZES = []
-        if preview_jpg_allowed_sizes:
-            for size in preview_jpg_allowed_sizes.split(','):
-                parts = preview_jpg_allowed_sizes.split('x')
+        preview_jpg_allowed_sizes_str = settings.get('preview.jpg.allowed_sizes', '')  # nopep8
+        allowed_size = []
+        if preview_jpg_allowed_sizes_str:
+            for sizes in preview_jpg_allowed_sizes_str.split(','):
+                parts = sizes.split('x')
                 assert len(parts) == 2
                 width, height = parts
-                assert width.is_decimal()
-                assert height.is_decimal()
+                assert width.isdecimal()
+                assert height.isdecimal()
                 size = PreviewSize(int(width), int(height))
-                self.PREVIEW_JPG_ALLOWED_SIZES.append(size)
+                allowed_size.append(size)
 
             self.PREVIEW_JPG_RESTRICTED_SIZES = asbool(settings.get(
                 'preview.jpg.restricted_sizes', False
             ))
-        if not self.PREVIEW_JPG_ALLOWED_SIZES:
+        if not allowed_size:
             size = PreviewSize(256, 256)
-            self.PREVIEW_JPG_ALLOWED_SIZES.append(size)
+            allowed_size.append(size)
 
+        self.PREVIEW_JPG_ALLOWED_SIZES = allowed_size
 
     def configure_filedepot(self):
         depot_storage_name = self.DEPOT_STORAGE_NAME
@@ -453,3 +454,9 @@ class PreviewSize(object):
     def __init__(self, width: int, height: int) -> None:
         self.width = width
         self.height = height
+
+    def __repr__(self):
+        return "<PreviewSize width:{width} height:{height}>".format(
+            width=self.width,
+            height=self.height,
+        )

tracim/tests/functional/test_contents.py

@@ -1080,9 +1080,15 @@ class TestFiles(FunctionalTest):
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
-            do_save=True,
+            do_save=False,
             do_notify=False,
         )
+        test_file.file_extension = '.txt'
+        test_file.depot_file = FileIntent(
+            b'Test file',
+            'Test_file.txt',
+            'text/plain',
+        )
         dbsession.flush()
         transaction.commit()
         content_id = int(test_file.content_id)
@@ -1097,7 +1103,7 @@ class TestFiles(FunctionalTest):
         res = self.testapp.put(
             '/api/v2/workspaces/1/files/{}/raw'.format(content_id),
             upload_files=[
-                ('files',image.name, image.getvalue())
+                ('files', image.name, image.getvalue())
             ],
             status=204,
         )
@@ -1163,6 +1169,79 @@ class TestFiles(FunctionalTest):
         new_image = Image.open(io.BytesIO(res.body))
         assert 256, 256 == new_image.size
 
+    def test_api__get_sized_jpeg_revision_preview__ok__200__nominal_case(self) -> None:
+        """
+        get 256x256 revision preview of a txt file
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        business_workspace = workspace_api.get_one(1)
+        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        test_file = content_api.create(
+            content_type=ContentType.File,
+            workspace=business_workspace,
+            parent=tool_folder,
+            label='Test file',
+            do_save=False,
+            do_notify=False,
+        )
+        test_file.file_extension = '.txt'
+        test_file.depot_file = FileIntent(
+            b'Test file',
+            'Test_file.txt',
+            'text/plain',
+        )
+        dbsession.flush()
+        transaction.commit()
+        content_id = int(test_file.content_id)
+        revision_id = int(test_file.revision_id)
+        image = create_test_image()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.put(
+            '/api/v2/workspaces/1/files/{}/raw'.format(content_id),
+            upload_files=[
+                ('files', image.name, image.getvalue())
+            ],
+            status=204,
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/1/files/{content_id}/revisions/{revision_id}/raw'.format(
+                content_id=content_id,
+                revision_id=revision_id,
+            ),
+            status=200
+        )
+        assert res.content_type == 'text/plain'
+        res = self.testapp.get(
+            '/api/v2/workspaces/1/files/{content_id}/revisions/{revision_id}/preview/jpg/256x256'.format(
+                content_id=content_id,
+                revision_id=revision_id,
+            ),
+            status=200
+        )
+        assert res.body != image.getvalue()
+        assert res.content_type == 'image/jpeg'
+        new_image = Image.open(io.BytesIO(res.body))
+        assert 256, 256 == new_image.size
+
     def test_api__get_full_pdf_preview__ok__200__nominal_case(self) -> None:
         """
         get full pdf preview of a txt file