From dc2e1c28b5306c7a66a13258f2d60dd139e16f32 Mon Sep 17 00:00:00 2001 From: Sweidan Omar Date: Mon, 6 Dec 2021 11:17:05 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32450 --- .../server/steps/NEXIO1TransferToStep.java | 67 ++++++++----------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIO1TransferToStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIO1TransferToStep.java index 5af53df1..e113d341 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIO1TransferToStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIO1TransferToStep.java @@ -1,54 +1,45 @@ package user.jobengine.server.steps; -import java.util.Arrays; -import java.util.List; - -import org.apache.commons.net.ftp.FTPClient; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import user.commons.StoreUri; -import user.commons.remotestore.FtpDirectoryLister; public class NEXIO1TransferToStep extends TransferStep { private static final Logger logger = LogManager.getLogger(); @Override @StepEntry - public Object[] execute(StoreUri sourceStoreUri, String sourceFileName, StoreUri targetStoreUri, String targetFileName) throws Exception { + public Object[] execute(StoreUri sourceStoreUri, String sourceFileName, StoreUri targetStoreUri, + String targetFileName) throws Exception { // - // try { - // String title = targetFileName; - // if (title.contains(".")) - // title = title.substring(0, title.lastIndexOf(".")); - // RemoteFile remoteFile = targetStoreUri.getFileWithContent(title + ".xml"); - // if (remoteFile != null && remoteFile.getContent() != null) { - // logger.info("File already exists on NEXIO1 {}", targetFileName); - // return null; - // } - // } catch (Exception e) { - // logger.error(e.getMessage()); - // } finally { - // targetStoreUri.cleanUp(); - // } -/* - try { - FTPClient client = ((FtpDirectoryLister) targetStoreUri.getLister()).connect(); - logger.info(getMarker(), "Reading target file list"); - List fileNames = Arrays.asList(client.listNames()); - logger.info(getMarker(), "Target file list reading completed, mediabase size is {}", fileNames.size()); - String title = targetFileName.replace(".mxf", ".lxf"); - boolean contains = fileNames.contains(title); - if (contains) { - logger.info(getMarker(), "File already exists {} on {}", title, getManager().getStore(targetStoreUri.getStoreId()).getName()); - return null; - } - } catch (Exception e) { - logger.catching(e); - } finally { - targetStoreUri.cleanUp(); - } -*/ + // try { + // String title = targetFileName; + // if (title.contains(".")) + // title = title.substring(0, title.lastIndexOf(".")); + // RemoteFile remoteFile = targetStoreUri.getFileWithContent(title + ".xml"); + // if (remoteFile != null && remoteFile.getContent() != null) { + // logger.info("File already exists on NEXIO1 {}", targetFileName); + // return null; + // } + // } catch (Exception e) { + // logger.error(e.getMessage()); + // } finally { + // targetStoreUri.cleanUp(); + // } + /* + * try { FTPClient client = ((FtpDirectoryLister) + * targetStoreUri.getLister()).connect(); logger.info(getMarker(), + * "Reading target file list"); List fileNames = + * Arrays.asList(client.listNames()); logger.info(getMarker(), + * "Target file list reading completed, mediabase size is {}", + * fileNames.size()); String title = targetFileName.replace(".mxf", ".lxf"); + * boolean contains = fileNames.contains(title); if (contains) { + * logger.info(getMarker(), "File already exists {} on {}", title, + * getManager().getStore(targetStoreUri.getStoreId()).getName()); return null; } + * } catch (Exception e) { logger.catching(e); } finally { + * targetStoreUri.cleanUp(); } + */ return super.execute(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); } } -- 2.54.0