fixed zip extraction

Author: North-West-Wind

src/ml/northwestwind/Constants.java

@@ -6,7 +6,7 @@
 
 public class Constants {
     public static final String CURSEFORGE_API = "https://northwestwind.ml/api/curseforge/mods/";
-    public static final String VERSION = "1.3.2";
+    public static final String VERSION = "1.3.3";
     private static final String OS = System.getProperty("os.name").toLowerCase();
     public static final boolean IS_WINDOWS = (OS.contains("win"));
     public static final boolean IS_MAC = (OS.contains("mac"));

src/ml/northwestwind/Utils.java

@@ -8,20 +8,19 @@
 
 import java.io.*;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
 public class Utils {
     private static final int BUFFER_SIZE = 4096;
     private static final String UPDATE_URL = "https://raw.githubusercontent.com/North-West-Wind/CurseForge-CLI/main/update.json";
+    private static final Charset[] CHARSETS = { StandardCharsets.UTF_8, StandardCharsets.ISO_8859_1, StandardCharsets.US_ASCII, StandardCharsets.UTF_16, StandardCharsets.UTF_16BE, StandardCharsets.UTF_16LE };
 
     public static void invalid() {
         System.err.println("Invalid usage. Use \"curseforge help\" for command list,");
@@ -100,40 +99,44 @@ public static <E> E getLast(List<E> list) {
     }
 
     public static boolean unzip(String file) {
-        try {
-            String fileZip = file;
-            String[] splitted = file.split("/");
-            File destDir = new File(Arrays.stream(Arrays.copyOf(splitted, splitted.length - 1)).collect(Collectors.joining("/")));
-            byte[] buffer = new byte[1024];
-            ZipInputStream zis = new ZipInputStream(new FileInputStream(fileZip));
-            ZipEntry zipEntry = zis.getNextEntry();
-            while (zipEntry != null) {
-                File newFile = newFile(destDir, zipEntry);
-                if (newFile.exists()) {
-                    if (newFile.isDirectory()) FileUtils.cleanDirectory(newFile);
-                    else newFile.delete();
-                }
-                if (zipEntry.isDirectory()) {
-                    if (!newFile.isDirectory() && !newFile.mkdirs())
-                        throw new IOException("Failed to create directory " + newFile);
-                } else {
-                    File parent = newFile.getParentFile();
-                    if (!parent.isDirectory() && !parent.mkdirs())
-                        throw new IOException("Failed to create directory " + parent);
-                    FileOutputStream fos = new FileOutputStream(newFile);
-                    int len;
-                    while ((len = zis.read(buffer)) > 0) fos.write(buffer, 0, len);
-                    fos.close();
+        for (Charset charset : CHARSETS) {
+            try {
+                File destDir = new File(file).getParentFile();
+                byte[] buffer = new byte[1024];
+
+                FileInputStream fis = new FileInputStream(file);
+                ZipInputStream zis = new ZipInputStream(fis, charset);
+                ZipEntry zipEntry = zis.getNextEntry();
+                while (zipEntry != null) {
+                    File newFile = newFile(destDir, zipEntry);
+                    if (newFile.exists()) {
+                        if (newFile.isDirectory()) FileUtils.cleanDirectory(newFile);
+                        else newFile.delete();
+                    }
+                    if (zipEntry.isDirectory()) {
+                        if (!newFile.isDirectory() && !newFile.mkdirs())
+                            throw new IOException("Failed to create directory " + newFile);
+                    } else {
+                        File parent = newFile.getParentFile();
+                        if (!parent.isDirectory() && !parent.mkdirs())
+                            throw new IOException("Failed to create directory " + parent);
+                        FileOutputStream fos = new FileOutputStream(newFile);
+                        int len;
+                        while ((len = zis.read(buffer)) > 0) fos.write(buffer, 0, len);
+                        fos.close();
+                    }
+                    zipEntry = zis.getNextEntry();
                 }
-                zipEntry = zis.getNextEntry();
+                zis.closeEntry();
+                zis.close();
+                fis.close();
+                return true;
+            } catch (Exception e) {
+                System.out.println(Ansi.ansi().fg(Ansi.Color.RED).a("Charset " + charset.name() + " failed. Trying the next one...").reset());
             }
-            zis.closeEntry();
-            zis.close();
-            return true;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
         }
+        System.out.println(Ansi.ansi().fg(Ansi.Color.RED).a("All charsets failed. Installation stopped.").reset());
+        return false;
     }
 
     public static File newFile(File destinationDir, ZipEntry zipEntry) throws IOException {

update.json

@@ -1,4 +1,8 @@
 {
+  "1.3.3": {
+    "title": "Added Charset retry",
+    "description": "This fixes some modpack ZIPs having malformed inputs error."
+  },
   "1.3.2": {
     "title": "Added User-Agent to requests",
     "description": "This should fix the 403 error some users are receiving."