X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=9453d674e1df4c18f8ffd959b7f5ab916bf971e9;hb=416c54f8bf5f60e2f8d7981e24fdd613fb9246f1;hp=29d2bcda594f353afc882436438d071686db2dc0;hpb=085a2f9a3a811a910de7c3011eb6f5ef2ab18aa0;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 29d2bcd..9453d67 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,8 +11,9 @@ 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.ConnectActionClient; +import be.nikiroo.utils.serial.server.ConnectActionClientObject; /** * This {@link BasicLibrary} will access a remote server to list the available @@ -23,16 +25,21 @@ import be.nikiroo.utils.serial.ConnectActionClient; public class RemoteLibrary extends BasicLibrary { private String host; private int port; + private final String md5; /** * Create a {@link RemoteLibrary} linked to the given server. * + * @param key + * the key that will allow us to exchange information with the + * server * @param host * the host to contact or NULL for localhost * @param port * the port to contact it on */ - public RemoteLibrary(String host, int port) { + public RemoteLibrary(String key, String host, int port) { + this.md5 = StringUtils.getMd5Hash(key); this.host = host; this.port = port; } @@ -43,46 +50,178 @@ public class RemoteLibrary extends BasicLibrary { } @Override - protected List getMetas(Progress pg) { - // TODO: progress - final List metas = new ArrayList(); - MetaData[] fromNetwork = this. getRemoteObject( // - new Object[] { "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; + } + } - if (fromNetwork != null) { - for (MetaData meta : fromNetwork) { - metas.add(meta); + @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 metas; + return result[0]; } @Override public BufferedImage getCover(final String luid) { - return this. getRemoteObject( // - new Object[] { "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[] { "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. getRemoteObject(new Object[] { "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[] { "SAVE_STORY", story, luid }); + public synchronized Story save(final Story story, final String luid, + Progress pg) throws IOException { + final Progress pgF = pg; + + 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[] { md5, "SAVE_STORY", luid }); + + List list = RemoteLibraryServer.breakStory(story); + for (Object obj : list) { + send(obj); + pg.add(1); + } + + send(null); + pg.done(); + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); // because the meta changed: clearCache(); @@ -92,14 +231,37 @@ public class RemoteLibrary extends BasicLibrary { } @Override - public synchronized void delete(String luid) throws IOException { - getRemoteObject(new Object[] { "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[] { "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 @@ -108,6 +270,51 @@ public class RemoteLibrary extends BasicLibrary { "Operation not supportorted on remote Libraries"); } + @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 { + Progress pg = pgF; + if (pg == null) { + pg = new Progress(); + } + + Object rep = send(new Object[] { md5, "GET_METADATA", "*" }); + + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; + } + + rep = send(null); + } + + for (MetaData meta : (MetaData[]) rep) { + metas.add(meta); + } + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (Exception e) { + Instance.getTraceHandler().error(e); + } + + return metas; + } + + @Override + protected void clearCache() { + } + // The following methods are only used by Save and Delete in BasicLibrary: @Override @@ -124,41 +331,4 @@ public class RemoteLibrary extends BasicLibrary { 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 - * - * @return the object or NULL - */ - @SuppressWarnings("unchecked") - private T getRemoteObject(final Object[] command) { - final Object[] result = new Object[1]; - try { - new ConnectActionClient(host, port, true) { - @Override - public void action(Version serverVersion) throws Exception { - try { - Object rep = send(command); - result[0] = rep; - } catch (Exception e) { - Instance.syserr(e); - } - } - }.connect(); - } catch (IOException e) { - Instance.syserr(e); - } - - try { - return (T) result[0]; - } catch (Exception e) { - Instance.syserr(e); - return null; - } - } }