From: Niki Roo <niki@nikiroo.be>
Date: Fri, 10 Aug 2018 16:08:53 +0000 (+0200)
Subject: Try 3
X-Git-Tag: fanfix-1.8.0~13
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=b56c9d60fe4ed9470881ebf6221acb0a52997291;p=fanfix.git

Try 3
---

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index ee2db3f..a906330 100644
--- 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) {
-		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);
diff --git a/src/be/nikiroo/fanfix/library/LocalLibrary.java b/src/be/nikiroo/fanfix/library/LocalLibrary.java
index 54ad1d6..e531072 100644
--- 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.sourceCovers = new HashMap<String, Image>();
+		this.sourceCovers = null;
 
 		baseDir.mkdirs();
 	}
@@ -134,7 +134,7 @@ public class LocalLibrary extends BasicLibrary {
 	@Override
 	protected void deleteInfo(String luid) {
 		stories = null;
-		sourceCovers = new HashMap<String, Image>();
+		sourceCovers = null;
 	}
 
 	@Override
@@ -199,6 +199,10 @@ public class LocalLibrary extends BasicLibrary {
 
 	@Override
 	public Image getSourceCover(String source) {
+		if (sourceCovers == null) {
+			getStories(null);
+		}
+
 		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) {
+		if (sourceCovers == null) {
+			getStories(null);
+		}
+
 		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);
-
 		deleteInfo();
 	}
 
@@ -425,6 +432,7 @@ public class LocalLibrary extends BasicLibrary {
 
 		if (stories == null) {
 			stories = new HashMap<MetaData, File[]>();
+			sourceCovers = new HashMap<String, Image>();
 
 			lastId = 0;
 
@@ -520,6 +528,10 @@ public class LocalLibrary extends BasicLibrary {
 	 *            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 {
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 138246a..dae73e4 100644
--- 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) {
-		System.out.println("Story to break: "+story);
-		
 		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;
 	}
 
diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index 407ec70..c57f8fd 100644
--- 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);
 
+		System.out.println("Meta from e621: "+meta);
+		
 		return meta;
 	}