Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed loading the cover when not in the image cache [#417] #450

Merged
merged 1 commit into from
Jul 29, 2020
Merged

Fixed loading the cover when not in the image cache [#417] #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion comixed-rest-api/src/main/java/org/comixedproject/controller/comic/ComicController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
import java.util.Optional;
import lombok.extern.log4j.Log4j2;
import org.comixedproject.adaptors.ComicDataAdaptor;
import org.comixedproject.adaptors.archive.ArchiveAdaptor;
import org.comixedproject.adaptors.archive.ArchiveAdaptorException;
import org.comixedproject.handlers.ComicFileHandler;
import org.comixedproject.handlers.ComicFileHandlerException;
import org.comixedproject.model.comic.Comic;
import org.comixedproject.model.comic.ComicFormat;
Expand Down Expand Up @@ -78,6 +80,7 @@ public class ComicController {
@Autowired private TaskManager taskManager;
@Autowired private ObjectFactory<DeleteComicsWorkerTask> deleteComicsWorkerTaskFactory;
@Autowired private ObjectFactory<UndeleteComicsWorkerTask> undeleteComicsWorkerTaskObjectFactory;
@Autowired private ComicFileHandler comicFileHandler;

@DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
@JsonView({View.ComicDetails.class})
Expand Down Expand Up @@ -347,7 +350,12 @@ public ResponseEntity<byte[]> getCoverImage(@PathVariable("id") final long id)
byte[] content = this.pageCacheService.findByHash(page.getHash());
if (content == null) {
log.debug("Loading page from archive");
content = comic.getPage(0).getContent();
final ArchiveAdaptor archiveAdaptor =
this.comicFileHandler.getArchiveAdaptorFor(comic.getFilename());
if (archiveAdaptor == null) {
throw new ComicFileHandlerException("no archive adaptor found");
}
content = archiveAdaptor.loadSingleFile(comic, filename);
this.pageCacheService.saveByHash(page.getHash(), content);
}
log.debug("Returning comic cover: filename={} size={}", filename, content.length);
Expand Down
11 changes: 9 additions & 2 deletions comixed-rest-api/src/test/java/org/comixedproject/controller/comic/ComicControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import org.comixedproject.adaptors.archive.ArchiveAdaptor;
import org.comixedproject.adaptors.archive.ArchiveAdaptorException;
import org.comixedproject.handlers.ComicFileHandler;
import org.comixedproject.handlers.ComicFileHandlerException;
import org.comixedproject.model.archives.ArchiveType;
import org.comixedproject.model.comic.Comic;
Expand Down Expand Up @@ -95,6 +97,8 @@ public class ComicControllerTest {
@Captor private ArgumentCaptor<InputStream> inputStreamCaptor;
@Mock private Page page;
@Mock private LastReadDate lastReadDate;
@Mock private ComicFileHandler comicFileHandler;
@Mock private ArchiveAdaptor archiveAdaptor;

private final List<Comic> emptyComicList = new ArrayList<>();

Expand Down Expand Up @@ -518,7 +522,11 @@ public void testGetCoverImageForProcessedComic()
Mockito.when(comic.getPage(Mockito.anyInt())).thenReturn(page);
Mockito.when(page.getHash()).thenReturn(TEST_PAGE_HASH);
Mockito.when(pageCacheService.findByHash(Mockito.anyString())).thenReturn(null);
Mockito.when(page.getContent()).thenReturn(TEST_PAGE_CONTENT);
Mockito.when(comic.getFilename()).thenReturn(TEST_COMIC_FILE);
Mockito.when(comicFileHandler.getArchiveAdaptorFor(Mockito.anyString()))
.thenReturn(archiveAdaptor);
Mockito.when(archiveAdaptor.loadSingleFile(Mockito.any(Comic.class), Mockito.anyString()))
.thenReturn(TEST_PAGE_CONTENT);
Mockito.doNothing()
.when(pageCacheService)
.saveByHash(Mockito.anyString(), Mockito.any(byte[].class));
Expand All @@ -537,7 +545,6 @@ public void testGetCoverImageForProcessedComic()
Mockito.verify(comic, Mockito.times(1)).isMissing();
Mockito.verify(page, Mockito.times(1)).getFilename();
Mockito.verify(pageCacheService, Mockito.times(1)).findByHash(TEST_PAGE_HASH);
Mockito.verify(page, Mockito.times(1)).getContent();
Mockito.verify(pageCacheService, Mockito.times(1))
.saveByHash(TEST_PAGE_HASH, TEST_PAGE_CONTENT);
Mockito.verify(fileTypeIdentifier, Mockito.times(1)).typeFor(inputStreamCaptor.getValue());
Expand Down