From 27eba894912a5b9a748d85c647f2f3a5b3a8a1c4 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Mon, 22 Apr 2019 11:22:49 +0200 Subject: [PATCH] sercer: fix one arg cmd, traces --- .../nikiroo/fanfix/library/RemoteLibrary.java | 17 +++++------------ .../fanfix/library/RemoteLibraryServer.java | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 884eee9..3318c12 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -134,8 +134,8 @@ public class RemoteLibrary extends BasicLibrary { new ConnectActionClientObject(host, port, false) { @Override public void action(Version serverVersion) throws Exception { - Object rep = sendCmd(this, - new Object[] { "GET_CUSTOM_COVER", type, source }); + Object rep = sendCmd(this, new Object[] { + "GET_CUSTOM_COVER", type, source }); result[0] = (Image) rep; } @@ -177,8 +177,7 @@ public class RemoteLibrary extends BasicLibrary { } List list = new ArrayList(); - for (Object obj = send(null); obj != null; obj = send( - null)) { + for (Object obj = send(null); obj != null; obj = send(null)) { list.add(obj); pg.add(1); } @@ -500,9 +499,8 @@ public class RemoteLibrary extends BasicLibrary { pg = new Progress(); } - - Object rep = sendCmd(this, - new Object[] { "GET_METADATA", luid }); + Object rep = sendCmd(this, new Object[] { "GET_METADATA", + luid }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { @@ -540,11 +538,6 @@ public class RemoteLibrary extends BasicLibrary { Object rep = action.send(params); String hash = hashKey(key, "" + rep); - rep = action.send(hash); - if (rep == null) { - throw new java.lang.IllegalArgumentException(); - } - return action.send(hash); } diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index f0d5f7a..a40103c 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -87,7 +87,7 @@ public class RemoteLibraryServer extends ServerObject { Object[] args = new Object[0]; if (data instanceof Object[]) { Object[] dataArray = (Object[]) data; - if (dataArray.length >= 2) { + if (dataArray.length > 0) { command = "" + dataArray[0]; args = new Object[dataArray.length - 1]; -- 2.27.0