X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=f3104135f2977b689a222ea68242c8bc5be75d27;hb=0fa0fe9552e57bf05d8dd295a9d96d2364730c4e;hp=ea155eb88d14515cf4334dfc38eb1843e0b9f005;hpb=b9ce9cad4a94e7c88770d5f7ac6cf4f200e336de;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index ea155eb..f310413 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -3,6 +3,7 @@ package be.nikiroo.fanfix.library;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,6 +11,7 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.StringUtils;
 import be.nikiroo.utils.Version;
 import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 
@@ -23,7 +25,7 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 public class RemoteLibrary extends BasicLibrary {
 	private String host;
 	private int port;
-	private final String key;
+	private final String md5;
 
 	/**
 	 * Create a {@link RemoteLibrary} linked to the given server.
@@ -37,7 +39,7 @@ public class RemoteLibrary extends BasicLibrary {
 	 *            the port to contact it on
 	 */
 	public RemoteLibrary(String key, String host, int port) {
-		this.key = key;
+		this.md5 = StringUtils.getMd5Hash(key);
 		this.host = host;
 		this.port = port;
 	}
@@ -47,6 +49,50 @@ public class RemoteLibrary extends BasicLibrary {
 		return host + ":" + port;
 	}
 
+	@Override
+	public Status getStatus() {
+		final Status[] result = new Status[1];
+
+		result[0] = Status.INVALID;
+
+		ConnectActionClientObject action = null;
+		try {
+			action = new ConnectActionClientObject(host, port, true) {
+				@Override
+				public void action(Version serverVersion) throws Exception {
+					Object rep = send(new Object[] { md5, "PING" });
+					if ("PONG".equals(rep)) {
+						result[0] = Status.READY;
+					} else {
+						result[0] = Status.UNAUTORIZED;
+					}
+				}
+
+				@Override
+				protected void onError(Exception e) {
+					result[0] = Status.UNAVAILABLE;
+				}
+			};
+
+		} catch (UnknownHostException e) {
+			result[0] = Status.INVALID;
+		} catch (IllegalArgumentException e) {
+			result[0] = Status.INVALID;
+		} catch (Exception e) {
+			result[0] = Status.UNAVAILABLE;
+		}
+
+		if (action != null) {
+			try {
+				action.connect();
+			} catch (Exception e) {
+				result[0] = Status.UNAVAILABLE;
+			}
+		}
+
+		return result[0];
+	}
+
 	@Override
 	public BufferedImage getCover(final String luid) {
 		final BufferedImage[] result = new BufferedImage[1];
@@ -55,7 +101,7 @@ public class RemoteLibrary extends BasicLibrary {
 			new ConnectActionClientObject(host, port, true) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { key, "GET_COVER", luid });
+					Object rep = send(new Object[] { md5, "GET_COVER", luid });
 					result[0] = (BufferedImage) rep;
 				}
 
@@ -79,7 +125,7 @@ public class RemoteLibrary extends BasicLibrary {
 			new ConnectActionClientObject(host, port, true) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					Object rep = send(new Object[] { key, "GET_SOURCE_COVER",
+					Object rep = send(new Object[] { md5, "GET_SOURCE_COVER",
 							source });
 					result[0] = (BufferedImage) rep;
 				}
@@ -110,7 +156,7 @@ public class RemoteLibrary extends BasicLibrary {
 						pg = new Progress();
 					}
 
-					Object rep = send(new Object[] { key, "GET_STORY", luid });
+					Object rep = send(new Object[] { md5, "GET_STORY", luid });
 
 					MetaData meta = null;
 					if (rep instanceof MetaData) {
@@ -145,21 +191,28 @@ public class RemoteLibrary extends BasicLibrary {
 	@Override
 	public synchronized Story save(final Story story, final String luid,
 			Progress pg) throws IOException {
-		final Progress pgF = pg;
+		final String[] luidSaved = new String[1];
+		Progress pgSave = new Progress();
+		Progress pgRefresh = new Progress();
+		if (pg == null) {
+			pg = new Progress();
+		}
+
+		pg.setMinMax(0, 10);
+		pg.addProgress(pgSave, 9);
+		pg.addProgress(pgRefresh, 1);
+
+		final Progress pgF = pgSave;
 
 		new ConnectActionClientObject(host, port, true) {
 			@Override
 			public void action(Version serverVersion) throws Exception {
 				Progress pg = pgF;
-				if (pg == null) {
-					pg = new Progress();
-				}
-
 				if (story.getMeta().getWords() <= Integer.MAX_VALUE) {
 					pg.setMinMax(0, (int) story.getMeta().getWords());
 				}
 
-				send(new Object[] { key, "SAVE_STORY", luid });
+				send(new Object[] { md5, "SAVE_STORY", luid });
 
 				List<Object> list = RemoteLibraryServer.breakStory(story);
 				for (Object obj : list) {
@@ -167,7 +220,9 @@ public class RemoteLibrary extends BasicLibrary {
 					pg.add(1);
 				}
 
-				send(null);
+				send(null); // done sending the story
+				luidSaved[0] = (String) send(null); // get LUID
+
 				pg.done();
 			}
 
@@ -179,7 +234,10 @@ public class RemoteLibrary extends BasicLibrary {
 
 		// because the meta changed:
 		clearCache();
-		story.setMeta(getInfo(luid));
+		refresh(pgRefresh);
+		story.setMeta(getInfo(luidSaved[0]));
+
+		pg.done();
 
 		return story;
 	}
@@ -189,7 +247,7 @@ public class RemoteLibrary extends BasicLibrary {
 		new ConnectActionClientObject(host, port, true) {
 			@Override
 			public void action(Version serverVersion) throws Exception {
-				send(new Object[] { key, "DELETE_STORY", luid });
+				send(new Object[] { md5, "DELETE_STORY", luid });
 			}
 
 			@Override
@@ -205,7 +263,7 @@ public class RemoteLibrary extends BasicLibrary {
 			new ConnectActionClientObject(host, port, true) {
 				@Override
 				public void action(Version serverVersion) throws Exception {
-					send(new Object[] { key, "SET_SOURCE_COVER", source, luid });
+					send(new Object[] { md5, "SET_SOURCE_COVER", source, luid });
 				}
 
 				@Override
@@ -224,6 +282,27 @@ public class RemoteLibrary extends BasicLibrary {
 				"Operation not supportorted on remote Libraries");
 	}
 
+	/**
+	 * Stop the server.
+	 */
+	public void exit() {
+		try {
+			new ConnectActionClientObject(host, port, true) {
+				@Override
+				public void action(Version serverVersion) throws Exception {
+					send(new Object[] { md5, "EXIT" });
+				}
+
+				@Override
+				protected void onError(Exception e) {
+					Instance.getTraceHandler().error(e);
+				}
+			}.connect();
+		} catch (IOException e) {
+			Instance.getTraceHandler().error(e);
+		}
+	}
+
 	@Override
 	protected List<MetaData> getMetas(Progress pg) {
 		final Progress pgF = pg;
@@ -238,7 +317,7 @@ public class RemoteLibrary extends BasicLibrary {
 						pg = new Progress();
 					}
 
-					Object rep = send(new Object[] { key, "GET_METADATA", "*" });
+					Object rep = send(new Object[] { md5, "GET_METADATA", "*" });
 
 					while (true) {
 						if (!RemoteLibraryServer.updateProgress(pg, rep)) {