X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=d6bdd1568546d625477f5a0c4baaae1f5bc3708f;hb=a0565636356ec3cd0154397215eb38ea4400df0a;hp=44d39adbcc30d8b6867aaf5fd4961ac0dc00bac9;hpb=efa3c511f39ab1432675e3b75b9b7b32d579f1c3;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 44d39ad..d6bdd15 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,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,12 +56,13 @@ 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, 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 { @@ -71,10 +72,13 @@ public class RemoteLibrary extends BasicLibrary { @Override protected void onError(Exception e) { - result[0] = Status.UNAVAILABLE; + if (e instanceof SSLException) { + result[0] = Status.UNAUTORIZED; + } else { + 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,16 +96,21 @@ public class RemoteLibrary extends BasicLibrary { 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) { @@ -119,21 +121,36 @@ public class RemoteLibrary extends BasicLibrary { } @Override - public Image getSourceCover(final String source) { + 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, key) { @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { md5, "GET_SOURCE_COVER", + 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) { @@ -149,15 +166,15 @@ public class RemoteLibrary extends BasicLibrary { 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 +196,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) { @@ -205,15 +227,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 +250,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 +277,52 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized void delete(final String luid) throws IOException { - new ConnectActionClientObject(host, port, true) { + 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) { + 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, 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 +333,13 @@ public class RemoteLibrary extends BasicLibrary { @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(); } @@ -299,13 +354,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)) { @@ -321,7 +375,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) { @@ -341,18 +400,19 @@ public class RemoteLibrary extends BasicLibrary { @Override // Could work (more slowly) without it - public synchronized void changeSource(final String luid, - final String newSource, Progress pg) throws IOException { + 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, key) { @Override - public void action(Version serverVersion) throws Exception { + public void action() throws Exception { Progress pg = pgF; - Object rep = send(new Object[] { md5, "CHANGE_SOURCE", - luid, newSource }); + Object rep = send(new Object[] { "CHANGE_STA", luid, + newSource, newTitle, newAuthor }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { break; @@ -364,7 +424,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) { @@ -383,15 +448,20 @@ public class RemoteLibrary extends BasicLibrary { */ public void exit() { 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) { @@ -420,7 +490,7 @@ public class RemoteLibrary extends BasicLibrary { } @Override - protected void deleteInfo(String luid) { + protected void invalidateInfo(String luid) { // Will be taken care of directly server side } @@ -446,6 +516,8 @@ public class RemoteLibrary extends BasicLibrary { /** * 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 * @@ -460,15 +532,15 @@ public class RemoteLibrary extends BasicLibrary { 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)) { @@ -489,7 +561,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) {