Skip to content

Commit 8583b26

Browse files
committed
Fixed not moving the external metadata file [#2302]
1 parent 6674f2d commit 8583b26

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

comixed-batch/src/main/java/org/comixedproject/batch/library/processors/MoveComicFilesProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public OrganizingComic process(final OrganizingComic comic) {
108108

109109
if (metadataSourceFile.exists()) {
110110
File metadataTargetFile =
111-
new File(this.comicBookAdaptor.getMetadataFilename(comic.getFilename()));
111+
new File(this.comicBookAdaptor.getMetadataFilename(comic.getUpdatedFilename()));
112112
if (!this.fileAdaptor.sameFile(metadataSourceFile, metadataTargetFile)) {
113113
log.trace(
114114
"Moving comic metadata file: {} => {}",

comixed-batch/src/test/java/org/comixedproject/batch/library/processors/MoveComicFilesProcessorTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public void setUp() throws IOException {
8686
Mockito.when(comicDetailFile.exists()).thenReturn(true);
8787
Mockito.when(organizingComic.getFile()).thenReturn(comicDetailFile);
8888
Mockito.when(organizingComic.getFilename()).thenReturn(TEST_SOURCE_FILENAME);
89+
Mockito.when(organizingComic.getFilename()).thenReturn(TEST_SOURCE_FILENAME);
8990
Mockito.when(
9091
comicFileAdaptor.findAvailableFilename(
9192
Mockito.anyString(), Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
@@ -217,11 +218,12 @@ public void testProcess_movingFileThrowsException() throws IOException {
217218
}
218219

219220
@Test
220-
public void testProcess_MetadataFileExists() throws IOException {
221+
public void testProcess_metadataFileExists() throws IOException {
221222
Mockito.when(comicBookAdaptor.getMetadataFilename(Mockito.anyString()))
222223
.thenReturn(TEST_SOURCE_METADATA_FILENAME, TEST_TARGET_METADATA_FILENAME);
223224
Mockito.when(fileAdaptor.sameFile(Mockito.any(File.class), Mockito.any(File.class)))
224225
.thenReturn(true, false);
226+
Mockito.when(organizingComic.getUpdatedFilename()).thenReturn(TEST_REBUILT_FILENAME);
225227

226228
processor.process(organizingComic);
227229

0 commit comments

Comments
 (0)