Skip to content

Commit

Permalink
Revert "Reduce file sizes"
Browse files Browse the repository at this point in the history
This reverts commit 197ac39.
  • Loading branch information
andrebrait committed Feb 20, 2022
1 parent 197ac39 commit d2ef9d0
Show file tree
Hide file tree
Showing 24 changed files with 12 additions and 25 deletions.
35 changes: 11 additions & 24 deletions core/src/main/java/io/github/datromtool/util/ArchiveUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
Expand All @@ -31,10 +30,7 @@

import javax.annotation.Nullable;
import java.io.*;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.time.LocalDateTime;
import java.util.Enumeration;
Expand All @@ -44,6 +40,7 @@
import java.util.regex.Pattern;
import java.util.stream.Stream;

import static io.github.datromtool.SystemUtils.OperatingSystem.WINDOWS;
import static java.nio.file.Files.newInputStream;
import static java.nio.file.StandardOpenOption.CREATE;
import static java.util.regex.Pattern.CASE_INSENSITIVE;
Expand All @@ -58,7 +55,6 @@ public static void deleteFolder(@Nullable Path folder) throws IOException {
if (folder == null) {
return;
}
log.info("Deleting folder '{}'", folder);
Files.walkFileTree(folder, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
Expand Down Expand Up @@ -392,29 +388,20 @@ private static boolean checkProcess(String... args) {

private static String copyToTempBinDir(String path, String destination) {
Path finalDestination = tempBinDir.resolve(destination);
try (ZipArchiveInputStream zipFile = new ZipArchiveInputStream(ClassLoader.getSystemResource("bin.zip").openStream())) {
ZipArchiveEntry entry;
while ((entry = zipFile.getNextZipEntry()) != null) {
try (OutputStream outputStream = Files.newOutputStream(finalDestination)) {
if (entry.getName().equals(path)) {
byte[] buffer = new byte[32];
long totalRead = 0;
int bytesRead;
int remainingBytes;
while ((remainingBytes = (int) Math.min(entry.getSize() - totalRead, buffer.length)) > 0
&& (bytesRead = zipFile.read(buffer, 0, remainingBytes)) > -1) {
totalRead += bytesRead;
outputStream.write(buffer, 0, bytesRead);
}
log.info("Copied '{}' to '{}'", path, finalDestination);
return finalDestination.toString();
}
try (InputStream stream = ClassLoader.getSystemResource(path).openStream()) {
Files.copy(stream, finalDestination, StandardCopyOption.REPLACE_EXISTING);
log.info("Copied '{}' to '{}'", path, finalDestination);
File file = finalDestination.toFile();
if (!file.canExecute() && !file.setExecutable(true)) {
if (SystemUtils.OPERATING_SYSTEM != WINDOWS) {
log.warn("Failed to make '{}' executable", finalDestination);
}
}
return finalDestination.toString();
} catch (IOException e) {
log.error("Could not copy file '{}' to '{}'", path, finalDestination, e);
return null;
}
return null;
}

private static void createTempBinDir() {
Expand Down
Binary file removed core/src/main/resources/bin.zip
Binary file not shown.
Binary file added core/src/main/resources/bin/7zip/linux/arm/7zzs
Binary file not shown.
Binary file added core/src/main/resources/bin/7zip/linux/arm64/7zzs
Binary file not shown.
Binary file added core/src/main/resources/bin/7zip/linux/x32/7zzs
Binary file not shown.
Binary file added core/src/main/resources/bin/7zip/linux/x64/7zzs
Binary file not shown.
Binary file added core/src/main/resources/bin/7zip/macos/7zz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added core/src/main/resources/bin/unrar/bsd/unrar-x32
Binary file not shown.
Binary file added core/src/main/resources/bin/unrar/bsd/unrar-x64
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ static Stream<Arguments> rar5Toggles() {
} else if (unrarAvailable || sevenZipAvailable) {
return Stream.of(toggles[0], toggles[2]).map(Arguments::of);
} else {
return Stream.of(new Boolean[][]{toggles[2]}).map(Arguments::of);
return Stream.of(toggles[2]).map(Arguments::of);
}
}

Expand Down

0 comments on commit d2ef9d0

Please sign in to comment.