Merge branch 'dev' into feature-unified-search

src/documents/parsers.py

@@ -143,6 +143,46 @@ def run_convert(input_file,
         raise ParseError("Convert failed at {}".format(args))
 
 
+def get_default_thumbnail():
+    return os.path.join(os.path.dirname(__file__), "resources", "document.png")
+
+
+def make_thumbnail_from_pdf_gs_fallback(in_path, temp_dir, logging_group=None):
+    out_path = os.path.join(temp_dir, "convert_gs.png")
+
+    # if convert fails, fall back to extracting
+    # the first PDF page as a PNG using Ghostscript
+    logger.warning(
+        "Thumbnail generation with ImageMagick failed, falling back "
+        "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!",
+        extra={'group': logging_group}
+    )
+    gs_out_path = os.path.join(temp_dir, "gs_out.png")
+    cmd = [settings.GS_BINARY,
+           "-q",
+           "-sDEVICE=pngalpha",
+           "-o", gs_out_path,
+           in_path]
+    try:
+        if not subprocess.Popen(cmd).wait() == 0:
+            raise ParseError("Thumbnail (gs) failed at {}".format(cmd))
+        # then run convert on the output from gs
+        run_convert(density=300,
+                    scale="500x5000>",
+                    alpha="remove",
+                    strip=True,
+                    trim=False,
+                    auto_orient=True,
+                    input_file=gs_out_path,
+                    output_file=out_path,
+                    logging_group=logging_group)
+
+        return out_path
+
+    except ParseError:
+        return get_default_thumbnail()
+
+
 def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None):
     """
     The thumbnail of a PDF is just a 500px wide image of the first page.
@@ -161,31 +201,8 @@ def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None):
                     output_file=out_path,
                     logging_group=logging_group)
     except ParseError:
-        # if convert fails, fall back to extracting
-        # the first PDF page as a PNG using Ghostscript
-        logger.warning(
-            "Thumbnail generation with ImageMagick failed, falling back "
-            "to ghostscript. Check your /etc/ImageMagick-x/policy.xml!",
-            extra={'group': logging_group}
-        )
-        gs_out_path = os.path.join(temp_dir, "gs_out.png")
-        cmd = [settings.GS_BINARY,
-               "-q",
-               "-sDEVICE=pngalpha",
-               "-o", gs_out_path,
-               in_path]
-        if not subprocess.Popen(cmd).wait() == 0:
-            raise ParseError("Thumbnail (gs) failed at {}".format(cmd))
-        # then run convert on the output from gs
-        run_convert(density=300,
-                    scale="500x5000>",
-                    alpha="remove",
-                    strip=True,
-                    trim=False,
-                    auto_orient=True,
-                    input_file=gs_out_path,
-                    output_file=out_path,
-                    logging_group=logging_group)
+        out_path = make_thumbnail_from_pdf_gs_fallback(
+            in_path, temp_dir, logging_group)
 
     return out_path
 

src/documents/serialisers.py

@@ -50,7 +50,7 @@ class MatchingModelSerializer(serializers.ModelSerializer):
                 re.compile(match)
             except Exception as e:
                 raise serializers.ValidationError(
-                    _("Invalid regular expresssion: %(error)s") %
+                    _("Invalid regular expression: %(error)s") %
                     {'error': str(e)}
                 )
         return match

src/documents/views.py

@@ -18,6 +18,7 @@ from django_q.tasks import async_task
 from rest_framework import parsers
 from rest_framework.decorators import action
 from rest_framework.filters import OrderingFilter, SearchFilter
+from rest_framework.generics import GenericAPIView
 from rest_framework.mixins import (
     DestroyModelMixin,
     ListModelMixin,
@@ -406,23 +407,12 @@ class SavedViewViewSet(ModelViewSet):
         serializer.save(user=self.request.user)
 
 
-class BulkEditView(APIView):
+class BulkEditView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = BulkEditSerializer
     parser_classes = (parsers.JSONParser,)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -439,23 +429,12 @@ class BulkEditView(APIView):
             return HttpResponseBadRequest(str(e))
 
 
-class PostDocumentView(APIView):
+class PostDocumentView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = PostDocumentSerializer
     parser_classes = (parsers.MultiPartParser,)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, *args, **kwargs):
 
         serializer = self.get_serializer(data=request.data)
@@ -493,23 +472,12 @@ class PostDocumentView(APIView):
         return Response("OK")
 
 
-class SelectionDataView(APIView):
+class SelectionDataView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = DocumentListSerializer
     parser_classes = (parsers.MultiPartParser, parsers.JSONParser)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, format=None):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -660,23 +628,12 @@ class StatisticsView(APIView):
         })
 
 
-class BulkDownloadView(APIView):
+class BulkDownloadView(GenericAPIView):
 
     permission_classes = (IsAuthenticated,)
     serializer_class = BulkDownloadSerializer
     parser_classes = (parsers.JSONParser,)
 
-    def get_serializer_context(self):
-        return {
-            'request': self.request,
-            'format': self.format_kwarg,
-            'view': self
-        }
-
-    def get_serializer(self, *args, **kwargs):
-        kwargs['context'] = self.get_serializer_context()
-        return self.serializer_class(*args, **kwargs)
-
     def post(self, request, format=None):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)