X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=3e0e192d1806abb2e7d4bd270f0e808821c20991;hb=878ec53820a09ab01397bfe74b3e0f3884e6f9cd;hp=f1ff214d5671f3cf52bc4a82e1472a2d9b9e414f;hpb=210465c33ff5e9b45e7afe808c18b23c4cf14b38;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index f1ff214..3e0e192 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -21,10 +21,35 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject;
* This {@link BasicLibrary} will access a remote server to list the available
* stories, and download the ones you try to load to the local directory
* specified in the configuration.
+ *
+ * This remote library uses a custom fanfix:// protocol.
*
* @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;
+ throw remoteEx.unwrapException();
+ }
+
+ return rep;
+ }
+ }
+
private String host;
private int port;
private final String key;
@@ -33,13 +58,11 @@ public class RemoteLibrary extends BasicLibrary {
// informative only (server will make the actual checks)
private boolean rw;
- // TODO: error handling is not up to par!
-
/**
* Create a {@link RemoteLibrary} linked to the given server.
*
* Note that the key is structured:
- * xxx (|yyy |wl )(|rw )
+ * xxx (|yyy (|wl )(|bl )(|rw )
*
* Note that anything before the first pipe (| ) character is
* considered to be the encryption key, anything after that character is
@@ -54,16 +77,16 @@ public class RemoteLibrary extends BasicLibrary {
*
yyy : the secondary key
* rw : flag to allow read and write access if it is not the
* default on this server
- * wl : flag to allow access to all the stories (bypassing the
- * whitelist if it exists)
+ * bl : flag to bypass the blacklist (if it exists)
+ * wl : flag to bypass the whitelist if it exists
*
- *
+ *
* Some examples:
*
* my_key : normal connection, will take the default server
* options
- * my_key|agzyzz|wl : will ask to bypass the white list (if it
- * exists)
+ * my_key|agzyzz|wl|bl : will ask to bypass the black list and the
+ * white list (if it exists)
* my_key|agzyzz|rw : will ask read-write access (if the default
* is read-only)
* my_key|agzyzz|wl|rw : will ask both read-write access and white
@@ -92,50 +115,45 @@ public class RemoteLibrary extends BasicLibrary {
this.subkey = "";
}
+ if (host.startsWith("fanfix://")) {
+ host = host.substring("fanfix://".length());
+ }
+
this.host = host;
this.port = port;
}
@Override
public String getLibraryName() {
- return host + ":" + port;
+ return (rw ? "[READ-ONLY] " : "") + "fanfix://" + host + ":" + port;
}
@Override
public Status getStatus() {
- Instance.getTraceHandler().trace("Getting remote lib status...");
+ Instance.getInstance().getTraceHandler()
+ .trace("Getting remote lib status...");
Status status = getStatusDo();
- Instance.getTraceHandler().trace("Remote lib status: " + status);
+ Instance.getInstance().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;
-
+ result[0] = null;
try {
- new ConnectActionClientObject(host, port, key) {
+ new RemoteConnectAction() {
@Override
public void action(Version serverVersion) throws Exception {
Object rep = send(new Object[] { subkey, "PING" });
if ("r/w".equals(rep)) {
rw = true;
- result[0] = Status.READY;
+ result[0] = Status.READ_WRITE;
} else if ("r/o".equals(rep)) {
rw = false;
- result[0] = Status.READY;
+ result[0] = Status.READ_ONLY;
} else {
result[0] = Status.UNAUTHORIZED;
}
@@ -162,141 +180,87 @@ public class RemoteLibrary extends BasicLibrary {
}
@Override
- public Image getCover(final String luid) {
- if (!check()) {
- return null;
- }
-
+ public Image getCover(final String luid) throws IOException {
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;
- }
-
+ public Image getCustomSourceCover(final String source) throws IOException {
return getCustomCover(source, "SOURCE");
}
@Override
- public Image getCustomAuthorCover(final String author) {
- if (!check()) {
- return null;
- }
-
+ public Image getCustomAuthorCover(final String author) throws IOException {
return getCustomCover(author, "AUTHOR");
}
// type: "SOURCE" or "AUTHOR"
- private Image getCustomCover(final String source, final String type) {
- if (!check()) {
- return null;
- }
-
+ private Image getCustomCover(final String source, final String type)
+ throws IOException {
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;
- }
-
+ public synchronized Story getStory(final String luid, Progress pg)
+ throws IOException {
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 +268,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 +282,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,83 +323,45 @@ 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 {
- send(new Object[] { subkey, "DELETE_STORY", luid });
- }
-
+ connectRemoteAction(new RemoteAction() {
@Override
- protected void onError(Exception e) {
- if (e instanceof SSLException) {
- Instance.getTraceHandler().error(
- "Connection refused (bad key)");
- } else {
- Instance.getTraceHandler().error(e);
- }
+ public void action(ConnectActionClientObject action)
+ throws Exception {
+ action.send(new Object[] { subkey, "DELETE_STORY", luid });
}
- }.connect();
+ });
}
@Override
- public void setSourceCover(final String source, final String luid) {
- if (!check()) {
- return;
- }
-
+ public void setSourceCover(final String source, final String luid)
+ throws IOException {
setCover(source, luid, "SOURCE");
}
@Override
- public void setAuthorCover(final String author, final String luid) {
- if (!check()) {
- return;
- }
-
+ public void setAuthorCover(final String author, final String luid)
+ throws IOException {
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);
- }
+ final String type) throws IOException {
+ 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;
- }
-
+ public MetaData 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);
}
@@ -458,59 +372,37 @@ public class RemoteLibrary extends BasicLibrary {
pg = new Progress();
}
- pg.setMinMax(0, 2);
- Progress pgImprt = new Progress();
- Progress pgGet = new Progress();
- pg.addProgress(pgImprt, 1);
- pg.addProgress(pgGet, 1);
-
- final Progress pgF = pgImprt;
+ final Progress pgF = pg;
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");
}
- Story story = getStory(luid[0], pgGet);
- pgGet.done();
-
pg.done();
- return story;
+ return getInfo(luid[0]);
}
@Override
@@ -518,86 +410,55 @@ 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
- public synchronized File getFile(final String luid, Progress pg) {
+ public File getFile(final String luid, Progress pg) {
throw new java.lang.InternalError(
"Operation not supportorted on remote Libraries");
}
/**
* Stop the server.
+ *
+ * @throws IOException
+ * in case of I/O errors
+ * @throws SSLException
+ * when the key was not accepted
*/
- 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);
- }
+ public void stop() throws IOException, SSLException {
+ connectRemoteAction(new RemoteAction() {
+ @Override
+ public void action(ConnectActionClientObject action)
+ throws Exception {
+ action.send(new Object[] { subkey, "EXIT" });
+ Thread.sleep(100);
+ }
+ });
}
@Override
- public synchronized MetaData getInfo(String luid) {
- if (!check()) {
- return null;
- }
-
+ public MetaData getInfo(String luid) throws IOException {
List metas = getMetasList(luid, null);
if (!metas.isEmpty()) {
return metas.get(0);
@@ -607,7 +468,7 @@ public class RemoteLibrary extends BasicLibrary {
}
@Override
- protected List getMetas(Progress pg) {
+ protected List getMetas(Progress pg) throws IOException {
return getMetasList("*", pg);
}
@@ -624,7 +485,7 @@ public class RemoteLibrary extends BasicLibrary {
// The following methods are only used by Save and Delete in BasicLibrary:
@Override
- protected int getNextId() {
+ protected String getNextId() {
throw new java.lang.InternalError("Should not have been called");
}
@@ -651,60 +512,78 @@ public class RemoteLibrary extends BasicLibrary {
* @param pg
* the optional progress
*
- *
* @return the metas
+ *
+ * @throws IOException
+ * in case of I/O error or bad key (SSLException)
*/
- private List getMetasList(final String luid, Progress pg) {
- if (!check()) {
- return null;
- }
-
+ private List getMetasList(final String luid, Progress pg)
+ throws IOException {
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)
+ throws IOException {
+ final IOException[] err = new IOException[1];
+ try {
+ final RemoteConnectAction[] array = new RemoteConnectAction[1];
+ RemoteConnectAction ra = new RemoteConnectAction() {
+ @Override
+ public void action(Version serverVersion) throws Exception {
+ runAction.action(array[0]);
}
@Override
protected void onError(Exception e) {
- if (e instanceof SSLException) {
- Instance.getTraceHandler().error(
- "Connection refused (bad key)");
- } else {
- Instance.getTraceHandler().error(e);
+ if (!(e instanceof IOException)) {
+ Instance.getInstance().getTraceHandler().error(e);
+ return;
}
+
+ err[0] = (IOException) e;
}
- }.connect();
+ };
+ array[0] = ra;
+ ra.connect();
} catch (Exception e) {
- Instance.getTraceHandler().error(e);
+ err[0] = (IOException) e;
}
- return metas;
+ if (err[0] != null) {
+ throw err[0];
+ }
}
}