From: Vásáry Dániel Date: Fri, 1 Dec 2017 15:48:38 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=d6e5536f862aa83ccbb3b17be5fbe82bd4ccadd3;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30781 --- diff --git a/client/Maestro/Configuration/configuration-archive.json b/client/Maestro/Configuration/-configuration-archive.json similarity index 63% rename from client/Maestro/Configuration/configuration-archive.json rename to client/Maestro/Configuration/-configuration-archive.json index 7e04aea1..d2ed0f90 100644 --- a/client/Maestro/Configuration/configuration-archive.json +++ b/client/Maestro/Configuration/-configuration-archive.json @@ -35,6 +35,30 @@ "userName": "MAM", "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ", "timeout": 1000 + }, + "projectSettings": { + "templateRoot": { + "address": "file://10.10.1.100/BRAAVOS/.MAESTRO", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + }, + "templateName": "ALAPTIMELINE.ezp", + "target": { + "label": "Projekt létrehozása", + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%-%TEXT%", + "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT", + "disableFileVersioning": true, + "remote": { + "address": "file://10.10.1.100/BRAAVOS/OCTOPUS", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + "disableOpenProject": false, + "disableOpenSourceFolder": false } }, { diff --git a/client/Maestro/Configuration/configuration-editor.json b/client/Maestro/Configuration/-configuration-editor.json similarity index 100% rename from client/Maestro/Configuration/configuration-editor.json rename to client/Maestro/Configuration/-configuration-editor.json diff --git a/client/Maestro/Configuration/configuration-nexio-ingest.json b/client/Maestro/Configuration/-configuration-nexio-ingest.json similarity index 100% rename from client/Maestro/Configuration/configuration-nexio-ingest.json rename to client/Maestro/Configuration/-configuration-nexio-ingest.json diff --git a/client/Maestro/Configuration/configuration-playout-ingest.json b/client/Maestro/Configuration/-configuration-playout-ingest.json similarity index 100% rename from client/Maestro/Configuration/configuration-playout-ingest.json rename to client/Maestro/Configuration/-configuration-playout-ingest.json diff --git a/client/Maestro/Configuration/configuration-playout.json b/client/Maestro/Configuration/-configuration-playout.json similarity index 100% rename from client/Maestro/Configuration/configuration-playout.json rename to client/Maestro/Configuration/-configuration-playout.json diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/-configuration-studio.json similarity index 100% rename from client/Maestro/Configuration/configuration-studio.json rename to client/Maestro/Configuration/-configuration-studio.json diff --git a/client/Maestro/Configuration/configuration-sxs-tibi.json b/client/Maestro/Configuration/-configuration-sxs-tibi.json similarity index 100% rename from client/Maestro/Configuration/configuration-sxs-tibi.json rename to client/Maestro/Configuration/-configuration-sxs-tibi.json diff --git a/client/Maestro/Configuration/configuration-sxs.json b/client/Maestro/Configuration/-configuration-sxs.json similarity index 100% rename from client/Maestro/Configuration/configuration-sxs.json rename to client/Maestro/Configuration/-configuration-sxs.json diff --git a/client/Maestro/Configuration/configuration-torokor-t.json b/client/Maestro/Configuration/-configuration-torokor-t.json similarity index 100% rename from client/Maestro/Configuration/configuration-torokor-t.json rename to client/Maestro/Configuration/-configuration-torokor-t.json diff --git a/client/Maestro/Configuration/-configuration-tqc-check.json b/client/Maestro/Configuration/-configuration-tqc-check.json new file mode 100644 index 00000000..acd07c7e --- /dev/null +++ b/client/Maestro/Configuration/-configuration-tqc-check.json @@ -0,0 +1,95 @@ +{ + "title": "TQC check", + "active": true, + "startInTray": false, + "enableCustomMetadataId": true, + "player": { + "enabled": true, + "autoStart": false, + "segmentEditor": true + }, + "source": { + "$type": "UNCSource", + "filter": "avi,wav,mxf", + "local": { + "address": "file://10.10.1.100/BRAAVOS/TQC/CHECK", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + }, + "remote": { + "address": "ftp://10.10.1.100/TQC/CHECK", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + "metadatas": [ + { + "$type": "TrafficMetadata", + "server": { + "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;", + "userName": "MAM", + "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ", + "timeout": 1000 + } + }, + { + "$type": "MediaCubeMetadata", + "server": { + "address": "http://10.10.1.27/services/rest/jobengine/", + "timeout": 1000 + } + } + ], + "targets": [ + { + "label": "Adáskész", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%", + "saveSegments": true, + "tag": "Adáskész", + "disableFileVersioning": true, + "saveMorpheusMetadata": true, + "pathMorpheusMetadata": "/PLAYOUT/MorpheusGateway/Input", + "deviceIdMorpheus": "ISILON", + "remote": { + "address": "ftp://10.10.1.100/PLAYOUT/Video", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + { + "label": "Újravágás", + "processor": "FXPTargetProcessor", + "subFolderFormat": "%IDROOT%-%TEXT%", + "outputFormat": "%ID%-%TEXT%", + "tag": "Újravágás", + "remote": { + "address": "ftp://10.10.1.100/PLAYOUT_NLE", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + }, + "sendEmailOnSuccess": true, + "successEmailRecipient": "vasary@elgekko.net", + "successEmailPattern": "A %TARGETNAME% újravágása szükséges." + }, + { + "label": "Archiválás", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%", + "tag": "Archiválás", + "saveArchiveMetadata": true, + "disableFileVersioning": true, + "enableOverride": true, + "remote": { + "address": "ftp://10.10.1.100/ARCHIVE", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + } + ] +} diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json index 0e3d822f..393c10c0 100644 --- a/client/Maestro/Configuration/configuration-nle.json +++ b/client/Maestro/Configuration/configuration-nle.json @@ -1,6 +1,6 @@ { "title": "NLE", - "active": false, + "active": true, "startInTray": false, "enableCustomMetadataId": true, "defaultWindowColor": "#E1BEE7", @@ -38,7 +38,7 @@ "target": { "label": "Projekt létrehozása", "processor": "UNCTargetProcessor", - "outputFormat": "%ID%-%TEXT%", + "outputFormat": "%ID%", "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT", "disableFileVersioning": true, "remote": { @@ -60,11 +60,29 @@ "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ", "timeout": 1000 }, - "local": { - "address": "file://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 + "projectSettings": { + "templateRoot": { + "address": "file://10.10.1.100/BRAAVOS/.MAESTRO", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + }, + "templateName": "ALAPTIMELINE.ezp", + "target": { + "label": "Projekt létrehozása", + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%", + "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT", + "disableFileVersioning": true, + "remote": { + "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + "disableOpenProject": false, + "disableOpenSourceFolder": false } }, { diff --git a/client/Maestro/Installer/installforge-installer-project.ifp b/client/Maestro/Installer/installforge-installer-project.ifp index ffa70141..5f680af8 100644 Binary files a/client/Maestro/Installer/installforge-installer-project.ifp and b/client/Maestro/Installer/installforge-installer-project.ifp differ diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index e2f2d510..54e50e8e 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -252,28 +252,31 @@ Always - + Always - + Always - + Always Always - + Always - + Always Always - + + Always + + Always @@ -303,16 +306,16 @@ PreserveNewest - + Always PreserveNewest - + Always - + Always diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index 643de7f0..01de42aa 100644 --- a/client/Maestro/MaestroForm.Designer.cs +++ b/client/Maestro/MaestroForm.Designer.cs @@ -33,11 +33,11 @@ namespace Maestro { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupSource = new System.Windows.Forms.GroupBox(); this.dgSource = new System.Windows.Forms.DataGridView(); this.bindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -77,13 +77,6 @@ namespace Maestro { this.tabSystem = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.dgJobs = new System.Windows.Forms.DataGridView(); - this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.dgMessages = new System.Windows.Forms.DataGridView(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Progress = new Maestro.Commons.DataGridViewProgressColumn(); @@ -94,6 +87,13 @@ namespace Maestro { this.columnOutput = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.columnKillDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Message = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.dgMessages = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.groupSource.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); @@ -751,80 +751,6 @@ namespace Maestro { this.dgJobs.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnJobsCellPainting); this.dgJobs.MouseClick += new System.Windows.Forms.MouseEventHandler(this.dataGridJobs_MouseClick); // - // tabPage2 - // - this.tabPage2.Controls.Add(this.dgMessages); - this.tabPage2.Location = new System.Drawing.Point(4, 24); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(994, 96); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = global::Maestro.StringResources.UZENETEK; - this.tabPage2.UseVisualStyleBackColor = true; - // - // dgMessages - // - this.dgMessages.AllowUserToAddRows = false; - this.dgMessages.AllowUserToResizeRows = false; - this.dgMessages.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells; - this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; - this.dgMessages.BackgroundColor = System.Drawing.Color.White; - this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn1, - this.dataGridViewTextBoxColumn2}); - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Red; - dataGridViewCellStyle9.NullValue = null; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Red; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgMessages.DefaultCellStyle = dataGridViewCellStyle9; - this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.dgMessages.EnableHeadersVisualStyles = false; - this.dgMessages.GridColor = System.Drawing.Color.White; - this.dgMessages.Location = new System.Drawing.Point(3, 3); - this.dgMessages.Name = "dgMessages"; - this.dgMessages.ReadOnly = true; - this.dgMessages.RowHeadersVisible = false; - dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle10; - this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgMessages.Size = new System.Drawing.Size(988, 90); - this.dgMessages.TabIndex = 1; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.dataGridViewTextBoxColumn1.DataPropertyName = "Time"; - this.dataGridViewTextBoxColumn1.HeaderText = "Időpont"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Width = 73; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dataGridViewTextBoxColumn2.DataPropertyName = "Message"; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle8; - this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.ReadOnly = true; - // - // systemMessageBindingSource - // - this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage); - // - // metadataInfoBindingSource - // - this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo); - // // columnLabel // this.columnLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; @@ -909,6 +835,80 @@ namespace Maestro { this.Message.Name = "Message"; this.Message.Width = 71; // + // tabPage2 + // + this.tabPage2.Controls.Add(this.dgMessages); + this.tabPage2.Location = new System.Drawing.Point(4, 24); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(994, 96); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = global::Maestro.StringResources.UZENETEK; + this.tabPage2.UseVisualStyleBackColor = true; + // + // dgMessages + // + this.dgMessages.AllowUserToAddRows = false; + this.dgMessages.AllowUserToResizeRows = false; + this.dgMessages.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells; + this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; + this.dgMessages.BackgroundColor = System.Drawing.Color.White; + this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn1, + this.dataGridViewTextBoxColumn2}); + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Red; + dataGridViewCellStyle9.NullValue = null; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Red; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgMessages.DefaultCellStyle = dataGridViewCellStyle9; + this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dgMessages.EnableHeadersVisualStyles = false; + this.dgMessages.GridColor = System.Drawing.Color.White; + this.dgMessages.Location = new System.Drawing.Point(3, 3); + this.dgMessages.Name = "dgMessages"; + this.dgMessages.ReadOnly = true; + this.dgMessages.RowHeadersVisible = false; + dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle10; + this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dgMessages.Size = new System.Drawing.Size(988, 90); + this.dgMessages.TabIndex = 1; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; + this.dataGridViewTextBoxColumn1.DataPropertyName = "Time"; + this.dataGridViewTextBoxColumn1.HeaderText = "Időpont"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.Width = 73; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn2.DataPropertyName = "Message"; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle8; + this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; + // + // systemMessageBindingSource + // + this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage); + // + // metadataInfoBindingSource + // + this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo); + // // MaestroForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index cf13a41d..b7f43ee6 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -64,11 +64,9 @@ namespace Maestro { tabMetadata.TabPages.Remove(tpTraffic); return; } - trafficIDSelector.Configuration = new TrafficConfiguration() { - Address = metadata.Server.Address, - UserName = metadata.Server.UserName, - Password = metadata.Server.Password, - Timeout = metadata.Server.Timeout, + trafficIDSelector.Parameters = new TrafficParameters() { + Configuration = metadata, + UserName = TrayApplicationContext.UserName, MessageBus = errorMessageBus }; trafficIDSelector.IDChangedEvent += OnTrafficIDSelected; @@ -406,30 +404,35 @@ namespace Maestro { config = Configuration.GetMetadataProvider(); if (config == null) return; + tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByMaterialID(id); break; case MetadataType.TrafficPromo: config = Configuration.GetMetadataProvider(); if (config == null) return; + tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByPromoID(id); break; case MetadataType.TrafficAD: config = Configuration.GetMetadataProvider(); if (config == null) return; + tabMetadata.SelectedIndex = tabMetadata.TabCount > 1 ? 1 : 0; trafficIDSelector.LookupByADID(id); break; case MetadataType.OctopusPlaceHolder: config = Configuration.GetMetadataProvider(); if (config == null) return; + tabMetadata.SelectedIndex = 0; octopusIDSelector.LookupByPlaceHolder(id); break; case MetadataType.OctopusStory: config = Configuration.GetMetadataProvider(); if (config == null) return; + tabMetadata.SelectedIndex = 0; octopusIDSelector.LookupByStory(id); break; } diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx index 6d1ada1a..aad7e19c 100644 --- a/client/Maestro/MaestroForm.resx +++ b/client/Maestro/MaestroForm.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS - CAAAAk1TRnQBSQFMAgEBAgEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index af91e83c..9ecd567a 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.5.8")] -[assembly: AssemblyFileVersion("2.0.5.8")] +[assembly: AssemblyVersion("2.0.6.0")] +[assembly: AssemblyFileVersion("2.0.6.0")] diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs index 035295de..201742fe 100644 --- a/client/Maestro/Sources/FileSystemSource.cs +++ b/client/Maestro/Sources/FileSystemSource.cs @@ -139,9 +139,9 @@ namespace Maestro.Sources { } public bool Reset(string path) { - if (Path == null || Path.Equals(path)) + if (Path.Equals(path)) return false; - Path = path; + Path = path == null ? rootPath : path; Clear(); cache = null; Shutdown(); diff --git a/client/MaestroShared/Commons/EdiusProject.cs b/client/MaestroShared/Commons/EdiusProject.cs new file mode 100644 index 00000000..da50bbf6 --- /dev/null +++ b/client/MaestroShared/Commons/EdiusProject.cs @@ -0,0 +1,57 @@ +using MaestroShared.Configuration; +using MaestroShared.Target; +using MaestroShared.Targets; +using System.Diagnostics; +using System.IO; + +namespace MaestroShared.Commons { + + public class EdiusProject { + + public static void Open(ProjectSettings projectConfiguration, string id, string text, string userName) { + if (!MsgBox.YesNoQuestion("Megnyissam vágásra?")) + return; + if (projectConfiguration == null) { + MsgBox.Error("Nem található a 'projectSettings' beállítás a konfigurációs állományban."); + return; + } + if (!projectConfiguration.IsValid) { + MsgBox.Error("A 'projectSettings' beállítás hiányos a konfigurációs állományban."); + return; + } + + TargetProcessorParameter processorParameter = new TargetProcessorParameter() { + SourceConfig = new Source() { + Local = projectConfiguration?.TemplateRoot, + Remote = projectConfiguration?.TemplateRoot + }, + TargetConfig = projectConfiguration?.Target, + ID = id, + MetadataText = text, + InputFileName = projectConfiguration?.TemplateName, + UserName = userName, + }; + + ITargetProcessor processor = TargetProcessor.Create(projectConfiguration.Target.Processor); + processor.Initialize(null, processorParameter); + if (TargetProcessor.REVOKED.Equals(processor.Status) || TargetProcessor.ERROR.Equals(processor.Status)) { + MsgBox.Error(processor.Message); + return; + } + + processor.Execute(); + + if (!TargetProcessor.READY.Equals(processor.Status) && !TargetProcessor.SKIPPED.Equals(processor.Status)) { + MsgBox.Error(processor.Message); + return; + } + + if (!projectConfiguration.DisableOpenProject) + Process.Start(processor.Output); + if (!projectConfiguration.DisableOpenSourceFolder) { + string path = Path.GetDirectoryName(Path.GetDirectoryName(processor.Output)); + Process.Start(path); + } + } + } +} \ No newline at end of file diff --git a/client/MaestroShared/Commons/MsgBox.cs b/client/MaestroShared/Commons/MsgBox.cs index 024107e0..f17a4d0f 100644 --- a/client/MaestroShared/Commons/MsgBox.cs +++ b/client/MaestroShared/Commons/MsgBox.cs @@ -17,5 +17,9 @@ namespace MaestroShared.Commons { public static void Exclamation(string text) { MessageBox.Show(text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Exclamation); } + + public static bool YesNoQuestion(string text) { + return MessageBox.Show(text, string.Empty, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes; + } } } diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index ac2b1b8d..379ff105 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -141,6 +141,7 @@ namespace MaestroShared.Configuration { } public class TrafficMetadata : MetadataProvider { + public ProjectSettings ProjectSettings { get; set; } } public class MediaCubeMetadata : MetadataProvider { diff --git a/client/MaestroShared/MaestroShared.csproj b/client/MaestroShared/MaestroShared.csproj index 4ac948d8..3e9f5286 100644 --- a/client/MaestroShared/MaestroShared.csproj +++ b/client/MaestroShared/MaestroShared.csproj @@ -80,6 +80,7 @@ + diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs index 49175610..88bf98d2 100644 --- a/client/MaestroShared/Targets/FXPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs @@ -105,12 +105,13 @@ namespace MaestroShared.Targets { long lastSize = 0; while (overall != ilength) { overall = monitorFTP.GetFileSize(OutputName); + /* FtpReply statRETR = sourceFTP.Execute("STAT"); if (!statRETR.Success) Debug.WriteLine($"Overall {overall}, last {lastSize}"); else Debug.WriteLine($"Overall {overall}, last {lastSize} site {statRETR.Message}"); - +*/ if (overall == lastSize && overall > 0) { Progress = 100; break; diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index 8a505086..59b8f312 100644 --- a/client/OctopusClient/OctopusIDSelector.cs +++ b/client/OctopusClient/OctopusIDSelector.cs @@ -251,7 +251,7 @@ namespace OctopusClient { } txtFilter.Text = storyId; if (selectedNode == null) - MessageBox.Show("Nincs találat."); + MsgBox.Info("Nincs találat."); else treeOctopus.Focus(); } @@ -397,54 +397,13 @@ namespace OctopusClient { private void OnNodeDoubleClick(object sender, TreeNodeMouseClickEventArgs e) { if (e.X < e.Node.Bounds.X + 5 || e.Node.Level != 0) return; - Open(e.Node); - } - - private void Open(TreeNode node) { - if (MessageBox.Show("Megnyissam vágásra?", null, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.No) + Story story = e.Node.Tag as Story; + if (story == null) return; ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings; - if (projectConfiguration == null) { - MessageBox.Show("Nem található a 'projectSetings' beállítás a konfigurációs állományban.", null, MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - if (!projectConfiguration.IsValid) { - MessageBox.Show("A 'projectSetings' beállítás hiányos a konfigurációs állományban.", null, MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - Story story = node.Tag as Story; - TargetProcessorParameter processorParameter = new TargetProcessorParameter() { - SourceConfig = new Source() { - Local = projectConfiguration.TemplateRoot, - Remote = projectConfiguration.TemplateRoot - }, - TargetConfig = projectConfiguration.Target, - ID = node.Name, - MetadataText = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"), - InputFileName = projectConfiguration.TemplateName, - UserName = parameters.UserName, - }; - - ITargetProcessor processor = TargetProcessor.Create(projectConfiguration.Target.Processor); - processor.Initialize(null, processorParameter); - if (TargetProcessor.REVOKED.Equals(processor.Status)) { - MsgBox.Error(processor.Message); - return; - } - - processor.Execute(); - - if (!TargetProcessor.READY.Equals(processor.Status) && !TargetProcessor.SKIPPED.Equals(processor.Status)) { - MsgBox.Error(processor.Message); - return; - } - - if (!projectConfiguration.DisableOpenProject) - Process.Start(processor.Output); - if (!projectConfiguration.DisableOpenSourceFolder) { - string path = Path.GetDirectoryName(Path.GetDirectoryName(processor.Output)); - Process.Start(path); - } + string id = story.ParentStoryID; + string text = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"); + EdiusProject.Open(projectConfiguration, id, text, parameters.UserName); } private void noFocusCueButton1_Click(object sender, EventArgs e) { diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs index 118a1530..f258c83a 100644 --- a/client/PlanAIRClient/Resources.Designer.cs +++ b/client/PlanAIRClient/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace TrafficClient { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -114,6 +114,16 @@ namespace TrafficClient { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ic_refresh_black_24dp_1x { + get { + object obj = ResourceManager.GetObject("ic_refresh_black_24dp_1x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to Keresés. /// diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx index 446f7d39..2b73b199 100644 --- a/client/PlanAIRClient/Resources.resx +++ b/client/PlanAIRClient/Resources.resx @@ -135,6 +135,10 @@ Hiányos + + + Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Keresés diff --git a/client/PlanAIRClient/Resources/ic_refresh_black_24dp_1x.png b/client/PlanAIRClient/Resources/ic_refresh_black_24dp_1x.png new file mode 100644 index 00000000..c82efd5f Binary files /dev/null and b/client/PlanAIRClient/Resources/ic_refresh_black_24dp_1x.png differ diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs index e4915e15..583e2617 100644 --- a/client/PlanAIRClient/TrafficAPI.cs +++ b/client/PlanAIRClient/TrafficAPI.cs @@ -90,8 +90,8 @@ namespace TrafficClient { return segmentWorker.GetADSegments(strParam); } - public TrafficVersion CreateMaterialVersion(string episodeID) { - return materialWorker.CreateMaterialVersion(episodeID); + public TrafficVersion CreateMaterialVersion(string episodeID, bool recut) { + return materialWorker.CreateMaterialVersion(episodeID, recut); } } } diff --git a/client/PlanAIRClient/TrafficClient.csproj b/client/PlanAIRClient/TrafficClient.csproj index 6c7966ac..5f485281 100644 --- a/client/PlanAIRClient/TrafficClient.csproj +++ b/client/PlanAIRClient/TrafficClient.csproj @@ -182,5 +182,8 @@ MaestroShared + + + \ No newline at end of file diff --git a/client/PlanAIRClient/TrafficConfiguration.cs b/client/PlanAIRClient/TrafficConfiguration.cs index a177a5ce..05317506 100644 --- a/client/PlanAIRClient/TrafficConfiguration.cs +++ b/client/PlanAIRClient/TrafficConfiguration.cs @@ -1,12 +1,10 @@ using LinkDotNet.MessageHandling.Contracts; -using System; +using MaestroShared.Configuration; namespace TrafficClient { - public class TrafficConfiguration { - public Uri Address { get; set; } + public class TrafficParameters { + public TrafficMetadata Configuration { get; set; } public string UserName { get; set; } - public string Password { get; set; } - public int Timeout; public IMessageBus MessageBus { get; set; } } } diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs index d434460b..b9f8ec04 100644 --- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs +++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs @@ -29,9 +29,9 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.trafficAPIBindingSource = new System.Windows.Forms.BindingSource(this.components); this.dtScheduled = new System.Windows.Forms.DateTimePicker(); this.txtFilter = new System.Windows.Forms.TextBox(); @@ -40,6 +40,7 @@ this.rbPromo = new System.Windows.Forms.RadioButton(); this.rbAD = new System.Windows.Forms.RadioButton(); this.pSearch = new System.Windows.Forms.TableLayoutPanel(); + this.noFocusCueButton1 = new MaestroShared.Controls.NoFocusCueButton(); this.chkProblematic = new System.Windows.Forms.CheckBox(); this.dgTraffic = new System.Windows.Forms.DataGridView(); this.pSeparator = new System.Windows.Forms.Panel(); @@ -63,19 +64,19 @@ // // txtFilter // - this.pSearch.SetColumnSpan(this.txtFilter, 2); + this.pSearch.SetColumnSpan(this.txtFilter, 3); this.txtFilter.Dock = System.Windows.Forms.DockStyle.Fill; this.txtFilter.Location = new System.Drawing.Point(4, 4); this.txtFilter.Margin = new System.Windows.Forms.Padding(1); this.txtFilter.Name = "txtFilter"; - this.txtFilter.Size = new System.Drawing.Size(292, 20); + this.txtFilter.Size = new System.Drawing.Size(324, 20); this.txtFilter.TabIndex = 0; this.txtFilter.TextChanged += new System.EventHandler(this.txtFilter_TextChanged); this.txtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFilter_KeyDown); // // pFolderType // - this.pSearch.SetColumnSpan(this.pFolderType, 2); + this.pSearch.SetColumnSpan(this.pFolderType, 3); this.pFolderType.Controls.Add(this.rbMaterial); this.pFolderType.Controls.Add(this.rbPromo); this.pFolderType.Controls.Add(this.rbAD); @@ -83,7 +84,7 @@ this.pFolderType.Location = new System.Drawing.Point(3, 25); this.pFolderType.Margin = new System.Windows.Forms.Padding(0); this.pFolderType.Name = "pFolderType"; - this.pFolderType.Size = new System.Drawing.Size(294, 22); + this.pFolderType.Size = new System.Drawing.Size(326, 22); this.pFolderType.TabIndex = 2; // // rbMaterial @@ -134,9 +135,11 @@ // this.pSearch.AutoSize = true; this.pSearch.BackColor = System.Drawing.Color.Transparent; - this.pSearch.ColumnCount = 2; + this.pSearch.ColumnCount = 3; this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.pSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.pSearch.Controls.Add(this.noFocusCueButton1, 2, 2); this.pSearch.Controls.Add(this.chkProblematic, 1, 2); this.pSearch.Controls.Add(this.pFolderType, 0, 1); this.pSearch.Controls.Add(this.txtFilter, 0, 0); @@ -150,10 +153,24 @@ this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.pSearch.Size = new System.Drawing.Size(300, 72); + this.pSearch.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.pSearch.Size = new System.Drawing.Size(332, 73); this.pSearch.TabIndex = 10; this.pSearch.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanelSearch_Paint); // + // noFocusCueButton1 + // + this.noFocusCueButton1.FlatAppearance.BorderSize = 0; + this.noFocusCueButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.noFocusCueButton1.Image = global::TrafficClient.Resources.ic_refresh_black_24dp_1x; + this.noFocusCueButton1.Location = new System.Drawing.Point(310, 48); + this.noFocusCueButton1.Margin = new System.Windows.Forms.Padding(1); + this.noFocusCueButton1.Name = "noFocusCueButton1"; + this.noFocusCueButton1.Size = new System.Drawing.Size(18, 21); + this.noFocusCueButton1.TabIndex = 8; + this.noFocusCueButton1.UseVisualStyleBackColor = true; + this.noFocusCueButton1.Click += new System.EventHandler(this.OnRefresh); + // // chkProblematic // this.chkProblematic.AutoSize = true; @@ -180,48 +197,48 @@ this.dgTraffic.BackgroundColor = System.Drawing.Color.White; this.dgTraffic.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgTraffic.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgTraffic.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgTraffic.DataSource = this.trafficAPIBindingSource; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgTraffic.DefaultCellStyle = dataGridViewCellStyle5; this.dgTraffic.Dock = System.Windows.Forms.DockStyle.Fill; this.dgTraffic.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dgTraffic.EnableHeadersVisualStyles = false; - this.dgTraffic.Location = new System.Drawing.Point(0, 78); + this.dgTraffic.Location = new System.Drawing.Point(0, 79); this.dgTraffic.Margin = new System.Windows.Forms.Padding(0); this.dgTraffic.MultiSelect = false; this.dgTraffic.Name = "dgTraffic"; this.dgTraffic.RowHeadersVisible = false; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.dgTraffic.RowsDefaultCellStyle = dataGridViewCellStyle6; this.dgTraffic.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); this.dgTraffic.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgTraffic.Size = new System.Drawing.Size(300, 322); + this.dgTraffic.Size = new System.Drawing.Size(332, 321); this.dgTraffic.TabIndex = 0; - this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); - this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); + this.dgTraffic.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnCellContentClick); + this.dgTraffic.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnCellDoubleClick); this.dgTraffic.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnDataGridKeyDown); // // pSeparator // this.pSeparator.BackColor = System.Drawing.Color.White; this.pSeparator.Dock = System.Windows.Forms.DockStyle.Top; - this.pSeparator.Location = new System.Drawing.Point(0, 72); + this.pSeparator.Location = new System.Drawing.Point(0, 73); this.pSeparator.Name = "pSeparator"; - this.pSeparator.Size = new System.Drawing.Size(300, 6); + this.pSeparator.Size = new System.Drawing.Size(332, 6); this.pSeparator.TabIndex = 13; // // TrafficIDSelector @@ -234,7 +251,7 @@ this.Controls.Add(this.pSeparator); this.Controls.Add(this.pSearch); this.Name = "TrafficIDSelector"; - this.Size = new System.Drawing.Size(300, 400); + this.Size = new System.Drawing.Size(332, 400); ((System.ComponentModel.ISupportInitialize)(this.trafficAPIBindingSource)).EndInit(); this.pFolderType.ResumeLayout(false); this.pFolderType.PerformLayout(); @@ -258,5 +275,6 @@ private System.Windows.Forms.CheckBox chkProblematic; private System.Windows.Forms.DataGridView dgTraffic; private System.Windows.Forms.Panel pSeparator; + private MaestroShared.Controls.NoFocusCueButton noFocusCueButton1; } } diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index c3fd5de3..bc7cac1e 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -4,6 +4,11 @@ using System.Collections.Generic; using System.Diagnostics; using LinkDotNet.MessageHandling.Contracts; using System.Drawing; +using MaestroShared.Commons; +using MaestroShared.Configuration; +using MaestroShared.Target; +using MaestroShared.Targets; +using System.IO; namespace TrafficClient { public delegate void OnSelectedIDChanged(string ID, int variantID, string text); @@ -12,6 +17,8 @@ namespace TrafficClient { public TrafficAPI trafficAPI { get; private set; } public OnSelectedIDChanged IDChangedEvent { get; set; } private DataGridViewCheckBoxCell selectedCell; + private bool refreshDisabled; + private TrafficParameters parameters; public TrafficIDSelector() { InitializeComponent(); @@ -28,14 +35,19 @@ namespace TrafficClient { rbAD.Text = Resources.REKLAM; } - public TrafficConfiguration Configuration { + public TrafficParameters Parameters { set { - trafficAPI = new TrafficAPI(value.Address.OriginalString, value.UserName, value.Password, value.Timeout, value.MessageBus); + parameters = value; + var server = parameters.Configuration?.Server; + if (server != null && server.Address != null) + trafficAPI = new TrafficAPI(server.Address.OriginalString, server.UserName, server.Password, server.Timeout, value.MessageBus); RefreshResults(); } } public void RefreshResults() { + if (refreshDisabled || trafficAPI == null) + return; ClearSelection(); Cursor.Current = Cursors.WaitCursor; string searchText = txtFilter.Text; @@ -63,15 +75,30 @@ namespace TrafficClient { Cursor.Current = Cursors.Default; } - private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - OnSelectionChanged(dgTraffic.SelectedRows[0]); + private void OnCellDoubleClick(object sender, DataGridViewCellEventArgs e) { + if (e.ColumnIndex < 1 || e.RowIndex < 0) + return; + TrafficItem trafficItem = dgTraffic.Rows[e.RowIndex].DataBoundItem as TrafficItem; + if (trafficItem == null) + return; + string id = trafficItem.MediaID; + if (String.IsNullOrEmpty(id)) { + //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?")) + // return; + OnSelectionChanged(dgTraffic.SelectedRows[0]); + id = trafficItem.MediaID; + } + + ProjectSettings projectConfiguration = parameters?.Configuration?.ProjectSettings; + string text = trafficItem.Title; + EdiusProject.Open(projectConfiguration, id, text, parameters.UserName); } - private void searchButton_Click(object sender, EventArgs e) { + private void OnSearchClick(object sender, EventArgs e) { RefreshResults(); } - private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) { + private void OnCellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex < 0 || e.ColumnIndex != 0) return; DataGridView gridView = sender as DataGridView; @@ -83,7 +110,7 @@ namespace TrafficClient { private void OnSelectionChanged(DataGridViewRow actualRow) { TrafficItem trafficItem = actualRow.DataBoundItem as TrafficItem; if (String.IsNullOrEmpty(trafficItem.MediaID)) { - TrafficVersion v = trafficAPI.CreateMaterialVersion(trafficItem.EpisodeID); + TrafficVersion v = trafficAPI.CreateMaterialVersion(trafficItem.EpisodeID, false); if (v != null) { trafficItem.MediaID = v.MediaID; trafficItem.VariantID = v.VariantID; @@ -98,7 +125,7 @@ namespace TrafficClient { } selectedCell.Value = !(bool)selectedCell.Value; bool selected = (bool)selectedCell.Value; - Debug.WriteLine("Selection {0}", selected); + //Debug.WriteLine("Selection {0}", selected); if (selected) IDChangedEvent?.Invoke(trafficItem.MediaID, trafficItem.VariantID, trafficItem.Title); else @@ -142,19 +169,60 @@ namespace TrafficClient { ControlPaint.DrawBorder(e.Graphics, e.ClipRectangle, Color.LightGray, ButtonBorderStyle.Solid); // dotted border } - public bool LookupByMaterialID(string id) { - //TrafficItem result = trafficAPI.GetMaterials(id, false); - return false; + private void ResetFilters(string id) { + txtFilter.Text = id; + dtScheduled.Checked = false; + chkProblematic.Checked = false; + } + + private void SelectResult() { + List result = trafficAPIBindingSource.DataSource as List; + OnSelectionChanged(dgTraffic.Rows[0]); + if (result == null || result.Count == 0) + MsgBox.Info("Nincs találat."); + else + result[0].Selected = true; } - public bool LookupByPromoID(string id) { - return false; + public void LookupByMaterialID(string id) { + refreshDisabled = true; + ResetFilters(id); + rbMaterial.Checked = true; + refreshDisabled = false; + RefreshResults(); + SelectResult(); } - public bool LookupByADID(string id) { - return false; + public void LookupByPromoID(string id) { + refreshDisabled = true; + ResetFilters(id); + rbPromo.Checked = true; + refreshDisabled = false; + RefreshResults(); + SelectResult(); } + public void LookupByADID(string id) { + refreshDisabled = true; + ResetFilters(id); + rbAD.Checked = true; + refreshDisabled = false; + RefreshResults(); + SelectResult(); + } + + private void OnRefresh(object sender, EventArgs e) { + //TrafficItem trafficItem = dgTraffic.SelectedRows[0].DataBoundItem as TrafficItem; + //TrafficVersion v = trafficAPI.CreateMaterialVersion(trafficItem.EpisodeID, true); + //if (v != null) { + // trafficItem.MediaID = v.MediaID; + // trafficItem.VariantID = v.VariantID; + //} + //if (trafficItem.VariantID == 0 || String.IsNullOrEmpty(trafficItem.MediaID)) + // return; + RefreshResults(); + + } } public class TrafficItem { diff --git a/client/PlanAIRClient/Workers/MaterialWorker.cs b/client/PlanAIRClient/Workers/MaterialWorker.cs index 7a44a3ad..0833e765 100644 --- a/client/PlanAIRClient/Workers/MaterialWorker.cs +++ b/client/PlanAIRClient/Workers/MaterialWorker.cs @@ -111,7 +111,7 @@ namespace TrafficClient.Workers { return result; } - public TrafficVersion CreateMaterialVersion(string episodeID) { + public TrafficVersion CreateMaterialVersion(string episodeID, bool recut) { TrafficVersion result = null; try { TryConnect(); @@ -119,7 +119,7 @@ namespace TrafficClient.Workers { cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@Operation", 1105); cmd.Parameters.AddWithValue("@@@Options", DBNull.Value); - cmd.Parameters.AddWithValue("@@IntParam1", 1); + cmd.Parameters.AddWithValue("@@IntParam1", recut ? 12 : 1); cmd.Parameters.AddWithValue("@@ItemID", DBNull.Value); cmd.Parameters.AddWithValue("@@StrParam1", episodeID); cmd.Parameters.AddWithValue("@@StrParam2", DBNull.Value); diff --git a/server/-configuration/debug-mediacube-remote.launch b/server/-configuration/debug-mediacube-remote.launch index 4a99bae5..e7463db1 100644 --- a/server/-configuration/debug-mediacube-remote.launch +++ b/server/-configuration/debug-mediacube-remote.launch @@ -10,7 +10,7 @@ - + diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF index 7f1df3f1..41baf281 100644 --- a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF @@ -3,9 +3,17 @@ Bundle-ManifestVersion: 2 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: . @@ -39,6 +47,5 @@ Require-Bundle: org.apache.commons.lang;bundle-version="2.4.0", 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" diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java index 7f25b32a..979411bd 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java @@ -16,8 +16,10 @@ import org.jboss.resteasy.client.jaxrs.BasicAuthentication; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; +import org.jboss.resteasy.spi.ResteasyDeployment; import org.joda.time.DateTime; +import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.ibm.nosql.json.JSONUtil; import com.ibm.nosql.json.api.BasicDBList; import com.ibm.nosql.json.api.BasicDBObject; @@ -34,7 +36,7 @@ import user.commons.remotestore.IProgressEventListener; import user.commons.remotestore.ProgressEvent; public class OctopusDataMiner implements Runnable { - private static final String _TMP = "_tmp"; + private static final String _TMP = "_tmp1"; private static final Logger logger = LogManager.getLogger(); private static final String LINEFEED = "\r\n"; private static final String SIMPLE_LINEFEED = "\n"; @@ -86,7 +88,7 @@ public class OctopusDataMiner implements Runnable { apiUser = System.getProperty("jobengine.octopus.api.user"); apiPwd = System.getProperty("jobengine.octopus.api.password"); - ResteasyClient client = new ResteasyClientBuilder().build(); + ResteasyClient client = new ResteasyClientBuilder().register(JacksonJsonProvider.class).build(); webTarget = client.target(apiAddress).register(new BasicAuthentication(apiUser, apiPwd)); } @@ -240,40 +242,46 @@ public class OctopusDataMiner implements Runnable { STORY_COLLECTION = IOctopusAPI.STORY_COLLECTION + _TMP; logger.info("Fetch rundowns"); - BasicDBList rundowns = queryRundowns(); - logger.info("Fetch rundown story references"); - storyRundowns = buildRundownReferences(rundowns); - logger.info("Fetch story folders"); - BasicDBList storyFolders = queryStoryFolders(); - logger.info("Fetch folder story references"); - storyStoryFolders = buildFolderReferences(storyFolders); - if (rundowns == null || rundowns.size() == 0) { - progressEvent.setProgress(50); - fireProgressEvent(progressEvent); - } else { - logger.info("Process rundowns"); - storeRundowns(rundowns, null); - } - - if (storyFolders == null || storyFolders.size() == 0) { - progressEvent.setProgress(100); - fireProgressEvent(progressEvent); - } else { - logger.info("Process story folders"); - storeStoryFolders(storyFolders, null); - } - setLastUpdateTime(new Date()); - logger.info("Activate"); - db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true); - db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true); - db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true); + ResteasyWebTarget target = webTarget.path(RUNDOWN); + Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd); + Response r = result.get(); + String x = r.readEntity(String.class); + return; + // BasicDBList rundowns = queryRundowns(); + // logger.info("Fetch rundown story references"); + // storyRundowns = buildRundownReferences(rundowns); + // logger.info("Fetch story folders"); + // BasicDBList storyFolders = queryStoryFolders(); + // logger.info("Fetch folder story references"); + // storyStoryFolders = buildFolderReferences(storyFolders); + // + // if (rundowns == null || rundowns.size() == 0) { + // progressEvent.setProgress(50); + // fireProgressEvent(progressEvent); + // } else { + // logger.info("Process rundowns"); + // storeRundowns(rundowns, null); + // } + // + // if (storyFolders == null || storyFolders.size() == 0) { + // progressEvent.setProgress(100); + // fireProgressEvent(progressEvent); + // } else { + // logger.info("Process story folders"); + // storeStoryFolders(storyFolders, null); + // } + // setLastUpdateTime(new Date()); + // logger.info("Activate"); + // db.getCollection(RUNDOWN_COLLECTION).rename(IOctopusAPI.RUNDOWN_COLLECTION, true); + // db.getCollection(FOLDER_COLLECTION).rename(IOctopusAPI.FOLDER_COLLECTION, true); + // db.getCollection(STORY_COLLECTION).rename(IOctopusAPI.STORY_COLLECTION, true); } catch (Exception e) { logger.catching(e); throw e; } - logger.trace(FINISHED); + // logger.trace(FINISHED); } @@ -419,6 +427,13 @@ public class OctopusDataMiner implements Runnable { } private Builder query(String path, String fields) { + logger.info("Class loader {}", getClass().getClassLoader()); + try { + ResteasyDeployment deployment = new ResteasyDeployment(); + deployment.start(); + } catch (Exception e) { + logger.catching(e); + } ResteasyWebTarget target = webTarget.path(path).queryParam(FIELDS, fields); Builder result = target.request().header(OCTOPUS_DEVICE_ID, apiUser).header(OCTOPUS_DEVICE_NAME, apiPwd); return result; diff --git a/server/user.jobengine.osgi.server/META-INF/services/javax.ws.rs.ext.Providers b/server/user.jobengine.osgi.server/META-INF/services/javax.ws.rs.ext.Providers new file mode 100644 index 00000000..e3fd06b0 --- /dev/null +++ b/server/user.jobengine.osgi.server/META-INF/services/javax.ws.rs.ext.Providers @@ -0,0 +1 @@ +org.jboss.resteasy.plugins.providers.StringTextStar \ No newline at end of file diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java index 4cc25574..701d72d3 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveSelectorModel.java @@ -57,7 +57,7 @@ public class RetrieveSelectorModel extends BaseModel { try { String trafficOutputPath = "/mnt/ISILON/PLAYOUT_NLE"; String octopusOutputPath = "/mnt/ISILON/OCTOPUS"; - String genericOutputPath = "/mnt/ISILON/RESTORE"; + String genericOutputPath = "/mnt/ISILON/ARCHIVE_RESTORE"; if (StringUtils.isBlank(houseId)) throw new Exception("Az azonosító megadása kötelező!"); Map parameters = ListUtils.asMap(TRAFFICOUTPUTPATH, trafficOutputPath, OCTOPUSOUTPUTPATH, octopusOutputPath, GENERICOUTPUTPATH, diff --git a/server/user.jobengine.osgi.services/META-INF/services/javax.ws.rs.ext.Providers b/server/user.jobengine.osgi.services/META-INF/services/javax.ws.rs.ext.Providers new file mode 100644 index 00000000..e3fd06b0 --- /dev/null +++ b/server/user.jobengine.osgi.services/META-INF/services/javax.ws.rs.ext.Providers @@ -0,0 +1 @@ +org.jboss.resteasy.plugins.providers.StringTextStar \ No newline at end of file diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/JacksonJsonProvider.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/JacksonJsonProvider.java index b62a7083..70678661 100644 --- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/JacksonJsonProvider.java +++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/JacksonJsonProvider.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; @Provider @Produces({ MediaType.APPLICATION_JSON }) +//@Consumes({ "application/json;charset=UTF-8" }) +//@Produces({ "text/plain", "text/html" }) public class JacksonJsonProvider extends JacksonJaxbJsonProvider { public JacksonJsonProvider() {