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;
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 {
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" });
- if ("PONG".equals(rep)) {
- result[0] = Status.READY;
- } else {
+ try {
+ Object rep = send(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 = send(new Object[] { "GET_COVER", luid });
result[0] = (Image) rep;
}
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 });
+ Object rep = send(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 = send(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 });
+ send(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 });
+ send(new Object[] { "DELETE_STORY", luid });
}
@Override
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 });
+ send(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 = send(new Object[] { "IMPORT", url.toString() });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
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_STA", luid,
+ Object rep = send(new Object[] { "CHANGE_STA", luid,
newSource, newTitle, newAuthor });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
*/
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" });
+ send(new Object[] { "EXIT" });
}
@Override
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 = send(new Object[] { "GET_METADATA", luid });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {