From 7a0ca694eaad02065f5d83a886a3767d02fcde90 Mon Sep 17 00:00:00 2001 From: lantzelot-swe Date: Thu, 21 Jan 2021 23:20:42 +0100 Subject: [PATCH] Fix: smarter file selection for downloaded zipped game files from gb64.com --- src/main/java/se/lantz/util/FileManager.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/se/lantz/util/FileManager.java b/src/main/java/se/lantz/util/FileManager.java index 9165147..6ba342a 100644 --- a/src/main/java/se/lantz/util/FileManager.java +++ b/src/main/java/se/lantz/util/FileManager.java @@ -860,7 +860,7 @@ public class FileManager { fis = new FileInputStream(zipFilePath); ZipArchiveInputStream zis = new ZipArchiveInputStream(fis); - ZipEntry ze = zis.getNextZipEntry(); + ZipEntry ze = getFirstMatchingZipEntry(zis); if (ze != null) { String fileName = ze.getName(); @@ -886,5 +886,15 @@ public class FileManager } return filePath != null ? filePath.toFile() : null; } + + private static ZipEntry getFirstMatchingZipEntry(ZipArchiveInputStream zis) throws IOException + { + ZipEntry ze = zis.getNextZipEntry(); + if (ze != null && ze.getName().endsWith(".NFO")) + { + ze = zis.getNextZipEntry(); + } + return ze; + } }