X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=884eee9a114d2c40853fb6659044bf4b0b3122e9;hb=ea734ab478afa830550dd63800e855618a4cab4d;hp=e51de45daf1d17aaf5ee294073b7e58ff3de726a;hpb=3bbc86a58d68069c6eb95ec17b02daa4ca75ec7f;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index e51de45..884eee9 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -1,15 +1,18 @@ package be.nikiroo.fanfix.library; -import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.net.URL; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Story; +import be.nikiroo.utils.Image; import be.nikiroo.utils.Progress; +import be.nikiroo.utils.StringUtils; import be.nikiroo.utils.Version; import be.nikiroo.utils.serial.server.ConnectActionClientObject; @@ -48,15 +51,57 @@ public class RemoteLibrary extends BasicLibrary { } @Override - public BufferedImage getCover(final String luid) { - final BufferedImage[] result = new BufferedImage[1]; + public Status getStatus() { + final Status[] result = new Status[1]; + + result[0] = Status.INVALID; + + try { + Instance.getTraceHandler().trace("Getting remote lib status..."); + new ConnectActionClientObject(host, port, false) { + @Override + public void action(Version serverVersion) throws Exception { + try { + Object rep = sendCmd(this, new Object[] { "PING" }); + + if ("PONG".equals(rep)) { + result[0] = Status.READY; + } else { + result[0] = Status.UNAUTORIZED; + } + } catch (IllegalArgumentException e) { + result[0] = Status.UNAUTORIZED; + } + } + + @Override + protected void onError(Exception e) { + result[0] = Status.UNAVAILABLE; + } + }.connect(); + } catch (UnknownHostException e) { + result[0] = Status.INVALID; + } catch (IllegalArgumentException e) { + result[0] = Status.INVALID; + } catch (Exception e) { + result[0] = Status.UNAVAILABLE; + } + + Instance.getTraceHandler().trace("Remote lib status: " + result[0]); + return result[0]; + } + + @Override + public Image getCover(final String luid) { + final Image[] result = new Image[1]; try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { key, "GET_COVER", luid }); - result[0] = (BufferedImage) rep; + Object rep = sendCmd(this, + new Object[] { "GET_COVER", luid }); + result[0] = (Image) rep; } @Override @@ -72,16 +117,26 @@ public class RemoteLibrary extends BasicLibrary { } @Override - public BufferedImage getSourceCover(final String source) { - final BufferedImage[] result = new BufferedImage[1]; + public Image getCustomSourceCover(final String source) { + return getCustomCover(source, "SOURCE"); + } + + @Override + public Image getCustomAuthorCover(final String author) { + return getCustomCover(author, "AUTHOR"); + } + + // type: "SOURCE" or "AUTHOR" + private Image getCustomCover(final String source, final String type) { + final Image[] result = new Image[1]; try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { key, "GET_SOURCE_COVER", - source }); - result[0] = (BufferedImage) rep; + Object rep = sendCmd(this, + new Object[] { "GET_CUSTOM_COVER", type, source }); + result[0] = (Image) rep; } @Override @@ -102,7 +157,7 @@ public class RemoteLibrary extends BasicLibrary { final Story[] result = new Story[1]; try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; @@ -110,7 +165,8 @@ public class RemoteLibrary extends BasicLibrary { pg = new Progress(); } - Object rep = send(new Object[] { key, "GET_STORY", luid }); + Object rep = sendCmd(this, + new Object[] { "GET_STORY", luid }); MetaData meta = null; if (rep instanceof MetaData) { @@ -121,7 +177,8 @@ public class RemoteLibrary extends BasicLibrary { } List list = new ArrayList(); - for (Object obj = send(null); obj != null; obj = send(null)) { + for (Object obj = send(null); obj != null; obj = send( + null)) { list.add(obj); pg.add(1); } @@ -145,21 +202,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) { + new ConnectActionClientObject(host, port, false) { @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 }); + sendCmd(this, new Object[] { "SAVE_STORY", luid }); List list = RemoteLibraryServer.breakStory(story); for (Object obj : list) { @@ -167,7 +231,8 @@ public class RemoteLibrary extends BasicLibrary { pg.add(1); } - send(null); + luidSaved[0] = (String) send(null); + pg.done(); } @@ -178,18 +243,27 @@ public class RemoteLibrary extends BasicLibrary { }.connect(); // because the meta changed: - clearCache(); - story.setMeta(getInfo(luid)); + MetaData meta = getInfo(luidSaved[0]); + if (story.getMeta().getClass() != null) { + // If already available locally: + meta.setCover(story.getMeta().getCover()); + } else { + // If required: + meta.setCover(getCover(meta.getLuid())); + } + story.setMeta(meta); + + pg.done(); return story; } @Override public synchronized void delete(final String luid) throws IOException { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - send(new Object[] { key, "DELETE_STORY", luid }); + sendCmd(this, new Object[] { "DELETE_STORY", luid }); } @Override @@ -201,11 +275,121 @@ public class RemoteLibrary extends BasicLibrary { @Override public void setSourceCover(final String source, final String luid) { + setCover(source, luid, "SOURCE"); + } + + @Override + public void setAuthorCover(final String author, final String luid) { + setCover(author, luid, "AUTHOR"); + } + + // type = "SOURCE" | "AUTHOR" + private void setCover(final String value, final String luid, + final String type) { + try { + new ConnectActionClientObject(host, port, false) { + @Override + public void action(Version serverVersion) throws Exception { + sendCmd(this, + new Object[] { "SET_COVER", type, value, luid }); + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (IOException e) { + Instance.getTraceHandler().error(e); + } + } + + @Override + // Could work (more slowly) without it + public Story imprt(final URL url, Progress pg) throws IOException { + // Import the file locally if it is actually a file + if (url == null || url.getProtocol().equalsIgnoreCase("file")) { + return super.imprt(url, pg); + } + + // Import it remotely if it is an URL + + if (pg == null) { + pg = new Progress(); + } + + pg.setMinMax(0, 2); + Progress pgImprt = new Progress(); + Progress pgGet = new Progress(); + pg.addProgress(pgImprt, 1); + pg.addProgress(pgGet, 1); + + final Progress pgF = pgImprt; + final String[] luid = new String[1]; + + try { + new ConnectActionClientObject(host, port, false) { + @Override + public void action(Version serverVersion) throws Exception { + Progress pg = pgF; + + Object rep = sendCmd(this, + new Object[] { "IMPORT", url.toString() }); + + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; + } + + rep = send(null); + } + + pg.done(); + luid[0] = (String) rep; + } + + @Override + protected void onError(Exception e) { + Instance.getTraceHandler().error(e); + } + }.connect(); + } catch (IOException e) { + Instance.getTraceHandler().error(e); + } + + if (luid[0] == null) { + throw new IOException("Remote failure"); + } + + Story story = getStory(luid[0], pgGet); + pgGet.done(); + + pg.done(); + return story; + } + + @Override + // Could work (more slowly) without it + protected synchronized void changeSTA(final String luid, + final String newSource, final String newTitle, + final String newAuthor, Progress pg) throws IOException { + final Progress pgF = pg == null ? new Progress() : pg; + try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - send(new Object[] { key, "SET_SOURCE_COVER", source, luid }); + Progress pg = pgF; + + Object rep = sendCmd(this, new Object[] { "CHANGE_STA", + luid, newSource, newTitle, newAuthor }); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; + } + + rep = send(null); + } } @Override @@ -225,21 +409,14 @@ public class RemoteLibrary extends BasicLibrary { } /** - * Check if this {@link RemoteLibraryServer} is able to connect and identify - * to the remote server. - * - * @return TRUE if it is online + * Stop the server. */ - public boolean isOnline() { - final Boolean[] result = new Boolean[1]; - - result[0] = false; + public void exit() { try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { key, "PING" }); - result[0] = "PONG".equals(rep); + sendCmd(this, new Object[] { "EXIT" }); } @Override @@ -247,20 +424,75 @@ public class RemoteLibrary extends BasicLibrary { Instance.getTraceHandler().error(e); } }.connect(); - } catch (Exception e) { + } catch (IOException e) { Instance.getTraceHandler().error(e); } + } - return result[0]; + @Override + public synchronized MetaData getInfo(String luid) { + List metas = getMetasList(luid, null); + if (!metas.isEmpty()) { + return metas.get(0); + } + + return null; } @Override protected List getMetas(Progress pg) { + return getMetasList("*", pg); + } + + @Override + protected void updateInfo(MetaData meta) { + // Will be taken care of directly server side + } + + @Override + protected void invalidateInfo(String luid) { + // Will be taken care of directly server side + } + + // 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 the meta of the given story or a list of all known metas if the + * luid is "*". + *

+ * Will not get the covers. + * + * @param luid + * the luid of the story or * + * @param pg + * the optional progress + * + * + * @return the metas + */ + private List getMetasList(final String luid, Progress pg) { final Progress pgF = pg; final List metas = new ArrayList(); try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; @@ -268,7 +500,9 @@ public class RemoteLibrary extends BasicLibrary { pg = new Progress(); } - Object rep = send(new Object[] { key, "GET_METADATA", "*" }); + + Object rep = sendCmd(this, + new Object[] { "GET_METADATA", luid }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -278,8 +512,12 @@ public class RemoteLibrary extends BasicLibrary { rep = send(null); } - for (MetaData meta : (MetaData[]) rep) { - metas.add(meta); + if (rep instanceof MetaData[]) { + for (MetaData meta : (MetaData[]) rep) { + metas.add(meta); + } + } else if (rep != null) { + metas.add((MetaData) rep); } } @@ -295,24 +533,34 @@ public class RemoteLibrary extends BasicLibrary { return metas; } - @Override - protected void clearCache() { - } + // IllegalArgumentException if key is bad + private Object sendCmd(ConnectActionClientObject action, Object[] params) + throws IOException, NoSuchFieldException, NoSuchMethodException, + ClassNotFoundException { + Object rep = action.send(params); - // The following methods are only used by Save and Delete in BasicLibrary: + String hash = hashKey(key, "" + rep); + rep = action.send(hash); + if (rep == null) { + throw new java.lang.IllegalArgumentException(); + } - @Override - protected int getNextId() { - throw new java.lang.InternalError("Should not have been called"); + return action.send(hash); } - @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 a hash that corresponds to the given key and the given random + * value. + * + * @param key + * the key (the secret) + * + * @param random + * the random value + * + * @return a hash that was computed using both + */ + static String hashKey(String key, String random) { + return StringUtils.getMd5Hash(key + " <==> " + random); } }