Merge pull request #298 from tracim/fix/249/preview_generator_stabilization

tracim/setup.py

@@ -91,7 +91,7 @@ setup(
         ]
     },
     dependency_links=[
-        "http://tg.gy/230",
+        'http://github.com/algoo/preview-generator/tarball/master#egg=preview_generator-1.0',
         ],
     zip_safe=False
 )

tracim/tracim/controllers/content.py

@@ -8,6 +8,7 @@ import traceback
 
 from cgi import FieldStorage
 from depot.manager import DepotManager
+from preview_generator.exception import PreviewGeneratorException
 from preview_generator.manager import PreviewManager
 from sqlalchemy.orm.exc import NoResultFound
 import tg
@@ -17,6 +18,7 @@ from tg import require
 from tg import predicates
 from tg.i18n import ugettext as _
 from tg.predicates import not_anonymous
+from typing import List
 
 from tracim.controllers import TIMRestController
 from tracim.controllers import StandardController
@@ -216,7 +218,14 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
             revision_id = file.revision_id
 
         file_path = content_api.get_one_revision_filepath(revision_id)
-        nb_page = preview_manager.get_nb_page(file_path=file_path)
+
+        nb_page = 0
+        try:
+            nb_page = preview_manager.get_page_nb(file_path=file_path)
+        except PreviewGeneratorException as e:
+            # INFO - A.P - Silently intercepts preview exception
+            # As preview generation isn't mandatory, just register it
+            logger.debug(self, 'Exception: {}'.format(e.__str__))
         preview_urls = []
         for page in range(int(nb_page)):
             url_str = '/previews/{}/pages/{}?revision_id={}'
@@ -225,6 +234,16 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
                                  revision_id)
             preview_urls.append(url)
 
+        enable_pdf_buttons = False  # type: bool
+        try:
+            enable_pdf_buttons = \
+                preview_manager.has_pdf_preview(file_path=file_path)
+        except PreviewGeneratorException as e:
+            # INFO - A.P - Silently intercepts preview exception
+            # As preview generation isn't mandatory, just register it
+            logger.debug(self, 'Exception: {}'.format(e.__str__))
+        pdf_available = 'true' if enable_pdf_buttons else 'false'  # type: str
+
         fake_api_breadcrumb = self.get_breadcrumb(file_id)
         fake_api_content = DictLikeClass(breadcrumb=fake_api_breadcrumb,
                                          current_user=current_user_content)
@@ -235,7 +254,8 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
         result = DictLikeClass(result=dictified_file,
                                fake_api=fake_api,
                                nb_page=nb_page,
-                               url=preview_urls)
+                               url=preview_urls,
+                               pdf_available=pdf_available)
         return result
 
     @tg.require(current_user_is_reader())

tracim/tracim/controllers/page.py

@@ -1,6 +1,7 @@
 import tg
 from tg import expose
 from tg import tmpl_context
+from preview_generator.exception import PreviewGeneratorException
 from preview_generator.manager import PreviewManager
 
 from tracim.config.app_cfg import CFG
@@ -43,12 +44,16 @@ class PagesController(TIMRestController):
         else:
             file = content_api.get_one(file_id, self._item_type)
             file_path = content_api.get_one_revision_filepath(file.revision_id)
-        path = preview_manager.get_jpeg_preview(file_path=file_path,
-                                                page=page,
-                                                height=size,
-                                                width=size)
-        with open(path, 'rb') as large:
-            return large.read()
+        try:
+            path = preview_manager.get_jpeg_preview(file_path=file_path,
+                                                    page=page,
+                                                    height=size,
+                                                    width=size)
+            with open(path, 'rb') as large:
+                result = large.read()
+        except PreviewGeneratorException:
+            result = None
+        return result
 
     @expose(content_type='image/jpeg')
     def high_quality(self,

tracim/tracim/templates/file/getone.mak

@@ -127,7 +127,7 @@
                     modifiedAt: '${h.format_short(created_localized)|n}',
                     owner: '${result.file.owner.name}',
                     sourceLink: '${download_url}',
-                    pdfAvailable: false // FIXME - Côme - 2017/07/24 - backend should return this information
+                    pdfAvailable: ${pdf_available}
                   }
                 )
               })()