X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=library%2FWebLibraryServer.java;h=56d78ed4de20b5a52583af21105043a07cc8e89f;hb=379a497e6fd2b959c57b2ff4023413e2daf36232;hp=b3d897d04bbbb8bf5ecc433cd4dee280e415c7e6;hpb=b063fe0a74fdf17f440a850bbb98a2de6233a679;p=fanfix.git

diff --git a/library/WebLibraryServer.java b/library/WebLibraryServer.java
index b3d897d..56d78ed 100644
--- a/library/WebLibraryServer.java
+++ b/library/WebLibraryServer.java
@@ -28,7 +28,6 @@ import be.nikiroo.utils.NanoHTTPD;
 import be.nikiroo.utils.NanoHTTPD.Response;
 import be.nikiroo.utils.NanoHTTPD.Response.Status;
 import be.nikiroo.utils.Progress;
-import be.nikiroo.utils.Progress.ProgressListener;
 
 public class WebLibraryServer extends WebLibraryServerHtml {
 	class WLoginResult extends LoginResult {
@@ -71,6 +70,8 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 
 	private Map<String, Progress> imprts = new HashMap<String, Progress>();
 
+	private boolean exiting;
+
 	public WebLibraryServer(boolean secure) throws IOException {
 		super(secure);
 
@@ -98,6 +99,56 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 		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);
@@ -166,9 +217,8 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 				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,
@@ -305,6 +355,11 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 					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];
 
@@ -385,6 +440,11 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 					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];
 
@@ -411,18 +471,15 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 					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();
 
-		// Keep the latest name
-		pg.addProgressListener(new ProgressListener() {
-			@Override
-			public void progress(Progress progress, String name) {
-				pg.setName(name);
-			}
-		});
-
 		synchronized (imprts) {
 			imprts.put(luid, pg);
 		}
@@ -486,6 +543,11 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 					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();