Fixed recreating comics munging the stored filename [#2510]

mcpierce · mcpierce · commit 4554e5a45015 · 2025-11-18T11:08:02.000-05:00
diff --git a/comixed-adaptors/src/main/java/org/comixedproject/adaptors/comicbooks/ComicBookAdaptor.java b/comixed-adaptors/src/main/java/org/comixedproject/adaptors/comicbooks/ComicBookAdaptor.java
@@ -259,7 +259,7 @@ public void save(
               comicBook.getComicDetail().getFilename(),
               directory
                   + File.separator
-                  + FilenameUtils.removeExtension(comicBook.getComicDetail().getFilename()),
+                  + FilenameUtils.getBaseName(comicBook.getComicDetail().getFilename()),
               0,
               targetArchiveType.getExtension());
       log.trace("Updating filename: {}", newComicDetailFilename);
diff --git a/comixed-batch/src/main/java/org/comixedproject/batch/BatchConfiguration.java b/comixed-batch/src/main/java/org/comixedproject/batch/BatchConfiguration.java
@@ -18,13 +18,9 @@
 
 package org.comixedproject.batch;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.batch.core.step.job.DefaultJobParametersExtractor;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -88,24 +84,4 @@ public JobLauncher batchJobLauncher(
     taskExecutorJobLauncher.afterPropertiesSet();
     return taskExecutorJobLauncher;
   }
-
-  /**
-   * Returns the step that launches the processing batch job.
-   *
-   * @param jobRepository the step factory
-   * @param loadComicBooksJob the job
-   * @param jobLauncher the job launcher
-   * @return the step the step
-   */
-  @Bean(name = "loadComicBooksStep")
-  public Step loadComicBooksStep(
-      final JobRepository jobRepository,
-      final @Qualifier("loadComicBooksJob") Job loadComicBooksJob,
-      final @Qualifier("batchJobLauncher") JobLauncher jobLauncher) {
-    return new StepBuilder("loadComicBooksStep", jobRepository)
-        .job(loadComicBooksJob)
-        .parametersExtractor(new DefaultJobParametersExtractor())
-        .launcher(jobLauncher)
-        .build();
-  }
 }
diff --git a/comixed-batch/src/main/java/org/comixedproject/batch/comicbooks/RecreateComicFilesConfiguration.java b/comixed-batch/src/main/java/org/comixedproject/batch/comicbooks/RecreateComicFilesConfiguration.java
@@ -28,9 +28,11 @@
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.launch.support.RunIdIncrementer;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.batch.core.step.job.DefaultJobParametersExtractor;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -82,4 +84,16 @@ public Step recreateComicFileStep(
         .listener(listener)
         .build();
   }
+
+  @Bean(name = "loadComicBooksStep")
+  public Step loadComicBooksStep(
+      final JobRepository jobRepository,
+      final @Qualifier("loadComicBooksJob") Job loadComicBooksJob,
+      final @Qualifier("batchJobLauncher") JobLauncher jobLauncher) {
+    return new StepBuilder("loadComicBooksStep", jobRepository)
+        .job(loadComicBooksJob)
+        .parametersExtractor(new DefaultJobParametersExtractor())
+        .launcher(jobLauncher)
+        .build();
+  }
 }
