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;
try {
Instance.getTraceHandler().trace("Getting remote lib status...");
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
try {
- Object rep = sendCmd(this, new Object[] { "PING" });
+ Object rep = send(new Object[] { "PING" });
if ("PONG".equals(rep)) {
result[0] = Status.READY;
final Image[] result = new Image[1];
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = sendCmd(this,
- new Object[] { "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, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- Object rep = sendCmd(this, new Object[] {
- "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, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
pg = new Progress();
}
- Object rep = sendCmd(this,
- new Object[] { "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, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
pg.setMinMax(0, (int) story.getMeta().getWords());
}
- sendCmd(this, new Object[] { "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, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this, new Object[] { "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, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this,
- new Object[] { "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, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
- Object rep = sendCmd(this,
- new Object[] { "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, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
- Object rep = sendCmd(this, new Object[] { "CHANGE_STA",
- luid, newSource, newTitle, newAuthor });
+ Object rep = send(new Object[] { "CHANGE_STA", luid,
+ newSource, newTitle, newAuthor });
while (true) {
if (!RemoteLibraryServer.updateProgress(pg, rep)) {
break;
*/
public void exit() {
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
- sendCmd(this, new Object[] { "EXIT" });
+ send(new Object[] { "EXIT" });
}
@Override
final List<MetaData> metas = new ArrayList<MetaData>();
try {
- new ConnectActionClientObject(host, port, false) {
+ new ConnectActionClientObject(host, port, key) {
@Override
public void action(Version serverVersion) throws Exception {
Progress pg = pgF;
pg = new Progress();
}
- Object rep = sendCmd(this, new Object[] { "GET_METADATA",
- luid });
+ Object rep = send(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);
- }
}