Fixed ChatGPT garbage, don't use it folks

This commit is contained in:
Flare Microsystems
2024-11-17 07:32:36 -08:00
parent cd8a5e88b7
commit d63ea7ba77

View File

@@ -1,10 +1,13 @@
package com.flaremicro.util; package com.flaremicro.util;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
@@ -15,21 +18,23 @@ import java.util.zip.ZipOutputStream;
public class ZipUtils { public class ZipUtils {
public static boolean zipList(File baseDir, List<String> filePaths, File zipFile) { public static boolean zipList(File baseDir, List<String> filePaths, File zipFile) {
FileOutputStream fos = null;
ZipOutputStream zos = null; ZipOutputStream zos = null;
FileInputStream fis = null; FileInputStream fis = null;
try try
{ {
fos = new FileOutputStream(zipFile); zos = new ZipOutputStream(new FileOutputStream(zipFile));
zos = new ZipOutputStream(fos);
for (String filePath : filePaths) for (String filePath : filePaths)
{ {
File file = new File(baseDir, filePath); File file = new File(baseDir, filePath);
if (file.isDirectory() || !file.exists()) if (file.isDirectory() || !file.exists())
{
System.out.println("Not adding " + filePath + ", does not exist or is directory");
continue; continue;
}
fis = new FileInputStream(file); fis = new FileInputStream(file);
String zipEntryName = filePath.replace("\\", "/"); String zipEntryName = filePath.replace("\\", "/");
System.out.println("Adding " + zipEntryName);
ZipEntry zipEntry = new ZipEntry(zipEntryName); ZipEntry zipEntry = new ZipEntry(zipEntryName);
zos.putNextEntry(zipEntry); zos.putNextEntry(zipEntry);
byte[] buffer = new byte[4096]; byte[] buffer = new byte[4096];
@@ -137,15 +142,18 @@ public class ZipUtils {
System.out.println("File " + newFile + "exists, replacing"); System.out.println("File " + newFile + "exists, replacing");
newFile.delete(); newFile.delete();
} }
FileOutputStream outputStream = null; OutputStream outputStream = null;
BufferedInputStream inputStream = null; InputStream inputStream = null;
try try
{ {
outputStream = new FileOutputStream(newFile); //Should they be buffered?
outputStream = new BufferedOutputStream(new FileOutputStream(newFile));
inputStream = new BufferedInputStream(zip.getInputStream(zipEntry)); inputStream = new BufferedInputStream(zip.getInputStream(zipEntry));
while (inputStream.available() > 0) byte[] buffer = new byte[4096];
int read = 0;
while ((read = inputStream.read(buffer)) > -1)
{ {
outputStream.write(inputStream.read()); outputStream.write(buffer, 0, read);
} }
} }
finally finally