import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
private Map<String, Progress> imprts = new HashMap<String, Progress>();
+ private boolean exiting;
+
public WebLibraryServer(boolean secure) throws IOException {
super(secure);
new Thread(this).start();
}
+ @Override
+ protected Response stop(WLoginResult login) {
+ if (!login.isRw()) {
+ return NanoHTTPD.newFixedLengthResponse(Status.FORBIDDEN,
+ NanoHTTPD.MIME_PLAINTEXT, "Exit not allowed");
+ }
+
+ if (exiting) {
+ return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
+ NanoHTTPD.MIME_PLAINTEXT, "Server is already exiting...");
+ }
+
+ exiting = true;
+ Instance.getInstance().getTraceHandler().trace("Exiting");
+
+ boolean ok;
+ do {
+ synchronized (imprts) {
+ ok = imprts.isEmpty();
+ }
+ if (!ok) {
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ Instance.getInstance().getTraceHandler()
+ .trace("Waiting to exit...");
+ }
+ }
+ } while (!ok);
+
+ doStop();
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(1500);
+ } catch (InterruptedException e) {
+ }
+
+ Instance.getInstance().getTraceHandler()
+ .trace("Exit timeout: force-quit");
+ System.exit(0);
+ }
+ }, "Exit program after timeout of 1500 ms").start();
+
+ return NanoHTTPD.newFixedLengthResponse(Status.OK,
+ NanoHTTPD.MIME_PLAINTEXT, "Exited");
+ }
+
@Override
protected WLoginResult login(boolean badLogin, boolean badCookie) {
return new WLoginResult(false, false);
jsons.add(JsonIO.toJson(meta));
}
- return newInputStreamResponse("application/json",
- new ByteArrayInputStream(
- new JSONArray(jsons).toString().getBytes()));
+ return NanoHTTPD.newFixedLengthResponse(Status.OK,
+ "application/json", new JSONArray(jsons).toString());
}
return NanoHTTPD.newFixedLengthResponse(Status.BAD_REQUEST,
NanoHTTPD.MIME_PLAINTEXT, "SET story part not allowed");
}
+ if (exiting) {
+ return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
+ NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
+ }
+
String luid = uriParts[off + 0];
String type = uriParts[off + 1];
}
String type = uriParts[off + 0];
- String id = uriParts[off + 1];
+ String id = URLDecoder.decode(uriParts[off + 1], "UTF-8");
InputStream in = null;
NanoHTTPD.MIME_PLAINTEXT, "Cover request not allowed");
}
+ if (exiting) {
+ return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
+ NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
+ }
+
String type = uriParts[off + 0];
- String id = uriParts[off + 1];
+ String id = URLDecoder.decode(uriParts[off + 1], "UTF-8");
if ("source".equals(type)) {
sourceCover(id, login, luid);
NanoHTTPD.MIME_PLAINTEXT, "Import not allowed");
}
+ if (exiting) {
+ return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
+ NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
+ }
+
final URL url = new URL(urlStr);
final Progress pg = new Progress();
final String luid = lib.getNextId();
@Override
public void run() {
try {
- lib.imprt(url, pg);
+ lib.imprt(url, luid, pg);
} catch (IOException e) {
Instance.getInstance().getTraceHandler().error(e);
} finally {
NanoHTTPD.MIME_PLAINTEXT, "Delete not allowed");
}
+ if (exiting) {
+ return NanoHTTPD.newFixedLengthResponse(Status.SERVICE_UNAVAILABLE,
+ NanoHTTPD.MIME_PLAINTEXT, "Server is exiting...");
+ }
+
String luid = uriParts[off + 0];
BasicLibrary lib = Instance.getInstance().getLibrary();