X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=884eee9a114d2c40853fb6659044bf4b0b3122e9;hb=ea734ab478afa830550dd63800e855618a4cab4d;hp=c01275b62d5db57e95bf4b8542b64a09b09ea591;hpb=c8d48938ca540d7b619a2c19bd76623d689b72cb;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index c01275b..884eee9 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -26,7 +26,7 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject; public class RemoteLibrary extends BasicLibrary { private String host; private int port; - private final String md5; + private final String key; /** * Create a {@link RemoteLibrary} linked to the given server. @@ -40,7 +40,7 @@ public class RemoteLibrary extends BasicLibrary { * the port to contact it on */ public RemoteLibrary(String key, String host, int port) { - this.md5 = StringUtils.getMd5Hash(key); + this.key = key; this.host = host; this.port = port; } @@ -56,15 +56,20 @@ public class RemoteLibrary extends BasicLibrary { result[0] = Status.INVALID; - ConnectActionClientObject action = null; try { - action = new ConnectActionClientObject(host, port, true) { + Instance.getTraceHandler().trace("Getting remote lib status..."); + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { md5, "PING" }); - if ("PONG".equals(rep)) { - result[0] = Status.READY; - } else { + 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; } } @@ -73,8 +78,7 @@ public class RemoteLibrary extends BasicLibrary { protected void onError(Exception e) { result[0] = Status.UNAVAILABLE; } - }; - + }.connect(); } catch (UnknownHostException e) { result[0] = Status.INVALID; } catch (IllegalArgumentException e) { @@ -83,14 +87,7 @@ public class RemoteLibrary extends BasicLibrary { result[0] = Status.UNAVAILABLE; } - if (action != null) { - try { - action.connect(); - } catch (Exception e) { - result[0] = Status.UNAVAILABLE; - } - } - + Instance.getTraceHandler().trace("Remote lib status: " + result[0]); return result[0]; } @@ -99,10 +96,11 @@ public class RemoteLibrary extends BasicLibrary { 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[] { md5, "GET_COVER", luid }); + Object rep = sendCmd(this, + new Object[] { "GET_COVER", luid }); result[0] = (Image) rep; } @@ -120,14 +118,24 @@ public class RemoteLibrary extends BasicLibrary { @Override 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[] { md5, - "GET_CUSTOM_SOURCE_COVER", source }); + Object rep = sendCmd(this, + new Object[] { "GET_CUSTOM_COVER", type, source }); result[0] = (Image) rep; } @@ -149,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; @@ -157,7 +165,8 @@ public class RemoteLibrary extends BasicLibrary { pg = new Progress(); } - Object rep = send(new Object[] { md5, "GET_STORY", luid }); + Object rep = sendCmd(this, + new Object[] { "GET_STORY", luid }); MetaData meta = null; if (rep instanceof MetaData) { @@ -168,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); } @@ -205,7 +215,7 @@ public class RemoteLibrary extends BasicLibrary { 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; @@ -213,7 +223,7 @@ public class RemoteLibrary extends BasicLibrary { pg.setMinMax(0, (int) story.getMeta().getWords()); } - send(new Object[] { md5, "SAVE_STORY", luid }); + sendCmd(this, new Object[] { "SAVE_STORY", luid }); List list = RemoteLibraryServer.breakStory(story); for (Object obj : list) { @@ -250,10 +260,10 @@ public class RemoteLibrary extends BasicLibrary { @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[] { md5, "DELETE_STORY", luid }); + sendCmd(this, new Object[] { "DELETE_STORY", luid }); } @Override @@ -265,11 +275,23 @@ 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, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - send(new Object[] { md5, "SET_SOURCE_COVER", source, luid }); + sendCmd(this, + new Object[] { "SET_COVER", type, value, luid }); } @Override @@ -306,13 +328,13 @@ public class RemoteLibrary extends BasicLibrary { final String[] luid = new String[1]; try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { Progress pg = pgF; - Object rep = send(new Object[] { md5, "IMPORT", - url.toString() }); + Object rep = sendCmd(this, + new Object[] { "IMPORT", url.toString() }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -354,13 +376,13 @@ public class RemoteLibrary extends BasicLibrary { 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 { Progress pg = pgF; - Object rep = send(new Object[] { md5, "CHANGE_STA", luid, - newSource, newTitle, newAuthor }); + Object rep = sendCmd(this, new Object[] { "CHANGE_STA", + luid, newSource, newTitle, newAuthor }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { break; @@ -391,10 +413,10 @@ public class RemoteLibrary extends BasicLibrary { */ public void exit() { try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - send(new Object[] { md5, "EXIT" }); + sendCmd(this, new Object[] { "EXIT" }); } @Override @@ -470,7 +492,7 @@ public class RemoteLibrary extends BasicLibrary { 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; @@ -478,7 +500,9 @@ public class RemoteLibrary extends BasicLibrary { pg = new Progress(); } - Object rep = send(new Object[] { md5, "GET_METADATA", luid }); + + Object rep = sendCmd(this, + new Object[] { "GET_METADATA", luid }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -508,4 +532,35 @@ public class RemoteLibrary extends BasicLibrary { return metas; } + + // IllegalArgumentException if key is bad + private Object sendCmd(ConnectActionClientObject action, Object[] params) + throws IOException, NoSuchFieldException, NoSuchMethodException, + ClassNotFoundException { + Object rep = action.send(params); + + String hash = hashKey(key, "" + rep); + rep = action.send(hash); + if (rep == null) { + throw new java.lang.IllegalArgumentException(); + } + + return action.send(hash); + } + + /** + * 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); + } }