From: Vásáry Dániel Date: Fri, 18 Jan 2019 13:52:02 +0000 (+0000) Subject: #121 Automatikus email tárgy módosításának lehetősége X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=ce82d25aa57120068f33f9f05f7ea6bdf7869e35;p=mediacube.git #121 Automatikus email tárgy módosításának lehetősége git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31390 --- diff --git a/client/IntegrationTests/JobEngineIT.cs b/client/IntegrationTests/JobEngineIT.cs index 94a01ef5..ffe0859e 100644 --- a/client/IntegrationTests/JobEngineIT.cs +++ b/client/IntegrationTests/JobEngineIT.cs @@ -1,8 +1,8 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +using MaestroShared.Model; using MediaCubeClient; -using System.Net; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using MaestroShared.Model; +using System.Net; namespace IntegrationTests { [TestClass] @@ -77,7 +77,7 @@ namespace IntegrationTests { [TestMethod] public void TestNotify() { MediaCubeApi client = new MediaCubeApi("http://localhost:8080/services/rest/jobengine/", null, null, 100, null); - client.Notify("vasay@elgekko.net", "Újravágást kérek!"); + client.Notify("vasay@elgekko.net", null, "Újravágást kérek!"); } } diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json index b26d0065..20b85668 100644 --- a/client/Maestro/Configuration/configuration.json +++ b/client/Maestro/Configuration/configuration.json @@ -53,7 +53,7 @@ "timeout": 1000 }, "wsserver": { - "address": "ws://10.10.1.27/services/wsapi", + "address": "ws://10.10.1.29:88/services/wsapi", "timeout": 1000 }, "jobTemplate": "retrieve-material.xml", @@ -101,23 +101,24 @@ "timeout": 1000 } }, - { - "label": "Teszt", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "sendEmailOnSuccess": true, - "successEmailPattern": "A %ID% - %ITEMTITLE% anyag felkerült a szerverre.\r\nJSON: %JSON%", - "successEmailRecipient": "vasary@elgekko.net", - "remote": { - "address": "ftp://10.10.1.105/TESZT/CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, + { + "label": "Teszt", + "processor": "FTPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "killDateDays": 7, + "saveArchiveMetadata": false, + "sendEmailOnSuccess": true, + "successEmailPattern": "%JSON%", + "successEmailSubject": "%ID% - %ITEMTITLE% sikeres feltöltése", + "successEmailRecipient": "vasary@elgekko.net", + "remote": { + "address": "ftp://10.10.1.105/TESZT/CHECK", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, { "label": "Napi megtekintőbe", "processor": "FTPTargetProcessor", diff --git a/client/MaestroShared/Commons/PatternNameMaker.cs b/client/MaestroShared/Commons/PatternNameMaker.cs index 60dbd5a6..61942803 100644 --- a/client/MaestroShared/Commons/PatternNameMaker.cs +++ b/client/MaestroShared/Commons/PatternNameMaker.cs @@ -45,19 +45,17 @@ namespace MaestroShared.Commons { } static public string Get(string pattern, string id, string inputName, string outputName, string userName, string text, DateTime? storedDateTime = null, string json = null, string itemTitle = null, string mediaTitle = null) { + if (pattern == null) + return null; string idRoot = id != null && id.Contains(UNDERSCORE) ? id.Split(UNDERSCORE[0])[0] : id; DateTime dt = storedDateTime == null ? DateTime.Now : (DateTime)storedDateTime; - var trimmedJSON = json; - if (json != null) { - trimmedJSON = json.Replace("\r", "").Replace("\n", ""); - } string result = pattern .Replace(PATTERN_ID, id) .Replace(PATTERN_IDROOT, idRoot) .Replace(PATTERN_GUID, ((ShortGuid)Guid.NewGuid()).ToString()) .Replace(PATTERN_TIMESTAMP, dt.ToString(DATETIME_FORMAT, CultureInfo.InvariantCulture)) .Replace(PATTERN_DATESTAMP, dt.ToString(DATE_FORMAT_NODOTS, CultureInfo.InvariantCulture)) - .Replace(PATTERN_JSON, trimmedJSON) + .Replace(PATTERN_JSON, json) .Replace(PATTERN_ITEMTITLE, itemTitle) .Replace(PATTERN_MEDIATITLE, mediaTitle); diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index 320d33cb..825a4c8c 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -116,6 +116,7 @@ namespace MaestroShared.Configuration { public string ErrorEmailPattern { get; set; } public bool SendEmailOnSuccess { get; set; } public string SuccessEmailRecipient { get; set; } + public string SuccessEmailSubject { get; set; } public string SuccessEmailPattern { get; set; } public string[] Reference { get; set; } public bool NexioServer { get; set; } diff --git a/client/MaestroShared/Interfaces/IMediaCubeApi.cs b/client/MaestroShared/Interfaces/IMediaCubeApi.cs index eb5e1bf9..eba6cab3 100644 --- a/client/MaestroShared/Interfaces/IMediaCubeApi.cs +++ b/client/MaestroShared/Interfaces/IMediaCubeApi.cs @@ -2,6 +2,6 @@ namespace MaestroShared.Interfaces { public interface IMediaCubeApi { T Create(object data); - void Notify(string to, string content); + void Notify(string to, string subject, string content); } } diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index dfe3609e..1b1311b3 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -116,7 +116,7 @@ namespace MaestroShared.Targets { workFlowAction.successful = false; logger.Error(e); if (Parameters.TargetConfig.SendEmailOnError && !string.IsNullOrEmpty(Parameters.TargetConfig.ErrorEmailRecipient) && !String.IsNullOrEmpty(Parameters.TargetConfig.ErrorEmailPattern)) - SendEmail(Parameters.TargetConfig.ErrorEmailRecipient, Parameters.TargetConfig.ErrorEmailPattern); + SendEmail(Parameters.TargetConfig.ErrorEmailRecipient, null, Parameters.TargetConfig.ErrorEmailPattern); } finally { AfterExecute(); } @@ -214,7 +214,7 @@ namespace MaestroShared.Targets { Parameters?.TrafficApi?.Approve(Parameters.VariantID, true, Parameters.MetadataKind, trafficItem, ifCompleted); } if (Parameters.TargetConfig.SendEmailOnSuccess && !String.IsNullOrEmpty(Parameters.TargetConfig.SuccessEmailRecipient) && !String.IsNullOrEmpty(Parameters.TargetConfig.SuccessEmailPattern)) - SendEmail(Parameters.TargetConfig.SuccessEmailRecipient, Parameters.TargetConfig.SuccessEmailPattern); + SendEmail(Parameters.TargetConfig.SuccessEmailRecipient, Parameters.TargetConfig.SuccessEmailSubject, Parameters.TargetConfig.SuccessEmailPattern); logger.Trace(Strings.EXIT); } @@ -258,11 +258,12 @@ namespace MaestroShared.Targets { logger.Trace(Strings.EXIT); } - private void SendEmail(string to, string messagePattern) { + private void SendEmail(string to, string subjectPattern, string messagePattern) { logger.Trace(Strings.ENTRY); try { string message = GetDynamicText(messagePattern); - Parameters.MediaCubeApi.Notify(to, message); + string subject = GetDynamicText(subjectPattern); + Parameters.MediaCubeApi.Notify(to, subject, message); } catch (Exception e) { MessageBox.Show(parent, e.Message); } diff --git a/client/MediaCubeClient/MediaCubeApi.cs b/client/MediaCubeClient/MediaCubeApi.cs index f2614a45..fdcc5472 100644 --- a/client/MediaCubeClient/MediaCubeApi.cs +++ b/client/MediaCubeClient/MediaCubeApi.cs @@ -49,10 +49,11 @@ namespace MediaCubeClient { return result; } - public void Notify(string to, string content) { + public void Notify(string to, string subject, string content) { var request = new RestRequest("notify", Method.GET); //Debug.WriteLine(body); request.AddQueryParameter("to", to); + request.AddQueryParameter("subject", subject); request.AddQueryParameter("content", content); var response = client.Execute(request); if (response.StatusCode != HttpStatusCode.OK || response.ContentLength < 1) diff --git a/server/-configuration/test-deploy-bkup-mediacube-modules.launch b/server/-configuration/test-deploy-bkup-mediacube-modules.launch deleted file mode 100644 index ed06cb2f..00000000 --- a/server/-configuration/test-deploy-bkup-mediacube-modules.launch +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - -