X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=f3104135f2977b689a222ea68242c8bc5be75d27;hb=0fa0fe9552e57bf05d8dd295a9d96d2364730c4e;hp=7869b694b23a562e3d6201bf603541089fcafd36;hpb=74a40dfb4551443fcb20dddb50af940e14acee25;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 7869b69..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; } @@ -48,64 +50,230 @@ public class RemoteLibrary extends BasicLibrary { } @Override - protected List getMetas(Progress pg) { - // TODO: progress - final List metas = new ArrayList(); - MetaData[] fromNetwork = this.getRemoteObject( // - new Object[] { key, "GET_METADATA", "*" }); + 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 (fromNetwork != null) { - for (MetaData meta : fromNetwork) { - metas.add(meta); + if (action != null) { + try { + action.connect(); + } catch (Exception e) { + result[0] = Status.UNAVAILABLE; } } - return metas; + return result[0]; } @Override public BufferedImage getCover(final String luid) { - return this.getRemoteObject( // - new Object[] { key, "GET_COVER", luid }); + final BufferedImage[] result = new BufferedImage[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; + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (Exception e) { + Instance.getTraceHandler().error(e); + } + + return result[0]; } @Override public BufferedImage getSourceCover(final String source) { - return this.getRemoteObject( // - new Object[] { key, "GET_SOURCE_COVER", source }); + final BufferedImage[] result = new BufferedImage[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; + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (Exception e) { + Instance.getTraceHandler().error(e); + } + + return result[0]; } @Override public synchronized Story getStory(final String luid, Progress pg) { - return this.getRemoteStory( // - new Object[] { key, "GET_STORY", luid }); - } + final Progress pgF = pg; + final Story[] result = new Story[1]; - @Override - protected void clearCache() { + try { + new ConnectActionClientObject(host, port, true) { + @Override + public void action(Version serverVersion) throws Exception { + Progress pg = pgF; + if (pg == null) { + pg = new Progress(); + } + + Object rep = send(new Object[] { md5, "GET_STORY", luid }); + + MetaData meta = null; + if (rep instanceof MetaData) { + meta = (MetaData) rep; + if (meta.getWords() <= Integer.MAX_VALUE) { + pg.setMinMax(0, (int) meta.getWords()); + } + } + + List list = new ArrayList(); + for (Object obj = send(null); obj != null; obj = send(null)) { + list.add(obj); + pg.add(1); + } + + result[0] = RemoteLibraryServer.rebuildStory(list); + pg.done(); + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (Exception e) { + Instance.getTraceHandler().error(e); + } + + return result[0]; } @Override - public synchronized Story save(Story story, String luid, Progress pg) - throws IOException { - getRemoteObject(new Object[] { key, "SAVE_STORY", story, luid }); + public synchronized Story save(final Story story, final String luid, + Progress pg) throws IOException { + 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 (story.getMeta().getWords() <= Integer.MAX_VALUE) { + pg.setMinMax(0, (int) story.getMeta().getWords()); + } + + send(new Object[] { md5, "SAVE_STORY", luid }); + + List list = RemoteLibraryServer.breakStory(story); + for (Object obj : list) { + send(obj); + pg.add(1); + } + + send(null); // done sending the story + luidSaved[0] = (String) send(null); // get LUID + + pg.done(); + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); // because the meta changed: clearCache(); - story.setMeta(getInfo(luid)); + refresh(pgRefresh); + story.setMeta(getInfo(luidSaved[0])); + + pg.done(); return story; } @Override - public synchronized void delete(String luid) throws IOException { - getRemoteObject(new Object[] { key, "DELETE_STORY", luid }); + public synchronized void delete(final String luid) throws IOException { + new ConnectActionClientObject(host, port, true) { + @Override + public void action(Version serverVersion) throws Exception { + send(new Object[] { md5, "DELETE_STORY", luid }); + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); } @Override - public void setSourceCover(String source, String luid) { - this. getRemoteObject( // - new Object[] { key, "SET_SOURCE_COVER", source, luid }); + public void setSourceCover(final String source, final String luid) { + try { + new ConnectActionClientObject(host, port, true) { + @Override + public void action(Version serverVersion) throws Exception { + send(new Object[] { md5, "SET_SOURCE_COVER", source, luid }); + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (IOException e) { + Instance.getTraceHandler().error(e); + } } @Override @@ -114,101 +282,86 @@ public class RemoteLibrary extends BasicLibrary { "Operation not supportorted on remote Libraries"); } - // 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 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 + * Stop the server. */ - private T getRemoteObject(final Object[] command) { - return getRemoteObjectOrStory(command, false); - } + public void exit() { + try { + new ConnectActionClientObject(host, port, true) { + @Override + public void action(Version serverVersion) throws Exception { + send(new Object[] { md5, "EXIT" }); + } - /** - * 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); + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (IOException e) { + Instance.getTraceHandler().error(e); + } } - /** - * 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]; + @Override + protected List getMetas(Progress pg) { + final Progress pgF = pg; + final List metas = new ArrayList(); + 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; - } - } + Progress pg = pgF; + if (pg == null) { + pg = new Progress(); + } - Object rep = send(command); + Object rep = send(new Object[] { md5, "GET_METADATA", "*" }); - if (story != null) { - RemoteLibraryServer.sendStory(story, this); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; } - if (getStory) { - rep = RemoteLibraryServer.recStory(this); - } + rep = send(null); + } - result[0] = rep; - } catch (Exception e) { - Instance.getTraceHandler().error(e); + for (MetaData meta : (MetaData[]) rep) { + metas.add(meta); } } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } - try { - return (T) result[0]; + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); } catch (Exception e) { Instance.getTraceHandler().error(e); - return null; } + + 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"); } }