From: vasary.daniel Date: Fri, 29 Apr 2022 10:34:50 +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=47051304dd7147cb6646496a66ae34d2e1fbf85f;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33236 --- diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs index aa537608..e745714f 100644 --- a/client/DxPlay/PlayerForm.Designer.cs +++ b/client/DxPlay/PlayerForm.Designer.cs @@ -88,7 +88,7 @@ namespace DxPlay { this.pVideo.Dock = System.Windows.Forms.DockStyle.Fill; this.pVideo.Location = new System.Drawing.Point(0, 0); this.pVideo.Name = "pVideo"; - this.pVideo.Size = new System.Drawing.Size(478, 349); + this.pVideo.Size = new System.Drawing.Size(478, 363); this.pVideo.TabIndex = 0; this.pVideo.TabStop = true; this.pVideo.SizeChanged += new System.EventHandler(this.Panel1_SizeChanged); @@ -99,7 +99,7 @@ namespace DxPlay { this.mainSplit.BackColor = System.Drawing.Color.Black; this.mainSplit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.mainSplit.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainSplit.Location = new System.Drawing.Point(0, 28); + this.mainSplit.Location = new System.Drawing.Point(0, 24); this.mainSplit.Name = "mainSplit"; // // mainSplit.Panel1 @@ -111,7 +111,7 @@ namespace DxPlay { this.mainSplit.Panel2.Controls.Add(this.tableLayoutPanel1); this.mainSplit.Panel2.Controls.Add(this.pMetadataDisplay); this.mainSplit.Panel2MinSize = 300; - this.mainSplit.Size = new System.Drawing.Size(784, 351); + this.mainSplit.Size = new System.Drawing.Size(784, 365); this.mainSplit.SplitterDistance = 480; this.mainSplit.TabIndex = 20; // @@ -121,7 +121,7 @@ namespace DxPlay { this.panelPlayer.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPlayer.Location = new System.Drawing.Point(0, 0); this.panelPlayer.Name = "panelPlayer"; - this.panelPlayer.Size = new System.Drawing.Size(478, 349); + this.panelPlayer.Size = new System.Drawing.Size(478, 363); this.panelPlayer.TabIndex = 0; // // tableLayoutPanel1 @@ -137,7 +137,7 @@ namespace DxPlay { this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 277); + this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 300); this.tableLayoutPanel1.TabIndex = 4; // // tabEditor @@ -148,13 +148,13 @@ namespace DxPlay { this.tabEditor.Dock = System.Windows.Forms.DockStyle.Fill; this.tabEditor.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.tabEditor.ImageList = this.imagesTabEdit; - this.tabEditor.Location = new System.Drawing.Point(28, 4); + this.tabEditor.Location = new System.Drawing.Point(23, 4); this.tabEditor.Margin = new System.Windows.Forms.Padding(0, 4, 4, 4); this.tabEditor.Multiline = true; this.tabEditor.Name = "tabEditor"; this.tabEditor.Padding = new System.Drawing.Point(10, 5); this.tabEditor.SelectedIndex = 0; - this.tabEditor.Size = new System.Drawing.Size(266, 269); + this.tabEditor.Size = new System.Drawing.Size(271, 292); this.tabEditor.TabIndex = 2; // // tpMetadata @@ -166,7 +166,7 @@ namespace DxPlay { this.tpMetadata.Location = new System.Drawing.Point(4, 4); this.tpMetadata.Name = "tpMetadata"; this.tpMetadata.Padding = new System.Windows.Forms.Padding(3); - this.tpMetadata.Size = new System.Drawing.Size(258, 199); + this.tpMetadata.Size = new System.Drawing.Size(263, 253); this.tpMetadata.TabIndex = 0; this.tpMetadata.Text = "Metadata"; // @@ -179,7 +179,7 @@ namespace DxPlay { this.trafficBrowser.Margin = new System.Windows.Forms.Padding(0); this.trafficBrowser.Name = "trafficBrowser"; this.trafficBrowser.Parameters = null; - this.trafficBrowser.Size = new System.Drawing.Size(252, 193); + this.trafficBrowser.Size = new System.Drawing.Size(257, 247); this.trafficBrowser.TabIndex = 0; // // tpSegments @@ -191,7 +191,7 @@ namespace DxPlay { this.tpSegments.Location = new System.Drawing.Point(4, 4); this.tpSegments.Name = "tpSegments"; this.tpSegments.Padding = new System.Windows.Forms.Padding(3); - this.tpSegments.Size = new System.Drawing.Size(258, 199); + this.tpSegments.Size = new System.Drawing.Size(214, 192); this.tpSegments.TabIndex = 1; this.tpSegments.Text = "Segments"; this.tpSegments.UseVisualStyleBackColor = true; @@ -216,13 +216,13 @@ namespace DxPlay { this.dgSegments.DefaultCellStyle = dataGridViewCellStyle1; this.dgSegments.Dock = System.Windows.Forms.DockStyle.Fill; this.dgSegments.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2; - this.dgSegments.Location = new System.Drawing.Point(3, 32); + this.dgSegments.Location = new System.Drawing.Point(3, 28); this.dgSegments.MultiSelect = false; this.dgSegments.Name = "dgSegments"; this.dgSegments.RowHeadersVisible = false; this.dgSegments.RowHeadersWidth = 51; this.dgSegments.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgSegments.Size = new System.Drawing.Size(252, 164); + this.dgSegments.Size = new System.Drawing.Size(208, 161); this.dgSegments.TabIndex = 1; this.dgSegments.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.OnSegmentsCellBeginEdit); this.dgSegments.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellContentClick); @@ -249,7 +249,7 @@ namespace DxPlay { this.segmentActions.Location = new System.Drawing.Point(3, 3); this.segmentActions.Name = "segmentActions"; this.segmentActions.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.segmentActions.Size = new System.Drawing.Size(252, 29); + this.segmentActions.Size = new System.Drawing.Size(208, 25); this.segmentActions.TabIndex = 0; this.segmentActions.Text = "toolStrip1"; // @@ -260,14 +260,14 @@ namespace DxPlay { this.tbDefineSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbDefineSegment.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbDefineSegment.Name = "tbDefineSegment"; - this.tbDefineSegment.Size = new System.Drawing.Size(29, 26); + this.tbDefineSegment.Size = new System.Drawing.Size(23, 22); this.tbDefineSegment.Text = "toolStripButton5"; this.tbDefineSegment.Click += new System.EventHandler(this.OnDefineOneSegmentClick); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 29); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); // // tbPositionAsTCIn // @@ -276,7 +276,7 @@ namespace DxPlay { this.tbPositionAsTCIn.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbPositionAsTCIn.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbPositionAsTCIn.Name = "tbPositionAsTCIn"; - this.tbPositionAsTCIn.Size = new System.Drawing.Size(29, 26); + this.tbPositionAsTCIn.Size = new System.Drawing.Size(23, 22); this.tbPositionAsTCIn.Text = "toolStripButton1"; this.tbPositionAsTCIn.Click += new System.EventHandler(this.OnActualPositionToTCInToolStripMenuItem1Click); // @@ -287,7 +287,7 @@ namespace DxPlay { this.tbSplitSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbSplitSegment.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbSplitSegment.Name = "tbSplitSegment"; - this.tbSplitSegment.Size = new System.Drawing.Size(29, 26); + this.tbSplitSegment.Size = new System.Drawing.Size(23, 22); this.tbSplitSegment.Text = "toolStripButton4"; this.tbSplitSegment.Click += new System.EventHandler(this.OnSplitSegmentAtCurrentPositionClick); // @@ -298,14 +298,14 @@ namespace DxPlay { this.tbPositionAsTCOut.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbPositionAsTCOut.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbPositionAsTCOut.Name = "tbPositionAsTCOut"; - this.tbPositionAsTCOut.Size = new System.Drawing.Size(29, 26); + this.tbPositionAsTCOut.Size = new System.Drawing.Size(23, 22); this.tbPositionAsTCOut.Text = "toolStripButton2"; this.tbPositionAsTCOut.Click += new System.EventHandler(this.OnActualPositionToTCOutToolStripMenuItem1Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 29); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); // // tbDeleteSegment // @@ -314,7 +314,7 @@ namespace DxPlay { this.tbDeleteSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbDeleteSegment.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbDeleteSegment.Name = "tbDeleteSegment"; - this.tbDeleteSegment.Size = new System.Drawing.Size(29, 26); + this.tbDeleteSegment.Size = new System.Drawing.Size(23, 22); this.tbDeleteSegment.Text = "toolStripButton3"; this.tbDeleteSegment.Click += new System.EventHandler(this.OnDeleteSegmentClick); // @@ -334,7 +334,7 @@ namespace DxPlay { this.btnToggleSegmentEditor.Location = new System.Drawing.Point(0, 4); this.btnToggleSegmentEditor.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0); this.btnToggleSegmentEditor.Name = "btnToggleSegmentEditor"; - this.btnToggleSegmentEditor.Size = new System.Drawing.Size(28, 72); + this.btnToggleSegmentEditor.Size = new System.Drawing.Size(23, 63); this.btnToggleSegmentEditor.TabIndex = 0; this.btnToggleSegmentEditor.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.btnToggleSegmentEditor.UseVisualStyleBackColor = false; @@ -350,13 +350,13 @@ namespace DxPlay { this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 0); this.pMetadataDisplay.Controls.Add(this.txtSelectedID, 0, 1); this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pMetadataDisplay.Location = new System.Drawing.Point(0, 277); + this.pMetadataDisplay.Location = new System.Drawing.Point(0, 300); this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0); this.pMetadataDisplay.Name = "pMetadataDisplay"; this.pMetadataDisplay.RowCount = 2; this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.pMetadataDisplay.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.pMetadataDisplay.Size = new System.Drawing.Size(298, 72); + this.pMetadataDisplay.Size = new System.Drawing.Size(298, 63); this.pMetadataDisplay.TabIndex = 5; // // btnApprove @@ -368,10 +368,10 @@ namespace DxPlay { this.btnApprove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnApprove.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.btnApprove.Image = ((System.Drawing.Image)(resources.GetObject("btnApprove.Image"))); - this.btnApprove.Location = new System.Drawing.Point(187, 32); + this.btnApprove.Location = new System.Drawing.Point(196, 29); this.btnApprove.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0); this.btnApprove.Name = "btnApprove"; - this.btnApprove.Size = new System.Drawing.Size(111, 30); + this.btnApprove.Size = new System.Drawing.Size(102, 30); this.btnApprove.TabIndex = 17; this.btnApprove.Text = "Approve"; this.btnApprove.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -388,7 +388,7 @@ namespace DxPlay { this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 0); this.labelSelectedMetadata.Name = "labelSelectedMetadata"; this.labelSelectedMetadata.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5); - this.labelSelectedMetadata.Size = new System.Drawing.Size(181, 28); + this.labelSelectedMetadata.Size = new System.Drawing.Size(190, 25); this.labelSelectedMetadata.TabIndex = 13; this.labelSelectedMetadata.Text = "Selected metadata"; // @@ -398,9 +398,9 @@ namespace DxPlay { this.txtSelectedID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSelectedID.Dock = System.Windows.Forms.DockStyle.Fill; this.txtSelectedID.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.txtSelectedID.Location = new System.Drawing.Point(3, 31); + this.txtSelectedID.Location = new System.Drawing.Point(3, 28); this.txtSelectedID.Name = "txtSelectedID"; - this.txtSelectedID.Size = new System.Drawing.Size(181, 38); + this.txtSelectedID.Size = new System.Drawing.Size(190, 32); this.txtSelectedID.TabIndex = 12; // // mainMenu @@ -410,7 +410,7 @@ namespace DxPlay { this.fileToolStripMenuItem}); this.mainMenu.Location = new System.Drawing.Point(0, 0); this.mainMenu.Name = "mainMenu"; - this.mainMenu.Size = new System.Drawing.Size(784, 28); + this.mainMenu.Size = new System.Drawing.Size(784, 24); this.mainMenu.TabIndex = 21; this.mainMenu.Text = "menuStrip1"; // @@ -422,14 +422,14 @@ namespace DxPlay { this.toolStripSeparator3, this.menuRedefineSegments}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; // // menuOpenFile // this.menuOpenFile.Name = "menuOpenFile"; this.menuOpenFile.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.menuOpenFile.Size = new System.Drawing.Size(269, 26); + this.menuOpenFile.Size = new System.Drawing.Size(215, 22); this.menuOpenFile.Text = "Open file"; this.menuOpenFile.Click += new System.EventHandler(this.MenuOpenFile_Click); // @@ -437,20 +437,20 @@ namespace DxPlay { // this.menuApprove.Name = "menuApprove"; this.menuApprove.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.menuApprove.Size = new System.Drawing.Size(269, 26); + this.menuApprove.Size = new System.Drawing.Size(215, 22); this.menuApprove.Text = "Approve"; this.menuApprove.Click += new System.EventHandler(this.OnApprove); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(266, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(212, 6); // // menuRedefineSegments // this.menuRedefineSegments.Name = "menuRedefineSegments"; this.menuRedefineSegments.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.menuRedefineSegments.Size = new System.Drawing.Size(269, 26); + this.menuRedefineSegments.Size = new System.Drawing.Size(215, 22); this.menuRedefineSegments.Text = "Redefine segments"; this.menuRedefineSegments.Click += new System.EventHandler(this.OnRedefineSegments); // @@ -460,17 +460,17 @@ namespace DxPlay { this.flowLayoutPanel1.Controls.Add(this.btnSave); this.flowLayoutPanel1.Controls.Add(this.btnCancel); this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 528); + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 532); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.flowLayoutPanel1.Size = new System.Drawing.Size(784, 33); + this.flowLayoutPanel1.Size = new System.Drawing.Size(784, 29); this.flowLayoutPanel1.TabIndex = 23; // // btnSave // - this.btnSave.Location = new System.Drawing.Point(691, 3); + this.btnSave.Location = new System.Drawing.Point(706, 3); this.btnSave.Name = "btnSave"; - this.btnSave.Size = new System.Drawing.Size(90, 27); + this.btnSave.Size = new System.Drawing.Size(75, 23); this.btnSave.TabIndex = 0; this.btnSave.Text = "Save"; this.btnSave.UseVisualStyleBackColor = true; @@ -478,9 +478,9 @@ namespace DxPlay { // // btnCancel // - this.btnCancel.Location = new System.Drawing.Point(595, 3); + this.btnCancel.Location = new System.Drawing.Point(625, 3); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(90, 27); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 1; this.btnCancel.Text = "Cancel"; this.btnCancel.UseVisualStyleBackColor = true; @@ -492,16 +492,16 @@ namespace DxPlay { this.playerControls.BackColor = System.Drawing.Color.Transparent; this.playerControls.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.playerControls.Dock = System.Windows.Forms.DockStyle.Bottom; - this.playerControls.Location = new System.Drawing.Point(0, 379); + this.playerControls.Location = new System.Drawing.Point(0, 389); this.playerControls.Margin = new System.Windows.Forms.Padding(0); this.playerControls.Name = "playerControls"; - this.playerControls.Size = new System.Drawing.Size(784, 149); + this.playerControls.Size = new System.Drawing.Size(784, 143); this.playerControls.TabIndex = 22; // // PlayerForm // this.AllowDrop = true; - this.AutoScaleBaseSize = new System.Drawing.Size(6, 15); + this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(784, 561); this.Controls.Add(this.mainSplit); @@ -510,7 +510,7 @@ namespace DxPlay { this.Controls.Add(this.flowLayoutPanel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; - this.MinimumSize = new System.Drawing.Size(768, 554); + this.MinimumSize = new System.Drawing.Size(640, 480); this.Name = "PlayerForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "MediaCube Player"; diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx index 45243086..11d3d89d 100644 --- a/client/DxPlay/PlayerForm.resx +++ b/client/DxPlay/PlayerForm.resx @@ -127,7 +127,7 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAC8SURBVDhP1ZO9DcIwFISfqKGjpaENG4S/GZiEOiWMkR2Y + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC8SURBVDhP1ZO9DcIwFISfqKGjpaENG4S/GZiEOiWMkR2Y gREo2IEVaBDcOXnS48m24lRw0qf4nHeXxFLkZ3UC15GcQVAF3uAGYoM5mGF2BWTfG15LpdmdNb6Ib3ro lkkNKtJ9fgJLY9KZrTWpIvICLZgDq+Ii8gQNsNKZjTW5ogtYAq/BRXcQDjIhza6t8UVTMOmWSX0V8aBo joA3SmCG2RrIDDz6jTEwy46gBfBPi4WIn2M2K/9fKX8hkQ9xw2LrlhXH8QAAAABJRU5ErkJggg== @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABOSURBVDhPYxgFVAWOUJoiUALE/4HYB8wjE8AMmQbmkQmo + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABOSURBVDhPYxgFVAWOUJoiUALE/4HYB8wjE8AMmQbmkQmo asg8MI8C0ADEMIMYQQKUgG4gpoqrQABmGEXhBAMww3zBPAqBG5QeBWQBBgYAaigQp+qpuEkAAAAASUVO RK5CYII= @@ -144,7 +144,7 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABlSURBVDhPYxjZ4AAUUwxGDUIFFUDcD2HCATaDQGoKIEzs + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABlSURBVDhPYxjZ4AAUUwxGDUIFFUDcD2HCATaDQGoKIEzs oIGRkfE/kEY2DN2gfqiaBggXN+hGMwzZIJgh3RAuYQAzrB2IYQa1k2oIDMAM+wHC5BoCA2DDKDUEBkAG UGzIkAUMDABv+SVD4UMwTwAAAABJRU5ErkJggg== @@ -152,7 +152,7 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABOSURBVDhPYxgFFAMnKE0R8APi/0BcAuZRCKYBMdUMmwfE + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABOSURBVDhPYxgFFAMnKE0R8APi/0BcAuZRCKYBMdUMmwfE VDGMEYiXADHFhoEMgrmqASRADkA2pBskQC6giiH+QEyxITDgBqVHAcWAgQEAtZ4QxOLkcD0AAAAASUVO RK5CYII= @@ -160,7 +160,7 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABvSURBVDhPYxhZwBVK4wOOUBoncAPi/0DcDuZhByA5kBon + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABvSURBVDhPYxhZwBVK4wOOUBoncAPi/0DcDuZhByA5kBon MA8P6AdiXIbBDAGpIQpgM4xkQ2AAZlg9EDdA2SQbAgPTgBhkAEWGgADMVRQZBDME5C2yvQYzhKLAxmYI DBBtGFUTJDFZhBg1wwMwMAAAvx8nVwi8b+UAAAAASUVORK5CYII= @@ -173,7 +173,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo - CAAAAk1TRnQBSQFMAgEBAgEAAZABAgGQAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZgBAgGYAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java index 3aa7016e..52e30e91 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java @@ -29,40 +29,34 @@ public class OutputPathAndNameSelectorStep extends JobStep { private static final Logger logger = LogManager.getLogger(); private Marker marker; - private String octopusAddress = SystemConfiguration.getInstance().value("services.octopus.api.address", null); - private void check(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, - String advertisementOutputFolder, String octopusOutputFolder, String genericOutputFolder, String houseId, - String targetPathType) { + private String octopusAddress = SystemConfiguration.getInstance().value("services.octopus.api.address", ""); + + private void check(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder, + String octopusOutputFolder, String genericOutputFolder, String houseId, String targetPathType) { if (StringUtils.isBlank(localRetrievePath)) { logger.error(marker, "A folyamat 'localRetrievePath' bemeneti paramétere üres."); - throw new NullPointerException( - "System is not configured properly, 'localRetrievePath' input parameter missing."); + throw new NullPointerException("System is not configured properly, 'localRetrievePath' input parameter missing."); } if (StringUtils.isBlank(materialOutputFolder)) { logger.error(marker, "A folyamat 'materialOutputFolder' bemeneti paramétere üres."); - throw new NullPointerException( - "System is not configured properly, 'materialOutputFolder' input parameter missing."); + throw new NullPointerException("System is not configured properly, 'materialOutputFolder' input parameter missing."); } if (StringUtils.isBlank(promoOutputFolder)) { logger.error(marker, "A folyamat 'promoOutputFolder' bemeneti paramétere üres."); - throw new NullPointerException( - "System is not configured properly, 'promoOutputFolder' input parameter missing."); + throw new NullPointerException("System is not configured properly, 'promoOutputFolder' input parameter missing."); } if (StringUtils.isBlank(advertisementOutputFolder)) { logger.error(marker, "A folyamat 'advertisementOutputFolder' bemeneti paramétere üres."); - throw new NullPointerException( - "System is not configured properly, 'advertisementOutputFolder' input parameter missing."); + throw new NullPointerException("System is not configured properly, 'advertisementOutputFolder' input parameter missing."); } if (StringUtils.isBlank(octopusOutputFolder)) { logger.error(marker, "A folyamat 'octopusOutputFolder' bemeneti paramétere üres."); - throw new NullPointerException( - "System is not configured properly, 'octopusOutputFolder' input parameter missing."); + throw new NullPointerException("System is not configured properly, 'octopusOutputFolder' input parameter missing."); } if (StringUtils.isBlank(genericOutputFolder)) { logger.error(marker, "A folyamat 'genericOutputFolder' bemeneti paramétere üres."); - throw new NullPointerException( - "System is not configured properly, 'genericOutputFolder' input parameter missing."); + throw new NullPointerException("System is not configured properly, 'genericOutputFolder' input parameter missing."); } if (StringUtils.isBlank(houseId)) { logger.error(marker, "A folyamat 'houseId' bemeneti paramétere üres."); @@ -70,24 +64,22 @@ public class OutputPathAndNameSelectorStep extends JobStep { } if (StringUtils.isBlank(targetPathType)) { logger.error(marker, "A folyamat 'targetPathType' bemeneti paramétere üres."); - throw new NullPointerException( - "System is not configured properly, 'targetPathType' input parameter missing."); + throw new NullPointerException("System is not configured properly, 'targetPathType' input parameter missing."); } } @StepEntry - public Object[] execute(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, - String advertisementOutputFolder, String octopusOutputFolder, String genericOutputFolder, - String onlineOutputFolder, String houseId, String targetPathType, ArchivedMedia archivedMedia, - IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { + public Object[] execute(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder, + String octopusOutputFolder, String genericOutputFolder, String onlineOutputFolder, String houseId, String targetPathType, + ArchivedMedia archivedMedia, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { marker = jobRuntime.getSessionMarker(); - check(localRetrievePath, materialOutputFolder, promoOutputFolder, advertisementOutputFolder, - octopusOutputFolder, genericOutputFolder, houseId, targetPathType); + check(localRetrievePath, materialOutputFolder, promoOutputFolder, advertisementOutputFolder, octopusOutputFolder, genericOutputFolder, houseId, + targetPathType); Object[] result = null; switch (Integer.parseInt(targetPathType)) { case 0: - String outputFolder = getFolderById(materialOutputFolder, promoOutputFolder, advertisementOutputFolder, - octopusOutputFolder, genericOutputFolder, houseId, archivedMedia); + String outputFolder = getFolderById(materialOutputFolder, promoOutputFolder, advertisementOutputFolder, octopusOutputFolder, genericOutputFolder, + houseId, archivedMedia); result = localTargetInit(localRetrievePath, outputFolder, houseId, jobRuntime); break; case 1: @@ -104,9 +96,8 @@ public class OutputPathAndNameSelectorStep extends JobStep { return result; } - private String getFolderById(String materialOutputFolder, String promoOutputFolder, - String advertisementOutputFolder, String octopusOutputFolder, String genericOutputFolder, String houseId, - ArchivedMedia archivedMedia) throws Exception { + private String getFolderById(String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder, String octopusOutputFolder, + String genericOutputFolder, String houseId, ArchivedMedia archivedMedia) throws Exception { String id = houseId.toUpperCase(); MetadataType mdType = MetadataTypeDetector.GuessMetadataType(id); String result = null; @@ -116,7 +107,7 @@ public class OutputPathAndNameSelectorStep extends JobStep { case "OctopusPlaceholder": case "OctopusStory": // 220429 MV-ben nincs Octopus - if (octopusAddress == null) + if (StringUtils.isBlank(octopusAddress)) result = genericOutputFolder; else result = octopusOutputFolder; @@ -154,16 +145,14 @@ public class OutputPathAndNameSelectorStep extends JobStep { return result[0]; } - private Object[] localTargetInit(String localRetrievePath, String outputFolder, String houseId, - IJobRuntime jobRuntime) throws IOException { + private Object[] localTargetInit(String localRetrievePath, String outputFolder, String houseId, IJobRuntime jobRuntime) throws IOException { String id = houseId.toUpperCase(); String targetPath = getPossiblePath(id, Paths.get(localRetrievePath, outputFolder, id)).toString(); String targetNamePattern = houseId + TARGETNAMEPATTERN; try { EscortFiles.ensureUNCFolder(Paths.get(targetPath)); } catch (Exception e) { - logger.error(jobRuntime.getSessionMarker(), - "A cél mappa '{}' nem létezik és nem hozható létre. A rendszer hibaüzenete: {}", targetPath, + logger.error(jobRuntime.getSessionMarker(), "A cél mappa '{}' nem létezik és nem hozható létre. A rendszer hibaüzenete: {}", targetPath, e.getMessage()); throw e; }