[Issue #173] Fix loading the first image from a 7zip encoded archive. (…

…#174) (#189)

comixed-library/src/main/java/org/comixed/adaptors/archive/AbstractArchiveAdaptor.java

@@ -59,10 +59,11 @@ public abstract class AbstractArchiveAdaptor<I> implements ArchiveAdaptor, Initi
   protected final Logger logger = LoggerFactory.getLogger(this.getClass());
   @Autowired protected FileTypeIdentifier fileTypeIdentifier;
   @Autowired protected ComicInfoEntryAdaptor comicInfoEntryAdaptor;
-  protected List<EntryLoaderForType> loaders = new ArrayList<>();
-  protected Map<String, EntryLoader> entryLoaders = new HashMap<>();
   @Autowired private ApplicationContext context;
   @Autowired private ComicFileHandler comicFileHandler;
+
+  protected List<EntryLoaderForType> loaders = new ArrayList<>();
+  protected Map<String, EntryLoader> entryLoaders = new HashMap<>();
   private String defaultExtension;
 
   public AbstractArchiveAdaptor(String defaultExtension) {
@@ -283,8 +284,8 @@ protected File validateFile(Comic comic) throws ArchiveAdaptorException {
   public String getFirstImageFileName(String filename) throws ArchiveAdaptorException {
     I archiveRef = this.openArchive(new File(filename));
 
+    // get the list of entries
     List<String> entries = this.getEntryFilenames(archiveRef);
-    Collections.sort(entries);
     String result = null;
 
     for (String entry : entries) {

comixed-library/src/main/java/org/comixed/adaptors/archive/SevenZipArchiveAdaptor.java

@@ -121,6 +121,7 @@ protected void loadAllFiles(Comic comic, SevenZFile archiveReference)
   protected byte[] loadSingleFileInternal(SevenZFile archiveReference, String entryName)
       throws ArchiveAdaptorException {
     byte[] result = null;
+
     try {
       boolean done = false;
       SevenZArchiveEntry entry = archiveReference.getNextEntry();

comixed-library/src/test/java/org/comixed/adaptors/archive/RarArchiveAdaptorTest.java

@@ -112,6 +112,6 @@ public void testLoadSingleFile() throws ArchiveAdaptorException {
 
   @Test
   public void testGetFirstImageFileName() throws ArchiveAdaptorException {
-    assertEquals(TEST_FILE_ENTRY_1, archiveAdaptor.getFirstImageFileName(TEST_CBR_FILE));
+    assertEquals(TEST_FILE_ENTRY_0, archiveAdaptor.getFirstImageFileName(TEST_CBR_FILE));
   }
 }

comixed-library/src/test/java/org/comixed/adaptors/archive/SevenZipArchiveAdaptorTest.java

@@ -35,16 +35,16 @@
 @SpringBootTest(classes = ComiXedTestContext.class)
 @TestPropertySource(locations = "classpath:application.properties")
 public class SevenZipArchiveAdaptorTest {
-  private static final String TEST_FILE_ENTRY_3 = "exampleCBR.jpg";
-  private static final String TEST_FILE_ENTRY_2 = "example.png";
+  private static final String TEST_FILE_ENTRY_2 = "exampleCBR.jpg";
+  private static final String TEST_FILE_ENTRY_3 = "example.png";
   private static final String TEST_FILE_ENTRY_1 = "example.jpg";
   private static final String TEST_FILE_ENTRY_0 = "example.jpeg";
   private static final String TEST_CB7_FILE = "target/test-classes/example.cb7";
   private static final String TEST_CBR_FILE = "target/test-classes/example.cbr";
   private static final Object TEST_FILE_ENTRY_RENAMED_0 = "offset-000.jpeg";
   private static final Object TEST_FILE_ENTRY_RENAMED_1 = "offset-001.jpg";
-  private static final Object TEST_FILE_ENTRY_RENAMED_2 = "offset-002.png";
-  private static final Object TEST_FILE_ENTRY_RENAMED_3 = "offset-003.jpg";
+  private static final Object TEST_FILE_ENTRY_RENAMED_2 = "offset-002.jpg";
+  private static final Object TEST_FILE_ENTRY_RENAMED_3 = "offset-003.png";
 
   @Autowired private SevenZipArchiveAdaptor archiveAdaptor;