From 93bc9691f97d8a7396e9bf3d564e102b8e39316e Mon Sep 17 00:00:00 2001
From: =?utf8?q?D=C3=A9nes=20Horv=C3=A1th?= <USER\denes.horvath>
Date: Fri, 6 Sep 2019 08:31:06 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31505

---
 .../config/config.xml                         |  2 +-
 .../jobtemplates/common-copy.xml              |  8 +--
 .../jobengine/server/steps/FileCopyStep.java  | 23 ++++---
 .../pages/directorylist.zul                   |  4 +-
 .../zk/model/DirectoryListModel.java          | 63 +++++--------------
 .../zk/model/MaestroJobListModel.java         | 57 ++++++++++-------
 .../jobengine/zk/model/TargetsListModel.java  | 31 +++++++--
 7 files changed, 95 insertions(+), 93 deletions(-)

diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml
index 93d01f23..8e3d1772 100644
--- a/server/user.jobengine.executors/config/config.xml
+++ b/server/user.jobengine.executors/config/config.xml
@@ -35,5 +35,5 @@
 	<executor className="user.jobengine.server.steps.UploadRecordingToNexioStep" maxConcurrent="1"/>
 	<executor className="user.jobengine.server.steps.MediaToolStep" maxConcurrent="1"/>
 	<executor className="user.jobengine.server.steps.UpdateGhostMediaData" maxConcurrent="1"/>
-	<executor className="user.jobengine.server.steps.FileCopyStep" maxConcurrent="1"/>
+	<executor className="user.jobengine.server.steps.FileCopyStep" maxConcurrent="10"/>
 </executors>
\ No newline at end of file
diff --git a/server/user.jobengine.executors/jobtemplates/common-copy.xml b/server/user.jobengine.executors/jobtemplates/common-copy.xml
index f175bc4b..caa14817 100644
--- a/server/user.jobengine.executors/jobtemplates/common-copy.xml
+++ b/server/user.jobengine.executors/jobtemplates/common-copy.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jobtemplate name="Általános file másolás">
+<jobtemplate name="Általános file másolás" multiInstance="true">
 	<declarations>
 		<parameters>
 			<parameter name="sourceProtocol" type="java.lang.String"/>
 			<parameter name="sourcePath" type="java.lang.String"/>
 			<parameter name="sourceFileName" type="java.lang.String"/>
-			<parameter name="targetPath" type="java.lang.String"/>
 			<parameter name="targetProtocol" type="java.lang.String"/>
+			<parameter name="targetPath" type="java.lang.String"/>
 			<parameter name="targetFileName" type="java.lang.String"/>
 		</parameters>
 	</declarations>
@@ -23,10 +23,10 @@
 					<parameter name="sourceFileName" />
 				</input>
 				<input>
-					<parameter name="targetPath" />
+					<parameter name="targetProtocol" />
 				</input>
 				<input>
-					<parameter name="targetProtocol" />
+					<parameter name="targetPath" />
 				</input>
 				<input>
 					<parameter name="targetFileName" />
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java
index a3587139..eefbc31b 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java
@@ -12,7 +12,7 @@ import user.jobengine.db.IItemManager;
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
 
-public class FileCopyStep {
+public class FileCopyStep extends JobStep {
 	private static final Logger logger = LogManager.getLogger();
 	private IItemManager manager;
 	private Marker marker;
@@ -30,27 +30,27 @@ public class FileCopyStep {
 		}
 		if (sourceProtocol == null) {
 			logger.error(marker, "A forrás protokol bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");
+			throw new NullPointerException("System is not configured properly, 'sourceProtocol' input parameter missing.");
 		}
 		if (sourcePath == null) {
 			logger.error(marker, "A forrás fájl elérés bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");
+			throw new NullPointerException("System is not configured properly, 'sourcePath' input parameter missing.");
 		}
 		if (sourceFileName == null) {
 			logger.error(marker, "A forrás fájlnév bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");
+			throw new NullPointerException("System is not configured properly, 'sourceFileName' input parameter missing.");
 		}
 		if (targetProtocol == null) {
 			logger.error(marker, "A cél protokol bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");
+			throw new NullPointerException("System is not configured properly, 'targetProtocol' input parameter missing.");
 		}
 		if (targetPath == null) {
 			logger.error(marker, "A cél fájl elérés bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");
+			throw new NullPointerException("System is not configured properly, 'targetPath' input parameter missing.");
 		}
 		if (targetFileName == null) {
 			logger.error(marker, "A cél fájlnév bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");
+			throw new NullPointerException("System is not configured properly, 'targetFileName' input parameter missing.");
 		}
 	}
 
@@ -80,11 +80,14 @@ public class FileCopyStep {
 			logger.catching(e);
 			throw e;
 		} finally {
-			source.cleanUp();
-			target.cleanUp();
+			if (source != null) {
+				source.cleanUp();
+			}
+			if (target != null) {
+				target.cleanUp();
+			}
 		}
 
 		return null;
 	}
-
 }
diff --git a/server/user.jobengine.osgi.server/pages/directorylist.zul b/server/user.jobengine.osgi.server/pages/directorylist.zul
index 58ab0ba3..5e58f8c6 100644
--- a/server/user.jobengine.osgi.server/pages/directorylist.zul
+++ b/server/user.jobengine.osgi.server/pages/directorylist.zul
@@ -7,8 +7,8 @@
 				    <!-- Keresés menü -->
 				    <hbox width="100%">
 						<button onClick="@command('onBack')" image="/img/baseline_arrow_back_black_18dp.png" />
-						<textbox id="sourceSearch" value="@bind(vm.searchText)" onOK="@command('doSearch')" />
-						<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
+						<textbox id="sourceSearch" value="@bind(vm.searchText)" onOK="@command('refresh')" />
+						<!-- button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" / -->
 						<button image="/img/baseline_close_black_18dp.png" onClick="@command('clearFilter')" />
 						<button image="/img/baseline_refresh_black_18dp.png" onClick="@command('refresh')"/>
 					</hbox>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
index b370b0fd..40783dcb 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
@@ -1,6 +1,5 @@
 package user.jobengine.zk.model;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,18 +17,17 @@ import org.zkoss.zul.ListModelList;
 import user.commons.RemoteFile;
 import user.commons.StoreUri;
 import user.commons.config.JSONConfig;
-import user.jobengine.db.Store;
 
 public class DirectoryListModel {
 	private static final Logger logger = LogManager.getLogger();
-	private Store store = new Store();
 	private ListModelList<RemoteFile> files;
-	private List<RemoteFile> filesCopy;
+	// private List<RemoteFile> filesCopy;
 	private StoreUri uri;
 	private MaestroConfig config = null;
 	private FileSizeConverter fileSizeConverter = new FileSizeConverter();
 	private String searchText;
 	private String defaultFileFilter;
+	private String defaultDirectoryFilter;
 
 	@NotifyChange("searchText")
 	public void changeDirectory(RemoteFile selectedFolder) throws Exception {
@@ -46,27 +44,12 @@ public class DirectoryListModel {
 	@Command
 	@NotifyChange({ "files", "searchText" })
 	public void clearFilter() throws Exception {
-		// files = new ListModelList<>(filesCopy);
 		setSearchText(null);
 		files.clear();
-		files.addAll(filesCopy);
-		selectedItemChanged();
-	}
+		uri.setFileFilter(defaultFileFilter);
+		uri.setDirectoryFilter(defaultDirectoryFilter);
+		setSourceList();
 
-	@Command
-	@NotifyChange({ "files", "searchText" })
-	public void doSearch() throws Exception {
-		if (searchText == null || searchText == "") {
-			files.clear();
-			files.addAll(filesCopy);
-		} else {
-			files.clear();
-			for (int i = 0; i < filesCopy.size(); i++) {
-				if (filesCopy.get(i).getName().contains(searchText)) {
-					files.add(filesCopy.get(i));
-				}
-			}
-		}
 		selectedItemChanged();
 	}
 
@@ -74,10 +57,6 @@ public class DirectoryListModel {
 		return files;
 	}
 
-	public List<RemoteFile> getFilesCopy() {
-		return filesCopy;
-	}
-
 	public FileSizeConverter getFileSizeConverter() {
 		return fileSizeConverter;
 	}
@@ -86,10 +65,6 @@ public class DirectoryListModel {
 		return searchText;
 	}
 
-	public Store getStore() {
-		return store;
-	}
-
 	public StoreUri getUri() {
 		return uri;
 	}
@@ -101,6 +76,7 @@ public class DirectoryListModel {
 			config = JSONConfig.read(key, MaestroConfig.class);
 			uri = config.getSourceStoreUri();
 			defaultFileFilter = uri.getFileFilter();
+			defaultDirectoryFilter = uri.getDirectoryFilter();
 
 			files = new ListModelList<>();
 			setSourceList();
@@ -146,18 +122,15 @@ public class DirectoryListModel {
 	@Command
 	@NotifyChange("files")
 	public void refresh() throws Exception {
-		if (searchText == null || searchText == "") {
-			files.clear();
-			files.addAll(uri.getRemoteFiles());
+		if (searchText == null || searchText.equals("")) {
+			uri.setFileFilter(defaultFileFilter);
+			uri.setDirectoryFilter(defaultDirectoryFilter);
+			setSourceList();
 		} else {
 			files.clear();
-			// List<RemoteFile> currList = new ArrayList<>;
-			List<RemoteFile> currList = uri.getRemoteFiles();
-			for (int i = 0; i < currList.size(); i++) {
-				if (currList.get(i).getName().contains(searchText)) {
-					files.add(currList.get(i));
-				}
-			}
+			uri.setFileFilter(searchText);
+			uri.setDirectoryFilter(searchText);
+			files.addAll(uri.getRemoteFiles());
 		}
 
 		selectedItemChanged();
@@ -174,10 +147,6 @@ public class DirectoryListModel {
 		BindUtils.postGlobalCommand(null, null, "updateExecuteState", args);
 	}
 
-	public void setFilesCopy(List<RemoteFile> filesCopy) {
-		this.filesCopy = filesCopy;
-	}
-
 	public void setFileSizeConverter(FileSizeConverter fileSizeConverter) {
 		this.fileSizeConverter = fileSizeConverter;
 	}
@@ -191,11 +160,7 @@ public class DirectoryListModel {
 		// files = new ListModelList<>(uri.getRemoteFiles());
 		files.clear();
 		files.addAll(uri.getRemoteFiles());
-		filesCopy = new ArrayList<>(files);
-	}
-
-	public void setStore(Store store) {
-		this.store = store;
+		// filesCopy = new ArrayList<>(files);
 	}
 
 	public void setUri(StoreUri uri) {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java
index bebeeea6..dc743471 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java
@@ -17,6 +17,7 @@ import org.zkoss.zul.Window;
 import com.ibm.nosql.json.api.BasicDBObject;
 
 import user.commons.ListUtils;
+import user.commons.remotestore.RemoteStoreProtocol;
 import user.jobengine.db.ItemManagerData.SignalType;
 import user.jobengine.server.IJobChangedListener;
 import user.jobengine.server.IJobEngine;
@@ -24,10 +25,12 @@ import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.JobChangedEvent;
 import user.jobengine.server.JobEngine;
 import user.jobengine.server.JobEngineException;
+import user.jobengine.server.scheduler.ScheduledJob;
 import user.jobengine.zk.util.SessionUtil;
 
 public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedListener {
 	private static final Logger logger = LogManager.getLogger();
+	private static final String TEMPLATE = "common-copy.xml";
 	private ListModelList<IJobRuntime> jobList = new ListModelList<IJobRuntime>();
 	private IJobEngine jobEngine = null;
 	private int newPriority = 1;
@@ -84,22 +87,24 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi
 	public void jobChanged(JobChangedEvent event) {
 		JobChangedEvent jobEvent = event;
 		final IJobRuntime job = jobEvent.getJob();
-		if (jobEvent.getSignalType().equals(SignalType.CREATE)) {
-			registerTask(() -> onJobCreated(job));
-			return;
-		}
-		if (jobEvent.getSignalType().equals(SignalType.DELETE)) {
-			registerTask(() -> onJobDeleted(job));
-			return;
-		}
-		if (jobEvent.getSignalType().equals(SignalType.UPDATE)) {
-			registerTask(() -> onJobUpdated(job));
-			return;
+		if (job.getOwner() == currentUser) {
+			if (jobEvent.getSignalType().equals(SignalType.CREATE)) {
+				registerTask(() -> onJobCreated(job));
+				return;
+			}
+			if (jobEvent.getSignalType().equals(SignalType.DELETE)) {
+				registerTask(() -> onJobDeleted(job));
+				return;
+			}
+			if (jobEvent.getSignalType().equals(SignalType.UPDATE)) {
+				registerTask(() -> onJobUpdated(job));
+				return;
+			}
 		}
 	}
 
 	private void onJobCreated(IJobRuntime job) {
-		jobList.add(job);
+		// jobList.add(job);
 		notifyChange("jobList");
 	}
 
@@ -134,17 +139,25 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi
 
 	@GlobalCommand
 	@NotifyChange({ "jobList" })
-	public void submitJob() {
-		// public void submitJob(@BindingParam("targets") MaestroTarget targets)
-		// {
-		IJobRuntime job;
-		String template = "fake.xml";
-		// Map<String, Object> args = new HashMap<>();
-		// args.put("targets", targets);
+	public void submitJob(@BindingParam("params") Object params) {
+		// public void submitJob() {
+		ScheduledJob scheduledJob = jobEngine.getScheduledJob(TEMPLATE);
+		Map<String, Object> parameters = scheduledJob.getJobParameters();
+		// Map<String, Object> parameters = new HashMap<>();
+		// parameters.putAll(params);
+		parameters.put("sourceProtocol", RemoteStoreProtocol.LOCAL.toString());
+		parameters.put("sourcePath", "c:/temp");
+		parameters.put("sourceFileName", "index.bat");
+
+		parameters.put("targetProtocol", RemoteStoreProtocol.LOCAL.toString());
+		parameters.put("targetPath", "c:/temp1");
+		parameters.put("targetFileName", "index.bat");
+
 		try {
-			// jobEngine.submit(template, "fakeJob", null, currentUser);
-			job = jobEngine.submit(template, "fakeJob", ListUtils.asMap("itemID", 0), currentUser);
-			// jobList.add(job);
+			IJobRuntime job;
+			// jobEngine.submit(template, "CopyJob", null, currentUser);
+			job = jobEngine.submit(TEMPLATE, "CopyJob", parameters, currentUser);
+			jobList.add(job);
 		} catch (JobEngineException e) {
 			logger.info("Hiba a job indításakor", e);
 		}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TargetsListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TargetsListModel.java
index 25e7cf86..91486880 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TargetsListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TargetsListModel.java
@@ -1,5 +1,7 @@
 package user.jobengine.zk.model;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.logging.log4j.LogManager;
@@ -14,6 +16,8 @@ import org.zkoss.zul.ListModelList;
 
 import user.commons.RemoteFile;
 import user.commons.config.JSONConfig;
+import user.commons.remotestore.RemoteStoreProtocol;
+import user.jobengine.server.IJobEngine;
 import user.mediacube.metadata.interfaces.IMetadata;
 
 public class TargetsListModel {
@@ -21,6 +25,7 @@ public class TargetsListModel {
 	private MaestroConfig config = null;
 	private ListModelList<MaestroTarget> targets;
 	private boolean executeEnabled;
+	private IJobEngine jobEngine = null;
 	Set<RemoteFile> sourceData;
 	Set<IMetadata> metaData;
 
@@ -54,11 +59,27 @@ public class TargetsListModel {
 
 	@Command
 	public void createJob() {
-		Set<MaestroTarget> selection = targets.getSelection();
-
-		// Map<String, Object> args = new HashMap<>();
-		// args.put("targets", selection);
-		BindUtils.postGlobalCommand(null, null, "submitJob", null);
+		/*
+		 * Set<MaestroTarget> selection = targets.getSelection();
+		 *
+		 * Map<String, Object> args = new HashMap<>(); args.put("targets",
+		 * selection);
+		 */
+		// ScheduledJob scheduledJob =
+		// jobEngine.getScheduledJob("common-copy.xml");
+		// Map<String, Object> parameters = scheduledJob.getJobParameters();
+		String fileName = sourceData.iterator().next().getName();
+		for (int i = 0; i < targets.size(); i++) {
+			Map<String, Object> params = new HashMap<>();
+			params.put("sourceProtocol", RemoteStoreProtocol.LOCAL.toString());
+			params.put("sourcePath", sourceData.iterator().next());
+			params.put("sourceFileName", fileName);
+
+			params.put("targetProtocol", RemoteStoreProtocol.LOCAL.toString());
+			params.put("targetPath", targets.get(i).getStoreUri().getUri());
+			params.put("targetFileName", fileName);
+			BindUtils.postGlobalCommand(null, null, "submitJob", params);
+		}
 	}
 
 	public ListModelList<MaestroTarget> getTargets() {
-- 
2.54.0