X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=077a857cf9a748ddbd242b1af625b853ecf6d75e;hb=5db598bc6386aaabe69f2eed55b03625c72c236b;hp=6e3380b4a2239a074c26750436f8abc0df368e12;hpb=651072f36310e996632979953e71275d3cbed5a3;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 6e3380b..077a857 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -25,6 +25,34 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject; * @author niki */ public class RemoteLibrary extends BasicLibrary { + interface RemoteAction { + public void action(ConnectActionClientObject action) throws Exception; + } + + class RemoteConnectAction extends ConnectActionClientObject { + public RemoteConnectAction() throws IOException { + super(host, port, key); + } + + @Override + public Object send(Object data) throws IOException, + NoSuchFieldException, NoSuchMethodException, + ClassNotFoundException { + Object rep = super.send(data); + if (rep instanceof RemoteLibraryException) { + RemoteLibraryException remoteEx = (RemoteLibraryException) rep; + IOException cause = remoteEx.getCause(); + if (cause == null) { + cause = new IOException("IOException"); + } + + throw cause; + } + + return rep; + } + } + private String host; private int port; private final String key; @@ -109,23 +137,13 @@ public class RemoteLibrary extends BasicLibrary { 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 { - new ConnectActionClientObject(host, port, key) { + new RemoteConnectAction() { @Override public void action(Version serverVersion) throws Exception { Object rep = send(new Object[] { subkey, "PING" }); @@ -143,11 +161,11 @@ public class RemoteLibrary extends BasicLibrary { @Override protected void onError(Exception e) { - // if (e instanceof SSLException) { - result[0] = Status.UNAUTHORIZED; - // } else { - // result[0] = Status.UNAVAILABLE; - // } + if (e instanceof SSLException) { + result[0] = Status.UNAUTHORIZED; + } else { + result[0] = Status.UNAVAILABLE; + } } }.connect(); } catch (UnknownHostException e) { @@ -163,140 +181,84 @@ public class RemoteLibrary extends BasicLibrary { @Override public Image getCover(final String luid) { - if (!check()) { - return null; - } - final Image[] result = new Image[1]; - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { subkey, "GET_COVER", luid }); - result[0] = (Image) rep; - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (Exception e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Object rep = action.send(new Object[] { subkey, "GET_COVER", + luid }); + result[0] = (Image) rep; + } + }); return result[0]; } @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, key) { - @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { subkey, - "GET_CUSTOM_COVER", type, source }); - result[0] = (Image) rep; - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (Exception e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Object rep = action.send(new Object[] { subkey, + "GET_CUSTOM_COVER", type, source }); + result[0] = (Image) rep; + } + }); return result[0]; } @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, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - if (pg == null) { - pg = new Progress(); - } - - Object rep = send(new Object[] { subkey, "GET_STORY", luid }); + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; + if (pg == null) { + pg = new Progress(); + } - MetaData meta = null; - if (rep instanceof MetaData) { - meta = (MetaData) rep; - if (meta.getWords() <= Integer.MAX_VALUE) { - pg.setMinMax(0, (int) meta.getWords()); - } - } + Object rep = action.send(new Object[] { subkey, "GET_STORY", + luid }); - List list = new ArrayList(); - for (Object obj = send(null); obj != null; obj = send(null)) { - list.add(obj); - pg.add(1); + MetaData meta = null; + if (rep instanceof MetaData) { + meta = (MetaData) rep; + if (meta.getWords() <= Integer.MAX_VALUE) { + pg.setMinMax(0, (int) meta.getWords()); } - - result[0] = RemoteLibraryServer.rebuildStory(list); - pg.done(); } - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } + List list = new ArrayList(); + for (Object obj = action.send(null); obj != null; obj = action + .send(null)) { + list.add(obj); + pg.add(1); } - }.connect(); - } catch (Exception e) { - Instance.getTraceHandler().error(e); - } + + result[0] = RemoteLibraryServer.rebuildStory(list); + pg.done(); + } + }); return result[0]; } @@ -304,9 +266,6 @@ 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(); @@ -321,37 +280,28 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pgSave; - new ConnectActionClientObject(host, port, key) { + connectRemoteAction(new RemoteAction() { @Override - public void action(Version serverVersion) throws Exception { + public void action(ConnectActionClientObject action) + throws Exception { Progress pg = pgF; if (story.getMeta().getWords() <= Integer.MAX_VALUE) { pg.setMinMax(0, (int) story.getMeta().getWords()); } - send(new Object[] { subkey, "SAVE_STORY", luid }); + action.send(new Object[] { subkey, "SAVE_STORY", luid }); List list = RemoteLibraryServer.breakStory(story); for (Object obj : list) { - send(obj); + action.send(obj); pg.add(1); } - luidSaved[0] = (String) send(null); + luidSaved[0] = (String) action.send(null); pg.done(); } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); + }); // because the meta changed: MetaData meta = getInfo(luidSaved[0]); @@ -371,82 +321,41 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized void delete(final String luid) throws IOException { - if (!check()) { - throw new IOException("Library not ready"); - } - - new ConnectActionClientObject(host, port, key) { + connectRemoteAction(new RemoteAction() { @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { subkey, "DELETE_STORY", luid }); + public void action(ConnectActionClientObject action) + throws Exception { + action.send(new Object[] { subkey, "DELETE_STORY", luid }); } - - @Override - protected void onError(Exception 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, key) { - @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { subkey, "SET_COVER", type, value, luid }); - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + action.send(new Object[] { subkey, "SET_COVER", type, value, + luid }); + } + }); } @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); @@ -467,40 +376,27 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pgImprt; final String[] luid = new String[1]; - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - - Object rep = send(new Object[] { subkey, "IMPORT", - url.toString() }); + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; - while (true) { - if (!RemoteLibraryServer.updateProgress(pg, rep)) { - break; - } + Object rep = action.send(new Object[] { subkey, "IMPORT", + url.toString() }); - rep = send(null); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; } - pg.done(); - luid[0] = (String) rep; + rep = action.send(null); } - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + pg.done(); + luid[0] = (String) rep; + } + }); if (luid[0] == null) { throw new IOException("Remote failure"); @@ -518,42 +414,26 @@ 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, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - - Object rep = send(new Object[] { subkey, "CHANGE_STA", - luid, newSource, newTitle, newAuthor }); - while (true) { - if (!RemoteLibraryServer.updateProgress(pg, rep)) { - break; - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; - rep = send(null); + Object rep = action.send(new Object[] { subkey, "CHANGE_STA", + luid, newSource, newTitle, newAuthor }); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; } - } - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } + rep = action.send(null); } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + } + }); } @Override @@ -566,38 +446,17 @@ public class RemoteLibrary extends BasicLibrary { * Stop the server. */ public void exit() { - if (!check()) { - return; - } - - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { subkey, "EXIT" }); - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + action.send(new Object[] { subkey, "EXIT" }); + } + }); } @Override public synchronized MetaData getInfo(String luid) { - if (!check()) { - return null; - } - List metas = getMetasList(luid, null); if (!metas.isEmpty()) { return metas.get(0); @@ -655,40 +514,49 @@ 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, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - if (pg == null) { - pg = new Progress(); - } - - Object rep = send(new Object[] { subkey, "GET_METADATA", - luid }); + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; + if (pg == null) { + pg = new Progress(); + } - while (true) { - if (!RemoteLibraryServer.updateProgress(pg, rep)) { - break; - } + Object rep = action.send(new Object[] { subkey, "GET_METADATA", + luid }); - rep = send(null); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; } - if (rep instanceof MetaData[]) { - for (MetaData meta : (MetaData[]) rep) { - metas.add(meta); - } - } else if (rep != null) { - metas.add((MetaData) rep); + rep = action.send(null); + } + + if (rep instanceof MetaData[]) { + for (MetaData meta : (MetaData[]) rep) { + metas.add(meta); } + } else if (rep != null) { + metas.add((MetaData) rep); + } + } + }); + + return metas; + } + + private void connectRemoteAction(final RemoteAction runAction) { + try { + final RemoteConnectAction[] array = new RemoteConnectAction[1]; + RemoteConnectAction ra = new RemoteConnectAction() { + @Override + public void action(Version serverVersion) throws Exception { + runAction.action(array[0]); } @Override @@ -700,11 +568,11 @@ public class RemoteLibrary extends BasicLibrary { Instance.getTraceHandler().error(e); } } - }.connect(); + }; + array[0] = ra; + ra.connect(); } catch (Exception e) { Instance.getTraceHandler().error(e); } - - return metas; } }