From 5a2e12eb5496e203c1cbe999e63044b46944e5e7 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Fri, 3 Feb 2017 17:34:28 +0000 Subject: [PATCH] [BUGFIX] Remade validateCache Closes issue #167. --- src/main/java/org/parabot/core/Core.java | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java index 16f0204..ff70069 100644 --- a/src/main/java/org/parabot/core/Core.java +++ b/src/main/java/org/parabot/core/Core.java @@ -20,6 +20,7 @@ import java.net.URISyntaxException; import java.net.URLEncoder; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Date; /** * The core of parabot @@ -206,31 +207,20 @@ public class Core { } /** - * Validates the cache and removes the cache contents if required + * Method that removes the cache contents after 3 days */ private static void validateCache() { File[] cache = Directories.getCachePath().listFiles(); - Integer lowest = null; + if (cache != null) { for (File f : cache) { - int date = (int) (f.lastModified() / 1000); - if (lowest == null || date < lowest) { - lowest = date; + long age = new Date().getTime() - f.lastModified(); + + if (age > 3 * 24 * 60 * 60 * 1000) { + f.delete(); } } } - - try { - JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(WebUtil.getContents("http://bdn.parabot.org/api/v2/bot/cache", "date=" + lowest)); - if ((boolean) object.get("result")) { - Core.verbose("Making space for the latest cache files"); - Directories.clearCache(); - } else { - Core.verbose("Cache is up to date"); - } - } catch (MalformedURLException | ParseException e) { - e.printStackTrace(); - } } public static void downloadNewVersion() {