X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=c01275b62d5db57e95bf4b8542b64a09b09ea591;hb=c8d48938ca540d7b619a2c19bd76623d689b72cb;hp=326a488b1766a8fc9ddf5052dae8c8fdb32b11cc;hpb=e272f05fd49f01e9fb6bd71c7b74a32839bbcc38;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index 326a488..c01275b 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.library;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -11,6 +10,7 @@ import java.util.List;
 import be.nikiroo.fanfix.Instance;
 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.StringUtils;
 import be.nikiroo.utils.Version;
@@ -95,15 +95,15 @@ public class RemoteLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public BufferedImage getCover(final String luid) {
-		final BufferedImage[] result = new BufferedImage[1];
+	public Image getCover(final String luid) {
+		final Image[] result = new Image[1];
 
 		try {
 			new ConnectActionClientObject(host, port, true) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
 					Object rep = send(new Object[] { md5, "GET_COVER", luid });
-					result[0] = (BufferedImage) rep;
+					result[0] = (Image) rep;
 				}
 
 				@Override
@@ -119,16 +119,16 @@ public class RemoteLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public BufferedImage getSourceCover(final String source) {
-		final BufferedImage[] result = new BufferedImage[1];
+	public Image getCustomSourceCover(final String source) {
+		final Image[] result = new Image[1];
 
 		try {
 			new ConnectActionClientObject(host, port, true) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { md5, "GET_SOURCE_COVER",
-							source });
-					result[0] = (BufferedImage) rep;
+					Object rep = send(new Object[] { md5,
+							"GET_CUSTOM_SOURCE_COVER", source });
+					result[0] = (Image) rep;
 				}
 
 				@Override
@@ -233,10 +233,14 @@ public class RemoteLibrary extends BasicLibrary {
 		}.connect();
 
 		// because the meta changed:
-		invalidateInfo(luidSaved[0]);
-
 		MetaData meta = getInfo(luidSaved[0]);
-		meta.setCover(story.getMeta().getCover());
+		if (story.getMeta().getClass() != null) {
+			// If already available locally:
+			meta.setCover(story.getMeta().getCover());
+		} else {
+			// If required:
+			meta.setCover(getCover(meta.getLuid()));
+		}
 		story.setMeta(meta);
 
 		pg.done();
@@ -281,6 +285,13 @@ public class RemoteLibrary extends BasicLibrary {
 	@Override
 	// Could work (more slowly) without it
 	public Story imprt(final URL url, Progress pg) throws IOException {
+		// Import the file locally if it is actually a file
+		if (url == null || url.getProtocol().equalsIgnoreCase("file")) {
+			return super.imprt(url, pg);
+		}
+
+		// Import it remotely if it is an URL
+
 		if (pg == null) {
 			pg = new Progress();
 		}
@@ -337,8 +348,9 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	// Could work (more slowly) without it
-	public synchronized void changeSource(final String luid,
-			final String newSource, Progress pg) throws IOException {
+	protected synchronized void changeSTA(final String luid,
+			final String newSource, final String newTitle,
+			final String newAuthor, Progress pg) throws IOException {
 		final Progress pgF = pg == null ? new Progress() : pg;
 
 		try {
@@ -347,8 +359,8 @@ public class RemoteLibrary extends BasicLibrary {
 				public void action(Version serverVersion) throws Exception {
 					Progress pg = pgF;
 
-					Object rep = send(new Object[] { md5, "CHANGE_SOURCE",
-							luid, newSource });
+					Object rep = send(new Object[] { md5, "CHANGE_STA", luid,
+							newSource, newTitle, newAuthor });
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
 							break;
@@ -410,8 +422,14 @@ public class RemoteLibrary extends BasicLibrary {
 		return getMetasList("*", pg);
 	}
 
+	@Override
+	protected void updateInfo(MetaData meta) {
+		// Will be taken care of directly server side
+	}
+
 	@Override
 	protected void invalidateInfo(String luid) {
+		// Will be taken care of directly server side
 	}
 
 	// The following methods are only used by Save and Delete in BasicLibrary:
@@ -436,6 +454,8 @@ public class RemoteLibrary extends BasicLibrary {
 	/**
 	 * Return the meta of the given story or a list of all known metas if the
 	 * luid is "*".
+	 * <p>
+	 * Will not get the covers.
 	 * 
 	 * @param luid
 	 *            the luid of the story or *