git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve ConfigItems and fix some related bugs
[fanfix.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..779b194f5cc66f0e706865e360c6a7b992344f9d 100644
(file)
--- a/
src/be/nikiroo/utils/Cache.java
+++ b/
src/be/nikiroo/utils/Cache.java
@@
-1,13
+1,14
@@
package be.nikiroo.utils;
import java.io.File;
package be.nikiroo.utils;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Date;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
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
+159,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
+179,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
+237,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
*/
@@
-246,7
+264,7
@@
public class Cache {
if (cached.exists() && cached.isFile()
&& (allowTooOld || !isOld(cached, stable))) {
try {
if (cached.exists() && cached.isFile()
&& (allowTooOld || !isOld(cached, stable))) {
try {
- return new MarkableFileInputStream(
new FileInputStream(cached)
);
+ return new MarkableFileInputStream(
cached
);
} catch (FileNotFoundException e) {
return null;
}
} catch (FileNotFoundException e) {
return null;
}
@@
-263,13
+281,15
@@
public class Cache {
* @param uniqueID
* a unique ID used to locate the cached resource
*
* @param uniqueID
* a unique ID used to locate the cached resource
*
+ * @return the number of bytes written
+ *
* @throws IOException
* in case of I/O error
*/
* @throws IOException
* in case of I/O error
*/
- public
void
save(InputStream in, String uniqueID) throws IOException {
+ public
long
save(InputStream in, String uniqueID) throws IOException {
File cached = getCached(uniqueID);
cached.getParentFile().mkdirs();
File cached = getCached(uniqueID);
cached.getParentFile().mkdirs();
- save(in, cached);
+
return
save(in, cached);
}
/**
}
/**
@@
-280,27
+300,36
@@
public class Cache {
* @param url
* the {@link URL} used to locate the cached resource
*
* @param url
* the {@link URL} used to locate the cached resource
*
+ * @return the number of bytes written
+ *
* @throws IOException
* in case of I/O error
*/
* @throws IOException
* in case of I/O error
*/
- public
void
save(InputStream in, URL url) throws IOException {
+ public
long
save(InputStream in, URL url) throws IOException {
File cached = getCached(url);
File cached = getCached(url);
- save(in, cached);
+
return
save(in, cached);
}
/**
* 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 cached
* the cached {@link File} to save to
*
*
* @param in
* the input data
* @param cached
* the cached {@link File} to save to
*
+ * @return the number of bytes written
+ *
* @throws IOException
* in case of I/O error
*/
* @throws IOException
* in case of I/O error
*/
- private void save(InputStream in, File cached) throws IOException {
- IOUtils.write(in, cached);
+ private long save(InputStream in, File cached) throws IOException {
+ // We delete AFTER so not to remove the subdir we will use...
+ long bytes = IOUtils.write(in, cached);
+ clean(true, dir, 10);
+ return bytes;
}
/**
}
/**