X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fcache%2FManageCacheFunction.java;h=04e3cc14e60e5d01a1cb21f02d8cea9b73fb106b;hp=65565987529d3885d72a38d12a7b545317e22ed9;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hpb=f1b92378a792131ac8fb33a869405851d5b2d1f7 diff --git a/tim/prune/function/cache/ManageCacheFunction.java b/tim/prune/function/cache/ManageCacheFunction.java index 6556598..04e3cc1 100644 --- a/tim/prune/function/cache/ManageCacheFunction.java +++ b/tim/prune/function/cache/ManageCacheFunction.java @@ -395,18 +395,13 @@ public class ManageCacheFunction extends GenericFunction implements Runnable if (subdir.isDirectory()) { numDeleted += deleteFilesFrom(subdir, inMaxDays); } - else if (subdir.isFile() && subdir.exists()) + else if (subdir.isFile() && subdir.exists() && _TILEFILTER.accept(subdir)) { - boolean isTileFile = _TILEFILTER.accept(subdir); - boolean isBadFile = !isTileFile && subdir.getName().toLowerCase().endsWith("png"); - if (isTileFile || isBadFile) + long fileAge = (now - subdir.lastModified()) / 1000 / 60 / 60 / 24; + if (inMaxDays < 0 || fileAge > inMaxDays) { - long fileAge = (now - subdir.lastModified()) / 1000 / 60 / 60 / 24; - if (inMaxDays < 0 || fileAge > inMaxDays || isBadFile) - { - if (subdir.delete()) { - numDeleted++; - } + if (subdir.delete()) { + numDeleted++; } } }