"userName": "MAM",\r
"password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
"timeout": 1000\r
+ },\r
+ "projectSettings": {\r
+ "templateRoot": {\r
+ "address": "file://10.10.1.100/BRAAVOS/.MAESTRO",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ },\r
+ "templateName": "ALAPTIMELINE.ezp",\r
+ "target": {\r
+ "label": "Projekt létrehozása",\r
+ "processor": "UNCTargetProcessor",\r
+ "outputFormat": "%ID%-%TEXT%",\r
+ "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT",\r
+ "disableFileVersioning": true,\r
+ "remote": {\r
+ "address": "file://10.10.1.100/BRAAVOS/OCTOPUS",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ }\r
+ },\r
+ "disableOpenProject": false,\r
+ "disableOpenSourceFolder": false\r
}\r
},\r
{\r
--- /dev/null
+{\r
+ "title": "TQC check",\r
+ "active": true,\r
+ "startInTray": false,\r
+ "enableCustomMetadataId": true,\r
+ "player": {\r
+ "enabled": true,\r
+ "autoStart": false,\r
+ "segmentEditor": true\r
+ },\r
+ "source": {\r
+ "$type": "UNCSource",\r
+ "filter": "avi,wav,mxf",\r
+ "local": {\r
+ "address": "file://10.10.1.100/BRAAVOS/TQC/CHECK",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ },\r
+ "remote": {\r
+ "address": "ftp://10.10.1.100/TQC/CHECK",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ }\r
+ },\r
+ "metadatas": [\r
+ {\r
+ "$type": "TrafficMetadata",\r
+ "server": {\r
+ "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+ "userName": "MAM",\r
+ "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+ "timeout": 1000\r
+ }\r
+ },\r
+ {\r
+ "$type": "MediaCubeMetadata",\r
+ "server": {\r
+ "address": "http://10.10.1.27/services/rest/jobengine/",\r
+ "timeout": 1000\r
+ }\r
+ }\r
+ ],\r
+ "targets": [\r
+ {\r
+ "label": "Adáskész",\r
+ "processor": "FXPTargetProcessor",\r
+ "outputFormat": "%ID%",\r
+ "saveSegments": true,\r
+ "tag": "Adáskész",\r
+ "disableFileVersioning": true,\r
+ "saveMorpheusMetadata": true,\r
+ "pathMorpheusMetadata": "/PLAYOUT/MorpheusGateway/Input",\r
+ "deviceIdMorpheus": "ISILON",\r
+ "remote": {\r
+ "address": "ftp://10.10.1.100/PLAYOUT/Video",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ }\r
+ },\r
+ {\r
+ "label": "Újravágás",\r
+ "processor": "FXPTargetProcessor",\r
+ "subFolderFormat": "%IDROOT%-%TEXT%",\r
+ "outputFormat": "%ID%-%TEXT%",\r
+ "tag": "Újravágás",\r
+ "remote": {\r
+ "address": "ftp://10.10.1.100/PLAYOUT_NLE",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ },\r
+ "sendEmailOnSuccess": true,\r
+ "successEmailRecipient": "vasary@elgekko.net",\r
+ "successEmailPattern": "A %TARGETNAME% újravágása szükséges."\r
+ },\r
+ {\r
+ "label": "Archiválás",\r
+ "processor": "FXPTargetProcessor",\r
+ "outputFormat": "%ID%",\r
+ "tag": "Archiválás",\r
+ "saveArchiveMetadata": true,\r
+ "disableFileVersioning": true,\r
+ "enableOverride": true,\r
+ "remote": {\r
+ "address": "ftp://10.10.1.100/ARCHIVE",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ }\r
+ }\r
+ ]\r
+}\r
{\r
"title": "NLE",\r
- "active": false,\r
+ "active": true,\r
"startInTray": false,\r
"enableCustomMetadataId": true,\r
"defaultWindowColor": "#E1BEE7",\r
"target": {\r
"label": "Projekt létrehozása",\r
"processor": "UNCTargetProcessor",\r
- "outputFormat": "%ID%-%TEXT%",\r
+ "outputFormat": "%ID%",\r
"subFolderFormat": "%IDROOT%-%TEXT%/PROJECT",\r
"disableFileVersioning": true,\r
"remote": {\r
"password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
"timeout": 1000\r
},\r
- "local": {\r
- "address": "file://10.10.1.100/OCTOPUS",\r
- "userName": "mediacube",\r
- "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
- "timeout": 1000\r
+ "projectSettings": {\r
+ "templateRoot": {\r
+ "address": "file://10.10.1.100/BRAAVOS/.MAESTRO",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ },\r
+ "templateName": "ALAPTIMELINE.ezp",\r
+ "target": {\r
+ "label": "Projekt létrehozása",\r
+ "processor": "UNCTargetProcessor",\r
+ "outputFormat": "%ID%",\r
+ "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT",\r
+ "disableFileVersioning": true,\r
+ "remote": {\r
+ "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE",\r
+ "userName": "mediacube",\r
+ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+ "timeout": 1000\r
+ }\r
+ },\r
+ "disableOpenProject": false,\r
+ "disableOpenSourceFolder": false\r
}\r
},\r
{\r
<None Include="Configuration\-ACTIVE-configuration-nle.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-archive.json">\r
+ <None Include="Configuration\-configuration-archive.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-sxs-tibi.json">\r
+ <None Include="Configuration\-configuration-sxs-tibi.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-torokor-t.json">\r
+ <None Include="Configuration\-configuration-torokor-t.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
<None Include="Configuration\global.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-nexio-ingest.json">\r
+ <None Include="Configuration\-configuration-nexio-ingest.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-editor.json">\r
+ <None Include="Configuration\-configuration-editor.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
<None Include="Configuration\configuration-nle.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-playout-ingest.json">\r
+ <None Include="Configuration\-configuration-playout-ingest.json">\r
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+ </None>\r
+ <None Include="Configuration\-configuration-tqc-check.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
<None Include="Connected Services\packages.config" />\r
<None Include="Resources\configuration-fxp.json">\r
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-playout.json">\r
+ <None Include="Configuration\-configuration-playout.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
<None Include="Resources\configuration-unc.json">\r
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-sxs.json">\r
+ <None Include="Configuration\-configuration-sxs.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-studio.json">\r
+ <None Include="Configuration\-configuration-studio.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
</ItemGroup>\r
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm));\r
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();\r
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();\r
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
this.groupSource = new System.Windows.Forms.GroupBox();\r
this.dgSource = new System.Windows.Forms.DataGridView();\r
this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
this.tabSystem = new System.Windows.Forms.TabControl();\r
this.tabPage1 = new System.Windows.Forms.TabPage();\r
this.dgJobs = new System.Windows.Forms.DataGridView();\r
- this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components);\r
- this.tabPage2 = new System.Windows.Forms.TabPage();\r
- this.dgMessages = new System.Windows.Forms.DataGridView();\r
- this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
- this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
- this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
- this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
this.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
this.Progress = new Maestro.Commons.DataGridViewProgressColumn();\r
this.columnOutput = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
this.columnKillDate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
this.Message = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+ this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components);\r
+ this.tabPage2 = new System.Windows.Forms.TabPage();\r
+ this.dgMessages = new System.Windows.Forms.DataGridView();\r
+ this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+ this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+ this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
+ this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
this.groupSource.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.dgSource)).BeginInit();\r
((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();\r
this.dgJobs.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnJobsCellPainting);\r
this.dgJobs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridJobs_MouseClick);\r
// \r
- // tabPage2\r
- // \r
- this.tabPage2.Controls.Add(this.dgMessages);\r
- this.tabPage2.Location = new System.Drawing.Point(4, 24);\r
- this.tabPage2.Name = "tabPage2";\r
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);\r
- this.tabPage2.Size = new System.Drawing.Size(994, 96);\r
- this.tabPage2.TabIndex = 1;\r
- this.tabPage2.Text = global::Maestro.StringResources.UZENETEK;\r
- this.tabPage2.UseVisualStyleBackColor = true;\r
- // \r
- // dgMessages\r
- // \r
- this.dgMessages.AllowUserToAddRows = false;\r
- this.dgMessages.AllowUserToResizeRows = false;\r
- this.dgMessages.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;\r
- this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
- this.dgMessages.BackgroundColor = System.Drawing.Color.White;\r
- this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
- this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
- this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
- this.dataGridViewTextBoxColumn1,\r
- this.dataGridViewTextBoxColumn2});\r
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;\r
- dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Red;\r
- dataGridViewCellStyle9.NullValue = null;\r
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Red;\r
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgMessages.DefaultCellStyle = dataGridViewCellStyle9;\r
- this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill;\r
- this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
- this.dgMessages.EnableHeadersVisualStyles = false;\r
- this.dgMessages.GridColor = System.Drawing.Color.White;\r
- this.dgMessages.Location = new System.Drawing.Point(3, 3);\r
- this.dgMessages.Name = "dgMessages";\r
- this.dgMessages.ReadOnly = true;\r
- this.dgMessages.RowHeadersVisible = false;\r
- dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle10;\r
- this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
- this.dgMessages.Size = new System.Drawing.Size(988, 90);\r
- this.dgMessages.TabIndex = 1;\r
- // \r
- // dataGridViewTextBoxColumn1\r
- // \r
- this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
- this.dataGridViewTextBoxColumn1.DataPropertyName = "Time";\r
- this.dataGridViewTextBoxColumn1.HeaderText = "Időpont";\r
- this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";\r
- this.dataGridViewTextBoxColumn1.ReadOnly = true;\r
- this.dataGridViewTextBoxColumn1.Width = 73;\r
- // \r
- // dataGridViewTextBoxColumn2\r
- // \r
- this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
- this.dataGridViewTextBoxColumn2.DataPropertyName = "Message";\r
- dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle8;\r
- this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet";\r
- this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
- this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
- // \r
- // systemMessageBindingSource\r
- // \r
- this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage);\r
- // \r
- // metadataInfoBindingSource\r
- // \r
- this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
- // \r
// columnLabel\r
// \r
this.columnLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
this.Message.Name = "Message";\r
this.Message.Width = 71;\r
// \r
+ // tabPage2\r
+ // \r
+ this.tabPage2.Controls.Add(this.dgMessages);\r
+ this.tabPage2.Location = new System.Drawing.Point(4, 24);\r
+ this.tabPage2.Name = "tabPage2";\r
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);\r
+ this.tabPage2.Size = new System.Drawing.Size(994, 96);\r
+ this.tabPage2.TabIndex = 1;\r
+ this.tabPage2.Text = global::Maestro.StringResources.UZENETEK;\r
+ this.tabPage2.UseVisualStyleBackColor = true;\r
+ // \r
+ // dgMessages\r
+ // \r
+ this.dgMessages.AllowUserToAddRows = false;\r
+ this.dgMessages.AllowUserToResizeRows = false;\r
+ this.dgMessages.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;\r
+ this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
+ this.dgMessages.BackgroundColor = System.Drawing.Color.White;\r
+ this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+ this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
+ this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
+ this.dataGridViewTextBoxColumn1,\r
+ this.dataGridViewTextBoxColumn2});\r
+ dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;\r
+ dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Red;\r
+ dataGridViewCellStyle9.NullValue = null;\r
+ dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+ dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Red;\r
+ dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgMessages.DefaultCellStyle = dataGridViewCellStyle9;\r
+ this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill;\r
+ this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
+ this.dgMessages.EnableHeadersVisualStyles = false;\r
+ this.dgMessages.GridColor = System.Drawing.Color.White;\r
+ this.dgMessages.Location = new System.Drawing.Point(3, 3);\r
+ this.dgMessages.Name = "dgMessages";\r
+ this.dgMessages.ReadOnly = true;\r
+ this.dgMessages.RowHeadersVisible = false;\r
+ dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle10;\r
+ this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
+ this.dgMessages.Size = new System.Drawing.Size(988, 90);\r
+ this.dgMessages.TabIndex = 1;\r
+ // \r
+ // dataGridViewTextBoxColumn1\r
+ // \r
+ this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
+ this.dataGridViewTextBoxColumn1.DataPropertyName = "Time";\r
+ this.dataGridViewTextBoxColumn1.HeaderText = "Időpont";\r
+ this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";\r
+ this.dataGridViewTextBoxColumn1.ReadOnly = true;\r
+ this.dataGridViewTextBoxColumn1.Width = 73;\r
+ // \r
+ // dataGridViewTextBoxColumn2\r
+ // \r
+ this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
+ this.dataGridViewTextBoxColumn2.DataPropertyName = "Message";\r
+ dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle8;\r
+ this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet";\r
+ this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
+ this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
+ // \r
+ // systemMessageBindingSource\r
+ // \r
+ this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage);\r
+ // \r
+ // metadataInfoBindingSource\r
+ // \r
+ this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo);\r
+ // \r
// MaestroForm\r
// \r
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
tabMetadata.TabPages.Remove(tpTraffic);\r
return;\r
}\r
- trafficIDSelector.Configuration = new TrafficConfiguration() {\r
- Address = metadata.Server.Address,\r
- UserName = metadata.Server.UserName,\r
- Password = metadata.Server.Password,\r
- Timeout = metadata.Server.Timeout,\r
+ trafficIDSelector.Parameters = new TrafficParameters() {\r
+ Configuration = metadata,\r
+ UserName = TrayApplicationContext.UserName,\r
MessageBus = errorMessageBus\r
};\r
trafficIDSelector.IDChangedEvent += OnTrafficIDSelected;\r
config = Configuration.GetMetadataProvider<TrafficMetadata>();\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
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
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
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
if (config == null)\r
return;\r
+ tabMetadata.SelectedIndex = 0;\r
octopusIDSelector.LookupByStory(id);\r
break;\r
}\r
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
- CAAAAk1TRnQBSQFMAgEBAgEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+ CAAAAk1TRnQBSQFMAgEBAgEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\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.5.8")]\r
-[assembly: AssemblyFileVersion("2.0.5.8")]\r
+[assembly: AssemblyVersion("2.0.6.0")]\r
+[assembly: AssemblyFileVersion("2.0.6.0")]\r
}\r
\r
public bool Reset(string path) {\r
- if (Path == null || Path.Equals(path))\r
+ if (Path.Equals(path))\r
return false;\r
- Path = path;\r
+ Path = path == null ? rootPath : path;\r
Clear();\r
cache = null;\r
Shutdown();\r
--- /dev/null
+using MaestroShared.Configuration;\r
+using MaestroShared.Target;\r
+using MaestroShared.Targets;\r
+using System.Diagnostics;\r
+using System.IO;\r
+\r
+namespace MaestroShared.Commons {\r
+\r
+ public class EdiusProject {\r
+\r
+ public static void Open(ProjectSettings projectConfiguration, string id, string text, string userName) {\r
+ if (!MsgBox.YesNoQuestion("Megnyissam vágásra?"))\r
+ return;\r
+ if (projectConfiguration == null) {\r
+ MsgBox.Error("Nem található a 'projectSettings' beállítás a konfigurációs állományban.");\r
+ return;\r
+ }\r
+ if (!projectConfiguration.IsValid) {\r
+ MsgBox.Error("A 'projectSettings' beállítás hiányos a konfigurációs állományban.");\r
+ return;\r
+ }\r
+\r
+ TargetProcessorParameter processorParameter = new TargetProcessorParameter() {\r
+ SourceConfig = new Source() {\r
+ Local = projectConfiguration?.TemplateRoot,\r
+ Remote = projectConfiguration?.TemplateRoot\r
+ },\r
+ TargetConfig = projectConfiguration?.Target,\r
+ ID = id,\r
+ MetadataText = text,\r
+ InputFileName = projectConfiguration?.TemplateName,\r
+ UserName = userName,\r
+ };\r
+\r
+ ITargetProcessor processor = TargetProcessor.Create(projectConfiguration.Target.Processor);\r
+ processor.Initialize(null, processorParameter);\r
+ if (TargetProcessor.REVOKED.Equals(processor.Status) || TargetProcessor.ERROR.Equals(processor.Status)) {\r
+ MsgBox.Error(processor.Message);\r
+ return;\r
+ }\r
+\r
+ processor.Execute();\r
+\r
+ if (!TargetProcessor.READY.Equals(processor.Status) && !TargetProcessor.SKIPPED.Equals(processor.Status)) {\r
+ MsgBox.Error(processor.Message);\r
+ return;\r
+ }\r
+\r
+ if (!projectConfiguration.DisableOpenProject)\r
+ Process.Start(processor.Output);\r
+ if (!projectConfiguration.DisableOpenSourceFolder) {\r
+ string path = Path.GetDirectoryName(Path.GetDirectoryName(processor.Output));\r
+ Process.Start(path);\r
+ }\r
+ }\r
+ }\r
+}
\ No newline at end of file
public static void Exclamation(string text) {\r
MessageBox.Show(text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);\r
}\r
+\r
+ public static bool YesNoQuestion(string text) {\r
+ return MessageBox.Show(text, string.Empty, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes;\r
+ }\r
}\r
}\r
}\r
\r
public class TrafficMetadata : MetadataProvider {\r
+ public ProjectSettings ProjectSettings { get; set; }\r
}\r
\r
public class MediaCubeMetadata : MetadataProvider {\r
<Reference Include="System.Xml" />\r
</ItemGroup>\r
<ItemGroup>\r
+ <Compile Include="Commons\EdiusProject.cs" />\r
<Compile Include="Commons\MsgBox.cs" />\r
<Compile Include="Commons\MorpheusXML.cs" />\r
<Compile Include="Commons\NexioXML.cs" />\r
long lastSize = 0;\r
while (overall != ilength) {\r
overall = monitorFTP.GetFileSize(OutputName);\r
+ /*\r
FtpReply statRETR = sourceFTP.Execute("STAT");\r
if (!statRETR.Success)\r
Debug.WriteLine($"Overall {overall}, last {lastSize}");\r
else\r
Debug.WriteLine($"Overall {overall}, last {lastSize} site {statRETR.Message}");\r
-\r
+*/\r
if (overall == lastSize && overall > 0) {\r
Progress = 100;\r
break;\r
}\r
txtFilter.Text = storyId;\r
if (selectedNode == null)\r
- MessageBox.Show("Nincs találat.");\r
+ MsgBox.Info("Nincs találat.");\r
else\r
treeOctopus.Focus();\r
}\r
private void OnNodeDoubleClick(object sender, TreeNodeMouseClickEventArgs e) {\r
if (e.X < e.Node.Bounds.X + 5 || e.Node.Level != 0)\r
return;\r
- Open(e.Node);\r
- }\r
-\r
- private void Open(TreeNode node) {\r
- if (MessageBox.Show("Megnyissam vágásra?", null, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.No)\r
+ Story story = e.Node.Tag as Story;\r
+ if (story == null)\r
return;\r
ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings;\r
- if (projectConfiguration == null) {\r
- MessageBox.Show("Nem található a 'projectSetings' beállítás a konfigurációs állományban.", null, MessageBoxButtons.OK, MessageBoxIcon.Error);\r
- return;\r
- }\r
- if (!projectConfiguration.IsValid) {\r
- MessageBox.Show("A 'projectSetings' beállítás hiányos a konfigurációs állományban.", null, MessageBoxButtons.OK, MessageBoxIcon.Error);\r
- return;\r
- }\r
- Story story = node.Tag as Story;\r
- TargetProcessorParameter processorParameter = new TargetProcessorParameter() {\r
- SourceConfig = new Source() {\r
- Local = projectConfiguration.TemplateRoot,\r
- Remote = projectConfiguration.TemplateRoot\r
- },\r
- TargetConfig = projectConfiguration.Target,\r
- ID = node.Name,\r
- MetadataText = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"),\r
- InputFileName = projectConfiguration.TemplateName,\r
- UserName = parameters.UserName,\r
- };\r
-\r
- ITargetProcessor processor = TargetProcessor.Create(projectConfiguration.Target.Processor);\r
- processor.Initialize(null, processorParameter);\r
- if (TargetProcessor.REVOKED.Equals(processor.Status)) {\r
- MsgBox.Error(processor.Message);\r
- return;\r
- }\r
-\r
- processor.Execute();\r
-\r
- if (!TargetProcessor.READY.Equals(processor.Status) && !TargetProcessor.SKIPPED.Equals(processor.Status)) {\r
- MsgBox.Error(processor.Message);\r
- return;\r
- }\r
-\r
- if (!projectConfiguration.DisableOpenProject)\r
- Process.Start(processor.Output);\r
- if (!projectConfiguration.DisableOpenSourceFolder) {\r
- string path = Path.GetDirectoryName(Path.GetDirectoryName(processor.Output));\r
- Process.Start(path);\r
- }\r
+ string id = story.ParentStoryID;\r
+ string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}");\r
+ EdiusProject.Open(projectConfiguration, id, text, parameters.UserName);\r
}\r
\r
private void noFocusCueButton1_Click(object sender, EventArgs e) {\r
// class via a tool like ResGen or Visual Studio.\r
// To add or remove a member, edit your .ResX file then rerun ResGen\r
// with the /str option, or rebuild your VS project.\r
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]\r
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
internal class Resources {\r
}\r
}\r
\r
+ /// <summary>\r
+ /// Looks up a localized resource of type System.Drawing.Bitmap.\r
+ /// </summary>\r
+ internal static System.Drawing.Bitmap ic_refresh_black_24dp_1x {\r
+ get {\r
+ object obj = ResourceManager.GetObject("ic_refresh_black_24dp_1x", resourceCulture);\r
+ return ((System.Drawing.Bitmap)(obj));\r
+ }\r
+ }\r
+ \r
/// <summary>\r
/// Looks up a localized string similar to Keresés.\r
/// </summary>\r
<data name="HIANYOS" xml:space="preserve">\r
<value>Hiányos</value>\r
</data>\r
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+ <data name="ic_refresh_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+ <value>Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+ </data>\r
<data name="KERESES" xml:space="preserve">\r
<value>Keresés</value>\r
</data>\r
return segmentWorker.GetADSegments(strParam);\r
}\r
\r
- public TrafficVersion CreateMaterialVersion(string episodeID) {\r
- return materialWorker.CreateMaterialVersion(episodeID);\r
+ public TrafficVersion CreateMaterialVersion(string episodeID, bool recut) {\r
+ return materialWorker.CreateMaterialVersion(episodeID, recut);\r
}\r
}\r
}\r
<Name>MaestroShared</Name>\r
</ProjectReference>\r
</ItemGroup>\r
+ <ItemGroup>\r
+ <None Include="Resources\ic_refresh_black_24dp_1x.png" />\r
+ </ItemGroup>\r
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
</Project>
\ No newline at end of file
using LinkDotNet.MessageHandling.Contracts;\r
-using System;\r
+using MaestroShared.Configuration;\r
\r
namespace TrafficClient {\r
- public class TrafficConfiguration {\r
- public Uri Address { get; set; }\r
+ public class TrafficParameters {\r
+ public TrafficMetadata Configuration { get; set; }\r
public string UserName { get; set; }\r
- public string Password { get; set; }\r
- public int Timeout;\r
public IMessageBus MessageBus { get; set; }\r
}\r
}\r
private void InitializeComponent()\r
{\r
this.components = new System.ComponentModel.Container();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
this.trafficAPIBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
this.dtScheduled = new System.Windows.Forms.DateTimePicker();\r
this.txtFilter = new System.Windows.Forms.TextBox();\r
this.rbPromo = new System.Windows.Forms.RadioButton();\r
this.rbAD = new System.Windows.Forms.RadioButton();\r
this.pSearch = new System.Windows.Forms.TableLayoutPanel();\r
+ this.noFocusCueButton1 = new MaestroShared.Controls.NoFocusCueButton();\r
this.chkProblematic = new System.Windows.Forms.CheckBox();\r
this.dgTraffic = new System.Windows.Forms.DataGridView();\r
this.pSeparator = new System.Windows.Forms.Panel();\r
// \r
// txtFilter\r
// \r
- this.pSearch.SetColumnSpan(this.txtFilter, 2);\r
+ this.pSearch.SetColumnSpan(this.txtFilter, 3);\r
this.txtFilter.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.txtFilter.Location = new System.Drawing.Point(4, 4);\r
this.txtFilter.Margin = new System.Windows.Forms.Padding(1);\r
this.txtFilter.Name = "txtFilter";\r
- this.txtFilter.Size = new System.Drawing.Size(292, 20);\r
+ this.txtFilter.Size = new System.Drawing.Size(324, 20);\r
this.txtFilter.TabIndex = 0;\r
this.txtFilter.TextChanged += new System.EventHandler(this.txtFilter_TextChanged);\r
this.txtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFilter_KeyDown);\r
// \r
// pFolderType\r
// \r
- this.pSearch.SetColumnSpan(this.pFolderType, 2);\r
+ this.pSearch.SetColumnSpan(this.pFolderType, 3);\r
this.pFolderType.Controls.Add(this.rbMaterial);\r
this.pFolderType.Controls.Add(this.rbPromo);\r
this.pFolderType.Controls.Add(this.rbAD);\r
this.pFolderType.Location = new System.Drawing.Point(3, 25);\r
this.pFolderType.Margin = new System.Windows.Forms.Padding(0);\r
this.pFolderType.Name = "pFolderType";\r
- this.pFolderType.Size = new System.Drawing.Size(294, 22);\r
+ this.pFolderType.Size = new System.Drawing.Size(326, 22);\r
this.pFolderType.TabIndex = 2;\r
// \r
// rbMaterial\r
// \r
this.pSearch.AutoSize = true;\r
this.pSearch.BackColor = System.Drawing.Color.Transparent;\r
- this.pSearch.ColumnCount = 2;\r
+ this.pSearch.ColumnCount = 3;\r
this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
+ this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+ this.pSearch.Controls.Add(this.noFocusCueButton1, 2, 2);\r
this.pSearch.Controls.Add(this.chkProblematic, 1, 2);\r
this.pSearch.Controls.Add(this.pFolderType, 0, 1);\r
this.pSearch.Controls.Add(this.txtFilter, 0, 0);\r
this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
- this.pSearch.Size = new System.Drawing.Size(300, 72);\r
+ this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+ this.pSearch.Size = new System.Drawing.Size(332, 73);\r
this.pSearch.TabIndex = 10;\r
this.pSearch.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanelSearch_Paint);\r
// \r
+ // noFocusCueButton1\r
+ // \r
+ this.noFocusCueButton1.FlatAppearance.BorderSize = 0;\r
+ this.noFocusCueButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+ this.noFocusCueButton1.Image = global::TrafficClient.Resources.ic_refresh_black_24dp_1x;\r
+ this.noFocusCueButton1.Location = new System.Drawing.Point(310, 48);\r
+ this.noFocusCueButton1.Margin = new System.Windows.Forms.Padding(1);\r
+ this.noFocusCueButton1.Name = "noFocusCueButton1";\r
+ this.noFocusCueButton1.Size = new System.Drawing.Size(18, 21);\r
+ this.noFocusCueButton1.TabIndex = 8;\r
+ this.noFocusCueButton1.UseVisualStyleBackColor = true;\r
+ this.noFocusCueButton1.Click += new System.EventHandler(this.OnRefresh);\r
+ // \r
// chkProblematic\r
// \r
this.chkProblematic.AutoSize = true;\r
this.dgTraffic.BackgroundColor = System.Drawing.Color.White;\r
this.dgTraffic.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
this.dgTraffic.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
- dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;\r
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;\r
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;\r
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\r
this.dgTraffic.DataSource = this.trafficAPIBindingSource;\r
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
- dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;\r
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
- this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle2;\r
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+ dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;\r
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+ dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;\r
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black;\r
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+ this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle5;\r
this.dgTraffic.Dock = System.Windows.Forms.DockStyle.Fill;\r
this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
this.dgTraffic.EnableHeadersVisualStyles = false;\r
- this.dgTraffic.Location = new System.Drawing.Point(0, 78);\r
+ this.dgTraffic.Location = new System.Drawing.Point(0, 79);\r
this.dgTraffic.Margin = new System.Windows.Forms.Padding(0);\r
this.dgTraffic.MultiSelect = false;\r
this.dgTraffic.Name = "dgTraffic";\r
this.dgTraffic.RowHeadersVisible = false;\r
- dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
- this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+ this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle6;\r
this.dgTraffic.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
this.dgTraffic.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
- this.dgTraffic.Size = new System.Drawing.Size(300, 322);\r
+ this.dgTraffic.Size = new System.Drawing.Size(332, 321);\r
this.dgTraffic.TabIndex = 0;\r
- this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);\r
- this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);\r
+ this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnCellContentClick);\r
+ this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnCellDoubleClick);\r
this.dgTraffic.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnDataGridKeyDown);\r
// \r
// pSeparator\r
// \r
this.pSeparator.BackColor = System.Drawing.Color.White;\r
this.pSeparator.Dock = System.Windows.Forms.DockStyle.Top;\r
- this.pSeparator.Location = new System.Drawing.Point(0, 72);\r
+ this.pSeparator.Location = new System.Drawing.Point(0, 73);\r
this.pSeparator.Name = "pSeparator";\r
- this.pSeparator.Size = new System.Drawing.Size(300, 6);\r
+ this.pSeparator.Size = new System.Drawing.Size(332, 6);\r
this.pSeparator.TabIndex = 13;\r
// \r
// TrafficIDSelector\r
this.Controls.Add(this.pSeparator);\r
this.Controls.Add(this.pSearch);\r
this.Name = "TrafficIDSelector";\r
- this.Size = new System.Drawing.Size(300, 400);\r
+ this.Size = new System.Drawing.Size(332, 400);\r
((System.ComponentModel.ISupportInitialize)(this.trafficAPIBindingSource)).EndInit();\r
this.pFolderType.ResumeLayout(false);\r
this.pFolderType.PerformLayout();\r
private System.Windows.Forms.CheckBox chkProblematic;\r
private System.Windows.Forms.DataGridView dgTraffic;\r
private System.Windows.Forms.Panel pSeparator;\r
+ private MaestroShared.Controls.NoFocusCueButton noFocusCueButton1;\r
}\r
}\r
using System.Diagnostics;\r
using LinkDotNet.MessageHandling.Contracts;\r
using System.Drawing;\r
+using MaestroShared.Commons;\r
+using MaestroShared.Configuration;\r
+using MaestroShared.Target;\r
+using MaestroShared.Targets;\r
+using System.IO;\r
\r
namespace TrafficClient {\r
public delegate void OnSelectedIDChanged(string ID, int variantID, string text);\r
public TrafficAPI trafficAPI { get; private set; }\r
public OnSelectedIDChanged IDChangedEvent { get; set; }\r
private DataGridViewCheckBoxCell selectedCell;\r
+ private bool refreshDisabled;\r
+ private TrafficParameters parameters;\r
\r
public TrafficIDSelector() {\r
InitializeComponent();\r
rbAD.Text = Resources.REKLAM;\r
}\r
\r
- public TrafficConfiguration Configuration {\r
+ public TrafficParameters Parameters {\r
set {\r
- trafficAPI = new TrafficAPI(value.Address.OriginalString, value.UserName, value.Password, value.Timeout, value.MessageBus);\r
+ parameters = value;\r
+ var server = parameters.Configuration?.Server;\r
+ if (server != null && server.Address != null)\r
+ trafficAPI = new TrafficAPI(server.Address.OriginalString, server.UserName, server.Password, server.Timeout, value.MessageBus);\r
RefreshResults();\r
}\r
}\r
\r
public void RefreshResults() {\r
+ if (refreshDisabled || trafficAPI == null)\r
+ return;\r
ClearSelection();\r
Cursor.Current = Cursors.WaitCursor;\r
string searchText = txtFilter.Text;\r
Cursor.Current = Cursors.Default;\r
}\r
\r
- private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) {\r
- OnSelectionChanged(dgTraffic.SelectedRows[0]);\r
+ private void OnCellDoubleClick(object sender, DataGridViewCellEventArgs e) {\r
+ if (e.ColumnIndex < 1 || e.RowIndex < 0)\r
+ return;\r
+ TrafficItem trafficItem = dgTraffic.Rows[e.RowIndex].DataBoundItem as TrafficItem;\r
+ if (trafficItem == null)\r
+ return;\r
+ string id = trafficItem.MediaID;\r
+ if (String.IsNullOrEmpty(id)) {\r
+ //if (!MsgBox.YesNoQuestion("A műsornak még nincs kópia azonosítója, ami szükséges a projekt létrehozáshoz. Létrehozzak egy eredeti kópiát?"))\r
+ // return;\r
+ OnSelectionChanged(dgTraffic.SelectedRows[0]);\r
+ id = trafficItem.MediaID;\r
+ }\r
+\r
+ ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings;\r
+ string text = trafficItem.Title;\r
+ EdiusProject.Open(projectConfiguration, id, text, parameters.UserName);\r
}\r
\r
- private void searchButton_Click(object sender, EventArgs e) {\r
+ private void OnSearchClick(object sender, EventArgs e) {\r
RefreshResults();\r
}\r
\r
- private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) {\r
+ private void OnCellContentClick(object sender, DataGridViewCellEventArgs e) {\r
if (e.RowIndex < 0 || e.ColumnIndex != 0)\r
return;\r
DataGridView gridView = sender as DataGridView;\r
private void OnSelectionChanged(DataGridViewRow actualRow) {\r
TrafficItem trafficItem = actualRow.DataBoundItem as TrafficItem;\r
if (String.IsNullOrEmpty(trafficItem.MediaID)) {\r
- TrafficVersion v = trafficAPI.CreateMaterialVersion(trafficItem.EpisodeID);\r
+ TrafficVersion v = trafficAPI.CreateMaterialVersion(trafficItem.EpisodeID, false);\r
if (v != null) {\r
trafficItem.MediaID = v.MediaID;\r
trafficItem.VariantID = v.VariantID;\r
}\r
selectedCell.Value = !(bool)selectedCell.Value;\r
bool selected = (bool)selectedCell.Value;\r
- Debug.WriteLine("Selection {0}", selected);\r
+ //Debug.WriteLine("Selection {0}", selected);\r
if (selected)\r
IDChangedEvent?.Invoke(trafficItem.MediaID, trafficItem.VariantID, trafficItem.Title);\r
else\r
ControlPaint.DrawBorder(e.Graphics, e.ClipRectangle, Color.LightGray, ButtonBorderStyle.Solid); // dotted border\r
}\r
\r
- public bool LookupByMaterialID(string id) {\r
- //TrafficItem result = trafficAPI.GetMaterials(id, false);\r
- return false;\r
+ private void ResetFilters(string id) {\r
+ txtFilter.Text = id;\r
+ dtScheduled.Checked = false;\r
+ chkProblematic.Checked = false;\r
+ }\r
+\r
+ private void SelectResult() {\r
+ List<TrafficItem> result = trafficAPIBindingSource.DataSource as List<TrafficItem>;\r
+ OnSelectionChanged(dgTraffic.Rows[0]);\r
+ if (result == null || result.Count == 0)\r
+ MsgBox.Info("Nincs találat.");\r
+ else\r
+ result[0].Selected = true;\r
}\r
\r
- public bool LookupByPromoID(string id) {\r
- return false;\r
+ public void LookupByMaterialID(string id) {\r
+ refreshDisabled = true;\r
+ ResetFilters(id);\r
+ rbMaterial.Checked = true;\r
+ refreshDisabled = false;\r
+ RefreshResults();\r
+ SelectResult();\r
}\r
\r
- public bool LookupByADID(string id) {\r
- return false;\r
+ public void LookupByPromoID(string id) {\r
+ refreshDisabled = true;\r
+ ResetFilters(id);\r
+ rbPromo.Checked = true;\r
+ refreshDisabled = false;\r
+ RefreshResults();\r
+ SelectResult();\r
}\r
\r
+ public void LookupByADID(string id) {\r
+ refreshDisabled = true;\r
+ ResetFilters(id);\r
+ rbAD.Checked = true;\r
+ refreshDisabled = false;\r
+ RefreshResults();\r
+ SelectResult();\r
+ }\r
+\r
+ private void OnRefresh(object sender, EventArgs e) {\r
+ //TrafficItem trafficItem = dgTraffic.SelectedRows[0].DataBoundItem as TrafficItem;\r
+ //TrafficVersion v = trafficAPI.CreateMaterialVersion(trafficItem.EpisodeID, true);\r
+ //if (v != null) {\r
+ // trafficItem.MediaID = v.MediaID;\r
+ // trafficItem.VariantID = v.VariantID;\r
+ //}\r
+ //if (trafficItem.VariantID == 0 || String.IsNullOrEmpty(trafficItem.MediaID))\r
+ // return;\r
+ RefreshResults();\r
+\r
+ }\r
}\r
\r
public class TrafficItem {\r
return result;\r
}\r
\r
- public TrafficVersion CreateMaterialVersion(string episodeID) {\r
+ public TrafficVersion CreateMaterialVersion(string episodeID, bool recut) {\r
TrafficVersion result = null;\r
try {\r
TryConnect();\r
cmd.CommandType = CommandType.StoredProcedure;\r
cmd.Parameters.AddWithValue("@Operation", 1105);\r
cmd.Parameters.AddWithValue("@@@Options", DBNull.Value);\r
- cmd.Parameters.AddWithValue("@@IntParam1", 1);\r
+ cmd.Parameters.AddWithValue("@@IntParam1", recut ? 12 : 1);\r
cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value);\r
cmd.Parameters.AddWithValue("@@StrParam1", episodeID);\r
cmd.Parameters.AddWithValue("@@StrParam2", DBNull.Value);\r
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.commons.log4j2&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.executors&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.commons&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.db&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.server&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkcharts.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/classes&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-codec-1.10.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-fileupload-1.2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-io-1.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-logging-1.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zcommon.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zel.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zhtml.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_bsh.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_commons-collections.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_elinez.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_eplotz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_Filters.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_flashchart.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_gmapsz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-annotations.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-core.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-databind.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jasperreports.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_javassist.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jcommon.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jfreechart.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jsp.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_monitor.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_psz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_sapphire.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_shchart.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_silvertail.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timelinez.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timeplotz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_zuljsp.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkbind.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkex_r.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkmax.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkplus.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zml.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zsoup.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zul.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zuti.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zweb.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.services&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.tsm.client&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> </sourceContainers> </sourceLookupDirector> "/>\r
<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="false"/>\r
<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">\r
-<mapEntry key="hostname" value="10.10.1.28"/>\r
+<mapEntry key="hostname" value="10.10.1.27"/>\r
<mapEntry key="port" value="8888"/>\r
</mapAttribute>\r
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="user.jobengine.osgi.server"/>\r
Bundle-Name: Commons
Bundle-SymbolicName: user.jobengine.osgi.commons;singleton:=true
Bundle-Version: 1.0.0
-Import-Package: org.apache.logging.log4j;version="2.8.2",
+Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
+ com.fasterxml.jackson.core;version="2.4.5",
+ com.fasterxml.jackson.databind;version="2.4.5",
+ com.fasterxml.jackson.databind.util;version="2.4.5",
+ com.fasterxml.jackson.datatype.joda;version="2.4.5",
+ com.fasterxml.jackson.jaxrs.json;version="2.4.5",
+ org.apache.logging.log4j;version="2.8.2",
org.apache.logging.log4j.core;version="2.8.2",
org.jboss.resteasy.client.jaxrs,
+ org.jboss.resteasy.plugins.providers,
+ org.jboss.resteasy.spi,
org.osgi.framework;version="1.5.0"
DynamicImport-Package: *
Bundle-ClassPath: .
javax.annotation-api;bundle-version="1.2.0",
org.apache.httpcomponents.httpclient;bundle-version="4.2.6",
org.apache.httpcomponents.httpcore;bundle-version="4.2.5",
- org.jboss.resteasy.jaxrs;bundle-version="3.0.11",
org.apache.commons.logging;bundle-version="1.1.1",
org.apache.commons.io;bundle-version="2.2.0"
import org.jboss.resteasy.client.jaxrs.ResteasyClient;\r
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;\r
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;\r
+import org.jboss.resteasy.spi.ResteasyDeployment;\r
import org.joda.time.DateTime;\r
\r
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;\r
import com.ibm.nosql.json.JSONUtil;\r
import com.ibm.nosql.json.api.BasicDBList;\r
import com.ibm.nosql.json.api.BasicDBObject;\r
import user.commons.remotestore.ProgressEvent;\r
\r
public class OctopusDataMiner implements Runnable {\r
- private static final String _TMP = "_tmp";\r
+ private static final String _TMP = "_tmp1";\r
private static final Logger logger = LogManager.getLogger();\r
private static final String LINEFEED = "\r\n";\r
private static final String SIMPLE_LINEFEED = "\n";\r
apiUser = System.getProperty("jobengine.octopus.api.user");\r
apiPwd = System.getProperty("jobengine.octopus.api.password");\r
\r
- ResteasyClient client = new ResteasyClientBuilder().build();\r
+ ResteasyClient client = new ResteasyClientBuilder().register(JacksonJsonProvider.class).build();\r
webTarget = client.target(apiAddress).register(new BasicAuthentication(apiUser, apiPwd));\r
}\r
\r
STORY_COLLECTION = IOctopusAPI.STORY_COLLECTION + _TMP;\r
\r
logger.info("Fetch rundowns");\r
- BasicDBList rundowns = queryRundowns();\r
- logger.info("Fetch rundown story references");\r
- storyRundowns = buildRundownReferences(rundowns);\r
- logger.info("Fetch story folders");\r
- BasicDBList storyFolders = queryStoryFolders();\r
- logger.info("Fetch folder story references");\r
- storyStoryFolders = buildFolderReferences(storyFolders);\r
\r
- if (rundowns == null || rundowns.size() == 0) {\r
- progressEvent.setProgress(50);\r
- fireProgressEvent(progressEvent);\r
- } else {\r
- logger.info("Process rundowns");\r
- storeRundowns(rundowns, null);\r
- }\r
-\r
- if (storyFolders == null || storyFolders.size() == 0) {\r
- progressEvent.setProgress(100);\r
- fireProgressEvent(progressEvent);\r
- } else {\r
- logger.info("Process story folders");\r
- storeStoryFolders(storyFolders, null);\r
- }\r
- setLastUpdateTime(new Date());\r
- logger.info("Activate");\r
- db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true);\r
- db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true);\r
- db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true);\r
+ ResteasyWebTarget target = webTarget.path(RUNDOWN);\r
+ Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd);\r
+ Response r = result.get();\r
+ String x = r.readEntity(String.class);\r
+ return;\r
+ // BasicDBList rundowns = queryRundowns();\r
+ // logger.info("Fetch rundown story references");\r
+ // storyRundowns = buildRundownReferences(rundowns);\r
+ // logger.info("Fetch story folders");\r
+ // BasicDBList storyFolders = queryStoryFolders();\r
+ // logger.info("Fetch folder story references");\r
+ // storyStoryFolders = buildFolderReferences(storyFolders);\r
+ //\r
+ // if (rundowns == null || rundowns.size() == 0) {\r
+ // progressEvent.setProgress(50);\r
+ // fireProgressEvent(progressEvent);\r
+ // } else {\r
+ // logger.info("Process rundowns");\r
+ // storeRundowns(rundowns, null);\r
+ // }\r
+ //\r
+ // if (storyFolders == null || storyFolders.size() == 0) {\r
+ // progressEvent.setProgress(100);\r
+ // fireProgressEvent(progressEvent);\r
+ // } else {\r
+ // logger.info("Process story folders");\r
+ // storeStoryFolders(storyFolders, null);\r
+ // }\r
+ // setLastUpdateTime(new Date());\r
+ // logger.info("Activate");\r
+ // db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true);\r
+ // db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true);\r
+ // db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true);\r
\r
} catch (Exception e) {\r
logger.catching(e);\r
throw e;\r
}\r
- logger.trace(FINISHED);\r
+ // logger.trace(FINISHED);\r
\r
}\r
\r
}\r
\r
private Builder query(String path, String fields) {\r
+ logger.info("Class loader {}", getClass().getClassLoader());\r
+ try {\r
+ ResteasyDeployment deployment = new ResteasyDeployment();\r
+ deployment.start();\r
+ } catch (Exception e) {\r
+ logger.catching(e);\r
+ }\r
ResteasyWebTarget target = webTarget.path(path).queryParam(FIELDS, fields);\r
Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd);\r
return result;\r
--- /dev/null
+org.jboss.resteasy.plugins.providers.StringTextStar
\ No newline at end of file
try {\r
String trafficOutputPath = "/mnt/ISILON/PLAYOUT_NLE";\r
String octopusOutputPath = "/mnt/ISILON/OCTOPUS";\r
- String genericOutputPath = "/mnt/ISILON/RESTORE";\r
+ String genericOutputPath = "/mnt/ISILON/ARCHIVE_RESTORE";\r
if (StringUtils.isBlank(houseId))\r
throw new Exception("Az azonosító megadása kötelező!");\r
Map<String, Object> parameters = ListUtils.asMap(TRAFFICOUTPUTPATH, trafficOutputPath, OCTOPUSOUTPUTPATH, octopusOutputPath, GENERICOUTPUTPATH,\r
--- /dev/null
+org.jboss.resteasy.plugins.providers.StringTextStar
\ No newline at end of file
@Provider
@Produces({ MediaType.APPLICATION_JSON })
+//@Consumes({ "application/json;charset=UTF-8" })
+//@Produces({ "text/plain", "text/html" })
public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
public JacksonJsonProvider() {
https://git.useribm.hu / mediacube.git / commitdiff
