git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change package for Streams to nikiroo.utils.streams
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
Cache.java
diff --git
a/src/be/nikiroo/utils/Cache.java
b/src/be/nikiroo/utils/Cache.java
index 13a50ea92219663a379eb58d7956237217a3f49a..cf8a780ef9ae49f99b5536a5d549e5522a01837b 100644
(file)
--- a/
src/be/nikiroo/utils/Cache.java
+++ b/
src/be/nikiroo/utils/Cache.java
@@
-8,6
+8,8
@@
import java.io.InputStream;
import java.net.URL;
import java.util.Date;
import java.net.URL;
import java.util.Date;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
+
/**
* A generic cache system, with special support for {@link URL}s.
* <p>
/**
* A generic cache system, with special support for {@link URL}s.
* <p>
@@
-158,7
+160,16
@@
public class Cache {
* @return the number of cleaned items
*/
public int clean(boolean onlyOld) {
* @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;
}
/**
}
/**
@@
-169,16
+180,23
@@
public class Cache {
* resources
* @param cacheDir
* the cache directory to clean
* 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
*/
*
* @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;
File[] files = cacheDir.listFiles();
if (files != null) {
for (File file : files) {
int num = 0;
File[] files = cacheDir.listFiles();
if (files != null) {
for (File file : files) {
+ if (limit >= 0 && num >= limit) {
+ return num;
+ }
+
if (file.isDirectory()) {
if (file.isDirectory()) {
- num += clean(onlyOld, file);
+ num += clean(onlyOld, file, limit);
+ file.delete(); // only if empty
} else {
if (!onlyOld || isOld(file, true)) {
if (file.delete()) {
} else {
if (!onlyOld || isOld(file, true)) {
if (file.delete()) {
@@
-220,8
+238,9
@@
public class Cache {
* @param allowTooOld
* allow files even if they are considered too old
* @param stable
* @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
*/
*
* @return the opened resource if found, NULL if not
*/
@@
-290,6
+309,8
@@
public class Cache {
/**
* Save the given resource to the cache.
/**
* Save the given resource to the cache.
+ * <p>
+ * Will also clean the {@link Cache} from old files.
*
* @param in
* the input data
*
* @param in
* the input data
@@
-300,7
+321,9
@@
public class Cache {
* in case of I/O error
*/
private void save(InputStream in, File cached) throws IOException {
* in case of I/O error
*/
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);
IOUtils.write(in, cached);
+ clean(true, dir, 10);
}
/**
}
/**