From: Sweidan Omar Date: Fri, 10 Dec 2021 10:31:44 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=5edcd75f461804fe5a75dfcd352383292ea1b908;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32551 --- diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java index 390c3845..f49961de 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java @@ -36,7 +36,8 @@ import user.mediacube.metadata.interfaces.IMetadata; public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedListener { private static final Logger logger = LogManager.getLogger(); private static final String TEMPLATE = "common-copy.xml"; - public static final Pattern DIACRITICS_AND_FRIENDS = Pattern.compile("[\\p{InCombiningDiacriticalMarks}\\p{IsLm}\\p{IsSk}]+"); + public static final Pattern DIACRITICS_AND_FRIENDS = Pattern + .compile("[\\p{InCombiningDiacriticalMarks}\\p{IsLm}\\p{IsSk}]+"); private static String stripDiacritics(String str) { str = Normalizer.normalize(str, Normalizer.Form.NFD); @@ -61,7 +62,7 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi String subFolder = String.format("%s_%s", targetMetadata.getId(), stripDiacritics(targetMetadata.getTitle())); Path path = Paths.get(targetPath, subFolder.toUpperCase()); String result = path.toString(); - //result = result.replace(" (OK)", ""); + // result = result.replace(" (OK)", ""); result = result.replace(" ", "_"); return result; } @@ -118,10 +119,10 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi registerTask(() -> onJobCreated(job)); return; } - // if (jobEvent.getSignalType().equals(SignalType.DELETE)) { - // registerTask(() -> onJobDeleted(job)); - // return; - // } + // if (jobEvent.getSignalType().equals(SignalType.DELETE)) { + // registerTask(() -> onJobDeleted(job)); + // return; + // } if (jobEvent.getSignalType().equals(SignalType.UPDATE)) { registerTask(() -> onJobUpdated(job)); return; @@ -165,10 +166,10 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi @GlobalCommand @NotifyChange({ "jobList" }) - public void submitJob(@BindingParam("sourceProtocol") String sourceProtocol, @BindingParam("sourcePath") String sourcePath, - @BindingParam("sourceFileName") String sourceFileName, @BindingParam("targetProtocol") String targetProtocol, - @BindingParam("targetPath") String targetPath, @BindingParam("killDateDays") int killDateDays, - @BindingParam("targetMetadata") IMetadata targetMetadata) { + public void submitJob(@BindingParam("sourceProtocol") String sourceProtocol, + @BindingParam("sourcePath") String sourcePath, @BindingParam("sourceFileName") String sourceFileName, + @BindingParam("targetProtocol") String targetProtocol, @BindingParam("targetPath") String targetPath, + @BindingParam("killDateDays") int killDateDays, @BindingParam("targetMetadata") IMetadata targetMetadata) { ScheduledJob scheduledJob = jobEngine.getScheduledJob(TEMPLATE); Map parameters = scheduledJob.getJobParameters();