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
Try 2
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
CacheLibrary.java
diff --git
a/src/be/nikiroo/fanfix/library/CacheLibrary.java
b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 7f4bb370d5a4fb0ad98e1c4c0882390cb5374512..ee2db3f6ce75371f1ab6bd5ec6468f2a9f984155 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/CacheLibrary.java
@@
-1,6
+1,5
@@
package be.nikiroo.fanfix.library;
package be.nikiroo.fanfix.library;
-import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.io.File;
import java.io.IOException;
import java.net.URL;
@@
-10,6
+9,7
@@
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.UiConfig;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.bundles.UiConfig;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
/**
import be.nikiroo.utils.Progress;
/**
@@
-83,8
+83,8
@@
public class CacheLibrary extends BasicLibrary {
if (!isCached(luid)) {
try {
cacheLib.imprt(lib, luid, pgImport);
if (!isCached(luid)) {
try {
cacheLib.imprt(lib, luid, pgImport);
+ updateInfo(cacheLib.getInfo(luid));
pgImport.done();
pgImport.done();
- invalidateInfo(luid);
} catch (IOException e) {
Instance.getTraceHandler().error(e);
}
} catch (IOException e) {
Instance.getTraceHandler().error(e);
}
@@
-101,7
+101,7
@@
public class CacheLibrary extends BasicLibrary {
}
@Override
}
@Override
- public
Buffered
Image getCover(final String luid) {
+ public Image getCover(final String luid) {
if (isCached(luid)) {
return cacheLib.getCover(luid);
}
if (isCached(luid)) {
return cacheLib.getCover(luid);
}
@@
-111,7
+111,7
@@
public class CacheLibrary extends BasicLibrary {
}
@Override
}
@Override
- public
Buffered
Image getSourceCover(String source) {
+ public Image getSourceCover(String source) {
// no cache for the source cover
return lib.getSourceCover(source);
}
// no cache for the source cover
return lib.getSourceCover(source);
}
@@
-123,31
+123,33
@@
public class CacheLibrary extends BasicLibrary {
}
@Override
}
@Override
- protected void invalidateInfo(String luid) {
- List<MetaData> metas = this.metas;
+ protected void updateInfo(MetaData meta) {
+ if (meta != null) {
+ for (int i = 0; i < metas.size(); i++) {
+ if (metas.get(i).getLuid().equals(meta.getLuid())) {
+ metas.set(i, meta);
+ }
+ }
+ }
+ cacheLib.updateInfo(meta);
+ lib.updateInfo(meta);
+ }
+
+ @Override
+ protected void deleteInfo(String luid) {
if (luid == null) {
if (luid == null) {
-
this.
metas = null;
+ metas = null;
} else if (metas != null) {
} else if (metas != null) {
- MetaData meta = lib.getInfo(luid);
for (int i = 0; i < metas.size(); i++) {
if (metas.get(i).getLuid().equals(luid)) {
for (int i = 0; i < metas.size(); i++) {
if (metas.get(i).getLuid().equals(luid)) {
- if (meta != null) {
- metas.set(i, meta);
- meta = null;
- } else {
- metas.remove(i--);
- }
+ metas.remove(i--);
}
}
}
}
-
- if (meta != null) {
- metas.add(meta);
- }
}
}
- cacheLib.
invalida
teInfo(luid);
- lib.
invalida
teInfo(luid);
+ cacheLib.
dele
teInfo(luid);
+ lib.
dele
teInfo(luid);
}
@Override
}
@Override
@@
-167,7
+169,7
@@
public class CacheLibrary extends BasicLibrary {
story = lib.save(story, luid, pgLib);
story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
story = lib.save(story, luid, pgLib);
story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
-
invalidateInfo(story.getMeta().getLuid
());
+
updateInfo(story.getMeta
());
return story;
}
return story;
}
@@
-179,13
+181,9
@@
public class CacheLibrary extends BasicLibrary {
}
lib.delete(luid);
}
lib.delete(luid);
- List<MetaData> metas = this.metas;
- if (metas != null) {
- for (int i = 0; i < metas.size(); i++) {
- if (metas.get(i).getLuid().equals(luid)) {
- metas.set(i, lib.getInfo(luid));
- }
- }
+ MetaData meta = getInfo(luid);
+ if (meta != null) {
+ metas.remove(meta);
}
}
}
}
@@
-244,7
+242,7
@@
public class CacheLibrary extends BasicLibrary {
public void clearFromCache(String luid) throws IOException {
if (isCached(luid)) {
cacheLib.delete(luid);
public void clearFromCache(String luid) throws IOException {
if (isCached(luid)) {
cacheLib.delete(luid);
-
invalida
teInfo(luid);
+
dele
teInfo(luid);
}
}
}
}
@@
-263,6
+261,8
@@
public class CacheLibrary extends BasicLibrary {
Story story = lib.imprt(url, pgImprt);
cacheLib.save(story, story.getMeta().getLuid(), pgCache);
Story story = lib.imprt(url, pgImprt);
cacheLib.save(story, story.getMeta().getLuid(), pgCache);
+ updateInfo(story.getMeta());
+
pg.done();
return story;
}
pg.done();
return story;
}