From 3e35775012d2800d53d83ebe5083121479d83720 Mon Sep 17 00:00:00 2001 From: Nils Schwabe Date: Thu, 10 Apr 2014 16:34:34 +0200 Subject: Added some functionallity to the ImageProcessor. Database using is missing! --- .../org/openslx/imagemaster/server/MasterFtplet.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/main/java/org/openslx/imagemaster/server/MasterFtplet.java') diff --git a/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java b/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java index a1b9a90..479729d 100644 --- a/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java +++ b/src/main/java/org/openslx/imagemaster/server/MasterFtplet.java @@ -9,14 +9,17 @@ import org.apache.ftpserver.ftplet.FtpSession; import org.apache.ftpserver.ftplet.Ftplet; import org.apache.ftpserver.ftplet.FtpletContext; import org.apache.ftpserver.ftplet.FtpletResult; +import org.apache.ftpserver.ftplet.UserManager; import org.apache.log4j.Logger; +import org.openslx.imagemaster.db.ImageProcessor; public class MasterFtplet implements Ftplet { private static Logger log = Logger.getLogger(Ftplet.class); + private UserManager userManager; @Override public void init(FtpletContext ftpletContext) throws FtpException { - // not used + userManager = ftpletContext.getUserManager(); } @Override @@ -37,9 +40,18 @@ public class MasterFtplet implements Ftplet { public FtpletResult afterCommand(FtpSession session, FtpRequest request, FtpReply reply) throws FtpException, IOException { if (session.getUser() != null) { - log.info(session.getUser().getName() + " is done with command: " + request.getRequestLine()); - // TODO: delete temporary user - ImageProcessor.processImageAfterUpload(session.getUser().getName(), request.getRequestLine().split(" ")[1]); + String username = session.getUser().getName(); + String command = request.getRequestLine(); + log.info(username + " is done with command: " + command); + if (request.getCommand().equals("STOR")) { + try { + userManager.delete(username); + } catch (FtpException e) { + } finally { + log.info("Stored file and deleted user: '" + username + "'"); + ImageProcessor.processImageAfterUpload(username, command.split(" ")[1]); + } + } } return null; } -- cgit v1.2.3-55-g7522