Bläddra i källkod

Tightens exception catches for preview manager calls

Adrien Panay 7 år sedan
förälder
incheckning
5f28f2b15d
2 ändrade filer med 7 tillägg och 4 borttagningar
  1. 2 1
      tracim/tracim/controllers/content.py
  2. 5 3
      tracim/tracim/controllers/page.py

+ 2 - 1
tracim/tracim/controllers/content.py Visa fil

@@ -8,6 +8,7 @@ import traceback
8 8
 
9 9
 from cgi import FieldStorage
10 10
 from depot.manager import DepotManager
11
+from preview_generator.exception import PreviewGeneratorException
11 12
 from preview_generator.manager import PreviewManager
12 13
 from sqlalchemy.orm.exc import NoResultFound
13 14
 import tg
@@ -219,7 +220,7 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
219 220
         nb_page = 0
220 221
         try:
221 222
             nb_page = preview_manager.get_page_nb(file_path=file_path)
222
-        except:
223
+        except PreviewGeneratorException:
223 224
             pass
224 225
         preview_urls = []
225 226
         for page in range(int(nb_page)):

+ 5 - 3
tracim/tracim/controllers/page.py Visa fil

@@ -1,6 +1,7 @@
1 1
 import tg
2 2
 from tg import expose
3 3
 from tg import tmpl_context
4
+from preview_generator.exception import PreviewGeneratorException
4 5
 from preview_generator.manager import PreviewManager
5 6
 
6 7
 from tracim.config.app_cfg import CFG
@@ -49,9 +50,10 @@ class PagesController(TIMRestController):
49 50
                                                     height=size,
50 51
                                                     width=size)
51 52
             with open(path, 'rb') as large:
52
-                return large.read()
53
-        except:
54
-            pass
53
+                result = large.read()
54
+        except PreviewGeneratorException:
55
+            result = None
56
+        return result
55 57
 
56 58
     @expose(content_type='image/jpeg')
57 59
     def high_quality(self,