\r
public partial class MainForm : Form {\r
\r
- private const String CONFIG_FILE = "Configuration/audiorecorder.json";\r
+ private const String CONFIG_FILE = "./Configuration/audiorecorder.json";\r
private const string WAV_EXT = ".WAV";\r
private AudioDevicesDetector devicesDetector;\r
private List<string> audioDevicesNames;\r
\r
private void OnMainShown(object sender, EventArgs e) {\r
try {\r
- Type[] knownTypes = { typeof(AudioRecorderSettings), typeof(Target), typeof(Connection), typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) };\r
+ Type[] knownTypes = { typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) };\r
parameters = ConfigurationSerializer.Load<AudioRecorderSettings>(CONFIG_FILE, knownTypes);\r
\r
UpdateGUI();\r
-using System;\r
+using MaestroShared.Configuration;\r
+using System;\r
using System.Collections.Generic;\r
using System.Windows.Forms;\r
\r
static void Main() {\r
Application.EnableVisualStyles();\r
Application.SetCompatibleTextRenderingDefault(false);\r
- Application.Run(new MainForm());\r
+ //Application.Run(new MainForm());\r
+ Type[] knownTypes = { typeof(OctopusMetadata), typeof(TrafficMetadata), typeof(MediaCubeMetadata) };\r
+ var parameters = ConfigurationSerializer.Load<AudioRecorderSettings>("./Configuration/audiorecorder.json", knownTypes);\r
+ Application.Run(new MetadataSelectorForm(parameters));\r
}\r
}\r
}\r
using Microsoft.VisualStudio.TestTools.UnitTesting;\r
using MediaCubeClient;\r
using System.Net;\r
-using Model;\r
using System;\r
+using MaestroShared.Model;\r
\r
namespace IntegrationTests {\r
[TestClass]\r
using OctopusClient;\r
using System.Linq;\r
using System;\r
-using DxPlay;\r
using System.Windows.Forms;\r
using TrafficClient;\r
using System.Collections.Generic;\r
using System.ComponentModel;\r
-using System.Text.RegularExpressions;\r
using MediaCubeClient;\r
-using Model;\r
using MaestroShared.Configuration;\r
using MaestroShared.Metadata;\r
using MaestroShared.Targets;\r
using MaestroShared.Commons;\r
+using MaestroShared.Model;\r
\r
namespace Maestro {\r
public partial class MaestroForm {\r
}\r
\r
private void InitializeTrafficSelector() {\r
- TrafficMetadata metadata = Configuration.GetMetadataProvider<TrafficMetadata>();\r
+ TrafficMetadata metadata = MetadataProvider.Get<TrafficMetadata>(Configuration.Metadatas);\r
if (metadata == null) {\r
tabMetadata.TabPages.Remove(tpTraffic);\r
return;\r
}\r
\r
private void InitializeOctopusSelector() {\r
- OctopusMetadata octopusConfiguration = Configuration.GetMetadataProvider<OctopusMetadata>();\r
+ OctopusMetadata octopusConfiguration = MetadataProvider.Get<OctopusMetadata>(Configuration.Metadatas);\r
if (octopusConfiguration == null) {\r
tabMetadata.TabPages.Remove(tpOctopus);\r
return;\r
}\r
\r
private void InitializeMediaCubeApi() {\r
- MediaCubeMetadata metadata = Configuration.GetMetadataProvider<MediaCubeMetadata>();\r
+ MediaCubeMetadata metadata = MetadataProvider.Get<MediaCubeMetadata>(Configuration.Metadatas);\r
if (metadata == null)\r
return;\r
mediaCubeApi = new MediaCubeApi(metadata.Server.Address.ToString(), metadata.Server.UserName, metadata.Server.Password, metadata.Server.Timeout, errorMessageBus);\r
if (masterId == null)\r
return null;\r
ArchiveMetadata result = new ArchiveMetadata();\r
- MediaCubeMetadata metadata = Configuration.GetMetadataProvider<MediaCubeMetadata>();\r
+ MediaCubeMetadata metadata = MetadataProvider.Get<MediaCubeMetadata>(Configuration.Metadatas);\r
string mcID = ARCHIVEID_PREFIX + masterId.id.ToString();\r
result.itemHouseId = string.IsNullOrEmpty(metadata?.MetadataIDFormat) ? mcID : metadata.MetadataIDFormat;\r
result.itemTitle = result.itemHouseId;\r
MetadataType metadataType = MetadataTypeUtil.Guess(id);\r
switch (metadataType) {\r
case MetadataType.TrafficMaterial:\r
- config = Configuration.GetMetadataProvider<TrafficMetadata>();\r
+ config = MetadataProvider.Get<TrafficMetadata>(Configuration.Metadatas);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
trafficIDSelector.LookupByMaterialID(id);\r
break;\r
case MetadataType.TrafficPromo:\r
- config = Configuration.GetMetadataProvider<TrafficMetadata>();\r
+ config = MetadataProvider.Get<TrafficMetadata>(Configuration.Metadatas);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
trafficIDSelector.LookupByPromoID(id);\r
break;\r
case MetadataType.TrafficAD:\r
- config = Configuration.GetMetadataProvider<TrafficMetadata>();\r
+ config = MetadataProvider.Get<TrafficMetadata>(Configuration.Metadatas);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
trafficIDSelector.LookupByADID(id);\r
break;\r
case MetadataType.OctopusPlaceHolder:\r
- config = Configuration.GetMetadataProvider<OctopusMetadata>();\r
+ config = MetadataProvider.Get<OctopusMetadata>(Configuration.Metadatas);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = 0;\r
octopusIDSelector.LookupByPlaceHolder(id);\r
break;\r
case MetadataType.OctopusStory:\r
- config = Configuration.GetMetadataProvider<OctopusMetadata>();\r
+ config = MetadataProvider.Get<OctopusMetadata>(Configuration.Metadatas);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = 0;\r
string replacementHost = arguments.ToList().Where(i => i.StartsWith("http") || i.StartsWith("https")).FirstOrDefault();\r
if (String.IsNullOrEmpty(replacementHost))\r
return;\r
- var mediaCubeProvider = config.GetMetadataProvider<MediaCubeMetadata>();\r
+ var mediaCubeProvider = MetadataProvider.Get<MediaCubeMetadata>(config.Metadatas);\r
if (mediaCubeProvider != null)\r
mediaCubeProvider.Server.Address = replaceAuthority(replacementHost, mediaCubeProvider.Server.Address);\r
- var octopusProvider = config.GetMetadataProvider<OctopusMetadata>();\r
+ var octopusProvider = MetadataProvider.Get<OctopusMetadata>(config.Metadatas);\r
if (octopusProvider != null)\r
octopusProvider.Server.Address = replaceAuthority(replacementHost, octopusProvider.Server.Address);\r
if (config.Source is NEXIOSource)\r
public bool MetadataOnly { get; set; }\r
public Point Size { get; set; }\r
\r
- public T GetMetadataProvider<T>() {\r
- MetadataProvider provider = Metadatas?.Where(m => { return m is T; }).FirstOrDefault();\r
- T result = default(T);\r
- try {\r
- result = (T)Convert.ChangeType(provider, typeof(T));\r
- } finally { }\r
- return result;\r
- }\r
}\r
\r
public class Player {\r
\r
public class MetadataProvider : UISettings {\r
public Connection Server { get; set; }\r
+ public static T Get<T>(MetadataProvider[] providers) {\r
+ MetadataProvider provider = providers?.Where(m => { return m is T; }).FirstOrDefault();\r
+ T result = default(T);\r
+ try {\r
+ result = (T)Convert.ChangeType(provider, typeof(T));\r
+ } finally { }\r
+ return result;\r
+ }\r
}\r
\r
public class ProjectSettings {\r
public ProjectSettings ProjectSettings { get; set; }\r
}\r
\r
+ public class NativeOctopusMetadata : OctopusMetadata {\r
+ }\r
+\r
public class TrafficMetadata : MetadataProvider {\r
public ProjectSettings ProjectSettings { get; set; }\r
}\r
}\r
}\r
}\r
+\r
}\r
--- /dev/null
+\r
+namespace MaestroShared.Interfaces {\r
+ public interface IMediaCubeApi {\r
+ T Create<T>(object data);\r
+ void Notify(string to, string content);\r
+ }\r
+}\r
<SubType>Component</SubType>\r
</Compile>\r
<Compile Include="Controls\Win32.cs" />\r
+ <Compile Include="Interfaces\IMediaCubeApi.cs" />\r
+ <Compile Include="MessageBus\MaestroMessage.cs" />\r
<Compile Include="Metadata\MetadataType.cs" />\r
<Compile Include="Metadata\MovieSegment.cs" />\r
<Compile Include="Metadata\Timecode.cs" />\r
+ <Compile Include="Model\Model.cs" />\r
<Compile Include="Properties\AssemblyInfo.cs" />\r
<Compile Include="Metadata\ArchiveMetadata.cs" />\r
<Compile Include="Properties\Resources.Designer.cs">\r
<Compile Include="Targets\UNCTargetProcessor.cs" />\r
</ItemGroup>\r
<ItemGroup>\r
- <ProjectReference Include="..\MediaCubeClient\MediaCubeClient.csproj">\r
- <Project>{cefd0348-ded4-453e-bf3a-0b52f8890ab3}</Project>\r
- <Name>MediaCubeClient</Name>\r
- </ProjectReference>\r
<ProjectReference Include="..\PasswordEncrypter\PasswordEncrypter.csproj">\r
<Project>{8c51d508-1759-4c10-84a4-80965fd074ff}</Project>\r
<Name>PasswordEncrypter</Name>\r
--- /dev/null
+\r
+using LinkDotNet.MessageHandling.Contracts;\r
+\r
+namespace MaestroShared.MessageBus {\r
+ public class MaestroMessage : IMessage {\r
+ public MaestroMessage(string message) {\r
+ Content = message;\r
+ }\r
+ public string Content { get; set; }\r
+ }\r
+}\r
using System;\r
\r
-namespace Model {\r
+namespace MaestroShared.Model {\r
public class WorkflowAction {\r
public long id;\r
public DateTime touched;\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.8.3")]\r
-[assembly: AssemblyFileVersion("2.0.8.3")]\r
+[assembly: AssemblyVersion("2.0.8.4")]\r
+[assembly: AssemblyFileVersion("2.0.8.4")]\r
using System.Collections.Generic;\r
-using MediaCubeClient;\r
using MaestroShared.Configuration;\r
using MaestroShared.Metadata;\r
using LinkDotNet.MessageHandling.Contracts;\r
using System;\r
+using MaestroShared.Interfaces;\r
\r
namespace MaestroShared.Target {\r
public class TargetProcessorParameter {\r
public string ID { get; set; }\r
public string MetadataText { get; set; }\r
public List<MovieSegment> MovieSegments { get; set; }\r
- public MediaCubeApi MediaCubeApi { get; set; }\r
+ public IMediaCubeApi MediaCubeApi { get; set; }\r
public ArchiveMetadata ArchiveMetadata { get; set; }\r
public int VariantID { get; set; }\r
public MetadataType MetadataKind { get; set; }\r
using System;\r
using System.IO;\r
using System.Windows.Forms;\r
-using Model;\r
using System.Text;\r
-using System.Globalization;\r
using MaestroShared.Configuration;\r
using MaestroShared.Target;\r
using MaestroShared.Metadata;\r
using MaestroShared.Commons;\r
+using MaestroShared.Model;\r
\r
namespace MaestroShared.Targets {\r
\r
using System.Net;\r
using System.Runtime.Serialization;\r
using LinkDotNet.MessageHandling.Contracts;\r
+using MaestroShared.MessageBus;\r
+using MaestroShared.Interfaces;\r
\r
namespace MediaCubeClient {\r
- public class MediaCubeMessage : IMessage {\r
- public MediaCubeMessage(string message) {\r
- Content = message;\r
+ public class MediaCubeMessage : MaestroMessage {\r
+ public MediaCubeMessage(string message) : base(message) {\r
}\r
- public string Content { get; set; }\r
}\r
\r
- public class MediaCubeApi {\r
+ public class MediaCubeApi : IMediaCubeApi {\r
private const string DATEFORMAT = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK";\r
private static Logger logger = LogManager.GetCurrentClassLogger();\r
private RestClient client;\r
</None>\r
</ItemGroup>\r
<ItemGroup>\r
- <Compile Include="Model\Model.cs" />\r
+ <ProjectReference Include="..\MaestroShared\MaestroShared.csproj">\r
+ <Project>{d4417174-f21e-4ce2-ae5c-8eb30c9a9625}</Project>\r
+ <Name>MaestroShared</Name>\r
+ </ProjectReference>\r
</ItemGroup>\r
- <ItemGroup />\r
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
</Project>
\ No newline at end of file
this.btnLookupMetadata = new System.Windows.Forms.Button();\r
this.labelSelectedMetadata = new System.Windows.Forms.Label();\r
this.textSelectedMetadata = new System.Windows.Forms.TextBox();\r
+ this.tpNativeOctopus = new System.Windows.Forms.TabPage();\r
+ this.nativeOctopusIDSelector = new NativeOctopusClient.NativeOctopusIDSelector();\r
this.tabMetadata.SuspendLayout();\r
this.tpOctopus.SuspendLayout();\r
this.tpTraffic.SuspendLayout();\r
this.pMetadataDisplay.SuspendLayout();\r
+ this.tpNativeOctopus.SuspendLayout();\r
this.SuspendLayout();\r
// \r
// tabMetadata\r
// \r
this.tabMetadata.Controls.Add(this.tpOctopus);\r
+ this.tabMetadata.Controls.Add(this.tpNativeOctopus);\r
this.tabMetadata.Controls.Add(this.tpTraffic);\r
this.tabMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.tabMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnSelectedMetadataIDChanged);\r
this.textSelectedMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnSelectedMetadataIDKeyDown);\r
// \r
+ // tpNativeOctopus\r
+ // \r
+ this.tpNativeOctopus.Controls.Add(this.nativeOctopusIDSelector);\r
+ this.tpNativeOctopus.Location = new System.Drawing.Point(4, 24);\r
+ this.tpNativeOctopus.Name = "tpNativeOctopus";\r
+ this.tpNativeOctopus.Padding = new System.Windows.Forms.Padding(3);\r
+ this.tpNativeOctopus.Size = new System.Drawing.Size(365, 428);\r
+ this.tpNativeOctopus.TabIndex = 2;\r
+ this.tpNativeOctopus.Text = "Octopus";\r
+ this.tpNativeOctopus.UseVisualStyleBackColor = true;\r
+ // \r
+ // nativeOctopusIDSelector\r
+ // \r
+ this.nativeOctopusIDSelector.BackColor = System.Drawing.Color.Transparent;\r
+ this.nativeOctopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
+ this.nativeOctopusIDSelector.IDChangedEvent = null;\r
+ this.nativeOctopusIDSelector.Location = new System.Drawing.Point(3, 3);\r
+ this.nativeOctopusIDSelector.Name = "nativeOctopusIDSelector";\r
+ this.nativeOctopusIDSelector.Size = new System.Drawing.Size(359, 422);\r
+ this.nativeOctopusIDSelector.TabIndex = 0;\r
+ // \r
// MetadataIDSelector\r
// \r
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
this.tpTraffic.PerformLayout();\r
this.pMetadataDisplay.ResumeLayout(false);\r
this.pMetadataDisplay.PerformLayout();\r
+ this.tpNativeOctopus.ResumeLayout(false);\r
this.ResumeLayout(false);\r
this.PerformLayout();\r
\r
private System.Windows.Forms.TextBox textSelectedMetadata;\r
private OctopusClient.OctopusIDSelector octopusIDSelector;\r
private TrafficClient.TrafficIDSelector trafficIDSelector;\r
+ private System.Windows.Forms.TabPage tpNativeOctopus;\r
+ private NativeOctopusClient.NativeOctopusIDSelector nativeOctopusIDSelector;\r
}\r
}\r
using MaestroShared.Configuration;\r
using MaestroShared.Metadata;\r
using MediaCubeClient;\r
+using NativeOctopusClient;\r
using OctopusClient;\r
using System;\r
-using System.Linq;\r
using System.Security.Principal;\r
using System.Text.RegularExpressions;\r
using System.Windows.Forms;\r
return;\r
InitializeTrafficSelector();\r
InitializeOctopusSelector();\r
+ InitializeNativeOctopusSelector();\r
}\r
}\r
\r
- public IMessageBus messageBus = new MessageBus();\r
+ public IMessageBus messageBus = new LinkDotNet.MessageHandling.MessageBus();\r
\r
public MetadataIDSelector() {\r
InitializeComponent();\r
messageBus.Subscribe<OctopusAPIMessage>(OnMessage);\r
+ messageBus.Subscribe<NativeOctopusAPIMessage>(OnMessage);\r
messageBus.Subscribe<TrafficAPIMessage>(OnMessage);\r
messageBus.Subscribe<MediaCubeMessage>(OnMessage);\r
}\r
\r
private void OnMessage(IMessage message) {\r
+ NativeOctopusAPIMessage nm = message as NativeOctopusAPIMessage;\r
+ if (nm != null)\r
+ MsgBox.Error(nm.Content);\r
OctopusAPIMessage om = message as OctopusAPIMessage;\r
if (om != null)\r
MsgBox.Error(om.Content);\r
}\r
\r
private void InitializeTrafficSelector() {\r
- TrafficMetadata metadata = GetMetadataProvider<TrafficMetadata>();\r
+ TrafficMetadata metadata = MetadataProvider.Get<TrafficMetadata>(Providers);\r
if (metadata == null) {\r
tabMetadata.TabPages.Remove(tpTraffic);\r
return;\r
}\r
\r
private void InitializeOctopusSelector() {\r
- OctopusMetadata octopusConfiguration = GetMetadataProvider<OctopusMetadata>();\r
+ OctopusMetadata octopusConfiguration = MetadataProvider.Get<OctopusMetadata>(Providers);\r
if (octopusConfiguration == null) {\r
tabMetadata.TabPages.Remove(tpOctopus);\r
return;\r
octopusIDSelector.IDChangedEvent += OctopusIDChangedEvent;\r
}\r
\r
+ private void InitializeNativeOctopusSelector() {\r
+ NativeOctopusMetadata octopusConfiguration = MetadataProvider.Get<NativeOctopusMetadata>(Providers);\r
+ if (octopusConfiguration == null) {\r
+ tabMetadata.TabPages.Remove(tpNativeOctopus);\r
+ return;\r
+ }\r
+ nativeOctopusIDSelector.Parameters = new NativeOctopusParameters() {\r
+ Configuration = octopusConfiguration,\r
+ UserName = WindowsIdentity.GetCurrent().Name,\r
+ MessageBus = messageBus,\r
+ };\r
+ nativeOctopusIDSelector.IDChangedEvent += NativeOctopusIDChangedEvent;\r
+ }\r
+\r
private void OctopusIDChangedEvent(string id, string name, string text) {\r
+ trafficIDSelector.ClearSelection();\r
+ nativeOctopusIDSelector.ClearSelection();\r
+ textSelectedMetadata.Text = name;\r
+ }\r
+\r
+ private void NativeOctopusIDChangedEvent(string id, string name, string text) {\r
+ octopusIDSelector.ClearSelection();\r
trafficIDSelector.ClearSelection();\r
textSelectedMetadata.Text = name;\r
}\r
\r
private void TrafficIDChangedEvent(string id, int variantID, string text) {\r
octopusIDSelector.ClearSelection();\r
+ nativeOctopusIDSelector.ClearSelection();\r
textSelectedMetadata.Text = id;\r
}\r
\r
Lookup(textSelectedMetadata.Text);\r
}\r
\r
- public T GetMetadataProvider<T>() {\r
- MetadataProvider provider = Providers?.Where(m => { return m is T; }).FirstOrDefault();\r
- T result = default(T);\r
- try {\r
- result = (T)Convert.ChangeType(provider, typeof(T));\r
- }\r
- finally { }\r
- return result;\r
- }\r
-\r
private void Lookup(string id) {\r
MetadataProvider config = null;\r
MetadataType metadataType = GuessMetadataType(id);\r
switch (metadataType) {\r
case MetadataType.TrafficMaterial:\r
- config = GetMetadataProvider<TrafficMetadata>();\r
+ config = MetadataProvider.Get<TrafficMetadata>(Providers);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
trafficIDSelector.LookupByMaterialID(id);\r
break;\r
case MetadataType.TrafficPromo:\r
- config = GetMetadataProvider<TrafficMetadata>();\r
+ config = MetadataProvider.Get<TrafficMetadata>(Providers);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
trafficIDSelector.LookupByPromoID(id);\r
break;\r
case MetadataType.TrafficAD:\r
- config = GetMetadataProvider<TrafficMetadata>();\r
+ config = MetadataProvider.Get<TrafficMetadata>(Providers);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0;\r
trafficIDSelector.LookupByADID(id);\r
break;\r
case MetadataType.OctopusPlaceHolder:\r
- config = GetMetadataProvider<OctopusMetadata>();\r
+ config = MetadataProvider.Get<OctopusMetadata>(Providers);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = 0;\r
octopusIDSelector.LookupByPlaceHolder(id);\r
break;\r
case MetadataType.OctopusStory:\r
- config = GetMetadataProvider<OctopusMetadata>();\r
+ config = MetadataProvider.Get<OctopusMetadata>(Providers);\r
if (config == null)\r
return;\r
tabMetadata.SelectedIndex = 0;\r
<Project>{cefd0348-ded4-453e-bf3a-0b52f8890ab3}</Project>\r
<Name>MediaCubeClient</Name>\r
</ProjectReference>\r
+ <ProjectReference Include="..\NativeOctopusClient\NativeOctopusClient.csproj">\r
+ <Project>{c1a664be-7852-4418-bf33-6f59434fc5dc}</Project>\r
+ <Name>NativeOctopusClient</Name>\r
+ </ProjectReference>\r
<ProjectReference Include="..\OctopusClient\OctopusClient.csproj">\r
<Project>{8CC7C930-9DBF-487B-AED5-776937A649D5}</Project>\r
<Name>OctopusClient</Name>\r
public string FormattedStart { get; set; }\r
public int? StoryPosition { get; set; }\r
public override String ToString() {\r
- string displayName = Name?.ToString() ?? OctopusAPI.UNNAMED;\r
+ string displayName = Name?.ToString() ?? NativeOctopusAPI.UNNAMED;\r
return "0".Equals(ID) ? displayName : String.Format($"{FormattedStart} {displayName} ");\r
}\r
}\r
public Rundown[] Rundowns { get; set; }\r
\r
public override String ToString() {\r
- string displayName = Name?.ToString() ?? OctopusAPI.UNNAMED;\r
+ string displayName = Name?.ToString() ?? NativeOctopusAPI.UNNAMED;\r
return "0".Equals(ID) ? displayName : String.Format($"{ID} {displayName} ");\r
}\r
}\r
public string Name { get; set; }\r
public int? StoryPosition { get; set; }\r
public override String ToString() {\r
- string displayName = Name?.ToString() ?? OctopusAPI.UNNAMED;\r
+ string displayName = Name?.ToString() ?? NativeOctopusAPI.UNNAMED;\r
return "0".Equals(ID) ? displayName : String.Format($"{ID} {displayName} ");\r
}\r
}\r
\r
- public class OctopusAPI {\r
+ public class NativeOctopusAPI {\r
private static Logger logger = LogManager.GetCurrentClassLogger();\r
public const string UNNAMED = "<üres>";\r
private const string ID = "id";\r
private string pwd;\r
private IMessageBus messageBus;\r
\r
- public OctopusAPI(string address, string user, string pwd, int timeout, IMessageBus messageBus) {\r
+ public NativeOctopusAPI(string address, string user, string pwd, int timeout, IMessageBus messageBus) {\r
this.user = user;\r
this.pwd = pwd;\r
client = new RestClient(address) {\r
result = resultObject.Children().Select(d => {\r
StoryFolder r = new StoryFolder {\r
ID = d[ID].ToString(),\r
- Name = String.IsNullOrEmpty(d["name"].ToString()) ? OctopusAPI.UNNAMED : d["name"].ToString()\r
+ Name = String.IsNullOrEmpty(d["name"].ToString()) ? NativeOctopusAPI.UNNAMED : d["name"].ToString()\r
};\r
\r
//logger.Debug($"{r}");\r
private void OnError(Exception e) {\r
logger.Error(e);\r
if (messageBus != null)\r
- messageBus.Send(new OctopusAPIMessage("Sikertelen MediaCube OCTOPUS lekérdezés. Rendszerüzenet: " + e.Message));\r
+ messageBus.Send(new NativeOctopusAPIMessage("Sikertelen OCTOPUS lekérdezés. Rendszerüzenet: " + e.Message));\r
}\r
\r
private static IEnumerable<MosObject> GetMosObjectsFromStory(JToken d) {\r
<Reference Include="System.Xml" />\r
</ItemGroup>\r
<ItemGroup>\r
- <Compile Include="OctopusAPI.cs" />\r
- <Compile Include="OctopusIDSelector.cs">\r
+ <Compile Include="NativeOctopusAPI.cs" />\r
+ <Compile Include="NativeOctopusIDSelector.cs">\r
<SubType>UserControl</SubType>\r
</Compile>\r
- <Compile Include="OctopusIDSelector.Designer.cs">\r
- <DependentUpon>OctopusIDSelector.cs</DependentUpon>\r
+ <Compile Include="NativeOctopusIDSelector.Designer.cs">\r
+ <DependentUpon>NativeOctopusIDSelector.cs</DependentUpon>\r
</Compile>\r
- <Compile Include="OctopusParameters.cs" />\r
+ <Compile Include="NativeOctopusParameters.cs" />\r
<Compile Include="Properties\AssemblyInfo.cs" />\r
<Compile Include="Properties\Resources.Designer.cs">\r
<AutoGen>True</AutoGen>\r
</Compile>\r
</ItemGroup>\r
<ItemGroup>\r
- <EmbeddedResource Include="OctopusIDSelector.resx">\r
- <DependentUpon>OctopusIDSelector.cs</DependentUpon>\r
+ <EmbeddedResource Include="NativeOctopusIDSelector.resx">\r
+ <DependentUpon>NativeOctopusIDSelector.cs</DependentUpon>\r
</EmbeddedResource>\r
<EmbeddedResource Include="Properties\Resources.resx">\r
<Generator>ResXFileCodeGenerator</Generator>\r
using MaestroShared.Controls;\r
\r
namespace NativeOctopusClient {\r
- partial class OctopusIDSelector {\r
+ partial class NativeOctopusIDSelector {\r
/// <summary> \r
/// Required designer variable.\r
/// </summary>\r
using System.Windows.Forms;\r
using System.Collections.Generic;\r
using System.Runtime.InteropServices;\r
-using LinkDotNet.MessageHandling.Contracts;\r
using MaestroShared.Configuration;\r
using MaestroShared.Commons;\r
+using MaestroShared.MessageBus;\r
\r
namespace NativeOctopusClient {\r
public delegate void OnSelectedIDChanged(string id, string name, string text);\r
\r
- public partial class OctopusIDSelector : UserControl {\r
+ public partial class NativeOctopusIDSelector : UserControl {\r
private static Logger logger = LogManager.GetCurrentClassLogger();\r
private static readonly string ZERO = "0";\r
private string lookupStoryId;\r
private string lookupPlaceHolderId;\r
private TreeNode selectedNode;\r
- private OctopusAPI client;\r
+ private NativeOctopusAPI client;\r
public OnSelectedIDChanged IDChangedEvent { get; set; }\r
- private OctopusParameters parameters;\r
+ private NativeOctopusParameters parameters;\r
private bool refreshDisabled;\r
\r
- public OctopusParameters Parameters {\r
+ public NativeOctopusParameters Parameters {\r
set {\r
parameters = value;\r
treeOctopus.DisableCheckBoxLevels = new[] { parameters.Configuration.DisableStoryCheck, parameters.Configuration.DisablePlaceHolderCheck };\r
- client = new OctopusAPI(value.Configuration.Server.Address.OriginalString, value.Configuration.Server.UserName, value.Configuration.Server.Password, value.Configuration.Server.Timeout, value.MessageBus);\r
+ client = new NativeOctopusAPI(value.Configuration.Server.Address.OriginalString, value.Configuration.Server.UserName, value.Configuration.Server.Password, value.Configuration.Server.Timeout, value.MessageBus);\r
rbRundown.Checked = true;\r
RefreshFolders();\r
}\r
[DllImport("user32.dll", CharSet = CharSet.Auto)]\r
private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, ref TVITEM lParam);\r
\r
- public OctopusIDSelector() {\r
+ public NativeOctopusIDSelector() {\r
InitializeComponent();\r
InitializeControls();\r
treeOctopus.AfterCheck += OnTreeAfterCheck;\r
return;\r
treeOctopus.BeginUpdate();\r
foreach (var story in sortedStories) {\r
- string name = story.Name == null ? OctopusAPI.UNNAMED : story.Name;\r
+ string name = story.Name == null ? NativeOctopusAPI.UNNAMED : story.Name;\r
//String ID = isFolderView ? story.ID : story.ParentStoryID;\r
string label = String.Empty;\r
string parentStoryID = story.ParentStoryID;\r
IDChangedEvent?.Invoke(null, null, null);\r
}\r
\r
- public OctopusAPI GetClient() {\r
+ public NativeOctopusAPI GetClient() {\r
return client;\r
}\r
\r
}\r
}\r
\r
- public class OctopusAPIMessage : IMessage {\r
- public OctopusAPIMessage(string message) {\r
- Content = message;\r
+ public class NativeOctopusAPIMessage : MaestroMessage {\r
+ public NativeOctopusAPIMessage(string message) : base(message) {\r
}\r
- public string Content { get; set; }\r
}\r
}\r
using MaestroShared.Configuration;\r
\r
namespace NativeOctopusClient {\r
- public class OctopusParameters {\r
+ public class NativeOctopusParameters {\r
public OctopusMetadata Configuration { get; set; }\r
public string UserName { get; set; }\r
public IMessageBus MessageBus { get; set; }\r
using LinkDotNet.MessageHandling.Contracts;\r
using MaestroShared.Configuration;\r
using MaestroShared.Commons;\r
+using MaestroShared.MessageBus;\r
\r
namespace OctopusClient {\r
public delegate void OnSelectedIDChanged(string id, string name, string text);\r
}\r
}\r
\r
- public class OctopusAPIMessage : IMessage {\r
- public OctopusAPIMessage(string message) {\r
- Content = message;\r
+ public class OctopusAPIMessage : MaestroMessage {\r
+ public OctopusAPIMessage(string message) : base(message) {\r
}\r
- public string Content { get; set; }\r
}\r
}\r
using MaestroShared.Commons;\r
using MaestroShared.Configuration;\r
using System.Text.RegularExpressions;\r
+using MaestroShared.MessageBus;\r
\r
namespace TrafficClient {\r
public delegate void OnSelectedIDChanged(string ID, int variantID, string text);\r
public bool OK { get; set; }\r
}\r
\r
- public class TrafficAPIMessage : IMessage {\r
- public TrafficAPIMessage(string message) {\r
- Content = message;\r
+ public class TrafficAPIMessage : MaestroMessage {\r
+ public TrafficAPIMessage(string message) : base(message) {\r
}\r
- public string Content { get; set; }\r
}\r
}\r
https://git.useribm.hu / mediacube.git / commitdiff