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
Fix remote timeot (try1) + reverse e621 /post/
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
LocalLibrary.java
diff --git
a/src/be/nikiroo/fanfix/library/LocalLibrary.java
b/src/be/nikiroo/fanfix/library/LocalLibrary.java
index 5e0ad40097f8add91f78d73cf1cf61b3334c53e7..838c97cf3e8b55363ab4683b07596c6857b74ac0 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/LocalLibrary.java
@@
-20,7
+20,6
@@
import be.nikiroo.fanfix.output.InfoCover;
import be.nikiroo.fanfix.supported.InfoReader;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
import be.nikiroo.fanfix.supported.InfoReader;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
import be.nikiroo.utils.Progress;
/**
import be.nikiroo.utils.Progress;
/**
@@
-87,7
+86,7
@@
public class LocalLibrary extends BasicLibrary {
this.lastId = 0;
this.stories = null;
this.lastId = 0;
this.stories = null;
- this.sourceCovers = n
ew HashMap<String, Image>()
;
+ this.sourceCovers = n
ull
;
baseDir.mkdirs();
}
baseDir.mkdirs();
}
@@
-99,12
+98,24
@@
public class LocalLibrary extends BasicLibrary {
@Override
public File getFile(String luid, Progress pg) {
@Override
public File getFile(String luid, Progress pg) {
- File[] files = getStories(pg).get(getInfo(luid));
+ Instance.getTraceHandler().trace(
+ this.getClass().getSimpleName() + ": get file for " + luid);
+
+ File file = null;
+ String mess = "no file found for ";
+
+ MetaData meta = getInfo(luid);
+ File[] files = getStories(pg).get(meta);
if (files != null) {
if (files != null) {
- return files[1];
+ mess = "file retrieved for ";
+ file = files[1];
}
}
- return null;
+ Instance.getTraceHandler().trace(
+ this.getClass().getSimpleName() + ": " + mess + luid + " ("
+ + meta.getTitle() + ")");
+
+ return file;
}
@Override
}
@Override
@@
-128,9
+139,14
@@
public class LocalLibrary extends BasicLibrary {
}
@Override
}
@Override
- protected synchronized void invalidateInfo(String luid) {
+ protected synchronized void updateInfo(MetaData meta) {
+ deleteInfo();
+ }
+
+ @Override
+ protected void deleteInfo(String luid) {
stories = null;
stories = null;
- sourceCovers = n
ew HashMap<String, Image>()
;
+ sourceCovers = n
ull
;
}
@Override
}
@Override
@@
-190,11
+206,15
@@
public class LocalLibrary extends BasicLibrary {
}
}
}
}
-
invalida
teInfo();
+
dele
teInfo();
}
@Override
public Image getSourceCover(String source) {
}
@Override
public Image getSourceCover(String source) {
+ if (sourceCovers == null) {
+ getStories(null);
+ }
+
if (!sourceCovers.containsKey(source)) {
sourceCovers.put(source, super.getSourceCover(source));
}
if (!sourceCovers.containsKey(source)) {
sourceCovers.put(source, super.getSourceCover(source));
}
@@
-204,8
+224,12
@@
public class LocalLibrary extends BasicLibrary {
@Override
public void setSourceCover(String source, String luid) {
@Override
public void setSourceCover(String source, String luid) {
+ if (sourceCovers == null) {
+ getStories(null);
+ }
+
sourceCovers.put(source, getCover(luid));
sourceCovers.put(source, getCover(luid));
- File cover = new File(getExpectedDir(source), ".cover
.png
");
+ File cover = new File(getExpectedDir(source), ".cover");
try {
Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
true);
try {
Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
true);
@@
-262,15
+286,13
@@
public class LocalLibrary extends BasicLibrary {
pg.add(1);
}
pg.add(1);
}
-
invalida
teInfo();
+
dele
teInfo();
pg.done();
return;
}
}
super.imprt(other, luid, pg);
pg.done();
return;
}
}
super.imprt(other, luid, pg);
-
- invalidateInfo();
}
/**
}
/**
@@
-405,12
+427,13
@@
public class LocalLibrary extends BasicLibrary {
* {@link LocalLibrary#baseDir}.
* <p>
* Will use a cached list when possible (see
* {@link LocalLibrary#baseDir}.
* <p>
* Will use a cached list when possible (see
- * {@link BasicLibrary#
invalida
teInfo()}).
+ * {@link BasicLibrary#
dele
teInfo()}).
*
* @param pg
* the optional {@link Progress}
*
*
* @param pg
* the optional {@link Progress}
*
- * @return the list of stories
+ * @return the list of stories (for each item, the first {@link File} is the
+ * info file, the second file is the target {@link File})
*/
private synchronized Map<MetaData, File[]> getStories(Progress pg) {
if (pg == null) {
*/
private synchronized Map<MetaData, File[]> getStories(Progress pg) {
if (pg == null) {
@@
-421,6
+444,7
@@
public class LocalLibrary extends BasicLibrary {
if (stories == null) {
stories = new HashMap<MetaData, File[]>();
if (stories == null) {
stories = new HashMap<MetaData, File[]>();
+ sourceCovers = new HashMap<String, Image>();
lastId = 0;
lastId = 0;
@@
-468,10
+492,8
@@
public class LocalLibrary extends BasicLibrary {
// not normal!!
throw new IOException(
"Cannot understand the LUID of "
// not normal!!
throw new IOException(
"Cannot understand the LUID of "
- + infoFile
- + ": "
- + (meta == null ? "[meta is NULL]"
- : meta.getLuid()), e);
+ + infoFile + ": "
+ + meta.getLuid(), e);
}
} catch (IOException e) {
// We should not have not-supported files in the
}
} catch (IOException e) {
// We should not have not-supported files in the
@@
-518,8
+540,12
@@
public class LocalLibrary extends BasicLibrary {
* the cover image
*/
void setSourceCover(String source, Image coverImage) {
* the cover image
*/
void setSourceCover(String source, Image coverImage) {
+ if (sourceCovers == null) {
+ getStories(null);
+ }
+
sourceCovers.put(source, coverImage);
sourceCovers.put(source, coverImage);
- File cover = new File(getExpectedDir(source), ".cover
.png
");
+ File cover = new File(getExpectedDir(source), ".cover");
try {
Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
true);
try {
Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
true);