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
Merge branch 'master' of github.com:nikiroo/fanfix
[fanfix.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 54ad1d66769d8962cf5516a2bc5c6302e04e0ac6..838c97cf3e8b55363ab4683b07596c6857b74ac0 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/LocalLibrary.java
@@
-86,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();
}
@@
-98,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
@@
-134,7
+146,7
@@
public class LocalLibrary extends BasicLibrary {
@Override
protected void deleteInfo(String luid) {
stories = null;
@Override
protected void deleteInfo(String luid) {
stories = null;
- sourceCovers = n
ew HashMap<String, Image>()
;
+ sourceCovers = n
ull
;
}
@Override
}
@Override
@@
-199,6
+211,10
@@
public class LocalLibrary extends BasicLibrary {
@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));
}
@@
-208,6
+224,10
@@
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));
File cover = new File(getExpectedDir(source), ".cover");
try {
sourceCovers.put(source, getCover(luid));
File cover = new File(getExpectedDir(source), ".cover");
try {
@@
-273,8
+293,6
@@
public class LocalLibrary extends BasicLibrary {
}
super.imprt(other, luid, pg);
}
super.imprt(other, luid, pg);
-
- deleteInfo();
}
/**
}
/**
@@
-414,7
+432,8
@@
public class LocalLibrary extends BasicLibrary {
* @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) {
@@
-425,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;
@@
-520,6
+540,10
@@
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);
File cover = new File(getExpectedDir(source), ".cover");
try {
sourceCovers.put(source, coverImage);
File cover = new File(getExpectedDir(source), ".cover");
try {