git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aac7079
)
Try 3
author
Niki Roo
<niki@nikiroo.be>
Fri, 10 Aug 2018 16:08:53 +0000
(18:08 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Fri, 10 Aug 2018 16:08:53 +0000
(18:08 +0200)
src/be/nikiroo/fanfix/library/CacheLibrary.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/library/LocalLibrary.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/supported/E621.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/fanfix/library/CacheLibrary.java
b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index ee2db3f6ce75371f1ab6bd5ec6468f2a9f984155..a9063308f8faf2ca0741c22b0e2cb21ea198ef96 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/CacheLibrary.java
@@
-124,7
+124,7
@@
public class CacheLibrary extends BasicLibrary {
@Override
protected void updateInfo(MetaData meta) {
@Override
protected void updateInfo(MetaData meta) {
- if (meta != null) {
+ if (meta != null
&& metas != null
) {
for (int i = 0; i < metas.size(); i++) {
if (metas.get(i).getLuid().equals(meta.getLuid())) {
metas.set(i, meta);
for (int i = 0; i < metas.size(); i++) {
if (metas.get(i).getLuid().equals(meta.getLuid())) {
metas.set(i, meta);
diff --git
a/src/be/nikiroo/fanfix/library/LocalLibrary.java
b/src/be/nikiroo/fanfix/library/LocalLibrary.java
index 54ad1d66769d8962cf5516a2bc5c6302e04e0ac6..e531072935764398870355bbd8a1027d368bc9e6 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();
}
@@
-134,7
+134,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
+199,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
+212,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,7
+281,6
@@
public class LocalLibrary extends BasicLibrary {
}
super.imprt(other, luid, pg);
}
super.imprt(other, luid, pg);
-
deleteInfo();
}
deleteInfo();
}
@@
-425,6
+432,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
+528,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 {
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 138246ae47044a33399b132ac6c619ca320083df..dae73e4b4c4e0c4c787b8c05ecb19ab34f362ceb 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@
-178,8
+178,6
@@
public class RemoteLibraryServer extends ServerObject {
* @return the list of {@link Object}s
*/
static List<Object> breakStory(Story story) {
* @return the list of {@link Object}s
*/
static List<Object> breakStory(Story story) {
- System.out.println("Story to break: "+story);
-
List<Object> list = new ArrayList<Object>();
story = story.clone();
List<Object> list = new ArrayList<Object>();
story = story.clone();
@@
-220,7
+218,6
@@
public class RemoteLibraryServer extends ServerObject {
}
}
}
}
- System.out.println("rebuilt story: "+story);
return story;
}
return story;
}
diff --git
a/src/be/nikiroo/fanfix/supported/E621.java
b/src/be/nikiroo/fanfix/supported/E621.java
index 407ec70ee996123e2b759e2169802fb86cfec63a..c57f8fd2cfbe0c565f15904cc5873a085acbb8b3 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/E621.java
+++ b/
src/be/nikiroo/fanfix/supported/E621.java
@@
-58,6
+58,8
@@
class E621 extends BasicSupport_Deprecated {
meta.setCover(getCover(source, reset(in)));
meta.setFakeCover(true);
meta.setCover(getCover(source, reset(in)));
meta.setFakeCover(true);
+ System.out.println("Meta from e621: "+meta);
+
return meta;
}
return meta;
}