From: Vásáry Dániel Date: Tue, 14 Aug 2018 09:57:43 +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=55e6989f9ca7589c599affce785e66b95720fde0;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31241 --- diff --git a/client/AudioRecorder/MainForm.cs b/client/AudioRecorder/MainForm.cs index 055828ec..1ff6fbe0 100644 --- a/client/AudioRecorder/MainForm.cs +++ b/client/AudioRecorder/MainForm.cs @@ -19,7 +19,7 @@ namespace AudioRecorder { public partial class MainForm : Form { - private const String CONFIG_FILE = "Configuration/audiorecorder.json"; + private const String CONFIG_FILE = "./Configuration/audiorecorder.json"; private const string WAV_EXT = ".WAV"; private AudioDevicesDetector devicesDetector; private List audioDevicesNames; @@ -76,7 +76,7 @@ namespace AudioRecorder { private void OnMainShown(object sender, EventArgs e) { try { - Type[] knownTypes = { typeof(AudioRecorderSettings), typeof(Target), typeof(Connection), typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) }; + Type[] knownTypes = { typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) }; parameters = ConfigurationSerializer.Load(CONFIG_FILE, knownTypes); UpdateGUI(); diff --git a/client/AudioRecorder/Program.cs b/client/AudioRecorder/Program.cs index 1c9899f6..f9cdad2d 100644 --- a/client/AudioRecorder/Program.cs +++ b/client/AudioRecorder/Program.cs @@ -1,4 +1,5 @@ -using System; +using MaestroShared.Configuration; +using System; using System.Collections.Generic; using System.Windows.Forms; @@ -11,7 +12,10 @@ namespace AudioRecorder { static void Main() { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); + //Application.Run(new MainForm()); + Type[] knownTypes = { typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) }; + var parameters = ConfigurationSerializer.Load("./Configuration/audiorecorder.json", knownTypes); + Application.Run(new MetadataSelectorForm(parameters)); } } } diff --git a/client/IntegrationTests/JobEngineIT.cs b/client/IntegrationTests/JobEngineIT.cs index bb4ab0bf..94a01ef5 100644 --- a/client/IntegrationTests/JobEngineIT.cs +++ b/client/IntegrationTests/JobEngineIT.cs @@ -1,8 +1,8 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using MediaCubeClient; using System.Net; -using Model; using System; +using MaestroShared.Model; namespace IntegrationTests { [TestClass] diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index fd68bd59..d6f7b9f5 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -2,18 +2,16 @@ using OctopusClient; using System.Linq; using System; -using DxPlay; using System.Windows.Forms; using TrafficClient; using System.Collections.Generic; using System.ComponentModel; -using System.Text.RegularExpressions; using MediaCubeClient; -using Model; using MaestroShared.Configuration; using MaestroShared.Metadata; using MaestroShared.Targets; using MaestroShared.Commons; +using MaestroShared.Model; namespace Maestro { public partial class MaestroForm { @@ -62,7 +60,7 @@ namespace Maestro { } private void InitializeTrafficSelector() { - TrafficMetadata metadata = Configuration.GetMetadataProvider(); + TrafficMetadata metadata = MetadataProvider.Get(Configuration.Metadatas); if (metadata == null) { tabMetadata.TabPages.Remove(tpTraffic); return; @@ -76,7 +74,7 @@ namespace Maestro { } private void InitializeOctopusSelector() { - OctopusMetadata octopusConfiguration = Configuration.GetMetadataProvider(); + OctopusMetadata octopusConfiguration = MetadataProvider.Get(Configuration.Metadatas); if (octopusConfiguration == null) { tabMetadata.TabPages.Remove(tpOctopus); return; @@ -90,7 +88,7 @@ namespace Maestro { } private void InitializeMediaCubeApi() { - MediaCubeMetadata metadata = Configuration.GetMetadataProvider(); + MediaCubeMetadata metadata = MetadataProvider.Get(Configuration.Metadatas); if (metadata == null) return; mediaCubeApi = new MediaCubeApi(metadata.Server.Address.ToString(), metadata.Server.UserName, metadata.Server.Password, metadata.Server.Timeout, errorMessageBus); @@ -241,7 +239,7 @@ namespace Maestro { if (masterId == null) return null; ArchiveMetadata result = new ArchiveMetadata(); - MediaCubeMetadata metadata = Configuration.GetMetadataProvider(); + MediaCubeMetadata metadata = MetadataProvider.Get(Configuration.Metadatas); string mcID = ARCHIVEID_PREFIX + masterId.id.ToString(); result.itemHouseId = string.IsNullOrEmpty(metadata?.MetadataIDFormat) ? mcID : metadata.MetadataIDFormat; result.itemTitle = result.itemHouseId; @@ -427,35 +425,35 @@ namespace Maestro { MetadataType metadataType = MetadataTypeUtil.Guess(id); switch (metadataType) { case MetadataType.TrafficMaterial: - config = Configuration.GetMetadataProvider(); + config = MetadataProvider.Get(Configuration.Metadatas); if (config == null) return; tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByMaterialID(id); break; case MetadataType.TrafficPromo: - config = Configuration.GetMetadataProvider(); + config = MetadataProvider.Get(Configuration.Metadatas); if (config == null) return; tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByPromoID(id); break; case MetadataType.TrafficAD: - config = Configuration.GetMetadataProvider(); + config = MetadataProvider.Get(Configuration.Metadatas); if (config == null) return; tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByADID(id); break; case MetadataType.OctopusPlaceHolder: - config = Configuration.GetMetadataProvider(); + config = MetadataProvider.Get(Configuration.Metadatas); if (config == null) return; tabMetadata.SelectedIndex = 0; octopusIDSelector.LookupByPlaceHolder(id); break; case MetadataType.OctopusStory: - config = Configuration.GetMetadataProvider(); + config = MetadataProvider.Get(Configuration.Metadatas); if (config == null) return; tabMetadata.SelectedIndex = 0; diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs index 5471bfe4..628f7e0b 100644 --- a/client/Maestro/Program.cs +++ b/client/Maestro/Program.cs @@ -256,10 +256,10 @@ namespace Maestro { string replacementHost = arguments.ToList().Where(i => i.StartsWith("http") || i.StartsWith("https")).FirstOrDefault(); if (String.IsNullOrEmpty(replacementHost)) return; - var mediaCubeProvider = config.GetMetadataProvider(); + var mediaCubeProvider = MetadataProvider.Get(config.Metadatas); if (mediaCubeProvider != null) mediaCubeProvider.Server.Address = replaceAuthority(replacementHost, mediaCubeProvider.Server.Address); - var octopusProvider = config.GetMetadataProvider(); + var octopusProvider = MetadataProvider.Get(config.Metadatas); if (octopusProvider != null) octopusProvider.Server.Address = replaceAuthority(replacementHost, octopusProvider.Server.Address); if (config.Source is NEXIOSource) diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index e7706c1e..f0826a55 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -84,14 +84,6 @@ namespace MaestroShared.Configuration { public bool MetadataOnly { get; set; } public Point Size { get; set; } - public T GetMetadataProvider() { - MetadataProvider provider = Metadatas?.Where(m => { return m is T; }).FirstOrDefault(); - T result = default(T); - try { - result = (T)Convert.ChangeType(provider, typeof(T)); - } finally { } - return result; - } } public class Player { @@ -155,6 +147,14 @@ namespace MaestroShared.Configuration { public class MetadataProvider : UISettings { public Connection Server { get; set; } + public static T Get(MetadataProvider[] providers) { + MetadataProvider provider = providers?.Where(m => { return m is T; }).FirstOrDefault(); + T result = default(T); + try { + result = (T)Convert.ChangeType(provider, typeof(T)); + } finally { } + return result; + } } public class ProjectSettings { @@ -179,6 +179,9 @@ namespace MaestroShared.Configuration { public ProjectSettings ProjectSettings { get; set; } } + public class NativeOctopusMetadata : OctopusMetadata { + } + public class TrafficMetadata : MetadataProvider { public ProjectSettings ProjectSettings { get; set; } } @@ -209,4 +212,5 @@ namespace MaestroShared.Configuration { } } } + } diff --git a/client/MaestroShared/Interfaces/IMediaCubeApi.cs b/client/MaestroShared/Interfaces/IMediaCubeApi.cs new file mode 100644 index 00000000..eb5e1bf9 --- /dev/null +++ b/client/MaestroShared/Interfaces/IMediaCubeApi.cs @@ -0,0 +1,7 @@ + +namespace MaestroShared.Interfaces { + public interface IMediaCubeApi { + T Create(object data); + void Notify(string to, string content); + } +} diff --git a/client/MaestroShared/MaestroShared.csproj b/client/MaestroShared/MaestroShared.csproj index dd78f7cf..a2b69961 100644 --- a/client/MaestroShared/MaestroShared.csproj +++ b/client/MaestroShared/MaestroShared.csproj @@ -111,9 +111,12 @@ Component + + + @@ -132,10 +135,6 @@ - - {cefd0348-ded4-453e-bf3a-0b52f8890ab3} - MediaCubeClient - {8c51d508-1759-4c10-84a4-80965fd074ff} PasswordEncrypter diff --git a/client/MaestroShared/MessageBus/MaestroMessage.cs b/client/MaestroShared/MessageBus/MaestroMessage.cs new file mode 100644 index 00000000..5285065c --- /dev/null +++ b/client/MaestroShared/MessageBus/MaestroMessage.cs @@ -0,0 +1,11 @@ + +using LinkDotNet.MessageHandling.Contracts; + +namespace MaestroShared.MessageBus { + public class MaestroMessage : IMessage { + public MaestroMessage(string message) { + Content = message; + } + public string Content { get; set; } + } +} diff --git a/client/MediaCubeClient/Model/Model.cs b/client/MaestroShared/Model/Model.cs similarity index 90% rename from client/MediaCubeClient/Model/Model.cs rename to client/MaestroShared/Model/Model.cs index 629e452e..9d0dee8a 100644 --- a/client/MediaCubeClient/Model/Model.cs +++ b/client/MaestroShared/Model/Model.cs @@ -1,6 +1,6 @@ using System; -namespace Model { +namespace MaestroShared.Model { public class WorkflowAction { public long id; public DateTime touched; diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index c4425a14..329d8b27 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.8.3")] -[assembly: AssemblyFileVersion("2.0.8.3")] +[assembly: AssemblyVersion("2.0.8.4")] +[assembly: AssemblyFileVersion("2.0.8.4")] diff --git a/client/MaestroShared/Targets/TargetProcessorParameter.cs b/client/MaestroShared/Targets/TargetProcessorParameter.cs index 1520f2ee..7af553e4 100644 --- a/client/MaestroShared/Targets/TargetProcessorParameter.cs +++ b/client/MaestroShared/Targets/TargetProcessorParameter.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using MediaCubeClient; using MaestroShared.Configuration; using MaestroShared.Metadata; using LinkDotNet.MessageHandling.Contracts; using System; +using MaestroShared.Interfaces; namespace MaestroShared.Target { public class TargetProcessorParameter { @@ -14,7 +14,7 @@ namespace MaestroShared.Target { public string ID { get; set; } public string MetadataText { get; set; } public List MovieSegments { get; set; } - public MediaCubeApi MediaCubeApi { get; set; } + public IMediaCubeApi MediaCubeApi { get; set; } public ArchiveMetadata ArchiveMetadata { get; set; } public int VariantID { get; set; } public MetadataType MetadataKind { get; set; } diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index 9b8ff2e8..5d5339f2 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -2,13 +2,12 @@ using System; using System.IO; using System.Windows.Forms; -using Model; using System.Text; -using System.Globalization; using MaestroShared.Configuration; using MaestroShared.Target; using MaestroShared.Metadata; using MaestroShared.Commons; +using MaestroShared.Model; namespace MaestroShared.Targets { diff --git a/client/MediaCubeClient/MediaCubeApi.cs b/client/MediaCubeClient/MediaCubeApi.cs index 4984faef..3efdd14e 100644 --- a/client/MediaCubeClient/MediaCubeApi.cs +++ b/client/MediaCubeClient/MediaCubeApi.cs @@ -8,16 +8,16 @@ using System.Diagnostics; using System.Net; using System.Runtime.Serialization; using LinkDotNet.MessageHandling.Contracts; +using MaestroShared.MessageBus; +using MaestroShared.Interfaces; namespace MediaCubeClient { - public class MediaCubeMessage : IMessage { - public MediaCubeMessage(string message) { - Content = message; + public class MediaCubeMessage : MaestroMessage { + public MediaCubeMessage(string message) : base(message) { } - public string Content { get; set; } } - public class MediaCubeApi { + public class MediaCubeApi : IMediaCubeApi { private const string DATEFORMAT = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK"; private static Logger logger = LogManager.GetCurrentClassLogger(); private RestClient client; diff --git a/client/MediaCubeClient/MediaCubeClient.csproj b/client/MediaCubeClient/MediaCubeClient.csproj index ddbf4944..fb4c22d5 100644 --- a/client/MediaCubeClient/MediaCubeClient.csproj +++ b/client/MediaCubeClient/MediaCubeClient.csproj @@ -113,8 +113,10 @@ - + + {d4417174-f21e-4ce2-ae5c-8eb30c9a9625} + MaestroShared + - \ No newline at end of file diff --git a/client/MetadataSelector/MetadataIDSelector.Designer.cs b/client/MetadataSelector/MetadataIDSelector.Designer.cs index 0005c266..b69fed4a 100644 --- a/client/MetadataSelector/MetadataIDSelector.Designer.cs +++ b/client/MetadataSelector/MetadataIDSelector.Designer.cs @@ -33,15 +33,19 @@ this.btnLookupMetadata = new System.Windows.Forms.Button(); this.labelSelectedMetadata = new System.Windows.Forms.Label(); this.textSelectedMetadata = new System.Windows.Forms.TextBox(); + this.tpNativeOctopus = new System.Windows.Forms.TabPage(); + this.nativeOctopusIDSelector = new NativeOctopusClient.NativeOctopusIDSelector(); this.tabMetadata.SuspendLayout(); this.tpOctopus.SuspendLayout(); this.tpTraffic.SuspendLayout(); this.pMetadataDisplay.SuspendLayout(); + this.tpNativeOctopus.SuspendLayout(); this.SuspendLayout(); // // tabMetadata // this.tabMetadata.Controls.Add(this.tpOctopus); + this.tabMetadata.Controls.Add(this.tpNativeOctopus); this.tabMetadata.Controls.Add(this.tpTraffic); this.tabMetadata.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); @@ -155,6 +159,27 @@ this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnSelectedMetadataIDChanged); this.textSelectedMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnSelectedMetadataIDKeyDown); // + // tpNativeOctopus + // + this.tpNativeOctopus.Controls.Add(this.nativeOctopusIDSelector); + this.tpNativeOctopus.Location = new System.Drawing.Point(4, 24); + this.tpNativeOctopus.Name = "tpNativeOctopus"; + this.tpNativeOctopus.Padding = new System.Windows.Forms.Padding(3); + this.tpNativeOctopus.Size = new System.Drawing.Size(365, 428); + this.tpNativeOctopus.TabIndex = 2; + this.tpNativeOctopus.Text = "Octopus"; + this.tpNativeOctopus.UseVisualStyleBackColor = true; + // + // nativeOctopusIDSelector + // + this.nativeOctopusIDSelector.BackColor = System.Drawing.Color.Transparent; + this.nativeOctopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill; + this.nativeOctopusIDSelector.IDChangedEvent = null; + this.nativeOctopusIDSelector.Location = new System.Drawing.Point(3, 3); + this.nativeOctopusIDSelector.Name = "nativeOctopusIDSelector"; + this.nativeOctopusIDSelector.Size = new System.Drawing.Size(359, 422); + this.nativeOctopusIDSelector.TabIndex = 0; + // // MetadataIDSelector // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -170,6 +195,7 @@ this.tpTraffic.PerformLayout(); this.pMetadataDisplay.ResumeLayout(false); this.pMetadataDisplay.PerformLayout(); + this.tpNativeOctopus.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -186,5 +212,7 @@ private System.Windows.Forms.TextBox textSelectedMetadata; private OctopusClient.OctopusIDSelector octopusIDSelector; private TrafficClient.TrafficIDSelector trafficIDSelector; + private System.Windows.Forms.TabPage tpNativeOctopus; + private NativeOctopusClient.NativeOctopusIDSelector nativeOctopusIDSelector; } } diff --git a/client/MetadataSelector/MetadataIDSelector.cs b/client/MetadataSelector/MetadataIDSelector.cs index 4d2612f7..f9716f5b 100644 --- a/client/MetadataSelector/MetadataIDSelector.cs +++ b/client/MetadataSelector/MetadataIDSelector.cs @@ -4,9 +4,9 @@ using MaestroShared.Commons; using MaestroShared.Configuration; using MaestroShared.Metadata; using MediaCubeClient; +using NativeOctopusClient; using OctopusClient; using System; -using System.Linq; using System.Security.Principal; using System.Text.RegularExpressions; using System.Windows.Forms; @@ -32,19 +32,24 @@ namespace MaestroShared.Controls { return; InitializeTrafficSelector(); InitializeOctopusSelector(); + InitializeNativeOctopusSelector(); } } - public IMessageBus messageBus = new MessageBus(); + public IMessageBus messageBus = new LinkDotNet.MessageHandling.MessageBus(); public MetadataIDSelector() { InitializeComponent(); messageBus.Subscribe(OnMessage); + messageBus.Subscribe(OnMessage); messageBus.Subscribe(OnMessage); messageBus.Subscribe(OnMessage); } private void OnMessage(IMessage message) { + NativeOctopusAPIMessage nm = message as NativeOctopusAPIMessage; + if (nm != null) + MsgBox.Error(nm.Content); OctopusAPIMessage om = message as OctopusAPIMessage; if (om != null) MsgBox.Error(om.Content); @@ -57,7 +62,7 @@ namespace MaestroShared.Controls { } private void InitializeTrafficSelector() { - TrafficMetadata metadata = GetMetadataProvider(); + TrafficMetadata metadata = MetadataProvider.Get(Providers); if (metadata == null) { tabMetadata.TabPages.Remove(tpTraffic); return; @@ -71,7 +76,7 @@ namespace MaestroShared.Controls { } private void InitializeOctopusSelector() { - OctopusMetadata octopusConfiguration = GetMetadataProvider(); + OctopusMetadata octopusConfiguration = MetadataProvider.Get(Providers); if (octopusConfiguration == null) { tabMetadata.TabPages.Remove(tpOctopus); return; @@ -84,13 +89,35 @@ namespace MaestroShared.Controls { octopusIDSelector.IDChangedEvent += OctopusIDChangedEvent; } + private void InitializeNativeOctopusSelector() { + NativeOctopusMetadata octopusConfiguration = MetadataProvider.Get(Providers); + if (octopusConfiguration == null) { + tabMetadata.TabPages.Remove(tpNativeOctopus); + return; + } + nativeOctopusIDSelector.Parameters = new NativeOctopusParameters() { + Configuration = octopusConfiguration, + UserName = WindowsIdentity.GetCurrent().Name, + MessageBus = messageBus, + }; + nativeOctopusIDSelector.IDChangedEvent += NativeOctopusIDChangedEvent; + } + private void OctopusIDChangedEvent(string id, string name, string text) { + trafficIDSelector.ClearSelection(); + nativeOctopusIDSelector.ClearSelection(); + textSelectedMetadata.Text = name; + } + + private void NativeOctopusIDChangedEvent(string id, string name, string text) { + octopusIDSelector.ClearSelection(); trafficIDSelector.ClearSelection(); textSelectedMetadata.Text = name; } private void TrafficIDChangedEvent(string id, int variantID, string text) { octopusIDSelector.ClearSelection(); + nativeOctopusIDSelector.ClearSelection(); textSelectedMetadata.Text = id; } @@ -98,50 +125,40 @@ namespace MaestroShared.Controls { Lookup(textSelectedMetadata.Text); } - public T GetMetadataProvider() { - MetadataProvider provider = Providers?.Where(m => { return m is T; }).FirstOrDefault(); - T result = default(T); - try { - result = (T)Convert.ChangeType(provider, typeof(T)); - } - finally { } - return result; - } - private void Lookup(string id) { MetadataProvider config = null; MetadataType metadataType = GuessMetadataType(id); switch (metadataType) { case MetadataType.TrafficMaterial: - config = GetMetadataProvider(); + config = MetadataProvider.Get(Providers); if (config == null) return; tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByMaterialID(id); break; case MetadataType.TrafficPromo: - config = GetMetadataProvider(); + config = MetadataProvider.Get(Providers); if (config == null) return; tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByPromoID(id); break; case MetadataType.TrafficAD: - config = GetMetadataProvider(); + config = MetadataProvider.Get(Providers); if (config == null) return; tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByADID(id); break; case MetadataType.OctopusPlaceHolder: - config = GetMetadataProvider(); + config = MetadataProvider.Get(Providers); if (config == null) return; tabMetadata.SelectedIndex = 0; octopusIDSelector.LookupByPlaceHolder(id); break; case MetadataType.OctopusStory: - config = GetMetadataProvider(); + config = MetadataProvider.Get(Providers); if (config == null) return; tabMetadata.SelectedIndex = 0; diff --git a/client/MetadataSelector/MetadataSelector.csproj b/client/MetadataSelector/MetadataSelector.csproj index 2bfd215e..0f67f4e7 100644 --- a/client/MetadataSelector/MetadataSelector.csproj +++ b/client/MetadataSelector/MetadataSelector.csproj @@ -84,6 +84,10 @@ {cefd0348-ded4-453e-bf3a-0b52f8890ab3} MediaCubeClient + + {c1a664be-7852-4418-bf33-6f59434fc5dc} + NativeOctopusClient + {8CC7C930-9DBF-487B-AED5-776937A649D5} OctopusClient diff --git a/client/NativeOctopusClient/OctopusAPI.cs b/client/NativeOctopusClient/NativeOctopusAPI.cs similarity index 94% rename from client/NativeOctopusClient/OctopusAPI.cs rename to client/NativeOctopusClient/NativeOctopusAPI.cs index f66972f5..1bf20a35 100644 --- a/client/NativeOctopusClient/OctopusAPI.cs +++ b/client/NativeOctopusClient/NativeOctopusAPI.cs @@ -17,7 +17,7 @@ namespace NativeOctopusClient { public string FormattedStart { get; set; } public int? StoryPosition { get; set; } public override String ToString() { - string displayName = Name?.ToString() ?? OctopusAPI.UNNAMED; + string displayName = Name?.ToString() ?? NativeOctopusAPI.UNNAMED; return "0".Equals(ID) ? displayName : String.Format($"{FormattedStart} {displayName} "); } } @@ -35,7 +35,7 @@ namespace NativeOctopusClient { public Rundown[] Rundowns { get; set; } public override String ToString() { - string displayName = Name?.ToString() ?? OctopusAPI.UNNAMED; + string displayName = Name?.ToString() ?? NativeOctopusAPI.UNNAMED; return "0".Equals(ID) ? displayName : String.Format($"{ID} {displayName} "); } } @@ -53,12 +53,12 @@ namespace NativeOctopusClient { public string Name { get; set; } public int? StoryPosition { get; set; } public override String ToString() { - string displayName = Name?.ToString() ?? OctopusAPI.UNNAMED; + string displayName = Name?.ToString() ?? NativeOctopusAPI.UNNAMED; return "0".Equals(ID) ? displayName : String.Format($"{ID} {displayName} "); } } - public class OctopusAPI { + public class NativeOctopusAPI { private static Logger logger = LogManager.GetCurrentClassLogger(); public const string UNNAMED = "<üres>"; private const string ID = "id"; @@ -67,7 +67,7 @@ namespace NativeOctopusClient { private string pwd; private IMessageBus messageBus; - public OctopusAPI(string address, string user, string pwd, int timeout, IMessageBus messageBus) { + public NativeOctopusAPI(string address, string user, string pwd, int timeout, IMessageBus messageBus) { this.user = user; this.pwd = pwd; client = new RestClient(address) { @@ -272,7 +272,7 @@ namespace NativeOctopusClient { result = resultObject.Children().Select(d => { StoryFolder r = new StoryFolder { ID = d[ID].ToString(), - Name = String.IsNullOrEmpty(d["name"].ToString()) ? OctopusAPI.UNNAMED : d["name"].ToString() + Name = String.IsNullOrEmpty(d["name"].ToString()) ? NativeOctopusAPI.UNNAMED : d["name"].ToString() }; //logger.Debug($"{r}"); @@ -321,7 +321,7 @@ namespace NativeOctopusClient { private void OnError(Exception e) { logger.Error(e); if (messageBus != null) - messageBus.Send(new OctopusAPIMessage("Sikertelen MediaCube OCTOPUS lekérdezés. Rendszerüzenet: " + e.Message)); + messageBus.Send(new NativeOctopusAPIMessage("Sikertelen OCTOPUS lekérdezés. Rendszerüzenet: " + e.Message)); } private static IEnumerable GetMosObjectsFromStory(JToken d) { diff --git a/client/NativeOctopusClient/NativeOctopusClient.csproj b/client/NativeOctopusClient/NativeOctopusClient.csproj index f3622f1a..aa8e87c1 100644 --- a/client/NativeOctopusClient/NativeOctopusClient.csproj +++ b/client/NativeOctopusClient/NativeOctopusClient.csproj @@ -58,14 +58,14 @@ - - + + UserControl - - OctopusIDSelector.cs + + NativeOctopusIDSelector.cs - + True @@ -74,8 +74,8 @@ - - OctopusIDSelector.cs + + NativeOctopusIDSelector.cs ResXFileCodeGenerator diff --git a/client/NativeOctopusClient/OctopusIDSelector.Designer.cs b/client/NativeOctopusClient/NativeOctopusIDSelector.Designer.cs similarity index 97% rename from client/NativeOctopusClient/OctopusIDSelector.Designer.cs rename to client/NativeOctopusClient/NativeOctopusIDSelector.Designer.cs index 87fa1d11..961235ec 100644 --- a/client/NativeOctopusClient/OctopusIDSelector.Designer.cs +++ b/client/NativeOctopusClient/NativeOctopusIDSelector.Designer.cs @@ -1,7 +1,7 @@ using MaestroShared.Controls; namespace NativeOctopusClient { - partial class OctopusIDSelector { + partial class NativeOctopusIDSelector { /// /// Required designer variable. /// diff --git a/client/NativeOctopusClient/OctopusIDSelector.cs b/client/NativeOctopusClient/NativeOctopusIDSelector.cs similarity index 93% rename from client/NativeOctopusClient/OctopusIDSelector.cs rename to client/NativeOctopusClient/NativeOctopusIDSelector.cs index 2dca42d2..5e75c2c0 100644 --- a/client/NativeOctopusClient/OctopusIDSelector.cs +++ b/client/NativeOctopusClient/NativeOctopusIDSelector.cs @@ -4,29 +4,29 @@ using System.Linq; using System.Windows.Forms; using System.Collections.Generic; using System.Runtime.InteropServices; -using LinkDotNet.MessageHandling.Contracts; using MaestroShared.Configuration; using MaestroShared.Commons; +using MaestroShared.MessageBus; namespace NativeOctopusClient { public delegate void OnSelectedIDChanged(string id, string name, string text); - public partial class OctopusIDSelector : UserControl { + public partial class NativeOctopusIDSelector : UserControl { private static Logger logger = LogManager.GetCurrentClassLogger(); private static readonly string ZERO = "0"; private string lookupStoryId; private string lookupPlaceHolderId; private TreeNode selectedNode; - private OctopusAPI client; + private NativeOctopusAPI client; public OnSelectedIDChanged IDChangedEvent { get; set; } - private OctopusParameters parameters; + private NativeOctopusParameters parameters; private bool refreshDisabled; - public OctopusParameters Parameters { + public NativeOctopusParameters Parameters { set { parameters = value; treeOctopus.DisableCheckBoxLevels = new[] { parameters.Configuration.DisableStoryCheck, parameters.Configuration.DisablePlaceHolderCheck }; - client = new OctopusAPI(value.Configuration.Server.Address.OriginalString, value.Configuration.Server.UserName, value.Configuration.Server.Password, value.Configuration.Server.Timeout, value.MessageBus); + client = new NativeOctopusAPI(value.Configuration.Server.Address.OriginalString, value.Configuration.Server.UserName, value.Configuration.Server.Password, value.Configuration.Server.Timeout, value.MessageBus); rbRundown.Checked = true; RefreshFolders(); } @@ -55,7 +55,7 @@ namespace NativeOctopusClient { [DllImport("user32.dll", CharSet = CharSet.Auto)] private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, ref TVITEM lParam); - public OctopusIDSelector() { + public NativeOctopusIDSelector() { InitializeComponent(); InitializeControls(); treeOctopus.AfterCheck += OnTreeAfterCheck; @@ -100,7 +100,7 @@ namespace NativeOctopusClient { return; treeOctopus.BeginUpdate(); foreach (var story in sortedStories) { - string name = story.Name == null ? OctopusAPI.UNNAMED : story.Name; + string name = story.Name == null ? NativeOctopusAPI.UNNAMED : story.Name; //String ID = isFolderView ? story.ID : story.ParentStoryID; string label = String.Empty; string parentStoryID = story.ParentStoryID; @@ -188,7 +188,7 @@ namespace NativeOctopusClient { IDChangedEvent?.Invoke(null, null, null); } - public OctopusAPI GetClient() { + public NativeOctopusAPI GetClient() { return client; } @@ -405,10 +405,8 @@ namespace NativeOctopusClient { } } - public class OctopusAPIMessage : IMessage { - public OctopusAPIMessage(string message) { - Content = message; + public class NativeOctopusAPIMessage : MaestroMessage { + public NativeOctopusAPIMessage(string message) : base(message) { } - public string Content { get; set; } } } diff --git a/client/NativeOctopusClient/OctopusIDSelector.resx b/client/NativeOctopusClient/NativeOctopusIDSelector.resx similarity index 100% rename from client/NativeOctopusClient/OctopusIDSelector.resx rename to client/NativeOctopusClient/NativeOctopusIDSelector.resx diff --git a/client/NativeOctopusClient/OctopusParameters.cs b/client/NativeOctopusClient/NativeOctopusParameters.cs similarity index 84% rename from client/NativeOctopusClient/OctopusParameters.cs rename to client/NativeOctopusClient/NativeOctopusParameters.cs index 9d77963a..ead7d2d4 100644 --- a/client/NativeOctopusClient/OctopusParameters.cs +++ b/client/NativeOctopusClient/NativeOctopusParameters.cs @@ -2,7 +2,7 @@ using MaestroShared.Configuration; namespace NativeOctopusClient { - public class OctopusParameters { + public class NativeOctopusParameters { public OctopusMetadata Configuration { get; set; } public string UserName { get; set; } public IMessageBus MessageBus { get; set; } diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index 92cf8f8c..a9f333b2 100644 --- a/client/OctopusClient/OctopusIDSelector.cs +++ b/client/OctopusClient/OctopusIDSelector.cs @@ -7,6 +7,7 @@ using System.Runtime.InteropServices; using LinkDotNet.MessageHandling.Contracts; using MaestroShared.Configuration; using MaestroShared.Commons; +using MaestroShared.MessageBus; namespace OctopusClient { public delegate void OnSelectedIDChanged(string id, string name, string text); @@ -405,10 +406,8 @@ namespace OctopusClient { } } - public class OctopusAPIMessage : IMessage { - public OctopusAPIMessage(string message) { - Content = message; + public class OctopusAPIMessage : MaestroMessage { + public OctopusAPIMessage(string message) : base(message) { } - public string Content { get; set; } } } diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 87f85fb5..37f7a1d4 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -6,6 +6,7 @@ using LinkDotNet.MessageHandling.Contracts; using MaestroShared.Commons; using MaestroShared.Configuration; using System.Text.RegularExpressions; +using MaestroShared.MessageBus; namespace TrafficClient { public delegate void OnSelectedIDChanged(string ID, int variantID, string text); @@ -273,10 +274,8 @@ namespace TrafficClient { public bool OK { get; set; } } - public class TrafficAPIMessage : IMessage { - public TrafficAPIMessage(string message) { - Content = message; + public class TrafficAPIMessage : MaestroMessage { + public TrafficAPIMessage(string message) : base(message) { } - public string Content { get; set; } } }