X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=2799a65a1923975f4695dd8d13bb1c33c0a91f1d;hb=74a40dfb4551443fcb20dddb50af940e14acee25;hp=d2d9a6e6fa870fd007d0617b18b540e49124bab8;hpb=f569d249d96479f9da73e0b37d3f543fa41eeadc;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index d2d9a6e..2799a65 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -2,37 +2,45 @@ package be.nikiroo.fanfix.library;
 
 import java.io.IOException;
 import java.security.InvalidParameterException;
+import java.util.ArrayList;
 import java.util.List;
 
 import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionServer;
-import be.nikiroo.utils.serial.Server;
+import be.nikiroo.utils.serial.server.ConnectActionClientObject;
+import be.nikiroo.utils.serial.server.ConnectActionServerObject;
+import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
  * Create a new remote server that will listen for order on the given port.
  * <p>
- * The available commands are given as String arrays (first item is the key,
- * second is the command, the rest are the arguments):
+ * The available commands are given as arrays of objects (first item is the key,
+ * second is the command, the rest are the arguments).
+ * <p>
+ * The key is always a String, the commands are also Strings; the parameters
+ * vary depending upon the command.
  * <ul>
- * <li>KEY GET_METADATA *: will return the metadata of all the stories in the
+ * <li>[key] GET_METADATA *: will return the metadata of all the stories in the
  * library</li>
- * <li>KEY GET_STORY [luid]: will return the given story if it exists (or NULL
+ * <li>[key] GET_STORY [luid]: will return the given story if it exists (or NULL
  * if not)</li>
- * <li>KEY SAVE_STORY [story] [luid]: save the story with the given LUID</li>
- * <li>KEY DELETE_STORY [luid]: delete the story of LUID luid</li>
- * <li>KEY GET_COVER [luid]: return the cover of the story</li>
- * <li>KEY GET_SOURCE_COVER [source]: return the cover for this source</li>
- * <li>KEY SET_SOURCE_COVER [source], [luid]: set the default cover for the
+ * <li>[key] SAVE_STORY [luid]: save the story (that must be sent just after the
+ * command) with the given LUID</li>
+ * <li>[key] DELETE_STORY [luid]: delete the story of LUID luid</li>
+ * <li>[key] GET_COVER [luid]: return the cover of the story</li>
+ * <li>[key] GET_SOURCE_COVER [source]: return the cover for this source</li>
+ * <li>[key] SET_SOURCE_COVER [source], [luid]: set the default cover for the
  * given source to the cover of the story denoted by luid</li>
- * <li>KEY EXIT: stop the server</li>
+ * <li>[key] EXIT: stop the server</li>
  * </ul>
  * 
  * @author niki
  */
-public class RemoteLibraryServer extends Server {
+public class RemoteLibraryServer extends ServerObject {
 	private final String key;
 
 	/**
@@ -48,12 +56,12 @@ public class RemoteLibraryServer extends Server {
 	 *             in case of I/O error
 	 */
 	public RemoteLibraryServer(String key, int port) throws IOException {
-		super(port, true);
+		super("Fanfix remote library", port, true);
 		this.key = key;
 	}
 
 	@Override
-	protected Object onRequest(ConnectActionServer action,
+	protected Object onRequest(ConnectActionServerObject action,
 			Version clientVersion, Object data) throws Exception {
 		String key = "";
 		String command = "";
@@ -92,9 +100,11 @@ public class RemoteLibraryServer extends Server {
 			throw new InvalidParameterException(
 					"only * is valid here, but you passed: " + args[0]);
 		} else if ("GET_STORY".equals(command)) {
-			return Instance.getLibrary().getStory("" + args[0], null);
+			Story story = Instance.getLibrary().getStory("" + args[0], null);
+			sendStory(story, action);
 		} else if ("SAVE_STORY".equals(command)) {
-			Instance.getLibrary().save((Story) args[0], "" + args[1], null);
+			Story story = recStory(action);
+			Instance.getLibrary().save(story, "" + args[1], null);
 		} else if ("DELETE_STORY".equals(command)) {
 			Instance.getLibrary().delete("" + args[0]);
 		} else if ("GET_COVER".equals(command)) {
@@ -109,4 +119,84 @@ public class RemoteLibraryServer extends Server {
 
 		return null;
 	}
+
+	public static void sendStory(Story story, Object sender)
+			throws NoSuchFieldException, NoSuchMethodException,
+			ClassNotFoundException, IOException {
+
+		if (!story.getMeta().isImageDocument()) {
+			sendNextObject(sender, story);
+			return;
+		}
+
+		story = story.clone();
+
+		List<Chapter> chaps = story.getChapters();
+		story.setChapters(new ArrayList<Chapter>());
+		sendNextObject(sender, story);
+
+		for (Chapter chap : chaps) {
+			List<Paragraph> paras = chap.getParagraphs();
+			chap.setParagraphs(new ArrayList<Paragraph>());
+			sendNextObject(sender, chap);
+
+			for (Paragraph para : paras) {
+				sendNextObject(sender, para);
+			}
+		}
+	}
+
+	public static Story recStory(Object source) throws NoSuchFieldException,
+			NoSuchMethodException, ClassNotFoundException, IOException {
+
+		Story story = null;
+
+		Object obj = getNextObject(source);
+		if (obj instanceof Story) {
+			story = (Story) obj;
+
+			Chapter current = null;
+			for (obj = getNextObject(source); obj != null; obj = getNextObject(source)) {
+				if (obj instanceof Chapter) {
+					current = (Chapter) obj;
+					story.getChapters().add(current);
+				} else if (obj instanceof Paragraph) {
+					current.getParagraphs().add((Paragraph) obj);
+				}
+			}
+		}
+
+		return story;
+	}
+
+	private static Object getNextObject(Object clientOrServer)
+			throws NoSuchFieldException, NoSuchMethodException,
+			ClassNotFoundException, IOException {
+		if (clientOrServer instanceof ConnectActionClientObject) {
+			ConnectActionClientObject client = (ConnectActionClientObject) clientOrServer;
+			return client.send(null);
+		} else if (clientOrServer instanceof ConnectActionServerObject) {
+			ConnectActionServerObject server = (ConnectActionServerObject) clientOrServer;
+			Object obj = server.rec();
+			server.send(null);
+			return obj;
+		} else {
+			throw new ClassNotFoundException();
+		}
+	}
+
+	private static void sendNextObject(Object clientOrServer, Object obj)
+			throws NoSuchFieldException, NoSuchMethodException,
+			ClassNotFoundException, IOException {
+		if (clientOrServer instanceof ConnectActionClientObject) {
+			ConnectActionClientObject client = (ConnectActionClientObject) clientOrServer;
+			client.send(obj);
+		} else if (clientOrServer instanceof ConnectActionServerObject) {
+			ConnectActionServerObject server = (ConnectActionServerObject) clientOrServer;
+			server.send(obj);
+			server.rec();
+		} else {
+			throw new ClassNotFoundException();
+		}
+	}
 }