From 11da1f72b1aeb38371b720969bd28a6c8696e6ff Mon Sep 17 00:00:00 2001 From: CalDescent Date: Wed, 18 Aug 2021 20:30:00 +0100 Subject: [PATCH] Added convenience method to make the code more readable. --- src/main/java/org/qortal/arbitrary/ArbitraryDataCache.java | 4 ++++ src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataCache.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataCache.java index a8ae0345..84947e26 100644 --- a/src/main/java/org/qortal/arbitrary/ArbitraryDataCache.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataCache.java @@ -32,6 +32,10 @@ public class ArbitraryDataCache { this.service = service; } + public boolean isCachedDataAvailable() { + return !this.shouldInvalidate(); + } + public boolean shouldInvalidate() { try { // If the user has requested an overwrite, always invalidate the cache diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java index d35fa322..d4d2482c 100644 --- a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java @@ -72,7 +72,7 @@ public class ArbitraryDataReader { // Not in the build queue - so check the cache itself ArbitraryDataCache cache = new ArbitraryDataCache(this.uncompressedPath, false, this.resourceId, this.resourceIdType, this.service); - if (!cache.shouldInvalidate()) { + if (cache.isCachedDataAvailable()) { this.filePath = this.uncompressedPath; return true; } @@ -111,7 +111,8 @@ public class ArbitraryDataReader { try { ArbitraryDataCache cache = new ArbitraryDataCache(this.uncompressedPath, overwrite, this.resourceId, this.resourceIdType, this.service); - if (!cache.shouldInvalidate()) { + if (cache.isCachedDataAvailable()) { + // Use cached data this.filePath = this.uncompressedPath; return; }