From 1fa1118e610d54137e82dfa02e75c0d52a4fe278 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Mon, 28 Jan 2019 10:32:16 +0000 Subject: [PATCH] =?utf8?q?#125=20Az=20archive=20JSON-ba=20ker=C3=BClj?= =?utf8?q?=C3=B6n=20be=20a=20STORYFORMAT?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31394 --- .../Maestro/Configuration/configuration.json | 40 +++++++++---------- client/Maestro/MaestroForm.Metadata.cs | 1 + client/Maestro/Properties/AssemblyInfo.cs | 4 +- .../MaestroShared/Commons/PatternNameMaker.cs | 6 ++- .../MaestroShared/Metadata/ArchiveMetadata.cs | 8 ++-- .../MaestroShared/Properties/AssemblyInfo.cs | 4 +- .../Targets/FXPTargetProcessor.cs | 2 +- .../Targets/UNCTargetProcessor.cs | 2 +- server/-dependencies/pom.xml | 16 +------- 9 files changed, 37 insertions(+), 46 deletions(-) diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json index 20b85668..322f07ec 100644 --- a/client/Maestro/Configuration/configuration.json +++ b/client/Maestro/Configuration/configuration.json @@ -44,25 +44,25 @@ "version": 0, "redefineSegments": true }, -{ - "$type": "MediaCubeMetadata", - "server": { - "address": "http://localhost:8888/services/rest/jobengine", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - }, - "wsserver": { - "address": "ws://10.10.1.29:88/services/wsapi", - "timeout": 1000 - }, - "jobTemplate": "retrieve-material.xml", - "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE", - "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE", - "restoreNamePattern": "%s_%GUID%", - "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE", - "killDateDays": 1 -} + { + "$type": "MediaCubeMetadata", + "server": { + "address": "http://10.10.1.27:88/services/rest/jobengine", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + }, + "wsserver": { + "address": "ws://10.10.1.27/services/wsapi", + "timeout": 1000 + }, + "jobTemplate": "retrieve-material.xml", + "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE", + "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE", + "restoreNamePattern": "%s_%GUID%", + "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE", + "killDateDays": 1 + } ], "targets": [ { @@ -110,7 +110,7 @@ "saveArchiveMetadata": false, "sendEmailOnSuccess": true, "successEmailPattern": "%JSON%", - "successEmailSubject": "%ID% - %ITEMTITLE% sikeres feltöltése", + "successEmailSubject": "%ID% - %ITEMTITLE% - %FORMAT% sikeres feltöltése", "successEmailRecipient": "vasary@elgekko.net", "remote": { "address": "ftp://10.10.1.105/TESZT/CHECK", diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 57c5b76f..15027508 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -357,6 +357,7 @@ namespace Maestro { result.mediaHouseId = story.ParentStoryID; result.mediaTitle = story.Name; result.mediaDescription = story.ScriptContent; + result.format = story.Format; return result; } diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 5eae53d8..2b9337d2 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.9.0")] -[assembly: AssemblyFileVersion("2.0.9.0")] +[assembly: AssemblyVersion("2.0.9.3")] +[assembly: AssemblyFileVersion("2.0.9.3")] diff --git a/client/MaestroShared/Commons/PatternNameMaker.cs b/client/MaestroShared/Commons/PatternNameMaker.cs index 61942803..edd42ee9 100644 --- a/client/MaestroShared/Commons/PatternNameMaker.cs +++ b/client/MaestroShared/Commons/PatternNameMaker.cs @@ -15,6 +15,7 @@ namespace MaestroShared.Commons { private const string PATTERN_JSON = "%JSON%"; private const string PATTERN_ITEMTITLE = "%ITEMTITLE%"; private const string PATTERN_MEDIATITLE = "%MEDIATITLE%"; + private const string PATTERN_FORMAT = "%FORMAT%"; private const string PATTERN_IDROOT = "%IDROOT%"; private const string PATTERN_GUID = "%GUID%"; private const string PATTERN_SOURCENAME = "%SOURCENAME%"; @@ -44,7 +45,7 @@ namespace MaestroShared.Commons { return result; } - 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) { + 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, string format = null) { if (pattern == null) return null; string idRoot = id != null && id.Contains(UNDERSCORE) ? id.Split(UNDERSCORE[0])[0] : id; @@ -57,7 +58,8 @@ namespace MaestroShared.Commons { .Replace(PATTERN_DATESTAMP, dt.ToString(DATE_FORMAT_NODOTS, CultureInfo.InvariantCulture)) .Replace(PATTERN_JSON, json) .Replace(PATTERN_ITEMTITLE, itemTitle) - .Replace(PATTERN_MEDIATITLE, mediaTitle); + .Replace(PATTERN_MEDIATITLE, mediaTitle) + .Replace(PATTERN_FORMAT, format); if (!String.IsNullOrEmpty(inputName)) { result = result.Replace(PATTERN_SOURCENAME, Normalize(Path.GetFileNameWithoutExtension(inputName))); diff --git a/client/MaestroShared/Metadata/ArchiveMetadata.cs b/client/MaestroShared/Metadata/ArchiveMetadata.cs index c2a46710..b5a5d78b 100644 --- a/client/MaestroShared/Metadata/ArchiveMetadata.cs +++ b/client/MaestroShared/Metadata/ArchiveMetadata.cs @@ -1,7 +1,7 @@ -using System; -using Newtonsoft.Json; -using System.Runtime.Serialization.Formatters.Binary; +using Newtonsoft.Json; +using System; using System.IO; +using System.Runtime.Serialization.Formatters.Binary; namespace MaestroShared.Metadata { @@ -12,6 +12,8 @@ namespace MaestroShared.Metadata { public string itemHouseId { get; set; } public string itemTitle { get; set; } public string itemDescription { get; set; } + //csak octopus + public string format { get; set; } public string mediaHouseId { get; set; } public string mediaTitle { get; set; } public string mediaDescription { get; set; } diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index c05a92a6..9c8a8f18 100644 --- a/client/MaestroShared/Properties/AssemblyInfo.cs +++ b/client/MaestroShared/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.9.1")] -[assembly: AssemblyFileVersion("2.0.9.1")] +[assembly: AssemblyVersion("2.0.9.4")] +[assembly: AssemblyFileVersion("2.0.9.4")] diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs index c88dbb6b..f390bc0c 100644 --- a/client/MaestroShared/Targets/FXPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs @@ -169,7 +169,7 @@ namespace MaestroShared.Targets { string xml = null; string name = Path.GetFileNameWithoutExtension(Input); string description = Parameters.ArchiveMetadata?.mediaTitle; - if (Parameters.TargetConfig.KillDateDays > 0) { + if (Parameters.TargetConfig.SourceNexioKillDateDays > 0) { DateTime date = GetKillDate(Parameters.TargetConfig.SourceNexioKillDateDays); KillDate = date.ToString(DATE_FORMAT); xml = NexioXML.ToXML(name, date, null, Parameters.TargetConfig.SourceNexioAgency); diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 1b1311b3..6fbb317e 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -420,7 +420,7 @@ namespace MaestroShared.Targets { } protected string GetDynamicText(string pattern) { - return PatternNameMaker.Get(pattern, ID, InputName, Output, Parameters.UserName, Parameters.MetadataText, Parameters.CreateDate, Parameters.ArchiveMetadata?.ToString(), Parameters.ArchiveMetadata?.itemTitle, Parameters.ArchiveMetadata?.mediaTitle); + return PatternNameMaker.Get(pattern, ID, InputName, Output, Parameters.UserName, Parameters.MetadataText, Parameters.CreateDate, Parameters.ArchiveMetadata?.ToString(), Parameters.ArchiveMetadata?.itemTitle, Parameters.ArchiveMetadata?.mediaTitle, Parameters.ArchiveMetadata?.format); } private string CreateOutputFileName() { diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 724ea60f..b39ff8fe 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -108,26 +108,12 @@ jar - - - - - - - - - - - - - - org.reficio p2-maven-plugin - 1.2.0-SNAPSHOT + 1.3.0 default-cli -- 2.54.0