crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added more debug logging when building resources.

Browse Source
This commit is contained in:
CalDescent 2023-05-08 12:13:12 +01:00
parent 923e90ebed
commit 21d1750779
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
View File

@ -441,6 +441,7 @@ public class ArbitraryDataReader {
Path unencryptedPath = Paths.get(this.workingPath.toString(), "zipped.zip"); Path unencryptedPath = Paths.get(this.workingPath.toString(), "zipped.zip");
SecretKey aesKey = new SecretKeySpec(secret, 0, secret.length, "AES"); SecretKey aesKey = new SecretKeySpec(secret, 0, secret.length, "AES");
AES.decryptFile(algorithm, aesKey, this.filePath.toString(), unencryptedPath.toString()); AES.decryptFile(algorithm, aesKey, this.filePath.toString(), unencryptedPath.toString());
LOGGER.debug("Finished decrypting {} using algorithm {}", this.arbitraryDataResource, algorithm);
// Replace filePath pointer with the encrypted file path // Replace filePath pointer with the encrypted file path
// Don't delete the original ArbitraryDataFile, as this is handled in the cleanup phase // Don't delete the original ArbitraryDataFile, as this is handled in the cleanup phase
@ -475,7 +476,9 @@ public class ArbitraryDataReader {
// Handle each type of compression // Handle each type of compression
if (compression == Compression.ZIP) { if (compression == Compression.ZIP) {
LOGGER.debug("Unzipping {}...", this.arbitraryDataResource);
ZipUtils.unzip(this.filePath.toString(), this.uncompressedPath.getParent().toString()); ZipUtils.unzip(this.filePath.toString(), this.uncompressedPath.getParent().toString());
LOGGER.debug("Finished unzipping {}", this.arbitraryDataResource);
} }
else if (compression == Compression.NONE) { else if (compression == Compression.NONE) {
Files.createDirectories(this.uncompressedPath); Files.createDirectories(this.uncompressedPath);
@ -511,10 +514,12 @@ public class ArbitraryDataReader {
private void validate() throws IOException, DataException { private void validate() throws IOException, DataException {
if (this.service.isValidationRequired()) { if (this.service.isValidationRequired()) {
LOGGER.debug("Validating {}...", this.arbitraryDataResource);
Service.ValidationResult result = this.service.validate(this.filePath); Service.ValidationResult result = this.service.validate(this.filePath);
if (result != Service.ValidationResult.OK) { if (result != Service.ValidationResult.OK) {
throw new DataException(String.format("Validation of %s failed: %s", this.service, result.toString())); throw new DataException(String.format("Validation of %s failed: %s", this.service, result.toString()));
} }
LOGGER.debug("Finished validating {}", this.arbitraryDataResource);
} }
} }