remote string -> stream + encrypt

[fanfix.git] / src / be / nikiroo / fanfix / library / RemoteLibrary.java

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index ffcf8f19c9c34f2923a969443aaaaee69eba30b8..d6bdd1568546d625477f5a0c4baaae1f5bc3708f 100644 (file)
--- 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,13 +56,13 @@ public class RemoteLibrary extends BasicLibrary {
 
                result[0] = Status.INVALID;
 
-               ConnectActionClientObject action = null;
                try {
                        Instance.getTraceHandler().trace("Getting remote lib status...");
-                       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 {
@@ -72,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) {
@@ -84,14 +87,6 @@ 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];
        }
@@ -101,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) {
@@ -135,17 +135,22 @@ 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_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) {
@@ -161,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) {
@@ -191,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) {
@@ -217,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<Object> list = RemoteLibraryServer.breakStory(story);
                                for (Object obj : list) {
@@ -240,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();
 
@@ -262,15 +277,20 @@ 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();
        }
@@ -289,15 +309,20 @@ public class RemoteLibrary extends BasicLibrary {
        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_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) {
@@ -329,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)) {
@@ -351,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) {
@@ -377,12 +406,12 @@ public class RemoteLibrary extends BasicLibrary {
                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)) {
@@ -395,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) {
@@ -414,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) {
@@ -493,15 +532,15 @@ public class RemoteLibrary extends BasicLibrary {
                final List<MetaData> metas = new ArrayList<MetaData>();
 
                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)) {
@@ -522,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) {