X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=75f98be8bd62b18c9ab66801eb372ba6a0003389;hb=00f6344a8389698f3332767d445b8345b050a763;hp=10cc44de423db239067e7318a667d7dd1e2df468;hpb=1b9a09a2d3ddd4558c9f440392e50504421ddb2e;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index 10cc44d..75f98be 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,11 +233,14 @@ public class RemoteLibrary extends BasicLibrary {
 		}.connect();
 
 		// because the meta changed:
-		clearCache();
-		refresh(pgRefresh);
-
 		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();
@@ -282,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();
 		}
@@ -357,8 +367,6 @@ public class RemoteLibrary extends BasicLibrary {
 
 						rep = send(null);
 					}
-
-					getInfo(luid).setSource(newSource);
 				}
 
 				@Override
@@ -398,8 +406,65 @@ public class RemoteLibrary extends BasicLibrary {
 		}
 	}
 
+	@Override
+	public synchronized MetaData getInfo(String luid) {
+		List<MetaData> metas = getMetasList(luid, null);
+		if (!metas.isEmpty()) {
+			return metas.get(0);
+		}
+
+		return null;
+	}
+
 	@Override
 	protected List<MetaData> getMetas(Progress pg) {
+		return getMetasList("*", pg);
+	}
+
+	@Override
+	protected void updateInfo(MetaData meta) {
+		// Will be taken care of directly server side
+	}
+
+	@Override
+	protected void deleteInfo(String luid) {
+		// Will be taken care of directly server side
+	}
+
+	// The following methods are only used by Save and Delete in BasicLibrary:
+
+	@Override
+	protected int getNextId() {
+		throw new java.lang.InternalError("Should not have been called");
+	}
+
+	@Override
+	protected void doDelete(String luid) throws IOException {
+		throw new java.lang.InternalError("Should not have been called");
+	}
+
+	@Override
+	protected Story doSave(Story story, Progress pg) throws IOException {
+		throw new java.lang.InternalError("Should not have been called");
+	}
+
+	//
+
+	/**
+	 * 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 *
+	 * @param pg
+	 *            the optional progress
+	 * 
+	 * 
+	 * @return the metas
+	 */
+	private List<MetaData> getMetasList(final String luid, Progress pg) {
 		final Progress pgF = pg;
 		final List<MetaData> metas = new ArrayList<MetaData>();
 
@@ -412,7 +477,7 @@ public class RemoteLibrary extends BasicLibrary {
 						pg = new Progress();
 					}
 
-					Object rep = send(new Object[] { md5, "GET_METADATA", "*" });
+					Object rep = send(new Object[] { md5, "GET_METADATA", luid });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@@ -422,8 +487,12 @@ public class RemoteLibrary extends BasicLibrary {
 						rep = send(null);
 					}
 
-					for (MetaData meta : (MetaData[]) rep) {
-						metas.add(meta);
+					if (rep instanceof MetaData[]) {
+						for (MetaData meta : (MetaData[]) rep) {
+							metas.add(meta);
+						}
+					} else if (rep != null) {
+						metas.add((MetaData) rep);
 					}
 				}
 
@@ -438,25 +507,4 @@ public class RemoteLibrary extends BasicLibrary {
 
 		return metas;
 	}
-
-	@Override
-	protected void clearCache() {
-	}
-
-	// The following methods are only used by Save and Delete in BasicLibrary:
-
-	@Override
-	protected int getNextId() {
-		throw new java.lang.InternalError("Should not have been called");
-	}
-
-	@Override
-	protected void doDelete(String luid) throws IOException {
-		throw new java.lang.InternalError("Should not have been called");
-	}
-
-	@Override
-	protected Story doSave(Story story, Progress pg) throws IOException {
-		throw new java.lang.InternalError("Should not have been called");
-	}
 }