Added some functionallity to the ImageProcessor.

Database using is missing!

1 files changed, 7 insertions, 14 deletions

diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
index 258c490..7a24c43 100644
--- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java
+++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
@@ -6,6 +6,7 @@ import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.imagemaster.Globals;
 import org.openslx.imagemaster.db.DbSatellite;
+import org.openslx.imagemaster.db.ImageProcessor;
 import org.openslx.imagemaster.serversession.ServerAuthenticator;
 import org.openslx.imagemaster.serversession.ServerSession;
 import org.openslx.imagemaster.serversession.ServerSessionManager;
@@ -91,24 +92,17 @@ public class ApiServer {
 	public static FtpCredentials submitImage(ImageData imageDescription,
 			ServerSessionData serverSessionData) throws AuthorizationException,
 			TException {
-		/*
-		 * TODO:
-		 * Check if session is ok.
-		 * create and return FtpCredentials
-		 */
-
-		/*
-		 * FTP Users can be added later with: ftpServer.addUser(username,
-		 * password, ftp_root);
-		 * 
-		 * And removed with: removeUser(username);
-		 */
 		if (ServerSessionManager.getSession(serverSessionData.sessionId) == null) {
 			throw new AuthenticationException(AuthenticationError.GENERIC_ERROR, "No valid serverSessionData");
 		}
-
+		
 		String generatedUser = RandomString.generate(10, false);
 		String generatedPass = RandomString.generate(16, true);
+		
+		if (!ImageProcessor.addImageDataToProcess(imageDescription, generatedUser)) {
+			throw new TException("ImageData is not valid. Does this image exist already?");
+		}
+
 		String dir = Globals.properties.getProperty("ftp_base_dir") + "/"
 				+ generatedUser + "/";
 		if (new File(dir).mkdir()) {
@@ -116,7 +110,6 @@ public class ApiServer {
 			log.info("Generated user/pass: " + generatedUser + "\t"
 					+ generatedPass + "\n with home dir: " + dir);
 		}
-		// TODO: remove old user
 
 		return new FtpCredentials(generatedUser, generatedPass);
 	}