X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FCache.java;h=ce33592ed3a4419cee1a6553908cae8621bfefd8;hb=05c4f401056abe16517a0b0d1ccb5841fa3dfcbb;hp=dcbde74ea4b053ae512c7ed9149114af5f4aa77e;hpb=530d4062471346d6ececf76d74a0358c91323998;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Cache.java b/src/be/nikiroo/utils/Cache.java
index dcbde74..ce33592 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();
@@ -70,9 +76,31 @@ public class Cache {
 	 *            the new traces handler
 	 */
 	public void setTraceHandler(TraceHandler tracer) {
+		if (tracer == null) {
+			tracer = new TraceHandler(false, false, false);
+		}
+
 		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.
 	 * 
@@ -88,9 +116,31 @@ public class Cache {
 	 * 
 	 */
 	public boolean check(URL url, boolean allowTooOld, boolean stable) {
-		File file = getCached(url);
-		if (file.exists()) {
-			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;
 			}
 		}
@@ -108,7 +158,16 @@ public class Cache {
 	 * @return the number of cleaned items
 	 */
 	public int clean(boolean onlyOld) {
-		return clean(onlyOld, dir);
+		long ms = System.currentTimeMillis();
+
+		tracer.trace("Cleaning cache from old files...");
+
+		int num = clean(onlyOld, dir, -1);
+
+		tracer.trace(num + "cache items cleaned in "
+				+ (System.currentTimeMillis() - ms) + " ms");
+
+		return num;
 	}
 
 	/**
@@ -119,21 +178,31 @@ public class Cache {
 	 *            resources
 	 * @param cacheDir
 	 *            the cache directory to clean
+	 * @param limit
+	 *            stop after limit files deleted, or -1 for unlimited
 	 * 
 	 * @return the number of cleaned items
 	 */
-	private int clean(boolean onlyOld, File cacheDir) {
+	private int clean(boolean onlyOld, File cacheDir, int limit) {
 		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 (limit >= 0 && num >= limit) {
+					return num;
+				}
+
+				if (file.isDirectory()) {
+					num += clean(onlyOld, file, limit);
+					file.delete(); // only if empty
+				} else {
+					if (!onlyOld || isOld(file, true)) {
+						if (file.delete()) {
+							num++;
+						} else {
+							tracer.error("Cannot delete temporary file: "
+									+ file.getAbsolutePath());
+						}
 					}
 				}
 			}
@@ -167,8 +236,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
 	 */
@@ -190,7 +260,8 @@ public class Cache {
 	 * @return the opened resource if found, NULL if not
 	 */
 	private InputStream load(File cached, boolean allowTooOld, boolean stable) {
-		if (cached.exists() && (allowTooOld || !isOld(cached, stable))) {
+		if (cached.exists() && cached.isFile()
+				&& (allowTooOld || !isOld(cached, stable))) {
 			try {
 				return new MarkableFileInputStream(new FileInputStream(cached));
 			} catch (FileNotFoundException e) {
@@ -209,15 +280,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);
 	}
 
 	/**
@@ -228,32 +297,31 @@ 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 {
+		// We delete AFTER so not to remove the subdir we will use...
 		IOUtils.write(in, cached);
-		return cached;
+		clean(true, dir, 10);
 	}
 
 	/**
@@ -328,7 +396,11 @@ public class Cache {
 		if (name == null || name.isEmpty()) {
 			// File
 			File file = new File(url.getFile());
-			subdir = new File(file.getParent().replace("..", "__"));
+			if (file.getParent() == null) {
+				subdir = new File("+");
+			} else {
+				subdir = new File(file.getParent().replace("..", "__"));
+			}
 			subdir = new File(dir, allowedChars(subdir.getPath()));
 			name = allowedChars(url.getFile());
 		} else {