update nikiroo-utils, remote lib errors need some work

[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 c2ed310b5da0fbf9f1e49dc57eacbb17c448e3fe..e35c57d146387ee3c582e08b398ba46dda792779 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -14,7 +14,6 @@ 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.Version;
 import be.nikiroo.utils.serial.server.ConnectActionClientObject;
 
 /**
@@ -29,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.
         * 
@@ -53,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, key) {
                                @Override
-                               public void action(Version serverVersion) throws Exception {
+                               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) {
-                                       if (e instanceof SSLException) {
-                                               result[0] = Status.UNAUTORIZED;
-                                       } else {
-                                               result[0] = Status.UNAVAILABLE;
-                                       }
+                                       // if (e instanceof SSLException) {
+                                       result[0] = Status.UNAUTHORIZED;
+                                       // } else {
+                                       // result[0] = Status.UNAVAILABLE;
+                                       // }
                                }
                        }.connect();
                } catch (UnknownHostException e) {
@@ -88,18 +105,21 @@ 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, key) {
                                @Override
-                               public void action(Version serverVersion) throws Exception {
+                               public void action() throws Exception {
                                        Object rep = send(new Object[] { "GET_COVER", luid });
                                        result[0] = (Image) rep;
                                }
@@ -123,22 +143,34 @@ 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, key) {
                                @Override
-                               public void action(Version serverVersion) throws Exception {
+                               public void action() throws Exception {
                                        Object rep = send(new Object[] { "GET_CUSTOM_COVER", type,
                                                        source });
                                        result[0] = (Image) rep;
@@ -163,13 +195,17 @@ 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, key) {
                                @Override
-                               public void action(Version serverVersion) throws Exception {
+                               public void action() throws Exception {
                                        Progress pg = pgF;
                                        if (pg == null) {
                                                pg = new Progress();
@@ -215,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();
@@ -230,7 +270,7 @@ public class RemoteLibrary extends BasicLibrary {
 
                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());
@@ -278,9 +318,13 @@ 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) {
                        @Override
-                       public void action(Version serverVersion) throws Exception {
+                       public void action() throws Exception {
                                send(new Object[] { "DELETE_STORY", luid });
                        }
 
@@ -298,21 +342,33 @@ public class RemoteLibrary extends BasicLibrary {
 
        @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 {
+                               public void action() throws Exception {
                                        send(new Object[] { "SET_COVER", type, value, luid });
                                }
 
@@ -334,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);
@@ -357,7 +417,7 @@ public class RemoteLibrary extends BasicLibrary {
                try {
                        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[] { "IMPORT", url.toString() });
@@ -404,12 +464,16 @@ 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 {
+                               public void action() throws Exception {
                                        Progress pg = pgF;
 
                                        Object rep = send(new Object[] { "CHANGE_STA", luid,
@@ -448,10 +512,14 @@ 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 {
+                               public void action() throws Exception {
                                        send(new Object[] { "EXIT" });
                                }
 
@@ -472,6 +540,10 @@ public class RemoteLibrary extends BasicLibrary {
 
        @Override
        public synchronized MetaData getInfo(String luid) {
+               if (!check()) {
+                       return null;
+               }
+
                List<MetaData> metas = getMetasList(luid, null);
                if (!metas.isEmpty()) {
                        return metas.get(0);
@@ -529,13 +601,17 @@ public class RemoteLibrary extends BasicLibrary {
         * @return the metas
         */
        private List<MetaData> getMetasList(final String luid, Progress pg) {
+               if (!check()) {
+                       return null;
+               }
+
                final Progress pgF = pg;
                final List<MetaData> metas = new ArrayList<MetaData>();
 
                try {
                        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();