AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

When zipping files, rename the outer folder to "data" instead of using the original folder name. This means that the data can be accessed deterministically without the need to first lookup the folder name.

Browse Source
This commit is contained in:
CalDescent 2021-06-23 08:09:59 +01:00
parent 1c6428dd3b
commit 3f20fadb81
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/api/resource/DataResource.java
View File

@ -131,7 +131,7 @@ public class DataResource {
// Firstly zip up the directory // Firstly zip up the directory
String outputFilePath = "temp/zipped.zip"; String outputFilePath = "temp/zipped.zip";
try { try {
ZipUtils.zip(directoryPath, outputFilePath); ZipUtils.zip(directoryPath, outputFilePath, "data");
} catch (IOException e) { } catch (IOException e) {
LOGGER.info("Unable to zip directory", e); LOGGER.info("Unable to zip directory", e);
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);

7
src/main/java/org/qortal/utils/ZipUtils.java
View File

@ -18,11 +18,14 @@ import java.util.zip.ZipOutputStream;
public class ZipUtils { public class ZipUtils {
public static void zip(String sourcePath, String destFilePath) throws IOException { public static void zip(String sourcePath, String destFilePath, String fileName) throws IOException {
File sourceFile = new File(sourcePath); File sourceFile = new File(sourcePath);
if (fileName == null) {
fileName = sourceFile.getName();
}
FileOutputStream fileOutputStream = new FileOutputStream(destFilePath); FileOutputStream fileOutputStream = new FileOutputStream(destFilePath);
ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream); ZipOutputStream zipOutputStream = new ZipOutputStream(fileOutputStream);
ZipUtils.zip(sourceFile, sourceFile.getName(), zipOutputStream); ZipUtils.zip(sourceFile, fileName, zipOutputStream);
zipOutputStream.close(); zipOutputStream.close();
fileOutputStream.close(); fileOutputStream.close();
} }