From 83999fd5164790978231f29a770f2befec97d0bc Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 8 Oct 2023 21:17:35 -0500 Subject: [PATCH] Fix render cache clearing deleting the database instead of removing the cache data --- .../file/renderfile/RenderSourceFileHandler.java | 16 +++------------- .../distanthorizons/core/sql/AbstractDhRepo.java | 3 +++ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java index 310ed5309..681e80c8f 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java @@ -317,21 +317,11 @@ public class RenderSourceFileHandler implements IRenderSourceProvider public void deleteRenderCache() { - // delete each file in the cache directory - File[] renderFiles = this.saveDir.listFiles(); - if (renderFiles != null) - { - for (File renderFile : renderFiles) - { - if (!renderFile.delete()) - { - LOGGER.warn("Unable to delete render file: " + renderFile.getPath()); - } - } - } - // clear the cached files this.loadedMetaFileBySectionPos.clear(); + + // delete the render cache + this.renderDataRepo.deleteAll(); } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java index 8361e2067..bc0684074 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java @@ -155,6 +155,9 @@ public abstract class AbstractDhRepo this.queryDictionaryFirst("DELETE FROM "+this.getTableName()+" WHERE "+whereEqualStatement); } + /** With great power comes great responsibility... */ + public void deleteAll() { this.queryDictionaryFirst("DELETE FROM "+this.getTableName()); } + public boolean exists(TDTO dto) { return this.existsWithPrimaryKey(dto.getPrimaryKeyString()); } public boolean existsWithPrimaryKey(String primaryKey)