From: vasary.daniel Date: Fri, 5 Feb 2021 12:23:07 +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=ea749a44ecb741fd74634757946d1dc2b8bcc8ed;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32131 --- diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json index 32edff1a..867041bc 100644 --- a/client/Maestro/Configuration/configuration.json +++ b/client/Maestro/Configuration/configuration.json @@ -23,6 +23,17 @@ } }, "metadatas": [ + { + "$type": "TrafficMetadata", + "functionName": "clIFsp_ORI_MAM", + "version": 1, + "server": { + "address": "Data Source=10.11.254.86;Initial Catalog=PA_Vivantis;Persist Security Info=True;", + "userName": "MAM", + "password": "1LCAeMAI5W5eWdtaN25mHX/9JkXjkr0JZDvTZp//HYtUPo/UKyJnuZoLKFo9G9FbAhUha8xnniV+v/9BQ6c/7e0phmCYUdeLEdQcg0hHvU9njMSqYBV75b6oB9jhvtoZ", + "timeout": 1000 + } + }, { "$type": "MediaCubeMetadata", "server": { diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index be37e789..b657a37d 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -127,7 +127,7 @@ namespace MaestroShared.Configuration { public string SourceNexioAgency { get; set; } public int SourceNexioKillDateDays { get; set; } public bool MoveToFolder { get; set; } - + public string ForceMediaType { get; set; } } public class Connection { diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index 6846506a..39ec0603 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.1.0.7")] -[assembly: AssemblyFileVersion("2.1.0.7")] +[assembly: AssemblyVersion("2.1.0.8")] +[assembly: AssemblyFileVersion("2.1.0.8")] diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 459383bf..1d33242a 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -403,8 +403,18 @@ namespace MaestroShared.Targets { Uri address = Parameters.TargetConfig.Remote.Address; string statusWorkDir = Path.Combine(workingDir, STATUS_FOLDER); EnsureDirectoryExistence(statusWorkDir); - string fileName = String.Format(METADATA_FILE, OutputName); + string fileName = string.Format(METADATA_FILE, OutputName); //logger.Debug("Creating METADATA file {0}", fileName); + + //20210201 tipus felulirva configbol + + logger.Info("Parameters.TargetConfig.ForceMediaType {0}", Parameters.TargetConfig.ForceMediaType); + if (!string.IsNullOrEmpty(Parameters.TargetConfig.ForceMediaType)) { + logger.Info("Using FIXED archive media type {0}", Parameters.TargetConfig.ForceMediaType); + Parameters.ArchiveMetadata.mediaType = Parameters.TargetConfig.ForceMediaType; + } + + byte[] content = Encoding.UTF8.GetBytes(Parameters.ArchiveMetadata.ToString()); string ouputPath = GetOutputFilePath(statusWorkDir, fileName); UploadContent(ouputPath, content); diff --git a/client/PlanAIRClient/Properties/AssemblyInfo.cs b/client/PlanAIRClient/Properties/AssemblyInfo.cs index 7b96f724..955909fa 100644 --- a/client/PlanAIRClient/Properties/AssemblyInfo.cs +++ b/client/PlanAIRClient/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("1.0.1.1")] -[assembly: AssemblyFileVersion("1.0.1.1")] +[assembly: AssemblyVersion("1.0.1.2")] +[assembly: AssemblyFileVersion("1.0.1.2")] diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 253bbb36..180c7cc6 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -91,7 +91,10 @@ namespace TrafficClient { dgTraffic.Columns.AddRange(GetMultiMaterialColumns(metadata)); else dgTraffic.Columns.AddRange(GetSingleMaterialColumns(metadata)); - string searchText = Regex.Replace(txtFilter.Text, "[^0-9]", ""); + + //Minden ami nem szam, torlodik. Miert? + //string searchText = Regex.Replace(txtFilter.Text, "[^0-9]", ""); + string searchText = txtFilter.Text; items = trafficAPI.GetMaterials(searchText, chkProblematic.Checked, scheduledDate, scheduledDate); } else if (rbAD.Checked) { dgTraffic.Columns.AddRange(GetADColumns(metadata)); diff --git a/server/-dependencies/libs/humble-video-arch-x86_64-pc-linux-gnu6-0.2.1.jar b/server/-dependencies/libs/humble-video-arch-x86_64-pc-linux-gnu6-0.2.1.jar deleted file mode 100644 index 9baa3133..00000000 Binary files a/server/-dependencies/libs/humble-video-arch-x86_64-pc-linux-gnu6-0.2.1.jar and /dev/null differ diff --git a/server/-dependencies/libs/humble-video-arch-x86_64-w64-mingw32-0.2.1.jar b/server/-dependencies/libs/humble-video-arch-x86_64-w64-mingw32-0.2.1.jar deleted file mode 100644 index ccd42e5e..00000000 Binary files a/server/-dependencies/libs/humble-video-arch-x86_64-w64-mingw32-0.2.1.jar and /dev/null differ diff --git a/server/-dependencies/libs/humble-video-noarch-0.2.1.jar b/server/-dependencies/libs/humble-video-noarch-0.2.1.jar deleted file mode 100644 index c8fc9bb4..00000000 Binary files a/server/-dependencies/libs/humble-video-noarch-0.2.1.jar and /dev/null differ diff --git a/server/-dependencies/libs/libhumblevideo-0.dll b/server/-dependencies/libs/libhumblevideo-0.dll deleted file mode 100644 index c47fb08a..00000000 Binary files a/server/-dependencies/libs/libhumblevideo-0.dll and /dev/null differ