[Issue comixed#73] Return the missing image placeholder when no cover…

… is found during import.
mcpierce · Mar 11, 2020 · 42eaf7f · 42eaf7f
1 parent 27b3f82
commit 42eaf7f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/comixed-rest-api/src/main/java/org/comixed/controller/file/FileController.java b/comixed-rest-api/src/main/java/org/comixed/controller/file/FileController.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
+import org.apache.commons.io.IOUtils;
 import org.comixed.adaptors.archive.ArchiveAdaptorException;
 import org.comixed.controller.library.ComicController;
 import org.comixed.handlers.ComicFileHandlerException;
@@ -89,15 +90,30 @@ private void getAllFilesUnder(File root, List<FileDetails> result) throws IOExce
   }
 
   @RequestMapping(value = "/import/cover", method = RequestMethod.GET)
-  public byte[] getImportFileCover(@RequestParam("filename") String filename)
-      throws ComicFileHandlerException, ArchiveAdaptorException {
+  public byte[] getImportFileCover(@RequestParam("filename") String filename) {
     // for some reason, during development, this value ALWAYS had a trailing
     // space...
     filename = filename.trim();
 
     this.logger.info("Getting cover image for archive: filename={}", filename);
 
-    return this.fileService.getImportFileCover(filename);
+    byte[] result = null;
+
+    try {
+      result = this.fileService.getImportFileCover(filename);
+    } catch (ComicFileHandlerException | ArchiveAdaptorException error) {
+      this.logger.error("Failed to load cover from import file", error);
+    }
+
+    if (result == null) {
+      try {
+        result = IOUtils.toByteArray(this.getClass().getResourceAsStream("/images/missing.png"));
+      } catch (IOException error) {
+        this.logger.error("Failed to load the missing page image", error);
+      }
+    }
+
+    return result;
   }
 
   @RequestMapping(value = "/import/status", method = RequestMethod.GET)

diff --git a/comixed-rest-api/src/test/java/org/comixed/controller/file/FileControllerTest.java b/comixed-rest-api/src/test/java/org/comixed/controller/file/FileControllerTest.java
@@ -57,7 +57,7 @@ public class FileControllerTest {
   @Mock private List<FileDetails> fileDetailsList;
 
   @Test
-  public void testGetImportFileCover() throws ComicFileHandlerException, ArchiveAdaptorException {
+  public void testGetImportFileCover() throws ArchiveAdaptorException, ComicFileHandlerException {
     Mockito.when(fileService.getImportFileCover(Mockito.anyString())).thenReturn(IMAGE_CONTENT);
 
     final byte[] result = controller.getImportFileCover(COMIC_ARCHIVE);