*/
public RemoteLibraryServer(String key, int port) throws IOException {
super("Fanfix remote library", port, key);
- setTraceHandler(Instance.getTraceHandler());
+ setTraceHandler(Instance.getInstance().getTraceHandler());
}
@Override
}
}
- List<String> whitelist = Instance.getConfig().getList(
- Config.SERVER_WHITELIST);
+ List<String> whitelist = Instance.getInstance().getConfig().getList(Config.SERVER_WHITELIST);
if (whitelist == null) {
whitelist = new ArrayList<String>();
}
wl = false;
}
- rw = Instance.getConfig().getBoolean(Config.SERVER_RW, rw);
+ rw = Instance.getInstance().getConfig().getBoolean(Config.SERVER_RW, rw);
if (!subkey.isEmpty()) {
- List<String> allowed = Instance.getConfig().getList(
- Config.SERVER_ALLOWED_SUBKEYS);
+ List<String> allowed = Instance.getInstance().getConfig().getList(Config.SERVER_ALLOWED_SUBKEYS);
if (allowed.contains(subkey)) {
if ((subkey + "|").contains("|rw|")) {
rw = true;
}
if ((subkey + "|").contains("|wl|")) {
wl = false; // |wl| = bypass whitelist
+ whitelist = new ArrayList<String>();
}
}
}
for (Object arg : args) {
trace += arg + " ";
}
- System.out.println(trace);
-
- Object rep = doRequest(action, command, args, rw, whitelist);
+ long now = System.currentTimeMillis();
+ System.out.println(StringUtils.fromTime(now) + ": " + trace);
+
+ Object rep = null;
+ try {
+ rep = doRequest(action, command, args, rw, whitelist);
+ } catch (IOException e) {
+ rep = new RemoteLibraryException(e, true);
+ }
commands.put(id, command);
wls.put(id, wl);
String rec = StringUtils.formatNumber(bytesReceived) + "b";
String sent = StringUtils.formatNumber(bytesSent) + "b";
- System.out.println(String.format("%s[>%s]: (%s sent, %s rec) in %d ms",
- display(whitelist, rw), commands.get(id), sent, rec,
- times.get(id)));
+ long now = System.currentTimeMillis();
+ System.out.println(StringUtils.fromTime(now)
+ + ": "
+ + String.format("%s[>%s]: (%s sent, %s rec) in %d ms",
+ display(whitelist, rw), commands.get(id), sent, rec,
+ times.get(id)));
commands.remove(id);
times.remove(id);
if ("PING".equals(command)) {
return rw ? "r/w" : "r/o";
} else if ("GET_METADATA".equals(command)) {
+ List<MetaData> metas = new ArrayList<MetaData>();
+
if ("*".equals(args[0])) {
Progress pg = createPgForwarder(action);
- List<MetaData> metas = new ArrayList<MetaData>();
-
- for (MetaData meta : Instance.getLibrary().getMetas(pg)) {
+ for (MetaData meta : Instance.getInstance().getLibrary().getMetas(pg)) {
MetaData light;
if (meta.getCover() == null) {
light = meta;
}
forcePgDoneSent(pg);
- return metas.toArray(new MetaData[] {});
+ } else {
+ MetaData meta = Instance.getInstance().getLibrary().getInfo((String) args[0]);
+ MetaData light;
+ if (meta.getCover() == null) {
+ light = meta;
+ } else {
+ light = meta.clone();
+ light.setCover(null);
+ }
+
+ metas.add(light);
}
- return new MetaData[] { Instance.getLibrary().getInfo(
- (String) args[0]) };
+ if (!whitelist.isEmpty()) {
+ for (int i = 0; i < metas.size(); i++) {
+ if (!whitelist.contains(metas.get(i).getSource())) {
+ metas.remove(i);
+ i--;
+ }
+ }
+ }
+
+ return metas.toArray(new MetaData[0]);
} else if ("GET_STORY".equals(command)) {
- MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
+ MetaData meta = Instance.getInstance().getLibrary().getInfo((String) args[0]);
+ if (meta == null) {
+ return null;
+ }
+
+ if (!whitelist.isEmpty()) {
+ if (!whitelist.contains(meta.getSource())) {
+ return null;
+ }
+ }
+
meta = meta.clone();
meta.setCover(null);
action.send(meta);
action.rec();
- Story story = Instance.getLibrary()
- .getStory((String) args[0], null);
+ Story story = Instance.getInstance().getLibrary().getStory((String) args[0], null);
for (Object obj : breakStory(story)) {
action.send(obj);
action.rec();
}
} else if ("SAVE_STORY".equals(command)) {
+ if (!rw) {
+ throw new RemoteLibraryException("Read-Only remote library: "
+ + args[0], false);
+ }
+
List<Object> list = new ArrayList<Object>();
action.send(null);
}
Story story = rebuildStory(list);
- Instance.getLibrary().save(story, (String) args[0], null);
+ Instance.getInstance().getLibrary().save(story, (String) args[0], null);
return story.getMeta().getLuid();
} else if ("IMPORT".equals(command)) {
+ if (!rw) {
+ throw new RemoteLibraryException("Read-Only remote library: "
+ + args[0], false);
+ }
+
Progress pg = createPgForwarder(action);
- Story story = Instance.getLibrary().imprt(
- new URL((String) args[0]), pg);
+ MetaData meta = Instance.getInstance().getLibrary().imprt(new URL((String) args[0]), pg);
forcePgDoneSent(pg);
- return story.getMeta().getLuid();
+ return meta.getLuid();
} else if ("DELETE_STORY".equals(command)) {
- Instance.getLibrary().delete((String) args[0]);
+ if (!rw) {
+ throw new RemoteLibraryException("Read-Only remote library: "
+ + args[0], false);
+ }
+
+ Instance.getInstance().getLibrary().delete((String) args[0]);
} else if ("GET_COVER".equals(command)) {
- return Instance.getLibrary().getCover((String) args[0]);
+ return Instance.getInstance().getLibrary().getCover((String) args[0]);
} else if ("GET_CUSTOM_COVER".equals(command)) {
if ("SOURCE".equals(args[0])) {
- return Instance.getLibrary().getCustomSourceCover(
- (String) args[1]);
+ return Instance.getInstance().getLibrary().getCustomSourceCover((String) args[1]);
} else if ("AUTHOR".equals(args[0])) {
- return Instance.getLibrary().getCustomAuthorCover(
- (String) args[1]);
+ return Instance.getInstance().getLibrary().getCustomAuthorCover((String) args[1]);
} else {
return null;
}
} else if ("SET_COVER".equals(command)) {
+ if (!rw) {
+ throw new RemoteLibraryException("Read-Only remote library: "
+ + args[0] + ", " + args[1], false);
+ }
+
if ("SOURCE".equals(args[0])) {
- Instance.getLibrary().setSourceCover((String) args[1],
- (String) args[2]);
+ Instance.getInstance().getLibrary().setSourceCover((String) args[1], (String) args[2]);
} else if ("AUTHOR".equals(args[0])) {
- Instance.getLibrary().setAuthorCover((String) args[1],
- (String) args[2]);
+ Instance.getInstance().getLibrary().setAuthorCover((String) args[1], (String) args[2]);
}
} else if ("CHANGE_STA".equals(command)) {
+ if (!rw) {
+ throw new RemoteLibraryException("Read-Only remote library: " + args[0] + ", " + args[1], false);
+ }
+
Progress pg = createPgForwarder(action);
- Instance.getLibrary().changeSTA((String) args[0], (String) args[1],
- (String) args[2], (String) args[3], pg);
+ Instance.getInstance().getLibrary().changeSTA((String) args[0], (String) args[1], (String) args[2],
+ (String) args[3], pg);
forcePgDoneSent(pg);
} else if ("EXIT".equals(command)) {
- stop(0, false);
+ if (!rw) {
+ throw new RemoteLibraryException(
+ "Read-Only remote library: EXIT", false);
+ }
+
+ stop(10000, false);
}
return null;
@Override
protected void onError(Exception e) {
if (e instanceof SSLException) {
- System.out.println("[Client connection refused (bad key)]");
+ long now = System.currentTimeMillis();
+ System.out.println(StringUtils.fromTime(now) + ": "
+ + "[Client connection refused (bad key)]");
} else {
getTraceHandler().error(e);
}
git://git.nikiroo.be / nikiroo-utils.git / blobdiff