From 0b42aa1e78a4530167e11418d45c53b1d8a4a7f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 16 Oct 2018 11:35:57 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31321 --- client/AudioRecorder/AudioRecorder.csproj | 3 +- .../{audiorecorder.en => audiorecorder.en1} | 0 .../Configuration/audiorecorder.json | 21 ++++ client/AudioRecorder/MainForm.cs | 43 +++---- .../Configuration/configuration-nle.json | 28 +---- .../Configuration/configuration-studio.json | 115 ++++++++++++++++-- .../Configuration/configuration-studio1.json | 65 ++++++++++ .../configuration-tqc-archive.json | 2 +- client/Maestro/Maestro.csproj | 7 +- 9 files changed, 217 insertions(+), 67 deletions(-) rename client/AudioRecorder/Configuration/{audiorecorder.en => audiorecorder.en1} (100%) create mode 100644 client/Maestro/Configuration/configuration-studio1.json diff --git a/client/AudioRecorder/AudioRecorder.csproj b/client/AudioRecorder/AudioRecorder.csproj index 235a09c1..a210555b 100644 --- a/client/AudioRecorder/AudioRecorder.csproj +++ b/client/AudioRecorder/AudioRecorder.csproj @@ -91,6 +91,7 @@ x64 prompt MinimumRecommendedRules.ruleset + true maestro.ico @@ -173,7 +174,7 @@ Always - + Always diff --git a/client/AudioRecorder/Configuration/audiorecorder.en b/client/AudioRecorder/Configuration/audiorecorder.en1 similarity index 100% rename from client/AudioRecorder/Configuration/audiorecorder.en rename to client/AudioRecorder/Configuration/audiorecorder.en1 diff --git a/client/AudioRecorder/Configuration/audiorecorder.json b/client/AudioRecorder/Configuration/audiorecorder.json index 4e1f4341..f6dd73c5 100644 --- a/client/AudioRecorder/Configuration/audiorecorder.json +++ b/client/AudioRecorder/Configuration/audiorecorder.json @@ -10,6 +10,27 @@ "address": "file://C:\\temp" } }, + "trafficTarget": { + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%", + "remote": { + "address": "file://C:\\temp" + } + }, + "trafficPromoTarget": { + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%", + "remote": { + "address": "file://C:\\temp" + } + }, + "trafficADTarget": { + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%", + "remote": { + "address": "file://C:\\temp" + } + }, "freeTarget": { "processor": "UNCTargetProcessor", "outputFormat": "%ID%", diff --git a/client/AudioRecorder/MainForm.cs b/client/AudioRecorder/MainForm.cs index 69c3c751..0a2988f5 100644 --- a/client/AudioRecorder/MainForm.cs +++ b/client/AudioRecorder/MainForm.cs @@ -1,20 +1,20 @@ -using System; +using AudioRecorder.Properties; +using MaestroShared.Commons; +using MaestroShared.Configuration; +using MaestroShared.Metadata; +using MaestroShared.Target; +using MaestroShared.Targets; +using NAudio.CoreAudioApi; +using System; using System.Collections.Generic; +using System.ComponentModel; using System.Diagnostics; using System.Drawing; -using NAudio.CoreAudioApi; -using System.Windows.Forms; using System.IO; -using MaestroShared.Configuration; -using System.ComponentModel; -using MaestroShared.Commons; -using MaestroShared.Target; using System.Security.Principal; -using MaestroShared.Targets; -using static AudioRecorder.MetadataSelectorForm; -using MaestroShared.Metadata; -using AudioRecorder.Properties; using System.Threading; +using System.Windows.Forms; +using static AudioRecorder.MetadataSelectorForm; namespace AudioRecorder { public delegate void RefreshPanelDelegate(); @@ -92,8 +92,7 @@ namespace AudioRecorder { SelectedDeviceIndex = audioDevicesNames.IndexOf(parameters.DeviceName); if (SelectedDeviceIndex < 0) ShowAudioDeviceSelectorForm(); - } - catch (Exception ex) { + } catch (Exception ex) { MsgBox.Error(ex.Message); } } @@ -106,8 +105,7 @@ namespace AudioRecorder { //Debug.WriteLine(String.Format($"Values {levels[0]}")); pmVolume.SetData(levels, 0, 1); System.Threading.Thread.Sleep(100); - } - catch (Exception ex) { + } catch (Exception ex) { Debug.WriteLine(ex.Message); } } @@ -151,8 +149,7 @@ namespace AudioRecorder { Directory.CreateDirectory(parameters.WorkingDirectory.LocalPath); recorder = new WavRecorder(SelectedDeviceIndex, CurrentDevice); currentDevice.AudioEndpointVolume.OnVolumeNotification += OnAudioEndpointVolumeChanged; - } - catch (Exception ex) { + } catch (Exception ex) { MsgBox.Error(ex.Message); } } @@ -169,8 +166,7 @@ namespace AudioRecorder { playButton.Enabled = false; stopButton.BackColor = Color.Red; recordButton.BackColor = Color.White; - } - catch (Exception e) { + } catch (Exception e) { MsgBox.Error(e.Message); } } @@ -199,8 +195,7 @@ namespace AudioRecorder { stopButton.BackColor = Color.White; recordButton.BackColor = Color.Lime; Export(); - } - catch (Exception e) { + } catch (Exception e) { MsgBox.Error(e.Message); } } @@ -208,8 +203,7 @@ namespace AudioRecorder { public DialogResult ShowMTAFileSaveDialog(SaveFileDialog sd) { DialogResult dlgRes = DialogResult.Cancel; - Thread theThread = new Thread((ThreadStart)delegate - { + Thread theThread = new Thread((ThreadStart)delegate { //Create a layout dialog instance on the current thread to align the file dialog Form Form frmLayout = new Form(); frmLayout.StartPosition = FormStartPosition.Manual; @@ -385,8 +379,7 @@ namespace AudioRecorder { string path = Path.GetDirectoryName(processor.Output); string name = Path.GetFileName(processor.Output); MsgBox.Info(String.Format(parameters.Resource("SUCCESSMESSAGE", Resources.SUCCESSMESSAGE), path, name)); - } - else + } else MsgBox.Error(processor.Message); } diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json index f13a4c19..93b3e282 100644 --- a/client/Maestro/Configuration/configuration-nle.json +++ b/client/Maestro/Configuration/configuration-nle.json @@ -1,6 +1,6 @@ { "title": "UNC2FTP_NEXIO_UNC", - "active": true, + "active": false, "startInTray": false, "enableCustomMetadataId": true, "defaultWindowColor": "#E1BEE7", @@ -22,34 +22,10 @@ "metadatas": [ { "$type": "OctopusMetadata", - "disableStoryCheck": true, + "disabled": true, "server": { "address": "http://10.10.1.27/services/rest/octopus/", "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/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - "disableOpenProject": false, - "disableOpenSourceFolder": false } }, { diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json index dc505802..61909c4c 100644 --- a/client/Maestro/Configuration/configuration-studio.json +++ b/client/Maestro/Configuration/configuration-studio.json @@ -1,7 +1,7 @@ { - "title": "NEXIO2UNC_FXP", + "title": "Stúdió szerverről másolás", "active": true, - "startInTray": false, + "startInTray": true, "enableCustomMetadataId": true, "filter": "avi", "player": { @@ -21,7 +21,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://localhost:8888/services/rest/octopus", + "address": "http://10.10.1.27/services/rest/octopus", "timeout": 1000 } }, @@ -46,20 +46,111 @@ ], "targets": [ { - "label": "Archiválás", + "label": "Octopus mappába küldés", + "processor": "FXPTargetProcessor", + "subFolderFormat": "%IDROOT%-%TEXT%", + "outputFormat": "%ID%-%SOURCENAME%", + "killDateDays": 15, + "temporaryCopy": true, + "remote": { + "address": "ftp://10.10.1.100/OCTOPUS", + "userName": "mediacube", + "password": "H7YCE8gvuGsPvN3bQSf4FTH0/4IRmoe3gKY0QvgG+wlfqS48yLhm/fDoPSRaWpDWa3RKZAnLF3pKs+lLSQX0IRVZDRCkydQP7syEwKhHztbJ+A88W9rKRF2JrQ7W6jA1", + "timeout": 1000 + }, + "tag": "Betöltés" + }, + { + "label": "Traffic mappába küldés", "processor": "FXPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "deleteAfterCopy": false, + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "subFolderFormat": "%IDROOT%-%TEXT%", + "killDateDays": 7, "temporaryCopy": true, - "killDateDays": 5, + "saveArchiveMetadata": false, "remote": { - "address": "ftp://10.10.1.100:21/ARCHIVE/TESZT", + "address": "ftp://10.10.1.100/PLAYOUT_NLE", "userName": "mediacube", "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", "timeout": 1000 } - } - ] + }, + { + "label": "Promo mappába küldés", + "processor": "FTPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "subFolderFormat": "%IDROOT%-%TEXT%/INGEST-%TIMESTAMP%", + "killDateDays": 30, + "temporaryCopy": true, + "saveArchiveMetadata": false, + "remote": { + "address": "ftp://10.10.1.100/PROMO_NLE", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + { + "label": "Reklám mappába küldés", + "processor": "FTPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "subFolderFormat": "%IDROOT%-%TEXT%/INGEST-%TIMESTAMP%", + "killDateDays": 14, + "temporaryCopy": true, + "saveArchiveMetadata": false, + "remote": { + "address": "ftp://10.10.1.100/REKLAM_NLE", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + { + "label": "TQC check", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "killDateDays": 7, + "temporaryCopy": true, + "saveArchiveMetadata": false, + "remote": { + "address": "ftp://10.10.1.100/TQC/CHECK", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + { + "label": "TQC promo", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "killDateDays": 7, + "temporaryCopy": true, + "saveArchiveMetadata": false, + "remote": { + "address": "ftp://10.10.1.100/TQC/PROMO", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + { + "label": "TQC reklám", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "killDateDays": 7, + "temporaryCopy": true, + "saveArchiveMetadata": false, + "remote": { + "address": "ftp://10.10.1.100/TQC/REKLAM", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }] } diff --git a/client/Maestro/Configuration/configuration-studio1.json b/client/Maestro/Configuration/configuration-studio1.json new file mode 100644 index 00000000..575cc832 --- /dev/null +++ b/client/Maestro/Configuration/configuration-studio1.json @@ -0,0 +1,65 @@ +{ + "title": "NEXIO2UNC_FXP", + "active": false, + "startInTray": false, + "enableCustomMetadataId": true, + "filter": "avi", + "player": { + }, + "source": { + "$type": "NEXIOSource", + "local": { + "address": "ws://10.10.1.27/services/nexio" + }, + "remote": { + "address": "ftp://10.10.1.55:2098", + "userName": "administrator", + "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh" + } + }, + "metadatas": [ + { + "$type": "OctopusMetadata", + "server": { + "address": "http://localhost:8888/services/rest/octopus", + "timeout": 1000 + } + }, + { + "$type": "TrafficMetadata", + "server": { + "address": "Data Source=10.10.1.45;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", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + } + ], + "targets": [ + { + "label": "Archiválás", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%", + "tag": "Archiválás", + "saveArchiveMetadata": true, + "deleteAfterCopy": false, + "temporaryCopy": true, + "killDateDays": 5, + "remote": { + "address": "ftp://10.10.1.100:21/ARCHIVE/TESZT", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + } + ] +} diff --git a/client/Maestro/Configuration/configuration-tqc-archive.json b/client/Maestro/Configuration/configuration-tqc-archive.json index 6c41a8bd..5fcb4d03 100644 --- a/client/Maestro/Configuration/configuration-tqc-archive.json +++ b/client/Maestro/Configuration/configuration-tqc-archive.json @@ -1,6 +1,6 @@ { "title": "Playout_NLE", - "active": true, + "active": false, "startInTray": false, "enableCustomMetadataId": true, "player": { diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index 646d9390..059b858c 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -111,7 +111,7 @@ MinimumRecommendedRules.ruleset - bin\x64\Release\ + ..\bin\Maestro\x64\Release\ TRACE true pdbonly @@ -305,6 +305,9 @@ Always + + Always + Always @@ -367,7 +370,7 @@ Always - + Always -- 2.54.0