dugulp
/
textile_backup_chinese
mirror of https://github.com/dugulingping/textile_backup_chinese.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test 2

56-bugfix
szymon 2021-01-23 18:46:49 +01:00
parent 2f55267ce2
commit 011283dc09
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/szum123321/textile_backup/core/restore/decompressors/GenericTarDecompressor.java
View File

@ -50,19 +50,31 @@ public class GenericTarDecompressor {
File file = target.toPath().resolve(entry.getName()).toFile(); File file = target.toPath().resolve(entry.getName()).toFile();
if(entry.isDirectory()) { if(entry.isDirectory()) {
file.mkdirs(); try {
Files.createDirectories(file.toPath());
} catch (IOException e) {
Statics.LOGGER.error("An exception occurred when trying to create {}", file, e);
}
} else { } else {
File parent = file.getParentFile(); File parent = file.getParentFile();
try {
Files.createDirectories(parent.toPath());
} catch (IOException e) {
Statics.LOGGER.error("An exception occurred when trying to create {}", file, e);
}
/*
if (!parent.isDirectory() && !parent.mkdirs()) { if (!parent.isDirectory() && !parent.mkdirs()) {
Statics.LOGGER.error("Failed to create {}", parent); Statics.LOGGER.error("Failed to create {}", parent);
} else { Statics.LOGGER.error("Skipping: {}", file);
try (OutputStream outputStream = Files.newOutputStream(file.toPath()); continue;
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream)) { }*/
IOUtils.copy(archiveInputStream, bufferedOutputStream);
} catch (IOException e) { try (OutputStream outputStream = Files.newOutputStream(file.toPath());
Statics.LOGGER.error("An exception occurred while trying to decompress file: {}", file.getName(), e); BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream)) {
} IOUtils.copy(archiveInputStream, bufferedOutputStream);
} catch (IOException e) {
Statics.LOGGER.error("An exception occurred while trying to decompress file: {}", file.getName(), e);
} }
} }
} }

28
src/main/java/net/szum123321/textile_backup/core/restore/decompressors/ZipDecompressor.java
View File

@ -47,19 +47,27 @@ public class ZipDecompressor {
File file = target.toPath().resolve(entry.getName()).toFile(); File file = target.toPath().resolve(entry.getName()).toFile();
if(entry.isDirectory()) { if(entry.isDirectory()) {
file.mkdirs(); try {
Files.createDirectories(file.toPath());
} catch (IOException e) {
Statics.LOGGER.error("An exception occurred when trying to create {}", file, e);
}
//if(!file.isDirectory() && !file.mkdirs())
// Statics.LOGGER.error("Failed to create: {}", file);
} else { } else {
File parent = file.getParentFile(); File parent = file.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) { try {
Statics.LOGGER.error("Failed to create {}", parent); Files.createDirectories(parent.toPath());
} else { } catch (IOException e) {
try (OutputStream outputStream = Files.newOutputStream(file.toPath()); Statics.LOGGER.error("An exception occurred when trying to create {}", file, e);
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream)) { }
IOUtils.copy(zipInputStream, bufferedOutputStream);
} catch (IOException e) { try (OutputStream outputStream = Files.newOutputStream(file.toPath());
Statics.LOGGER.error("An exception occurred while trying to decompress file: {}", file.getName(), e); BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream)) {
} IOUtils.copy(zipInputStream, bufferedOutputStream);
} catch (IOException e) {
Statics.LOGGER.error("An exception occurred while trying to decompress file: {}", file.getName(), e);
} }
} }
} }