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.
* 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;
}
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" });
- if ("PONG".equals(rep)) {
- result[0] = Status.READY;
- } else {
+ try {
+ Object rep = sendCmd(this, new Object[] { "PING" });
+
+ if ("PONG".equals(rep)) {
+ result[0] = Status.READY;
+ } else {
+ result[0] = Status.UNAUTORIZED;
+ }
+ } catch (IllegalArgumentException e) {
result[0] = Status.UNAUTORIZED;
}
}
protected void onError(Exception e) {
result[0] = Status.UNAVAILABLE;
}
- };
-
+ }.connect();
} catch (UnknownHostException e) {
result[0] = Status.INVALID;
} catch (IllegalArgumentException e) {
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];
}
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 });
+ Object rep = sendCmd(this,
+ new Object[] { "GET_COVER", luid });
result[0] = (Image) rep;
}
@Override
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_CUSTOM_SOURCE_COVER", source });
+ Object rep = sendCmd(this, new Object[] {
+ "GET_CUSTOM_COVER", type, source });
result[0] = (Image) rep;
}
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 {
Progress pg = pgF;
pg = new Progress();
}
- Object rep = send(new Object[] { md5, "GET_STORY", luid });
+ Object rep = sendCmd(this,
+ new Object[] { "GET_STORY", luid });
MetaData meta = null;
if (rep instanceof MetaData) {
final Progress pgF = pgSave;
- new ConnectActionClientObject(host, port, true) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
pg.setMinMax(0, (int) story.getMeta().getWords());
}
- send(new Object[] { md5, "SAVE_STORY", luid });
+ sendCmd(this, new Object[] { "SAVE_STORY", luid });
List<Object> list = RemoteLibraryServer.breakStory(story);
for (Object obj : list) {
@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 });
+ sendCmd(this, new Object[] { "DELETE_STORY", luid });
}
@Override
@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 });
+ sendCmd(this,
+ new Object[] { "SET_COVER", type, value, luid });
}
@Override
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 {
Progress pg = pgF;
- Object rep = send(new Object[] { md5, "IMPORT",
- url.toString() });
+ Object rep = sendCmd(this,
+ new Object[] { "IMPORT", url.toString() });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
@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 {
Progress pg = pgF;
- Object rep = send(new Object[] { md5, "CHANGE_SOURCE",
- luid, newSource });
+ Object rep = sendCmd(this, new Object[] { "CHANGE_STA",
+ luid, newSource, newTitle, newAuthor });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
break;
*/
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" });
+ sendCmd(this, new Object[] { "EXIT" });
}
@Override
}
@Override
- protected void deleteInfo(String luid) {
+ protected void invalidateInfo(String luid) {
// Will be taken care of directly server side
}
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 {
Progress pg = pgF;
pg = new Progress();
}
- Object rep = send(new Object[] { md5, "GET_METADATA", luid });
+ Object rep = sendCmd(this, new Object[] { "GET_METADATA",
+ luid });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
return metas;
}
+
+ // IllegalArgumentException if key is bad
+ private Object sendCmd(ConnectActionClientObject action, Object[] params)
+ throws IOException, NoSuchFieldException, NoSuchMethodException,
+ ClassNotFoundException {
+ Object rep = action.send(params);
+
+ String hash = hashKey(key, "" + rep);
+ return action.send(hash);
+ }
+
+ /**
+ * Return a hash that corresponds to the given key and the given random
+ * value.
+ *
+ * @param key
+ * the key (the secret)
+ *
+ * @param random
+ * the random value
+ *
+ * @return a hash that was computed using both
+ */
+ static String hashKey(String key, String random) {
+ return StringUtils.getMd5Hash(key + " <==> " + random);
+ }
}