X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FCache.java;h=4750ef844f1e6593ab1f90ebd76273ddaee77497;hb=f6e8d60dbb9f124046f1b951315d74f003624f09;hp=111fc769b9a5ded89c772d0ff2ede551cfcf080c;hpb=805005449dacb1e7b825db63836bf100e472ddd0;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Cache.java b/src/be/nikiroo/utils/Cache.java
index 111fc76..4750ef8 100644
--- a/src/be/nikiroo/utils/Cache.java
+++ b/src/be/nikiroo/utils/Cache.java
@@ -21,6 +21,12 @@ public class Cache {
 	private long tooOldStable;
 	private TraceHandler tracer = new TraceHandler();
 
+	/**
+	 * Only for inheritance.
+	 */
+	protected Cache() {
+	}
+
 	/**
 	 * Create a new {@link Cache} object.
 	 * 
@@ -41,8 +47,8 @@ public class Cache {
 	public Cache(File dir, int hoursChanging, int hoursStable)
 			throws IOException {
 		this.dir = dir;
-		this.tooOldChanging = 1000 * 60 * 60 * hoursChanging;
-		this.tooOldStable = 1000 * 60 * 60 * hoursStable;
+		this.tooOldChanging = 1000L * 60 * 60 * hoursChanging;
+		this.tooOldStable = 1000L * 60 * 60 * hoursStable;
 
 		if (dir != null && !dir.exists()) {
 			dir.mkdirs();
@@ -77,6 +83,24 @@ public class Cache {
 		this.tracer = tracer;
 	}
 
+	/**
+	 * Check the resource to see if it is in the cache.
+	 * 
+	 * @param uniqueID
+	 *            the resource to check
+	 * @param allowTooOld
+	 *            allow files even if they are considered too old
+	 * @param stable
+	 *            a stable file (that dones't change too often) -- parameter
+	 *            used to check if the file is too old to keep or not
+	 * 
+	 * @return TRUE if it is
+	 * 
+	 */
+	public boolean check(String uniqueID, boolean allowTooOld, boolean stable) {
+		return check(getCached(uniqueID), allowTooOld, stable);
+	}
+
 	/**
 	 * Check the resource to see if it is in the cache.
 	 * 
@@ -92,9 +116,31 @@ public class Cache {
 	 * 
 	 */
 	public boolean check(URL url, boolean allowTooOld, boolean stable) {
-		File file = getCached(url);
-		if (file.exists() && file.isFile()) {
-			if (allowTooOld || !isOld(file, stable)) {
+		return check(getCached(url), allowTooOld, stable);
+	}
+
+	/**
+	 * Check the resource to see if it is in the cache.
+	 * 
+	 * @param cached
+	 *            the resource to check
+	 * @param allowTooOld
+	 *            allow files even if they are considered too old
+	 * @param stable
+	 *            a stable file (that dones't change too often) -- parameter
+	 *            used to check if the file is too old to keep or not
+	 * 
+	 * @return TRUE if it is
+	 * 
+	 */
+	private boolean check(File cached, boolean allowTooOld, boolean stable) {
+		if (cached.exists() && cached.isFile()) {
+			if (!allowTooOld && isOld(cached, stable)) {
+				if (!cached.delete()) {
+					tracer.error("Cannot delete temporary file: "
+							+ cached.getAbsolutePath());
+				}
+			} else {
 				return true;
 			}
 		}
@@ -128,16 +174,19 @@ public class Cache {
 	 */
 	private int clean(boolean onlyOld, File cacheDir) {
 		int num = 0;
-		for (File file : cacheDir.listFiles()) {
-			if (file.isDirectory()) {
-				num += clean(onlyOld, file);
-			} else {
-				if (!onlyOld || isOld(file, true)) {
-					if (file.delete()) {
-						num++;
-					} else {
-						tracer.error("Cannot delete temporary file: "
-								+ file.getAbsolutePath());
+		File[] files = cacheDir.listFiles();
+		if (files != null) {
+			for (File file : files) {
+				if (file.isDirectory()) {
+					num += clean(onlyOld, file);
+				} else {
+					if (!onlyOld || isOld(file, true)) {
+						if (file.delete()) {
+							num++;
+						} else {
+							tracer.error("Cannot delete temporary file: "
+									+ file.getAbsolutePath());
+						}
 					}
 				}
 			}
@@ -171,8 +220,9 @@ public class Cache {
 	 * @param allowTooOld
 	 *            allow files even if they are considered too old
 	 * @param stable
-	 *            a stable file (that dones't change too often) -- parameter
-	 *            used to check if the file is too old to keep or not
+	 *            a stable file (that doesn't change too often) -- parameter
+	 *            used to check if the file is too old to keep or not in the
+	 *            cache
 	 * 
 	 * @return the opened resource if found, NULL if not
 	 */
@@ -214,15 +264,13 @@ public class Cache {
 	 * @param uniqueID
 	 *            a unique ID used to locate the cached resource
 	 * 
-	 * @return the resulting {@link File}
-	 * 
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	public File save(InputStream in, String uniqueID) throws IOException {
+	public void save(InputStream in, String uniqueID) throws IOException {
 		File cached = getCached(uniqueID);
 		cached.getParentFile().mkdirs();
-		return save(in, cached);
+		save(in, cached);
 	}
 
 	/**
@@ -233,32 +281,30 @@ public class Cache {
 	 * @param url
 	 *            the {@link URL} used to locate the cached resource
 	 * 
-	 * @return the actual cache file
-	 * 
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	public File save(InputStream in, URL url) throws IOException {
+	public void save(InputStream in, URL url) throws IOException {
 		File cached = getCached(url);
-		return save(in, cached);
+		save(in, cached);
 	}
 
 	/**
 	 * Save the given resource to the cache.
+	 * <p>
+	 * Will also clean the {@link Cache} from old files.
 	 * 
 	 * @param in
 	 *            the input data
 	 * @param cached
 	 *            the cached {@link File} to save to
 	 * 
-	 * @return the actual cache file
-	 * 
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	private File save(InputStream in, File cached) throws IOException {
+	private void save(InputStream in, File cached) throws IOException {
+		clean(true);
 		IOUtils.write(in, cached);
-		return cached;
 	}
 
 	/**