X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=e35c57d146387ee3c582e08b398ba46dda792779;hb=99206a39d3c58140402d2b4903f7436168d1d349;hp=884eee9a114d2c40853fb6659044bf4b0b3122e9;hpb=ea734ab478afa830550dd63800e855618a4cab4d;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 884eee9..e35c57d 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -7,13 +7,13 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; +import javax.net.ssl.SSLException; + 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; /** @@ -28,6 +28,8 @@ public class RemoteLibrary extends BasicLibrary { private int port; private final String key; + // TODO: error handling is not up to par! + /** * Create a {@link RemoteLibrary} linked to the given server. * @@ -52,31 +54,47 @@ public class RemoteLibrary extends BasicLibrary { @Override public Status getStatus() { + Instance.getTraceHandler().trace("Getting remote lib status..."); + Status status = getStatusDo(); + Instance.getTraceHandler().trace("Remote lib status: " + status); + return status; + } + + private boolean check() { + Status status = getStatusDo(); + if (status != Status.READY) { + Instance.getTraceHandler().error("Remote lib not ready: " + status); + return false; + } + + return true; + } + + private Status getStatusDo() { final Status[] result = new Status[1]; result[0] = Status.INVALID; try { - Instance.getTraceHandler().trace("Getting remote lib status..."); - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @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; + public void action() throws Exception { + Object rep = send(new Object[] { "PING" }); + + if ("PONG".equals(rep)) { + result[0] = Status.READY; + } else { + result[0] = Status.UNAUTHORIZED; } } @Override protected void onError(Exception e) { - result[0] = Status.UNAVAILABLE; + // if (e instanceof SSLException) { + result[0] = Status.UNAUTHORIZED; + // } else { + // result[0] = Status.UNAVAILABLE; + // } } }.connect(); } catch (UnknownHostException e) { @@ -87,26 +105,33 @@ public class RemoteLibrary extends BasicLibrary { result[0] = Status.UNAVAILABLE; } - Instance.getTraceHandler().trace("Remote lib status: " + result[0]); return result[0]; } @Override public Image getCover(final String luid) { + if (!check()) { + return null; + } + final Image[] result = new Image[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - Object rep = sendCmd(this, - new Object[] { "GET_COVER", luid }); + public void action() throws Exception { + Object rep = send(new Object[] { "GET_COVER", luid }); result[0] = (Image) rep; } @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (Exception e) { @@ -118,30 +143,47 @@ public class RemoteLibrary extends BasicLibrary { @Override public Image getCustomSourceCover(final String source) { + if (!check()) { + return null; + } + return getCustomCover(source, "SOURCE"); } @Override public Image getCustomAuthorCover(final String author) { + if (!check()) { + return null; + } + return getCustomCover(author, "AUTHOR"); } // type: "SOURCE" or "AUTHOR" private Image getCustomCover(final String source, final String type) { + if (!check()) { + return null; + } + final Image[] result = new Image[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - Object rep = sendCmd(this, - new Object[] { "GET_CUSTOM_COVER", type, source }); + public void action() throws Exception { + Object rep = send(new Object[] { "GET_CUSTOM_COVER", type, + source }); result[0] = (Image) rep; } @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (Exception e) { @@ -153,20 +195,23 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized Story getStory(final String luid, Progress pg) { + if (!check()) { + return null; + } + final Progress pgF = pg; final Story[] result = new Story[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; if (pg == null) { pg = new Progress(); } - Object rep = sendCmd(this, - new Object[] { "GET_STORY", luid }); + Object rep = send(new Object[] { "GET_STORY", luid }); MetaData meta = null; if (rep instanceof MetaData) { @@ -177,8 +222,7 @@ 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); } @@ -189,7 +233,12 @@ public class RemoteLibrary extends BasicLibrary { @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (Exception e) { @@ -202,6 +251,10 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized Story save(final Story story, final String luid, Progress pg) throws IOException { + if (!check()) { + return null; + } + final String[] luidSaved = new String[1]; Progress pgSave = new Progress(); Progress pgRefresh = new Progress(); @@ -215,15 +268,15 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pgSave; - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; if (story.getMeta().getWords() <= Integer.MAX_VALUE) { pg.setMinMax(0, (int) story.getMeta().getWords()); } - sendCmd(this, new Object[] { "SAVE_STORY", luid }); + send(new Object[] { "SAVE_STORY", luid }); List list = RemoteLibraryServer.breakStory(story); for (Object obj : list) { @@ -238,7 +291,12 @@ public class RemoteLibrary extends BasicLibrary { @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); @@ -260,43 +318,68 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized void delete(final String luid) throws IOException { - new ConnectActionClientObject(host, port, false) { + if (!check()) { + throw new IOException("Library not ready"); + } + + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - sendCmd(this, new Object[] { "DELETE_STORY", luid }); + public void action() throws Exception { + send(new Object[] { "DELETE_STORY", luid }); } @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } @Override public void setSourceCover(final String source, final String luid) { + if (!check()) { + return; + } + setCover(source, luid, "SOURCE"); } @Override public void setAuthorCover(final String author, final String luid) { + if (!check()) { + return; + } + setCover(author, luid, "AUTHOR"); } // type = "SOURCE" | "AUTHOR" private void setCover(final String value, final String luid, final String type) { + if (!check()) { + return; + } + try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - sendCmd(this, - new Object[] { "SET_COVER", type, value, luid }); + public void action() throws Exception { + send(new Object[] { "SET_COVER", type, value, luid }); } @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (IOException e) { @@ -307,6 +390,10 @@ public class RemoteLibrary extends BasicLibrary { @Override // Could work (more slowly) without it public Story imprt(final URL url, Progress pg) throws IOException { + if (!check()) { + return null; + } + // Import the file locally if it is actually a file if (url == null || url.getProtocol().equalsIgnoreCase("file")) { return super.imprt(url, pg); @@ -328,13 +415,12 @@ public class RemoteLibrary extends BasicLibrary { final String[] luid = new String[1]; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; - Object rep = sendCmd(this, - new Object[] { "IMPORT", url.toString() }); + Object rep = send(new Object[] { "IMPORT", url.toString() }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -350,7 +436,12 @@ public class RemoteLibrary extends BasicLibrary { @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (IOException e) { @@ -373,16 +464,20 @@ public class RemoteLibrary extends BasicLibrary { protected synchronized void changeSTA(final String luid, final String newSource, final String newTitle, final String newAuthor, Progress pg) throws IOException { + if (!check()) { + return; + } + final Progress pgF = pg == null ? new Progress() : pg; try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; - Object rep = sendCmd(this, new Object[] { "CHANGE_STA", - luid, newSource, newTitle, newAuthor }); + Object rep = send(new Object[] { "CHANGE_STA", luid, + newSource, newTitle, newAuthor }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { break; @@ -394,7 +489,12 @@ public class RemoteLibrary extends BasicLibrary { @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (IOException e) { @@ -412,16 +512,25 @@ public class RemoteLibrary extends BasicLibrary { * Stop the server. */ public void exit() { + if (!check()) { + return; + } + try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - sendCmd(this, new Object[] { "EXIT" }); + public void action() throws Exception { + send(new Object[] { "EXIT" }); } @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (IOException e) { @@ -431,6 +540,10 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized MetaData getInfo(String luid) { + if (!check()) { + return null; + } + List metas = getMetasList(luid, null); if (!metas.isEmpty()) { return metas.get(0); @@ -488,21 +601,23 @@ public class RemoteLibrary extends BasicLibrary { * @return the metas */ private List getMetasList(final String luid, Progress pg) { + if (!check()) { + return null; + } + final Progress pgF = pg; final List metas = new ArrayList(); try { - new ConnectActionClientObject(host, port, false) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; if (pg == null) { pg = new Progress(); } - - Object rep = sendCmd(this, - new Object[] { "GET_METADATA", luid }); + Object rep = send(new Object[] { "GET_METADATA", luid }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -523,7 +638,12 @@ public class RemoteLibrary extends BasicLibrary { @Override protected void onError(Exception e) { - Instance.getTraceHandler().error(e); + if (e instanceof SSLException) { + Instance.getTraceHandler().error( + "Connection refused (bad key)"); + } else { + Instance.getTraceHandler().error(e); + } } }.connect(); } catch (Exception e) { @@ -532,35 +652,4 @@ 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); - } }