X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=cccfedba0cfd29ec755034b9197f7a7495dd0b38;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=ea1fd707913ba0b6696e732a64f38cc3d9cfcdbc;hpb=60f723111f3f7f5bd60760afa7d0b645406b48d7;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index ea1fd70..cccfedb 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -7,8 +7,10 @@ import java.util.List;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.UiConfig;
+import be.nikiroo.fanfix.bundles.UiConfigBundle;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.output.BasicOutput.OutputType;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
@@ -25,19 +27,18 @@ public class CacheLibrary extends BasicLibrary {
/**
* Create a cache library around the given one.
*
- * It will return the same result, but those will be saved to disk at the
- * same time to be fetched quicker the next time.
+ * It will return the same result, but those will be saved to disk at the same
+ * time to be fetched quicker the next time.
*
- * @param cacheDir
- * the cache directory where to save the files to disk
- * @param lib
- * the original library to wrap
+ * @param cacheDir the cache directory where to save the files to disk
+ * @param lib the original library to wrap
+ * @param config the configuration used to know which kind of default
+ * {@link OutputType} to use for images and non-images stories
*/
- public CacheLibrary(File cacheDir, BasicLibrary lib) {
- this.cacheLib = new LocalLibrary(cacheDir, Instance.getUiConfig()
- .getString(UiConfig.GUI_NON_IMAGES_DOCUMENT_TYPE), Instance
- .getUiConfig().getString(UiConfig.GUI_IMAGES_DOCUMENT_TYPE),
- true);
+ public CacheLibrary(File cacheDir, BasicLibrary lib, UiConfigBundle config) {
+ this.cacheLib = new LocalLibrary(cacheDir, //
+ config.getString(UiConfig.GUI_NON_IMAGES_DOCUMENT_TYPE),
+ config.getString(UiConfig.GUI_IMAGES_DOCUMENT_TYPE), true);
this.lib = lib;
}
@@ -52,7 +53,7 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- protected List getMetas(Progress pg) {
+ protected List getMetas(Progress pg) throws IOException {
if (pg == null) {
pg = new Progress();
}
@@ -66,33 +67,28 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public synchronized Story getStory(String luid, MetaData meta, Progress pg) {
- String normal = Instance.getUiConfig().getString(
- UiConfig.GUI_NON_IMAGES_DOCUMENT_TYPE);
- String images = Instance.getUiConfig().getString(
- UiConfig.GUI_IMAGES_DOCUMENT_TYPE);
- String type = meta.isImageDocument() ? images : normal;
-
- MetaData cachedMeta = meta.clone();
- cachedMeta.setType(type);
+ public synchronized MetaData getInfo(String luid) throws IOException {
+ MetaData info = cacheLib.getInfo(luid);
+ if (info == null) {
+ info = lib.getInfo(luid);
+ }
- return super.getStory(luid, cachedMeta, pg);
+ return info;
}
@Override
- public synchronized File getFile(final String luid, Progress pg) {
+ public synchronized Story getStory(String luid, MetaData meta, Progress pg)
+ throws IOException {
if (pg == null) {
pg = new Progress();
}
Progress pgImport = new Progress();
Progress pgGet = new Progress();
- Progress pgRecall = new Progress();
- pg.setMinMax(0, 5);
+ pg.setMinMax(0, 4);
pg.addProgress(pgImport, 3);
pg.addProgress(pgGet, 1);
- pg.addProgress(pgRecall, 1);
if (!isCached(luid)) {
try {
@@ -100,13 +96,39 @@ public class CacheLibrary extends BasicLibrary {
updateInfo(cacheLib.getInfo(luid));
pgImport.done();
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
}
pgImport.done();
pgGet.done();
}
+ String type = cacheLib.getOutputType(meta.isImageDocument());
+ MetaData cachedMeta = meta.clone();
+ cachedMeta.setType(type);
+
+ return cacheLib.getStory(luid, cachedMeta, pg);
+ }
+
+ @Override
+ public synchronized File getFile(final String luid, Progress pg)
+ throws IOException {
+ if (pg == null) {
+ pg = new Progress();
+ }
+
+ Progress pgGet = new Progress();
+ Progress pgRecall = new Progress();
+
+ pg.setMinMax(0, 5);
+ pg.addProgress(pgGet, 4);
+ pg.addProgress(pgRecall, 1);
+
+ if (!isCached(luid)) {
+ getStory(luid, pgGet);
+ pgGet.done();
+ }
+
File file = cacheLib.getFile(luid, pgRecall);
pgRecall.done();
@@ -115,7 +137,7 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public Image getCover(final String luid) {
+ public Image getCover(final String luid) throws IOException {
if (isCached(luid)) {
return cacheLib.getCover(luid);
}
@@ -125,7 +147,7 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public Image getSourceCover(String source) {
+ public Image getSourceCover(String source) throws IOException {
Image custom = getCustomSourceCover(source);
if (custom != null) {
return custom;
@@ -140,7 +162,7 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public Image getAuthorCover(String author) {
+ public Image getAuthorCover(String author) throws IOException {
Image custom = getCustomAuthorCover(author);
if (custom != null) {
return custom;
@@ -155,7 +177,7 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public Image getCustomSourceCover(String source) {
+ public Image getCustomSourceCover(String source) throws IOException {
Image custom = cacheLib.getCustomSourceCover(source);
if (custom == null) {
custom = lib.getCustomSourceCover(source);
@@ -168,7 +190,7 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public Image getCustomAuthorCover(String author) {
+ public Image getCustomAuthorCover(String author) throws IOException {
Image custom = cacheLib.getCustomAuthorCover(author);
if (custom == null) {
custom = lib.getCustomAuthorCover(author);
@@ -181,25 +203,31 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public void setSourceCover(String source, String luid) {
+ public void setSourceCover(String source, String luid) throws IOException {
lib.setSourceCover(source, luid);
cacheLib.setSourceCover(source, getCover(luid));
}
@Override
- public void setAuthorCover(String author, String luid) {
+ public void setAuthorCover(String author, String luid) throws IOException {
lib.setAuthorCover(author, luid);
cacheLib.setAuthorCover(author, getCover(luid));
}
@Override
- protected void updateInfo(MetaData meta) {
+ protected void updateInfo(MetaData meta) throws IOException {
if (meta != null && metas != null) {
+ boolean changed = false;
for (int i = 0; i < metas.size(); i++) {
if (metas.get(i).getLuid().equals(meta.getLuid())) {
metas.set(i, meta);
+ changed = true;
}
}
+
+ if (!changed) {
+ metas.add(meta);
+ }
}
cacheLib.updateInfo(meta);
@@ -251,10 +279,7 @@ public class CacheLibrary extends BasicLibrary {
}
lib.delete(luid);
- MetaData meta = getInfo(luid);
- if (meta != null) {
- metas.remove(meta);
- }
+ invalidateInfo(luid);
}
@Override
@@ -287,6 +312,8 @@ public class CacheLibrary extends BasicLibrary {
meta.setTitle(newTitle);
meta.setAuthor(newAuthor);
pg.done();
+
+ invalidateInfo(luid);
}
/**
@@ -299,7 +326,11 @@ public class CacheLibrary extends BasicLibrary {
* @return TRUE if it is
*/
public boolean isCached(String luid) {
- return cacheLib.getInfo(luid) != null;
+ try {
+ return cacheLib.getInfo(luid) != null;
+ } catch (IOException e) {
+ return false;
+ }
}
/**
@@ -321,7 +352,7 @@ public class CacheLibrary extends BasicLibrary {
}
@Override
- public Story imprt(URL url, Progress pg) throws IOException {
+ public MetaData imprt(URL url, Progress pg) throws IOException {
if (pg == null) {
pg = new Progress();
}
@@ -332,13 +363,13 @@ public class CacheLibrary extends BasicLibrary {
pg.addProgress(pgImprt, 7);
pg.addProgress(pgCache, 3);
- Story story = lib.imprt(url, pgImprt);
- cacheLib.save(story, story.getMeta().getLuid(), pgCache);
-
- updateInfo(story.getMeta());
-
+ MetaData meta = lib.imprt(url, pgImprt);
+ updateInfo(meta);
+
+ clearFromCache(meta.getLuid());
+
pg.done();
- return story;
+ return meta;
}
// All the following methods are only used by Save and Delete in