From a2347ea2d28af468debfd46d83b5506c55b24bd0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 13 Nov 2018 11:27:12 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31341 --- client/DxPlay/DxPlayer.cs | 3 +- client/DxPlay/PlayerForm.cs | 1 - .../-ACTIVE-configuration-editor-project.json | 72 ---- .../-ACTIVE-configuration-nle.json | 183 ---------- .../-ACTIVE-configuration-promo.json | 120 ------ .../-ACTIVE-configuration-vezerlo.json | 137 ------- .../Configuration/-configuration-archive.json | 117 ------ .../Configuration/-configuration-editor.json | 119 ------ .../Configuration/-configuration-grafika.json | 86 ----- .../-configuration-playout-ingest.json | 102 ------ .../Configuration/-configuration-playout.json | 96 ----- .../-configuration-sxs-tibi.json | 105 ------ .../Configuration/-configuration-sxs.json | 116 ------ .../-configuration-torokor-t.json | 110 ------ .../-configuration-tqc-check.json | 96 ----- .../-configuration-transcoder.json | 118 ------ .../Configuration/configuration - Copy.json | 64 ++++ .../Configuration/configuration-nle.json | 118 ------ .../Maestro/Configuration/configuration.json | 62 ++++ client/Maestro/Maestro.csproj | 49 +-- client/Maestro/MaestroForm.Designer.cs | 342 ++++++++++++++---- client/Maestro/MaestroForm.Source.cs | 22 +- client/Maestro/MaestroForm.Target.cs | 1 + client/Maestro/MaestroForm.cs | 54 ++- client/Maestro/MaestroForm.resx | 21 +- client/Maestro/Properties/AssemblyInfo.cs | 4 +- client/Maestro/Sources/FileSystemSource.cs | 49 +-- client/Maestro/Sources/NexioRESTSource.cs | 86 +++-- client/Maestro/Sources/NexioSourceItem.cs | 6 +- .../Configuration/ConfigurationInfo.cs | 20 +- .../MaestroShared/Properties/AssemblyInfo.cs | 4 +- .../Targets/FXPTargetProcessor.cs | 13 +- .../Targets/UNCTargetProcessor.cs | 2 +- .../server/steps/ArchiveListBuilderStep.java | 7 +- 34 files changed, 586 insertions(+), 1919 deletions(-) delete mode 100644 client/Maestro/Configuration/-ACTIVE-configuration-editor-project.json delete mode 100644 client/Maestro/Configuration/-ACTIVE-configuration-nle.json delete mode 100644 client/Maestro/Configuration/-ACTIVE-configuration-promo.json delete mode 100644 client/Maestro/Configuration/-ACTIVE-configuration-vezerlo.json delete mode 100644 client/Maestro/Configuration/-configuration-archive.json delete mode 100644 client/Maestro/Configuration/-configuration-editor.json delete mode 100644 client/Maestro/Configuration/-configuration-grafika.json delete mode 100644 client/Maestro/Configuration/-configuration-playout-ingest.json delete mode 100644 client/Maestro/Configuration/-configuration-playout.json delete mode 100644 client/Maestro/Configuration/-configuration-sxs-tibi.json delete mode 100644 client/Maestro/Configuration/-configuration-sxs.json delete mode 100644 client/Maestro/Configuration/-configuration-torokor-t.json delete mode 100644 client/Maestro/Configuration/-configuration-tqc-check.json delete mode 100644 client/Maestro/Configuration/-configuration-transcoder.json create mode 100644 client/Maestro/Configuration/configuration - Copy.json delete mode 100644 client/Maestro/Configuration/configuration-nle.json create mode 100644 client/Maestro/Configuration/configuration.json diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs index 101655ab..8a044d95 100644 --- a/client/DxPlay/DxPlayer.cs +++ b/client/DxPlay/DxPlayer.cs @@ -184,7 +184,7 @@ namespace DxPlay { // Pause the capture graph. public void Pause() { // If we are playing - if (State == GraphState.Playing) { + if (State == GraphState.Playing || State == GraphState.Completed) { int hr = graph.MediaControl.Pause(); DsError.ThrowExceptionForHR(hr); @@ -516,6 +516,7 @@ namespace DxPlay { // If the clip is finished playing if (ec == EventCode.Complete) { State = GraphState.Completed; + Pause(); } // Release any resources the message allocated diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index f9ba8d10..68da28e4 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -291,7 +291,6 @@ namespace DxPlay { private void OnForwardMouseDown(object sender, EventArgs e) { buttonDown = true; - int num = 0; do { m_play.Forward(10); Application.DoEvents(); diff --git a/client/Maestro/Configuration/-ACTIVE-configuration-editor-project.json b/client/Maestro/Configuration/-ACTIVE-configuration-editor-project.json deleted file mode 100644 index a88eeba6..00000000 --- a/client/Maestro/Configuration/-ACTIVE-configuration-editor-project.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "title": "Project megnyitás", - "active": false, - "startInTray": true, - "enableCustomMetadataId": true, - "defaultWindowColor": "#BDBDBD", - "partialWindowColor": "#757575", - "metadataOnly": true, - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "filter": "avi,wav,mxf", - "local": { - "address": "file://C:/xyz", - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "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%-%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 - } - }, - { - "$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": [ - ] -} diff --git a/client/Maestro/Configuration/-ACTIVE-configuration-nle.json b/client/Maestro/Configuration/-ACTIVE-configuration-nle.json deleted file mode 100644 index 30ee7038..00000000 --- a/client/Maestro/Configuration/-ACTIVE-configuration-nle.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "title": "NLE", - "active": true, - "startInTray": false, - "enableCustomMetadataId": true, - "defaultWindowColor": "#E1BEE7", - "partialWindowColor": "#F3E5F5", - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "filter": "avi,wav,mxf", - "foldersAutoExpand": true, - "local": { - "address": "file://c:/x" - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "disableStoryCheck": 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%-%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 - } - }, - { - "$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 - }, - "local": { - "address": "file://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "$type": "MediaCubeMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/jobengine/", - "timeout": 1000 - } - } - ], - "targets": [ - { - "label": "Stúdióba küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Betöltés", - "nexioServer": true, - "nexioFileExistsMessage": "A feltöltéshez új 'placeholder' generálása szükséges az Octopus rendszerben, az anyagon belül az ALT+1 billenytűkombináció segítségével.", - "killDateDays": 7, - "disableFileVersioning": true, - "agency": "MAESTRO-NLE", - "reference": [ "Napi megtekintőbe","Online archívba" ], - "remote": { - "address": "ftp://10.10.1.55:2098", - "userName": "administrator", - "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh", - "timeout": 1000 - } - }, - { - "label": "Napi megtekintőbe", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Online", - "disableFileVersioning": true, - "killDateDays": 2, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS/_NAPI_MEGTEKINTO", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Online archívba", - "processor": "FTPTargetProcessor", - "subFolderFormat": "%DATESTAMP%", - "outputFormat": "%ID%-%TEXT%", - "tag": "Online", - "disableFileVersioning": true, - "killDateDays": 0, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/MEGTEKINTO_ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "TQC check", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/TQC/CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "TQC promo", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/TQC/PROMO", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "TQC reklám", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/TQC/REKLAM", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-ACTIVE-configuration-promo.json b/client/Maestro/Configuration/-ACTIVE-configuration-promo.json deleted file mode 100644 index 25439d2a..00000000 --- a/client/Maestro/Configuration/-ACTIVE-configuration-promo.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "title": "PROMO SZAKOSZTÁLY", - "active": true, - "startInTray": false, - "enableCustomMetadataId": true, - "defaultWindowColor": "#4DB6AC", - "partialWindowColor": "#00796B", - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "filter": "avi,wav,mxf", - "foldersAutoExpand": true, - "local": { - "address": "file://P:/_KESZ_PROMO" - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "disableStoryCheck": 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%-%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 - } - }, - { - "$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 - }, - "local": { - "address": "file://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "$type": "MediaCubeMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/jobengine/", - "timeout": 1000 - } - } - ], - "targets": [ - { - "label": "TQC promo", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/TQC/PROMO", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "TQC reklám", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/TQC/REKLAM", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-ACTIVE-configuration-vezerlo.json b/client/Maestro/Configuration/-ACTIVE-configuration-vezerlo.json deleted file mode 100644 index 033f4b84..00000000 --- a/client/Maestro/Configuration/-ACTIVE-configuration-vezerlo.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "title": "Vezérlő", - "active": true, - "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://10.10.1.27/services/rest/octopus", - "timeout": 1000 - } - }, - { - "$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", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ], - "targets": [ - { - "label": "Octopus mappába küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Grafika mappába küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/GRAFIKA", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Újravágás", - "processor": "FXPTargetProcessor", - "subFolderFormat": "%IDROOT%-%TEXT%", - "outputFormat": "%SOURCENAME%", - "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": "TQC check - Playoutba küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/TQC/CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "TQC promo - Playoutba küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/TQC/PROMO", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "TQC reklám - Playoutba küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "killDateDays": 7, - "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-archive.json b/client/Maestro/Configuration/-configuration-archive.json deleted file mode 100644 index bf6f11fc..00000000 --- a/client/Maestro/Configuration/-configuration-archive.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "title": "Archiválás", - "active": true, - "startInTray": false, - "enableCustomMetadataId": true, - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "filter": "mov,wav,mxf", - "foldersAutoExpand": false, - "local": { - "address": "file://10.10.1.100/BRAAVOS/TOROKOR", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "disableStoryCheck": 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%-%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 - } - - }, - { - "$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 - }, - "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/PLAYOUT_NLE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - "disableOpenProject": false, - "disableOpenSourceFolder": false - } - }, - { - "$type": "MediaCubeMetadata", - "metadataTitleFormat": "%SOURCENAME%", - "metadataIDFormat": "%SOURCESTARTID%", - "server": { - "address": "http://10.10.1.27/services/rest/jobengine/", - "timeout": 1000 - } - } - ], - "targets": [ - { - "label": "Archiválás", - "processor": "UNCTargetProcessor", - "outputFormat": "%SOURCENAME%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "disableFileVersioning": true, - "killDateDays": 1, - "remote": { - "address": "file://10.10.1.100/BRAAVOS/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - - ] -} diff --git a/client/Maestro/Configuration/-configuration-editor.json b/client/Maestro/Configuration/-configuration-editor.json deleted file mode 100644 index 34015f55..00000000 --- a/client/Maestro/Configuration/-configuration-editor.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "title": "Szerkesztő", - "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/OCTOPUS" - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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": "Stúdióba küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Betöltés", - "nexioServer": true, - "nexioFileExistsMessage": "A feltöltéshez új 'placeholder' generálása szükséges az Octopus rendszerben, az anyagon belül az ALT+1 billenytűkombináció segítségével.", - "killDateDays": 7, - "disableFileVersioning": true, - "agency": "MAESTRO-EDITOR", - "reference": [ "Octopus mappába küldés" ], - "remote": { - "address": "ftp://10.10.1.55:2098", - "userName": "administrator", - "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh", - "timeout": 1000 - } - }, - { - "label": "Octopus mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Traffic mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_NLE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Lebonyba küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Betöltés", - "killDateDays": 7, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-configuration-grafika.json b/client/Maestro/Configuration/-configuration-grafika.json deleted file mode 100644 index 37df670c..00000000 --- a/client/Maestro/Configuration/-configuration-grafika.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "title": "Grafikai feltöltő", - "active": true, - "startInTray": false, - "enableCustomMetadataId": true, - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": false - }, - "source": { - "$type": "UNCSource", - "filter": "png,tga,mov,mxf", - "local": { - "address": "file://e:/", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - }, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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", - "metadataTitleFormat": "%SOURCENAME%", - "metadataIDFormat": "%SOURCESTARTID%", - "server": { - "address": "http://10.10.1.27/services/rest/jobengine/", - "timeout": 1000 - } - } - ], - "targets": [ - { - "label": "Octopus mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%/GRAFIKA-%TIMESTAMP%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Traffic mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%/GRAFIKA-%TIMESTAMP%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_NLE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-configuration-playout-ingest.json b/client/Maestro/Configuration/-configuration-playout-ingest.json deleted file mode 100644 index 04854ee1..00000000 --- a/client/Maestro/Configuration/-configuration-playout-ingest.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "title": "Lebony betöltő", - "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/PLAYOUT/Video", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - }, - "remote": { - "address": "ftp://10.10.1.100/READY", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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": "X Adáskész", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%", - "saveSegments": false, - "tag": "XAdáskész", - "disableFileVersioning": false, - "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": "Archiválás", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - - ] -} diff --git a/client/Maestro/Configuration/-configuration-playout.json b/client/Maestro/Configuration/-configuration-playout.json deleted file mode 100644 index cf4d62ed..00000000 --- a/client/Maestro/Configuration/-configuration-playout.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "title": "Adáslebony", - "active": false, - "startInTray": false, - "enableCustomMetadataId": true, - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "local": { - "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - }, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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", - "reference": [ "Archiválás" ], - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT/IceGateway", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Újravágás", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Újravágás", - "subFolderFormat": "%IDROOT%", - "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, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-configuration-sxs-tibi.json b/client/Maestro/Configuration/-configuration-sxs-tibi.json deleted file mode 100644 index 2ac76c0f..00000000 --- a/client/Maestro/Configuration/-configuration-sxs-tibi.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "title": "TIBI SxS", - "active": false, - "startInTray": true, - "enableCustomMetadataId": true, - "defaultWindowColor": "#E0F2F1", - "partialWindowColor": "#B2DFDB", - "player": { - "enabled": true, - "autoStart": true, - "segmentEditor": true, - "extensions": [ "mxf", "mov" ] - }, - "source": { - "$type": "UNCSource", - "filter": "mov,wav,mxf,jpg", - "local": { - "address": "file://c:/x" - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "disableStoryCheck": true, - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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": "Octopus mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "saveArchiveMetadata": false, - "killDateDays": 7, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "H7YCE8gvuGsPvN3bQSf4FTH0/4IRmoe3gKY0QvgG+wlfqS48yLhm/fDoPSRaWpDWa3RKZAnLF3pKs+lLSQX0IRVZDRCkydQP7syEwKhHztbJ+A88W9rKRF2JrQ7W6jA1", - "timeout": 1000 - }, - "subFolderFormat": "%IDROOT%-%TEXT%", - "tag": "Betöltés" - }, - { - "label": "Traffic mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_NLE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Lebonyba küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Lebony", - "killDateDays": 7, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-configuration-sxs.json b/client/Maestro/Configuration/-configuration-sxs.json deleted file mode 100644 index f8f351cf..00000000 --- a/client/Maestro/Configuration/-configuration-sxs.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "title": "SxS", - "active": true, - "startInTray": false, - "enableCustomMetadataId": true, - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "filter": "mov,wav,mxf", - "local": { - "address": "file://c:/x" - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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": "GRAFIKA Octopus mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%/GRAFIKA-%TIMESTAMP%", - "killDateDays": 15, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Octopus mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Traffic mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_NLE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Lebonyba küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Lebony", - "killDateDays": 7, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-configuration-torokor-t.json b/client/Maestro/Configuration/-configuration-torokor-t.json deleted file mode 100644 index 51b58bb5..00000000 --- a/client/Maestro/Configuration/-configuration-torokor-t.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "title": "Törökőr hír nyersanyag betöltő (csak MXF)", - "active": false, - "startInTray": true, - "enableCustomMetadataId": true, - "defaultWindowColor": "#10F2F1", - "partialWindowColor": "#10DFDB", - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "foldersAutoExpand": false, - "filter": "mxf", - "local": { - "address": "file://10.10.1.100//BRAAVOS//OCTOPUS" - }, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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": "Octopus mappába küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Traffic mappába küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_NLE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Lebonyba küldés", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Lebony", - "killDateDays": 7, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FXPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/-configuration-tqc-check.json b/client/Maestro/Configuration/-configuration-tqc-check.json deleted file mode 100644 index d519cb83..00000000 --- a/client/Maestro/Configuration/-configuration-tqc-check.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "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, - "enableOverride": 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-transcoder.json b/client/Maestro/Configuration/-configuration-transcoder.json deleted file mode 100644 index 12922727..00000000 --- a/client/Maestro/Configuration/-configuration-transcoder.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "title": "TRANSCODER", - "active": true, - "startInTray": true, - "enableCustomMetadataId": true, - "defaultWindowColor": "#E3F2FD", - "partialWindowColor": "#BBDEFB", - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "filter": "avi,wav,mxf", - "local": { - "address": "file://10.10.1.100/braavos/TRANSCODER" - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/octopus/", - "timeout": 1000 - } - }, - { - "$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": "Octopus mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Traffic mappába küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%-%SOURCENAME%", - "tag": "Betöltés", - "subFolderFormat": "%IDROOT%-%TEXT%", - "killDateDays": 7, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/PLAYOUT_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, - "saveArchiveMetadata": false, - "remote": { - "address": "ftp://10.10.1.100/REKLAM_NLE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Lebonyba küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Lebony", - "killDateDays": 7, - "remote": { - "address": "ftp://10.10.1.100/TQC/CHECK", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/configuration - Copy.json b/client/Maestro/Configuration/configuration - Copy.json new file mode 100644 index 00000000..1e964867 --- /dev/null +++ b/client/Maestro/Configuration/configuration - Copy.json @@ -0,0 +1,64 @@ +{ + "title": "Development", + "active": false, + "startInTray": false, + "enableCustomMetadataId": true, + "filter": "avi", + "player": { + }, + "source": { + "$type": "NEXIOSource", + "hideEmpty": true, + "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://10.10.1.27/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": "Teszt", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "killDateDays": 7, + "saveArchiveMetadata": false, + "remote": { + "address": "ftp://10.10.1.100/TESZT", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + } + ] +} diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json deleted file mode 100644 index 93b3e282..00000000 --- a/client/Maestro/Configuration/configuration-nle.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "title": "UNC2FTP_NEXIO_UNC", - "active": false, - "startInTray": false, - "enableCustomMetadataId": true, - "defaultWindowColor": "#E1BEE7", - "partialWindowColor": "#F3E5F5", - "metadataOnly": false, - "player": { - "enabled": true, - "autoStart": false, - "segmentEditor": true - }, - "source": { - "$type": "UNCSource", - "filter": "avi,wav,mxf", - "foldersAutoExpand": true, - "local": { - "address": "file://c:/_video" - } - }, - "metadatas": [ - { - "$type": "OctopusMetadata", - "disabled": true, - "server": { - "address": "http://10.10.1.27/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 - }, - "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 - } - }, - { - "$type": "MediaCubeMetadata", - "server": { - "address": "http://10.10.1.27/services/rest/jobengine/", - "timeout": 1000 - } - } - ], - "targets": [ - { - "label": "Stúdióba küldés", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Betöltés", - "nexioServer": true, - "nexioFileExistsMessage": "A feltöltéshez új 'placeholder' generálása szükséges az Octopus rendszerben, az anyagon belül az ALT+1 billenytűkombináció segítségével.", - "killDateDays": 7, - "disableFileVersioning": true, - "agency": "MAESTRO-NLE", - "remote": { - "address": "ftp://10.10.1.55:2098", - "userName": "administrator", - "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh", - "timeout": 1000 - } - }, - { - "label": "Helyi küldés", - "processor": "UNCTargetProcessor", - "outputFormat": "%ID%", - "deleteAfterCopy": true, - "tag": "Betöltés", - "killDateDays": 0, - "remote": { - "address": "file://c:\\_video", - "timeout": 1000 - } - }, - { - "label": "Archiválás", - "processor": "FTPTargetProcessor", - "outputFormat": "%ID%", - "tag": "Archiválás", - "saveArchiveMetadata": true, - "temporaryCopy": true, - "killDateDays": 5, - "remote": { - "address": "ftp://10.10.1.100/ARCHIVE/TESZT", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - } - } - ] -} diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json new file mode 100644 index 00000000..6abfefc1 --- /dev/null +++ b/client/Maestro/Configuration/configuration.json @@ -0,0 +1,62 @@ +{ + "title": "Development", + "active": true, + "startInTray": false, + "enableCustomMetadataId": true, + "filter": "avi", + "player": { + }, + "source": { + "$type": "UNCSource", + "filter": "avi,wav,mxf", + "local": { + "address": "file://c:\\_video", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + "metadatas": [ + { + "$type": "OctopusMetadata", + "server": { + "address": "http://10.10.1.27/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": "Teszt", + "processor": "FXPTargetProcessor", + "outputFormat": "%ID%-%SOURCENAME%", + "tag": "Betöltés", + "killDateDays": 7, + "saveArchiveMetadata": false, + "remote": { + "address": "ftp://10.10.1.100/TESZT/CHECK", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + } + ] +} diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index ed1d9b3b..c2f30eae 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -278,54 +278,15 @@ Form - + Always - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - + Always Always - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - @@ -355,15 +316,9 @@ PreserveNewest - - Always - PreserveNewest - - Always - diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index 3d0d96b3..458e2251 100644 --- a/client/Maestro/MaestroForm.Designer.cs +++ b/client/Maestro/MaestroForm.Designer.cs @@ -49,6 +49,7 @@ namespace Maestro { this.pSourceDisplay = new System.Windows.Forms.TableLayoutPanel(); this.tsSource = new System.Windows.Forms.ToolStrip(); this.btnShowFolders = new System.Windows.Forms.ToolStripButton(); + this.lSelectionCounts = new System.Windows.Forms.ToolStripLabel(); this.textSelectedSource = new System.Windows.Forms.TextBox(); this.lSelectedSource = new System.Windows.Forms.Label(); this.btnLookupBySource = new System.Windows.Forms.Button(); @@ -73,12 +74,12 @@ namespace Maestro { this.btnExecute = new System.Windows.Forms.Button(); this.scMain = new System.Windows.Forms.SplitContainer(); this.groupActions = new System.Windows.Forms.GroupBox(); - this.chkAutoScroll = new System.Windows.Forms.CheckBox(); this.tabSystem = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.dgJobs = new System.Windows.Forms.DataGridView(); this.columnInputName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.columnProgress = new Maestro.Commons.DataGridViewProgressColumn(); this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.columnStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.columnStarted = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -90,9 +91,27 @@ namespace Maestro { 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.dataGridViewProgressColumn1 = new Maestro.Commons.DataGridViewProgressColumn(); + this.columnMessagesTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.columnMessagesMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.btnSweepJobList = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.chkAutoScroll = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.lAll = new System.Windows.Forms.ToolStripLabel(); + this.lAllCount = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.lRunning = new System.Windows.Forms.ToolStripLabel(); + this.lRunningCount = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.lDone = new System.Windows.Forms.ToolStripLabel(); + this.lDoneCount = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.lError = new System.Windows.Forms.ToolStripLabel(); + this.lErrorCount = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.lRevoked = new System.Windows.Forms.ToolStripLabel(); + this.lRevokedCount = new System.Windows.Forms.ToolStripLabel(); this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components); this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.groupSource.SuspendLayout(); @@ -130,6 +149,7 @@ namespace Maestro { ((System.ComponentModel.ISupportInitialize)(this.bindingSourceJobs)).BeginInit(); this.tabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgMessages)).BeginInit(); + this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.systemMessageBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.metadataInfoBindingSource)).BeginInit(); this.SuspendLayout(); @@ -145,7 +165,7 @@ namespace Maestro { this.groupSource.Location = new System.Drawing.Point(0, 0); this.groupSource.Name = "groupSource"; this.groupSource.Padding = new System.Windows.Forms.Padding(10); - this.groupSource.Size = new System.Drawing.Size(350, 471); + this.groupSource.Size = new System.Drawing.Size(350, 472); this.groupSource.TabIndex = 0; this.groupSource.TabStop = false; this.groupSource.Text = "Source file"; @@ -192,7 +212,7 @@ namespace Maestro { this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dgSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgSource.Size = new System.Drawing.Size(330, 162); + this.dgSource.Size = new System.Drawing.Size(330, 163); this.dgSource.TabIndex = 0; this.dgSource.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.sourceGridView_CellContentClick); this.dgSource.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridSource_CellEnter); @@ -211,7 +231,7 @@ namespace Maestro { this.treeFolders.HotTracking = true; this.treeFolders.ImageIndex = 0; this.treeFolders.ImageList = this.ilFolders; - this.treeFolders.Location = new System.Drawing.Point(10, 209); + this.treeFolders.Location = new System.Drawing.Point(10, 210); this.treeFolders.Name = "treeFolders"; this.treeFolders.SelectedImageIndex = 0; this.treeFolders.Size = new System.Drawing.Size(330, 161); @@ -299,7 +319,7 @@ namespace Maestro { this.pSourceDisplay.Controls.Add(this.lSelectedSource, 0, 1); this.pSourceDisplay.Controls.Add(this.btnLookupBySource, 1, 2); this.pSourceDisplay.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pSourceDisplay.Location = new System.Drawing.Point(10, 370); + this.pSourceDisplay.Location = new System.Drawing.Point(10, 371); this.pSourceDisplay.Margin = new System.Windows.Forms.Padding(0); this.pSourceDisplay.Name = "pSourceDisplay"; this.pSourceDisplay.RowCount = 3; @@ -314,7 +334,8 @@ namespace Maestro { this.pSourceDisplay.SetColumnSpan(this.tsSource, 2); this.tsSource.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.tsSource.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.btnShowFolders}); + this.btnShowFolders, + this.lSelectionCounts}); this.tsSource.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.tsSource.Location = new System.Drawing.Point(0, 0); this.tsSource.Name = "tsSource"; @@ -335,6 +356,15 @@ namespace Maestro { this.btnShowFolders.ToolTipText = "Mappák"; this.btnShowFolders.Click += new System.EventHandler(this.OnShowFolders); // + // lSelectionCounts + // + this.lSelectionCounts.Font = new System.Drawing.Font("Segoe UI", 10F); + this.lSelectionCounts.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); + this.lSelectionCounts.Name = "lSelectionCounts"; + this.lSelectionCounts.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.lSelectionCounts.Size = new System.Drawing.Size(30, 19); + this.lSelectionCounts.Text = "0/0"; + // // textSelectedSource // this.textSelectedSource.BackColor = System.Drawing.SystemColors.ActiveCaption; @@ -393,7 +423,7 @@ namespace Maestro { // scOperations.Panel2 // this.scOperations.Panel2.Controls.Add(this.scRightOperations); - this.scOperations.Size = new System.Drawing.Size(1022, 471); + this.scOperations.Size = new System.Drawing.Size(1022, 472); this.scOperations.SplitterDistance = 350; this.scOperations.TabIndex = 1; // @@ -411,7 +441,7 @@ namespace Maestro { // scRightOperations.Panel2 // this.scRightOperations.Panel2.Controls.Add(this.groupTarget); - this.scRightOperations.Size = new System.Drawing.Size(668, 471); + this.scRightOperations.Size = new System.Drawing.Size(668, 472); this.scRightOperations.SplitterDistance = 350; this.scRightOperations.TabIndex = 2; // @@ -424,7 +454,7 @@ namespace Maestro { this.groupMetadata.Location = new System.Drawing.Point(0, 0); this.groupMetadata.Name = "groupMetadata"; this.groupMetadata.Padding = new System.Windows.Forms.Padding(10); - this.groupMetadata.Size = new System.Drawing.Size(350, 471); + this.groupMetadata.Size = new System.Drawing.Size(350, 472); this.groupMetadata.TabIndex = 1; this.groupMetadata.TabStop = false; this.groupMetadata.Text = "Metadata"; @@ -440,7 +470,7 @@ namespace Maestro { this.tabMetadata.Location = new System.Drawing.Point(10, 23); this.tabMetadata.Name = "tabMetadata"; this.tabMetadata.SelectedIndex = 0; - this.tabMetadata.Size = new System.Drawing.Size(330, 347); + this.tabMetadata.Size = new System.Drawing.Size(330, 348); this.tabMetadata.TabIndex = 1; // // tpOctopus @@ -450,7 +480,7 @@ namespace Maestro { this.tpOctopus.Location = new System.Drawing.Point(4, 24); this.tpOctopus.Name = "tpOctopus"; this.tpOctopus.Padding = new System.Windows.Forms.Padding(3); - this.tpOctopus.Size = new System.Drawing.Size(322, 319); + this.tpOctopus.Size = new System.Drawing.Size(322, 320); this.tpOctopus.TabIndex = 0; this.tpOctopus.Text = "Octopus"; // @@ -464,7 +494,7 @@ namespace Maestro { this.octopusIDSelector.Margin = new System.Windows.Forms.Padding(0); this.octopusIDSelector.MinimumSize = new System.Drawing.Size(200, 300); this.octopusIDSelector.Name = "octopusIDSelector"; - this.octopusIDSelector.Size = new System.Drawing.Size(316, 313); + this.octopusIDSelector.Size = new System.Drawing.Size(316, 314); this.octopusIDSelector.TabIndex = 1; // // tpTraffic @@ -474,7 +504,7 @@ namespace Maestro { this.tpTraffic.Location = new System.Drawing.Point(4, 24); this.tpTraffic.Name = "tpTraffic"; this.tpTraffic.Padding = new System.Windows.Forms.Padding(3); - this.tpTraffic.Size = new System.Drawing.Size(322, 319); + this.tpTraffic.Size = new System.Drawing.Size(322, 320); this.tpTraffic.TabIndex = 1; this.tpTraffic.Text = "Traffic"; // @@ -487,7 +517,7 @@ namespace Maestro { this.trafficIDSelector.Location = new System.Drawing.Point(3, 3); this.trafficIDSelector.Margin = new System.Windows.Forms.Padding(0); this.trafficIDSelector.Name = "trafficIDSelector"; - this.trafficIDSelector.Size = new System.Drawing.Size(316, 313); + this.trafficIDSelector.Size = new System.Drawing.Size(316, 314); this.trafficIDSelector.TabIndex = 0; // // pMetadataDisplay @@ -500,7 +530,7 @@ namespace Maestro { this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 1); this.pMetadataDisplay.Controls.Add(this.textSelectedMetadata, 0, 2); this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pMetadataDisplay.Location = new System.Drawing.Point(10, 370); + this.pMetadataDisplay.Location = new System.Drawing.Point(10, 371); this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0); this.pMetadataDisplay.Name = "pMetadataDisplay"; this.pMetadataDisplay.RowCount = 3; @@ -600,7 +630,7 @@ namespace Maestro { this.groupTarget.Location = new System.Drawing.Point(0, 0); this.groupTarget.Name = "groupTarget"; this.groupTarget.Padding = new System.Windows.Forms.Padding(10); - this.groupTarget.Size = new System.Drawing.Size(314, 471); + this.groupTarget.Size = new System.Drawing.Size(314, 472); this.groupTarget.TabIndex = 0; this.groupTarget.TabStop = false; this.groupTarget.Text = "Target action"; @@ -620,7 +650,7 @@ namespace Maestro { this.panelActions.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0); this.panelActions.RowCount = 1; this.panelActions.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.panelActions.Size = new System.Drawing.Size(294, 376); + this.panelActions.Size = new System.Drawing.Size(294, 377); this.panelActions.TabIndex = 4; this.panelActions.MouseClick += new System.Windows.Forms.MouseEventHandler(this.OnTargetPanelsMouseClick); // @@ -629,7 +659,7 @@ namespace Maestro { this.pExecute.BackColor = System.Drawing.Color.Transparent; this.pExecute.Controls.Add(this.btnExecute); this.pExecute.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pExecute.Location = new System.Drawing.Point(10, 399); + this.pExecute.Location = new System.Drawing.Point(10, 400); this.pExecute.Name = "pExecute"; this.pExecute.Size = new System.Drawing.Size(294, 62); this.pExecute.TabIndex = 5; @@ -664,40 +694,26 @@ namespace Maestro { // scMain.Panel2 // this.scMain.Panel2.Controls.Add(this.groupActions); - this.scMain.Size = new System.Drawing.Size(1022, 632); - this.scMain.SplitterDistance = 471; + this.scMain.Size = new System.Drawing.Size(1022, 664); + this.scMain.SplitterDistance = 472; this.scMain.TabIndex = 2; // // groupActions // this.groupActions.BackColor = System.Drawing.Color.Transparent; - this.groupActions.Controls.Add(this.chkAutoScroll); this.groupActions.Controls.Add(this.tabSystem); + this.groupActions.Controls.Add(this.toolStrip1); this.groupActions.Dock = System.Windows.Forms.DockStyle.Fill; this.groupActions.Location = new System.Drawing.Point(0, 0); this.groupActions.Name = "groupActions"; this.groupActions.Padding = new System.Windows.Forms.Padding(10); - this.groupActions.Size = new System.Drawing.Size(1022, 157); + this.groupActions.Size = new System.Drawing.Size(1022, 188); this.groupActions.TabIndex = 1; this.groupActions.TabStop = false; this.groupActions.Text = "Actions"; this.groupActions.Enter += new System.EventHandler(this.groupBox_Enter); this.groupActions.Leave += new System.EventHandler(this.groupBox_Leave); // - // chkAutoScroll - // - this.chkAutoScroll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chkAutoScroll.AutoSize = true; - this.chkAutoScroll.Checked = true; - this.chkAutoScroll.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAutoScroll.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.chkAutoScroll.Location = new System.Drawing.Point(944, 24); - this.chkAutoScroll.Name = "chkAutoScroll"; - this.chkAutoScroll.Size = new System.Drawing.Size(69, 19); - this.chkAutoScroll.TabIndex = 2; - this.chkAutoScroll.Text = "Követés"; - this.chkAutoScroll.UseVisualStyleBackColor = true; - // // tabSystem // this.tabSystem.Controls.Add(this.tabPage1); @@ -707,7 +723,7 @@ namespace Maestro { this.tabSystem.Location = new System.Drawing.Point(10, 23); this.tabSystem.Name = "tabSystem"; this.tabSystem.SelectedIndex = 0; - this.tabSystem.Size = new System.Drawing.Size(1002, 124); + this.tabSystem.Size = new System.Drawing.Size(1002, 130); this.tabSystem.TabIndex = 1; // // tabPage1 @@ -716,7 +732,7 @@ namespace Maestro { this.tabPage1.Location = new System.Drawing.Point(4, 24); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(994, 96); + this.tabPage1.Size = new System.Drawing.Size(994, 102); this.tabPage1.TabIndex = 0; this.tabPage1.Text = global::Maestro.StringResources.FOLYAMATOK; this.tabPage1.UseVisualStyleBackColor = true; @@ -734,6 +750,7 @@ namespace Maestro { this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.columnInputName, this.columnLabel, + this.columnProgress, this.columnID, this.columnStatus, this.columnStarted, @@ -763,7 +780,7 @@ namespace Maestro { this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle7; this.dgJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dgJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgJobs.Size = new System.Drawing.Size(988, 90); + this.dgJobs.Size = new System.Drawing.Size(988, 96); this.dgJobs.TabIndex = 0; this.dgJobs.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnJobsCellPainting); this.dgJobs.CellToolTipTextNeeded += new System.Windows.Forms.DataGridViewCellToolTipTextNeededEventHandler(this.dgJobs_CellToolTipTextNeeded); @@ -774,8 +791,8 @@ namespace Maestro { this.columnInputName.DataPropertyName = "InputName"; this.columnInputName.Frozen = true; this.columnInputName.HeaderText = "InputName"; + this.columnInputName.MinimumWidth = 100; this.columnInputName.Name = "columnInputName"; - this.columnInputName.Width = 93; // // columnLabel // @@ -785,6 +802,15 @@ namespace Maestro { this.columnLabel.Name = "columnLabel"; this.columnLabel.Width = 63; // + // columnProgress + // + this.columnProgress.DataPropertyName = "Progress"; + this.columnProgress.Frozen = true; + this.columnProgress.HeaderText = ""; + this.columnProgress.MinimumWidth = 100; + this.columnProgress.Name = "columnProgress"; + this.columnProgress.Resizable = System.Windows.Forms.DataGridViewTriState.False; + // // columnID // this.columnID.DataPropertyName = "ID"; @@ -851,7 +877,7 @@ namespace Maestro { 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.Size = new System.Drawing.Size(994, 102); this.tabPage2.TabIndex = 1; this.tabPage2.Text = global::Maestro.StringResources.UZENETEK; this.tabPage2.UseVisualStyleBackColor = true; @@ -866,8 +892,8 @@ namespace Maestro { 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}); + this.columnMessagesTime, + this.columnMessagesMessage}); 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))); @@ -889,35 +915,184 @@ namespace Maestro { 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.Size = new System.Drawing.Size(988, 96); this.dgMessages.TabIndex = 1; // - // dataGridViewTextBoxColumn1 + // columnMessagesTime // - 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; + this.columnMessagesTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; + this.columnMessagesTime.DataPropertyName = "Time"; + this.columnMessagesTime.HeaderText = "Időpont"; + this.columnMessagesTime.Name = "columnMessagesTime"; + this.columnMessagesTime.ReadOnly = true; + this.columnMessagesTime.Width = 73; // - // dataGridViewTextBoxColumn2 + // columnMessagesMessage // - this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dataGridViewTextBoxColumn2.DataPropertyName = "Message"; + this.columnMessagesMessage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.columnMessagesMessage.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; + this.columnMessagesMessage.DefaultCellStyle = dataGridViewCellStyle8; + this.columnMessagesMessage.HeaderText = "Üzenet"; + this.columnMessagesMessage.Name = "columnMessagesMessage"; + this.columnMessagesMessage.ReadOnly = true; + // + // toolStrip1 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.btnSweepJobList, + this.toolStripSeparator3, + this.chkAutoScroll, + this.toolStripSeparator2, + this.lAll, + this.lAllCount, + this.toolStripSeparator6, + this.lRunning, + this.lRunningCount, + this.toolStripSeparator5, + this.lDone, + this.lDoneCount, + this.toolStripSeparator4, + this.lError, + this.lErrorCount, + this.toolStripSeparator1, + this.lRevoked, + this.lRevokedCount}); + this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; + this.toolStrip1.Location = new System.Drawing.Point(10, 153); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.toolStrip1.Size = new System.Drawing.Size(1002, 25); + this.toolStrip1.TabIndex = 3; + this.toolStrip1.Text = "toolStrip1"; + // + // btnSweepJobList + // + this.btnSweepJobList.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnSweepJobList.Image = ((System.Drawing.Image)(resources.GetObject("btnSweepJobList.Image"))); + this.btnSweepJobList.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnSweepJobList.Name = "btnSweepJobList"; + this.btnSweepJobList.Size = new System.Drawing.Size(23, 22); + this.btnSweepJobList.Text = "toolStripButton2"; + this.btnSweepJobList.Click += new System.EventHandler(this.OnSweepJobList); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); + // + // chkAutoScroll + // + this.chkAutoScroll.Checked = true; + this.chkAutoScroll.CheckOnClick = true; + this.chkAutoScroll.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkAutoScroll.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.chkAutoScroll.ImageTransparentColor = System.Drawing.Color.Magenta; + this.chkAutoScroll.Name = "chkAutoScroll"; + this.chkAutoScroll.Size = new System.Drawing.Size(52, 22); + this.chkAutoScroll.Text = "Követés"; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // lAll + // + this.lAll.Name = "lAll"; + this.lAll.Size = new System.Drawing.Size(45, 22); + this.lAll.Text = "Összes:"; + this.lAll.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lAllCount + // + this.lAllCount.AutoSize = false; + this.lAllCount.Name = "lAllCount"; + this.lAllCount.Size = new System.Drawing.Size(30, 22); + this.lAllCount.Text = "0"; + this.lAllCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // dataGridViewProgressColumn1 + // toolStripSeparator6 // - this.dataGridViewProgressColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.dataGridViewProgressColumn1.DataPropertyName = "Progress"; - this.dataGridViewProgressColumn1.HeaderText = ""; - this.dataGridViewProgressColumn1.MinimumWidth = 100; - this.dataGridViewProgressColumn1.Name = "dataGridViewProgressColumn1"; + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); + // + // lRunning + // + this.lRunning.Name = "lRunning"; + this.lRunning.Size = new System.Drawing.Size(27, 22); + this.lRunning.Text = "Fut:"; + this.lRunning.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lRunningCount + // + this.lRunningCount.AutoSize = false; + this.lRunningCount.Name = "lRunningCount"; + this.lRunningCount.Size = new System.Drawing.Size(30, 22); + this.lRunningCount.Text = "0"; + this.lRunningCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); + // + // lDone + // + this.lDone.Name = "lDone"; + this.lDone.Size = new System.Drawing.Size(33, 22); + this.lDone.Text = "Kész:"; + this.lDone.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lDoneCount + // + this.lDoneCount.AutoSize = false; + this.lDoneCount.Name = "lDoneCount"; + this.lDoneCount.Size = new System.Drawing.Size(30, 22); + this.lDoneCount.Text = "0"; + this.lDoneCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // lError + // + this.lError.Name = "lError"; + this.lError.Size = new System.Drawing.Size(35, 22); + this.lError.Text = "Hiba:"; + this.lError.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lErrorCount + // + this.lErrorCount.AutoSize = false; + this.lErrorCount.Name = "lErrorCount"; + this.lErrorCount.Size = new System.Drawing.Size(30, 22); + this.lErrorCount.Text = "0"; + this.lErrorCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // lRevoked + // + this.lRevoked.Name = "lRevoked"; + this.lRevoked.Size = new System.Drawing.Size(73, 22); + this.lRevoked.Text = "Visszavonva:"; + this.lRevoked.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lRevokedCount + // + this.lRevokedCount.AutoSize = false; + this.lRevokedCount.Name = "lRevokedCount"; + this.lRevokedCount.Size = new System.Drawing.Size(30, 22); + this.lRevokedCount.Text = "0"; + this.lRevokedCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // systemMessageBindingSource // @@ -932,7 +1107,7 @@ namespace Maestro { this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(1022, 632); + this.ClientSize = new System.Drawing.Size(1022, 664); this.Controls.Add(this.scMain); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "MaestroForm"; @@ -984,6 +1159,8 @@ namespace Maestro { ((System.ComponentModel.ISupportInitialize)(this.bindingSourceJobs)).EndInit(); this.tabPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgMessages)).EndInit(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.systemMessageBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.metadataInfoBindingSource)).EndInit(); this.ResumeLayout(false); @@ -1024,8 +1201,6 @@ namespace Maestro { private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.BindingSource systemMessageBindingSource; private System.Windows.Forms.DataGridView dgMessages; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.TableLayoutPanel pSourceFilter; private System.Windows.Forms.TextBox txtSourceFilter; private System.Windows.Forms.PictureBox picRefreshFileList; @@ -1037,12 +1212,31 @@ namespace Maestro { private System.Windows.Forms.ToolStripButton btnShowFolders; private MaestroShared.Controls.DoubleClickTreeView treeFolders; private System.Windows.Forms.ImageList ilFolders; - private System.Windows.Forms.CheckBox chkAutoScroll; - private Commons.DataGridViewProgressColumn dataGridViewProgressColumn1; private PictureBox picResetSearch; - private Commons.DataGridViewProgressColumn columnProgress; + private DataGridViewTextBoxColumn columnMessagesTime; + private DataGridViewTextBoxColumn columnMessagesMessage; + private ToolStrip toolStrip1; + private ToolStripButton btnSweepJobList; + private ToolStripSeparator toolStripSeparator3; + private ToolStripButton chkAutoScroll; + private ToolStripSeparator toolStripSeparator2; + private ToolStripLabel lAll; + private ToolStripLabel lAllCount; + private ToolStripSeparator toolStripSeparator6; + private ToolStripLabel lRunning; + private ToolStripLabel lRunningCount; + private ToolStripSeparator toolStripSeparator5; + private ToolStripLabel lDone; + private ToolStripLabel lDoneCount; + private ToolStripSeparator toolStripSeparator4; + private ToolStripLabel lError; + private ToolStripLabel lErrorCount; + private ToolStripSeparator toolStripSeparator1; + private ToolStripLabel lRevoked; + private ToolStripLabel lRevokedCount; private DataGridViewTextBoxColumn columnInputName; private DataGridViewTextBoxColumn columnLabel; + private Commons.DataGridViewProgressColumn columnProgress; private DataGridViewTextBoxColumn columnID; private DataGridViewTextBoxColumn columnStatus; private DataGridViewTextBoxColumn columnStarted; @@ -1051,7 +1245,7 @@ namespace Maestro { private DataGridViewTextBoxColumn columnOutput; private DataGridViewTextBoxColumn columnKillDate; private DataGridViewTextBoxColumn columnMessage; - private Commons.DataGridViewProgressColumn Progress; + private ToolStripLabel lSelectionCounts; } } diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index 58980ba0..dcd5971d 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -39,6 +39,7 @@ namespace Maestro { UpdateDefineSegmentEnabled(); UpdateEditArchiveMetadataEnabled(); UpdateLookupBySourceEnabled(); + UpdateSelectionCounts(); } } @@ -52,8 +53,8 @@ namespace Maestro { Uri localAddress = Configuration?.Source?.Local?.Address; Uri remoteAddress = Configuration?.Source?.Remote?.Address; - if (String.IsNullOrEmpty(remoteAddress?.ToString())) { - if (!String.IsNullOrEmpty(localAddress?.LocalPath)) + if (string.IsNullOrEmpty(remoteAddress?.ToString())) { + if (!string.IsNullOrEmpty(localAddress?.LocalPath)) formTooltip.SetToolTip(groupSource, localAddress.LocalPath); } else formTooltip.SetToolTip(groupSource, remoteAddress?.ToString()); @@ -67,10 +68,11 @@ namespace Maestro { if (Configuration?.Source is NEXIOSource) { btnShowFolders.Enabled = false; logger.Debug("NEXIO source initialization"); - source = new NexioRESTSource(this, MessageBus, Configuration.Source.Filter); + source = new NexioRESTSource(this, MessageBus, Configuration.Source as NEXIOSource); logger.Debug("NEXIO source created"); } + source.ListChanged += Source_ListChanged; source.Startup(localAddress); bindingSource.DataSource = source; dgSource.Columns.AddRange(source.Columns); @@ -78,6 +80,14 @@ namespace Maestro { treeFolders.NodeDoubleClick += OnDoubleClickFolder; } + private void Source_ListChanged(object sender, System.ComponentModel.ListChangedEventArgs e) { + UpdateSelectionCounts(); + } + + private void UpdateSelectionCounts() { + lSelectionCounts.Text = string.Format("{0}/{1}", source.Count, selectedSourceItems == null ? 0 : selectedSourceItems.Count); + } + private void dataGridSource_CellMouseEnter(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex > -1 && IsPlayColumn(e.ColumnIndex)) dgSource.Cursor = Cursors.Hand; @@ -217,7 +227,7 @@ namespace Maestro { string selectedNames = String.Empty; foreach (ISourceItem actual in selectedSourceItems) { string name = actual.Name; - if (String.IsNullOrEmpty(name)) + if (string.IsNullOrEmpty(name)) continue; selectedNames += name + " "; string currentPrefix = GetPrefix(name); @@ -226,7 +236,7 @@ namespace Maestro { else selectionPrefix = selectionPrefix.Equals(currentPrefix) ? selectionPrefix : null; } - if (String.IsNullOrEmpty(selectedNames)) + if (string.IsNullOrEmpty(selectedNames)) SelectedSource = null; else SelectedSource = new SourceInfo() { @@ -237,7 +247,7 @@ namespace Maestro { } private string GetPrefix(string name) { - if (String.IsNullOrEmpty(name)) + if (string.IsNullOrEmpty(name)) return null; string nameWithoutExtension = name.Contains(".") ? name.Split('.')[0] : name; diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index dd52678f..4d7645c2 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -278,6 +278,7 @@ namespace Maestro { jobsQueue.Enqueue(p); }); + UpdateJobCounts(); ClearSelectedProcessors(); if (processorWorkers == null) diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index 3bedf1c5..d9eb9be9 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -145,12 +145,34 @@ namespace Maestro { return processorWorker; } + private void UpdateJobCounts() { + lAllCount.Text = jobs.Count.ToString(); + var error = 0; + var revoked = 0; + var done = 0; + foreach (ITargetProcessor j in jobs) { + if (TargetProcessor.REVOKED.Equals(j.Status)) { + revoked++; + continue; + } + if (TargetProcessor.ERROR.Equals(j.Status)) { + error++; + continue; + } + if (TargetProcessor.READY.Equals(j.Status)) { + done++; + continue; + } + } + lErrorCount.Text = error.ToString(); + lRevokedCount.Text = revoked.ToString(); + lDoneCount.Text = done.ToString(); + + } + private void ProcessorWorker_DoWork(object sender, DoWorkEventArgs e) { while (!e.Cancel) { - ITargetProcessor job; - if (jobsQueue.TryDequeue(out job)) { - if (TargetProcessor.REVOKED.Equals(job.Status)) - continue; + if (jobsQueue.TryDequeue(out ITargetProcessor job)) { (this).SafeCall(() => { int position = jobs.IndexOf(job); if (position == -1) @@ -160,8 +182,20 @@ namespace Maestro { dgJobs.FirstDisplayedScrollingRowIndex = position; } }); + if (TargetProcessor.REVOKED.Equals(job.Status)) + continue; + (this).SafeCall(() => { + lRunningCount.Text = "1"; + }); job.Execute(); + (this).SafeCall(() => { + UpdateJobCounts(); + lRunningCount.Text = "0"; + }); } else { + (this).SafeCall(() => { + lRunningCount.Text = "0"; + }); Thread.Sleep(100); } } @@ -285,5 +319,17 @@ namespace Maestro { return; e.ToolTipText = dgJobs.Rows[e.RowIndex].Cells[e.ColumnIndex].FormattedValue as string; } + + private void OnSweepJobList(object sender, EventArgs e) { + bindingSourceJobs.DataSource = null; + + BindingList sweepedJobs = new BindingList(); + jobs.Where(x => x.Status == null || TargetProcessor.INPROGRESS.Equals(x.Status)) + .ToList() + .ForEach(i => sweepedJobs.Add(i)); + jobs = sweepedJobs; + bindingSourceJobs.DataSource = jobs; + UpdateJobCounts(); + } } } diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx index d975f3f6..106019a8 100644 --- a/client/Maestro/MaestroForm.resx +++ b/client/Maestro/MaestroForm.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS - CAAAAk1TRnQBSQFMAgEBAgEAAcgBAQHIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATABAgEwAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -186,6 +186,9 @@ True + + True + True @@ -213,12 +216,24 @@ 154, 17 - + True - + True + + 1146, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACHSURBVDhP5ZKxDYAwDAQzCqPQIBiDUbIWHaPAHkjwLxHJ + OAn5Gk66Amx/HET4Ph3s4QQ3eN7ucICssadJhGm4JnuapI3elDYiKyxtQlkjpZ5sUyVohhy0ctsHSpCE + EuR7igcoQf5qfM5QgiSUINuTfeTEAu2wlTVir1b9r0Z4QB/Cd6z9kxAuooZloBF+1qkAAAAASUVORK5C + YII= + + 630, 17 diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 822bd58d..f0e0d7b3 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.8.5")] -[assembly: AssemblyFileVersion("2.0.8.5")] +[assembly: AssemblyVersion("2.0.8.7")] +[assembly: AssemblyFileVersion("2.0.8.7")] diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs index 7d6682da..193e7ee5 100644 --- a/client/Maestro/Sources/FileSystemSource.cs +++ b/client/Maestro/Sources/FileSystemSource.cs @@ -1,14 +1,14 @@ -using System; -using System.Linq; +using LinkDotNet.MessageHandling.Contracts; +using Maestro.Sources.Messages; +using MaestroShared.Commons; +using NLog; +using System; using System.Collections.Generic; using System.ComponentModel; +using System.Drawing; using System.IO; +using System.Linq; using System.Windows.Forms; -using LinkDotNet.MessageHandling.Contracts; -using Maestro.Sources.Messages; -using System.Drawing; -using NLog; -using MaestroShared.Commons; namespace Maestro.Sources { public delegate void ClearAndInitialize(); @@ -19,12 +19,12 @@ namespace Maestro.Sources { private List createdFileMonitors = new List(); private Control parent; private string filter; - private List acceptableExtensions = new List(); + private List acceptableExtensions = new List(); private List cache; private BackgroundWorker pathWatcherWorker = new BackgroundWorker(); private string rootPath; private FileSystemWatcher watcher; - private Object lck = new Object(); + private readonly object lck = new object(); public DataGridViewColumn[] Columns { get { @@ -103,18 +103,20 @@ namespace Maestro.Sources { cache = new List(this); Clear(); IEnumerable filteredItems = null; - if (String.IsNullOrEmpty(Filter)) + if (string.IsNullOrEmpty(Filter)) filteredItems = cache; else filteredItems = cache.Where(i => (i.Name == null) ? false : i.Name.ToLower().Contains(Filter.ToLower())); - switch (SortDirection) { - case ListSortDirection.Ascending: - filteredItems.OrderBy(i => getValue(i)).ToList().ForEach(i => Add(i)); - break; - case ListSortDirection.Descending: - filteredItems.OrderByDescending(i => getValue(i)).ToList().ForEach(i => Add(i)); - break; + lock (lck) { + switch (SortDirection) { + case ListSortDirection.Ascending: + filteredItems.OrderBy(i => getValue(i)).ToList().ForEach(i => Add(i)); + break; + case ListSortDirection.Descending: + filteredItems.OrderByDescending(i => getValue(i)).ToList().ForEach(i => Add(i)); + break; + } } logger.Trace("Exit"); } @@ -219,8 +221,8 @@ namespace Maestro.Sources { } private void SafeRemove(FileSourceItem item) { - if (String.IsNullOrEmpty(filter)) - parent.SafeCall(() => this.Remove(item)); + if (string.IsNullOrEmpty(filter)) + parent.SafeCall(() => Remove(item)); else parent.SafeCall(() => cache.Remove(item)); } @@ -250,8 +252,7 @@ namespace Maestro.Sources { //}; //bg.RunWorkerAsync(); - } - catch (Exception e) { + } catch (Exception e) { logger.Error(e); Shutdown(); } @@ -293,7 +294,7 @@ namespace Maestro.Sources { } public void OnRenamed(object sender, RenamedEventArgs e) { - if (!String.IsNullOrEmpty(filter)) + if (!string.IsNullOrEmpty(filter)) return; logger.Trace("Entry"); //logger.Debug("{0} {1} {2}", e.ChangeType, e.OldName, e.Name); @@ -327,7 +328,7 @@ namespace Maestro.Sources { } private void OnChanged(object sender, FileSystemEventArgs e) { - if (!String.IsNullOrEmpty(filter)) + if (!string.IsNullOrEmpty(filter)) return; logger.Trace("Entry"); //logger.Debug("{0} {1}", e.ChangeType, e.Name); @@ -369,7 +370,7 @@ namespace Maestro.Sources { } private void OnDeleted(object sender, FileSystemEventArgs e) { - if (!String.IsNullOrEmpty(filter)) + if (!string.IsNullOrEmpty(filter)) return; logger.Trace("Entry"); logger.Debug("{0} {1}", e.ChangeType, e.Name); diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs index 7b4f8400..945877d1 100644 --- a/client/Maestro/Sources/NexioRESTSource.cs +++ b/client/Maestro/Sources/NexioRESTSource.cs @@ -1,18 +1,18 @@ -using System.Linq; -using System.ComponentModel; -using System.Diagnostics; -using System.Windows.Forms; -using LinkDotNet.MessageHandling.Contracts; +using LinkDotNet.MessageHandling.Contracts; using Maestro.Sources.Messages; -using NexioClient; +using MaestroShared.Commons; +using MaestroShared.Configuration; +using MaestroShared.Metadata; using Newtonsoft.Json.Linq; -using WebSocketSharp; -using System; -using System.Drawing; +using NexioClient; using NLog; +using System; using System.Collections.Generic; -using MaestroShared.Commons; -using MaestroShared.Metadata; +using System.ComponentModel; +using System.Drawing; +using System.Linq; +using System.Windows.Forms; +using WebSocketSharp; namespace Maestro.Sources { class NexioRESTSource : BindingList, ISource { @@ -24,14 +24,16 @@ namespace Maestro.Sources { private const string DURATION = "duration"; private const string MODIFIED = "modifiedtimestamp"; private const string MXFEXT = ".MXF"; - private List acceptableAgencies = new List(); + private List acceptableAgencies = new List(); private List cache; private IMessageBus messageBus; + private readonly NEXIOSource configuration; private Control parent; private NexioAPI nexioAPI; private string filter; private string path; private volatile bool initialized; + private readonly object lck = new object(); public DataGridViewColumn[] Columns { get { @@ -92,7 +94,7 @@ namespace Maestro.Sources { public string Filter { get => filter; set { filter = value; - if (String.IsNullOrEmpty(filter)) + if (string.IsNullOrEmpty(filter)) RemoveFilter(); else Refresh(); @@ -104,18 +106,20 @@ namespace Maestro.Sources { cache = new List(this); Clear(); IEnumerable filteredItems = null; - if (String.IsNullOrEmpty(Filter)) + if (string.IsNullOrEmpty(Filter)) filteredItems = cache; else filteredItems = cache.Where(i => (i.Name == null) ? false : i.Name.ToLower().Contains(Filter.ToLower())); - switch (SortDirection) { - case ListSortDirection.Ascending: - filteredItems.OrderBy(i => getValue(i)).ToList().ForEach(i => Add(i)); - break; - case ListSortDirection.Descending: - filteredItems.OrderByDescending(i => getValue(i)).ToList().ForEach(i => Add(i)); - break; + lock (lck) { + switch (SortDirection) { + case ListSortDirection.Ascending: + filteredItems.OrderBy(i => getValue(i)).ToList().ForEach(i => Add(i)); + break; + case ListSortDirection.Descending: + filteredItems.OrderByDescending(i => getValue(i)).ToList().ForEach(i => Add(i)); + break; + } } //filteredItems.ToList().ForEach(i => parent.SafeCall(() => Add(i))); @@ -143,12 +147,13 @@ namespace Maestro.Sources { return result; } - public NexioRESTSource(Control parent, IMessageBus messageBus, String agencyFilter) { + public NexioRESTSource(Control parent, IMessageBus messageBus, NEXIOSource configuration) { SortProperty = TypeDescriptor.GetProperties(typeof(FileSourceItem)).Find("Created", false); SortDirection = ListSortDirection.Descending; this.parent = parent; this.messageBus = messageBus; - SetAcceptableAgencies(agencyFilter); + this.configuration = configuration; + SetAcceptableAgencies(configuration?.Filter); } private void SetAcceptableAgencies(string agencyFilter) { @@ -163,7 +168,7 @@ namespace Maestro.Sources { private void InnerStartup() { CreateWatch(path); - initializeList(path); + InitializeList(path); } private void CreateWatch(string path) { @@ -171,7 +176,7 @@ namespace Maestro.Sources { nexioAPI.Open(OnResponse); } - private void initializeList(string path) { + private void InitializeList(string path) { nexioAPI.GetListAsync(); } @@ -191,21 +196,26 @@ namespace Maestro.Sources { case NexioAPI.CREATE: if (!initialized) return; - OnCreated(d); + lock (lck) { + OnCreated(d); + } break; case NexioAPI.DELETE: if (!initialized) return; - OnDeleted(d); + lock (lck) { + OnDeleted(d); + } break; case NexioAPI.UPDATE: if (!initialized) return; - OnChanged(d); + lock (lck) { + OnChanged(d); + } break; } - } - catch (Exception ex) { + } catch (Exception ex) { logger.Error(ex); MsgBox.Error(ex.Message); } @@ -225,13 +235,12 @@ namespace Maestro.Sources { item.Name = token[LONGNAMEID].ToString() + MXFEXT; item.Agency = token[EXTAGENCY]?.ToString(); DateTime? created = token.Value(RECORDDATE); - item.Created = created ?? DateTime.MinValue; + item.Created = created ?? DateTime.MinValue; DateTime? modified = token.Value(MODIFIED); item.Modified = modified ?? DateTime.MinValue; item.Frames = token.Value(DURATION); item.Duration = new Timecode((int)item.Frames).ToString(); - } - catch (Exception e) { + } catch (Exception e) { logger.Error(e.Message); } @@ -245,7 +254,7 @@ namespace Maestro.Sources { l.Children(). ToList(). Select(t => CreateItem(t, false)). - Where(x => x.CanHandle(acceptableAgencies)). + Where(x => (configuration.HideEmpty && x.Frames > 1 && x.CanHandle(acceptableAgencies)) || (!configuration.HideEmpty && x.CanHandle(acceptableAgencies))). OrderByDescending(i => i.Created). ToList().ForEach(i => Add(i)); initialized = true; @@ -253,7 +262,7 @@ namespace Maestro.Sources { } private void OnChanged(JToken token) { - if (!String.IsNullOrEmpty(filter)) + if (!string.IsNullOrEmpty(filter)) return; string id = token[ID].ToString(); var item = Items.Where(x => x.ID == id).FirstOrDefault(); @@ -289,7 +298,7 @@ namespace Maestro.Sources { } private void OnCreated(JToken token) { - if (!String.IsNullOrEmpty(filter)) + if (!string.IsNullOrEmpty(filter)) return; var item = CreateItem(token, true); if (!item.CanHandle(acceptableAgencies)) @@ -305,7 +314,7 @@ namespace Maestro.Sources { } private void OnDeleted(JToken d) { - if (!String.IsNullOrEmpty(filter)) + if (!string.IsNullOrEmpty(filter)) return; string id = d[ID].ToString(); var item = this.Where(i => i.ID != null && i.ID.Equals(id)).FirstOrDefault(); @@ -314,8 +323,7 @@ namespace Maestro.Sources { parent.SafeCall(() => { try { Remove(item); - } - catch (Exception e) { } + } catch (Exception e) { } messageBus.Send(new RemoveFileActionMsg() { FileName = item.Name, Source = parent diff --git a/client/Maestro/Sources/NexioSourceItem.cs b/client/Maestro/Sources/NexioSourceItem.cs index 354293ed..770cb4cf 100644 --- a/client/Maestro/Sources/NexioSourceItem.cs +++ b/client/Maestro/Sources/NexioSourceItem.cs @@ -1,7 +1,7 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using System.Runtime.CompilerServices; -using System.Collections.Generic; namespace Maestro.Sources { public class NexioSourceItem : ISourceItem { private bool isHighlighted; @@ -103,9 +103,7 @@ namespace Maestro.Sources { } public bool CanHandle(List extensions) { - if (extensions == null || extensions.Count < 1) - return true; - if (extensions.Contains(Agency.ToLower()) || extensions.Contains(Agency.ToUpper())) + if (extensions == null || extensions.Count < 1 || extensions.Contains(Agency.ToLower()) || extensions.Contains(Agency.ToUpper())) return true; return false; } diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index c65e215d..8427af26 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -1,12 +1,12 @@ -using Newtonsoft.Json; +using MaestroShared.Commons; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Serialization; using System; -using System.Linq; -using System.IO; -using System.Drawing; using System.ComponentModel; -using Newtonsoft.Json.Serialization; -using MaestroShared.Commons; -using Newtonsoft.Json.Linq; +using System.Drawing; +using System.IO; +using System.Linq; using System.Runtime.Serialization; namespace MaestroShared.Configuration { @@ -53,8 +53,7 @@ namespace MaestroShared.Configuration { }; File.WriteAllText(fileName, JsonConvert.SerializeObject(data, settings)); - } - catch (Exception e) { + } catch (Exception e) { MsgBox.Error(e.Message); } } @@ -90,7 +89,7 @@ namespace MaestroShared.Configuration { public bool Enabled { get; set; } public bool AutoStart { get; set; } public bool SegmentEditor { get; set; } - [DefaultValue(new []{"MXF"})] + [DefaultValue(new[] { "MXF" })] [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] public string[] Extensions { get; set; } } @@ -145,6 +144,7 @@ namespace MaestroShared.Configuration { } public class NEXIOSource : Source { + public bool HideEmpty { get; set; } } public class MetadataProvider : UISettings { diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index d025253f..e4191e46 100644 --- a/client/MaestroShared/Properties/AssemblyInfo.cs +++ b/client/MaestroShared/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.8.8")] -[assembly: AssemblyFileVersion("2.0.8.8")] +[assembly: AssemblyVersion("2.0.9.0")] +[assembly: AssemblyFileVersion("2.0.9.0")] diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs index 240f5e98..2ad9649e 100644 --- a/client/MaestroShared/Targets/FXPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs @@ -22,6 +22,7 @@ namespace MaestroShared.Targets { private FtpClient monitorFTP = null; private long sourceFileLength = 0; private long uploadedFileLength = 0; + private bool isNexioSource = false; Uri inputUri; public override void Initialize(Control parent, TargetProcessorParameter parameters) { @@ -56,7 +57,7 @@ namespace MaestroShared.Targets { Input = Input.Replace("/", ""); sourceFileLength = sourceFTP.GetFileSize(Input); - bool isNexioSource = sourceFTP.IsNexio(); + isNexioSource = sourceFTP.IsNexio(); //Nexio eseten frame-eket kerdunk le if (isNexioSource) sourceFileLength = GetNexioLength(); @@ -115,7 +116,9 @@ namespace MaestroShared.Targets { Thread.Sleep(500); } - targetFTP.GetReply(); + var reply = targetFTP.GetReply(); + //logger.Info("Reply is {0}", reply.Message); + if (useTemporaryName) { if (!targetFTP.MoveFile(targetFilePath, OutputName)) throw new Exception(UPLOAD_ERROR); @@ -152,7 +155,7 @@ namespace MaestroShared.Targets { } protected override void ValidateTransfer() { - if (!targetFTP.IsNexio() && !sourceFTP.IsNexio()) { + if (!isNexioSource && !targetFTP.IsNexio()) { if (sourceFileLength != uploadedFileLength) throw new Exception(COPY_SIZE_ERROR); } @@ -187,6 +190,7 @@ namespace MaestroShared.Targets { } public static class FtpClientExtensions { + public static String Command(this FtpClient client, String command) { FtpReply response = client.Execute(command); if (!response.Success) @@ -206,7 +210,8 @@ namespace MaestroShared.Targets { //Device Type lekerdezese string response = client.Command("SITE 0011"); result = response.Contains("1211"); - } catch { } + } catch { + } return result; } diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs index c30e2835..d3312c96 100644 --- a/client/MaestroShared/Targets/UNCTargetProcessor.cs +++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs @@ -266,7 +266,7 @@ namespace MaestroShared.Targets { Finished = DateTime.Now; workFlowAction.finished = Finished; SendWorkFlowAction(); - Progress = 0; + //Progress = 0; logger.Trace(Strings.EXIT); } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java index b5c42646..79497481 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java @@ -109,8 +109,11 @@ public class ArchiveListBuilderStep extends JobStep { if (limit > 0) { int correctedLimit = limit > archiveList.size() ? archiveList.size() : limit; - archiveList = archiveList.subList(0, correctedLimit - 1); - logger.info(marker, "A folyamat elérte a beállított {} limitet.", limit); + if (correctedLimit > 0) { + archiveList = archiveList.subList(0, correctedLimit - 1); + logger.info(marker, "A folyamat elérte a beállított {} limitet.", limit); + } else + logger.info(marker, "Nincs archiválandó anyag."); } else logger.info(marker, "Az archiváló folyamat {} új anyagot érzékelt.", archiveList == null ? 0 : archiveList.size()); -- 2.54.0