From 74a40dfb4551443fcb20dddb50af940e14acee25 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Wed, 29 Nov 2017 23:11:39 +0100 Subject: [PATCH] Remote: try to send the stories image-per-image --- .../nikiroo/fanfix/library/RemoteLibrary.java | 56 +++++++++-- .../fanfix/library/RemoteLibraryServer.java | 93 ++++++++++++++++++- 2 files changed, 140 insertions(+), 9 deletions(-) diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index f4e8264..7869b69 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -51,7 +51,7 @@ public class RemoteLibrary extends BasicLibrary { protected List getMetas(Progress pg) { // TODO: progress final List metas = new ArrayList(); - MetaData[] fromNetwork = this. getRemoteObject( // + MetaData[] fromNetwork = this.getRemoteObject( // new Object[] { key, "GET_METADATA", "*" }); if (fromNetwork != null) { @@ -65,19 +65,19 @@ public class RemoteLibrary extends BasicLibrary { @Override public BufferedImage getCover(final String luid) { - return this. getRemoteObject( // + return this.getRemoteObject( // new Object[] { key, "GET_COVER", luid }); } @Override public BufferedImage getSourceCover(final String source) { - return this. getRemoteObject( // + return this.getRemoteObject( // new Object[] { key, "GET_SOURCE_COVER", source }); } @Override public synchronized Story getStory(final String luid, Progress pg) { - return this. getRemoteObject( // + return this.getRemoteStory( // new Object[] { key, "GET_STORY", luid }); } @@ -137,19 +137,63 @@ public class RemoteLibrary extends BasicLibrary { * @param * the expected type of object * @param command - * the command to send + * the command to send (can contain at most ONE {@link Story}) * * @return the object or NULL */ - @SuppressWarnings("unchecked") private T getRemoteObject(final Object[] command) { + return getRemoteObjectOrStory(command, false); + } + + /** + * Return an object from the server. + * + * @param command + * the command to send (can contain at most ONE {@link Story}) + * + * @return the object or NULL + */ + private Story getRemoteStory(final Object[] command) { + return getRemoteObjectOrStory(command, true); + } + + /** + * Return an object from the server. + * + * @param + * the expected type of object + * @param command + * the command to send (can contain at most ONE {@link Story}) + * + * @return the object or NULL + */ + @SuppressWarnings("unchecked") + private T getRemoteObjectOrStory(final Object[] command, + final boolean getStory) { final Object[] result = new Object[1]; try { new ConnectActionClientObject(host, port, true) { @Override public void action(Version serverVersion) throws Exception { try { + Story story = null; + for (int i = 0; i < command.length; i++) { + if (command[i] instanceof Story) { + story = (Story) command[i]; + command[i] = null; + } + } + Object rep = send(command); + + if (story != null) { + RemoteLibraryServer.sendStory(story, this); + } + + if (getStory) { + rep = RemoteLibraryServer.recStory(this); + } + result[0] = rep; } catch (Exception e) { Instance.getTraceHandler().error(e); diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index 55c50c1..2799a65 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -2,12 +2,16 @@ 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.server.ConnectActionClientObject; import be.nikiroo.utils.serial.server.ConnectActionServerObject; import be.nikiroo.utils.serial.server.ServerObject; @@ -24,7 +28,8 @@ import be.nikiroo.utils.serial.server.ServerObject; * library *
  • [key] GET_STORY [luid]: will return the given story if it exists (or NULL * if not)
    • - *
  • [key] SAVE_STORY [story] [luid]: save the story with the given LUID
    • + *
  • [key] SAVE_STORY [luid]: save the story (that must be sent just after the + * command) with the given LUID
    • *
  • [key] DELETE_STORY [luid]: delete the story of LUID luid
    • *
  • [key] GET_COVER [luid]: return the cover of the story
    • *
  • [key] GET_SOURCE_COVER [source]: return the cover for this source
    • @@ -95,9 +100,11 @@ public class RemoteLibraryServer extends ServerObject { 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)) { @@ -112,4 +119,84 @@ public class RemoteLibraryServer extends ServerObject { 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 chaps = story.getChapters(); + story.setChapters(new ArrayList()); + sendNextObject(sender, story); + + for (Chapter chap : chaps) { + List paras = chap.getParagraphs(); + chap.setParagraphs(new ArrayList()); + 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(); + } + } } -- 2.27.0