Uploader progress bar

Fixes imports and routes
Merge branch 'master' into Develop
Finished routing

cps/uploader.py

@@ -65,6 +65,7 @@ logger = logging.getLogger("book_formats")
 try:
     from wand.image import Image
     from wand import version as ImageVersion
+    from wand.exceptions import PolicyError
     use_generic_pdf_cover = False
 except (ImportError, RuntimeError) as e:
     logger.warning('cannot import Image, generating pdf covers for pdf uploads will not work: %s', e)
@@ -160,12 +161,18 @@ def pdf_preview(tmp_file_path, tmp_dir):
     if use_generic_pdf_cover:
         return None
     else:
-        cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jpg"
-        with Image(filename=tmp_file_path + "[0]", resolution=150) as img:
-            img.compression_quality = 88
-            img.save(filename=os.path.join(tmp_dir, cover_file_name))
-        return cover_file_name
-
+        try:
+            cover_file_name = os.path.splitext(tmp_file_path)[0] + ".cover.jpg"
+            with Image(filename=tmp_file_path + "[0]", resolution=150) as img:
+                img.compression_quality = 88
+                img.save(filename=os.path.join(tmp_dir, cover_file_name))
+            return cover_file_name
+        except PolicyError as ex:
+            logger.warning('Pdf extraction forbidden by Imagemagick policy: %s', ex)
+            return None
+        except Exception as ex:
+            logger.warning('Cannot extract cover image, using default: %s', ex)
+            return None
 
 def get_versions():
     if not use_generic_pdf_cover:
@@ -197,5 +204,5 @@ def upload(uploadfile):
     md5.update(filename.encode('utf-8'))
     tmp_file_path = os.path.join(tmp_dir, md5.hexdigest())
     uploadfile.save(tmp_file_path)
-    meta = book_formats.process(tmp_file_path, filename_root, file_extension)
+    meta = process(tmp_file_path, filename_root, file_extension)
     return meta