Added clearing the comic file list on import [#2483]

mcpierce · mcpierce · commit 091b81868a5e · 2025-10-15T15:31:14.000-04:00
diff --git a/comixed-rest/src/main/java/org/comixedproject/rest/comicfiles/ComicFileController.java b/comixed-rest/src/main/java/org/comixedproject/rest/comicfiles/ComicFileController.java
@@ -167,7 +167,8 @@ public byte[] getImportFileCover(@RequestParam("filename") String filename) {
       consumes = MediaType.APPLICATION_JSON_VALUE)
   @PreAuthorize("hasRole('ADMIN')")
   @Timed(value = "comixed.comic-file.batch.import-files")
-  public void importComicFiles(@RequestBody() ImportComicFilesRequest request)
+  public void importComicFiles(
+      final HttpSession session, @RequestBody() ImportComicFilesRequest request)
       throws JobInstanceAlreadyCompleteException,
           JobExecutionAlreadyRunningException,
           JobParametersInvalidException,
@@ -176,6 +177,9 @@ public void importComicFiles(@RequestBody() ImportComicFilesRequest request)
 
     log.info("Importing comic files");
     this.comicFileService.importComicFiles(filenames);
+
+    log.debug("Cleared comic files list");
+    session.removeAttribute(COMIC_FILES);
   }
 
   /**
diff --git a/comixed-rest/src/test/java/org/comixedproject/rest/comicfiles/ComicFileControllerTest.java b/comixed-rest/src/test/java/org/comixedproject/rest/comicfiles/ComicFileControllerTest.java
@@ -184,9 +184,11 @@ void importComicFiles()
           JobParametersInvalidException,
           JobRestartException {
     controller.importComicFiles(
+        session,
         new ImportComicFilesRequest(filenameList, TEST_SKIP_METADATA, TEST_SKIP_BLOCKING_PAGES));
 
     Mockito.verify(comicFileService, Mockito.times(1)).importComicFiles(filenameList);
+    Mockito.verify(session, Mockito.times(1)).removeAttribute(COMIC_FILES);
   }
 
   @Test
