X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=e35c57d146387ee3c582e08b398ba46dda792779;hb=99206a39d3c58140402d2b4903f7436168d1d349;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..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; /** @@ -26,7 +26,9 @@ 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; + + // TODO: error handling is not up to par! /** * Create a {@link RemoteLibrary} linked to the given server. @@ -40,7 +42,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; } @@ -52,29 +54,49 @@ 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; - ConnectActionClientObject action = null; try { - action = new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { md5, "PING" }); + public void action() throws Exception { + Object rep = send(new Object[] { "PING" }); + if ("PONG".equals(rep)) { result[0] = Status.READY; } else { - result[0] = Status.UNAUTORIZED; + 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) { result[0] = Status.INVALID; } catch (IllegalArgumentException e) { @@ -83,32 +105,33 @@ public class RemoteLibrary extends BasicLibrary { result[0] = Status.UNAVAILABLE; } - if (action != null) { - try { - action.connect(); - } catch (Exception e) { - result[0] = Status.UNAVAILABLE; - } - } - 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, true) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { md5, "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) { @@ -120,20 +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, true) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { md5, - "GET_CUSTOM_SOURCE_COVER", 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) { @@ -145,19 +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, true) { + 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 = send(new Object[] { md5, "GET_STORY", luid }); + Object rep = send(new Object[] { "GET_STORY", luid }); MetaData meta = null; if (rep instanceof MetaData) { @@ -179,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) { @@ -192,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(); @@ -205,15 +268,15 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pgSave; - new ConnectActionClientObject(host, port, true) { + 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()); } - send(new Object[] { md5, "SAVE_STORY", luid }); + send(new Object[] { "SAVE_STORY", luid }); List list = RemoteLibraryServer.breakStory(story); for (Object obj : list) { @@ -228,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(); @@ -250,31 +318,68 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized void delete(final String luid) throws IOException { - new ConnectActionClientObject(host, port, true) { + if (!check()) { + throw new IOException("Library not ready"); + } + + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { md5, "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, true) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { md5, "SET_SOURCE_COVER", source, 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) { @@ -285,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); @@ -306,13 +415,12 @@ public class RemoteLibrary extends BasicLibrary { final String[] luid = new String[1]; try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; - Object rep = send(new Object[] { md5, "IMPORT", - url.toString() }); + Object rep = send(new Object[] { "IMPORT", url.toString() }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -328,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) { @@ -351,15 +464,19 @@ 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, true) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; - Object rep = send(new Object[] { md5, "CHANGE_STA", luid, + Object rep = send(new Object[] { "CHANGE_STA", luid, newSource, newTitle, newAuthor }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -372,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) { @@ -390,16 +512,25 @@ public class RemoteLibrary extends BasicLibrary { * Stop the server. */ public void exit() { + if (!check()) { + return; + } + try { - new ConnectActionClientObject(host, port, true) { + new ConnectActionClientObject(host, port, key) { @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { md5, "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) { @@ -409,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); @@ -466,19 +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, true) { + 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 = send(new Object[] { md5, "GET_METADATA", luid }); + Object rep = send(new Object[] { "GET_METADATA", luid }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -499,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) {