rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 16:27:11 -07:00
Code Activity

Don't hold on to the cache file

Browse source
This commit is contained in:
Geert Bevin 2024-07-19 07:51:10 -04:00
parent e731b00287
commit a33e373367
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/rife/bld/BldCache.java
View file

@ -47,13 +47,13 @@ public class BldCache {
private static final String PROPERTY_DEPENDENCIES_PREFIX = "bld.dependencies"; private static final String PROPERTY_DEPENDENCIES_PREFIX = "bld.dependencies";
private static final String PROPERTY_DEPENDENCIES_HASH = PROPERTY_DEPENDENCIES_PREFIX + PROPERTY_SUFFIX_HASH; private static final String PROPERTY_DEPENDENCIES_HASH = PROPERTY_DEPENDENCIES_PREFIX + PROPERTY_SUFFIX_HASH;
private final File hashFile_; private final File bldLibDir_;
private final VersionResolution resolution_; private final VersionResolution resolution_;
private String extensionsHash_; private String extensionsHash_;
private String dependenciesHash_; private String dependenciesHash_;
public BldCache(File bldLibDir, VersionResolution resolution) { public BldCache(File bldLibDir, VersionResolution resolution) {
hashFile_ = new File(bldLibDir, BLD_CACHE); bldLibDir_ = bldLibDir;
resolution_ = resolution; resolution_ = resolution;
new File(bldLibDir, WRAPPER_PROPERTIES_HASH).delete(); new File(bldLibDir, WRAPPER_PROPERTIES_HASH).delete();
@ -112,11 +112,15 @@ public class BldCache {
return validateExtensionsHash(extensionsHash_); return validateExtensionsHash(extensionsHash_);
} }
private File getCacheFile() {
return new File(bldLibDir_, BLD_CACHE);
}
private Properties hashProperties() { private Properties hashProperties() {
var properties = new Properties(); var properties = new Properties();
if (hashFile_.exists()) { if (getCacheFile().exists()) {
try { try {
properties.load(new FileInputStream(hashFile_)); properties.load(new FileInputStream(getCacheFile()));
} catch (IOException e) { } catch (IOException e) {
// no-op, we'll store a new properties file when we're writing the cache // no-op, we'll store a new properties file when we're writing the cache
} }
@ -126,7 +130,7 @@ public class BldCache {
private boolean validateExtensionsHash(String hash) { private boolean validateExtensionsHash(String hash) {
var properties = hashProperties(); var properties = hashProperties();
if (!hashFile_.exists() || properties.isEmpty()) { if (properties.isEmpty()) {
return false; return false;
} }
@ -169,7 +173,7 @@ public class BldCache {
private boolean validateDependenciesHash(String hash) { private boolean validateDependenciesHash(String hash) {
var properties = hashProperties(); var properties = hashProperties();
if (!hashFile_.exists() || properties.isEmpty()) { if (properties.isEmpty()) {
return false; return false;
} }
@ -202,8 +206,8 @@ public class BldCache {
properties.put(PROPERTY_DEPENDENCIES_HASH, dependenciesHash_); properties.put(PROPERTY_DEPENDENCIES_HASH, dependenciesHash_);
} }
hashFile_.getParentFile().mkdirs(); bldLibDir_.mkdirs();
properties.store(new FileOutputStream(hashFile_), null); properties.store(new FileOutputStream(getCacheFile()), null);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }