Browse Source

Tightens exception catches for preview manager calls

Adrien Panay 7 years ago
parent
commit
5f28f2b15d
2 changed files with 7 additions and 4 deletions
  1. 2 1
      tracim/tracim/controllers/content.py
  2. 5 3
      tracim/tracim/controllers/page.py

+ 2 - 1
tracim/tracim/controllers/content.py View File

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

+ 5 - 3
tracim/tracim/controllers/page.py View File

1
 import tg
1
 import tg
2
 from tg import expose
2
 from tg import expose
3
 from tg import tmpl_context
3
 from tg import tmpl_context
4
+from preview_generator.exception import PreviewGeneratorException
4
 from preview_generator.manager import PreviewManager
5
 from preview_generator.manager import PreviewManager
5
 
6
 
6
 from tracim.config.app_cfg import CFG
7
 from tracim.config.app_cfg import CFG
49
                                                     height=size,
50
                                                     height=size,
50
                                                     width=size)
51
                                                     width=size)
51
             with open(path, 'rb') as large:
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
     @expose(content_type='image/jpeg')
58
     @expose(content_type='image/jpeg')
57
     def high_quality(self,
59
     def high_quality(self,