}
@Override
- public synchronized File getFile(final String luid, Progress pg) {
+ public synchronized MetaData getInfo(String luid) {
+ MetaData info = cacheLib.getInfo(luid);
+ if (info == null) {
+ info = lib.getInfo(luid);
+ }
+
+ return info;
+ }
+
+ @Override
+ public synchronized Story getStory(String luid, MetaData meta, Progress pg) {
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 {
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) {
+ 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();
@Override
public Image getAuthorCover(String author) {
- Image custom = getCustomSourceCover(author);
+ Image custom = getCustomAuthorCover(author);
if (custom != null) {
return custom;
}
- Image cached = cacheLib.getSourceCover(author);
+ Image cached = cacheLib.getAuthorCover(author);
if (cached != null) {
return cached;
}
- return lib.getSourceCover(author);
-
+ return lib.getAuthorCover(author);
}
@Override
return custom;
}
-
+
@Override
public Image getCustomAuthorCover(String author) {
Image custom = cacheLib.getCustomAuthorCover(author);
}
lib.delete(luid);
- MetaData meta = getInfo(luid);
- if (meta != null) {
- metas.remove(meta);
- }
+ invalidateInfo(luid);
}
@Override
meta.setTitle(newTitle);
meta.setAuthor(newAuthor);
pg.done();
+
+ invalidateInfo(luid);
}
/**