git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 13 Nov 2018 11:27:12 +0000 (11:27 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 13 Nov 2018 11:27:12 +0000 (11:27 +0000)
34 files changed:
client/DxPlay/DxPlayer.cs
client/DxPlay/PlayerForm.cs
client/Maestro/Configuration/-ACTIVE-configuration-editor-project.json [deleted file]
client/Maestro/Configuration/-ACTIVE-configuration-nle.json [deleted file]
client/Maestro/Configuration/-ACTIVE-configuration-promo.json [deleted file]
client/Maestro/Configuration/-ACTIVE-configuration-vezerlo.json [deleted file]
client/Maestro/Configuration/-configuration-archive.json [deleted file]
client/Maestro/Configuration/-configuration-editor.json [deleted file]
client/Maestro/Configuration/-configuration-grafika.json [deleted file]
client/Maestro/Configuration/-configuration-playout-ingest.json [deleted file]
client/Maestro/Configuration/-configuration-playout.json [deleted file]
client/Maestro/Configuration/-configuration-sxs-tibi.json [deleted file]
client/Maestro/Configuration/-configuration-sxs.json [deleted file]
client/Maestro/Configuration/-configuration-torokor-t.json [deleted file]
client/Maestro/Configuration/-configuration-tqc-check.json [deleted file]
client/Maestro/Configuration/-configuration-transcoder.json [deleted file]
client/Maestro/Configuration/configuration - Copy.json [new file with mode: 0644]
client/Maestro/Configuration/configuration-nle.json [deleted file]
client/Maestro/Configuration/configuration.json [new file with mode: 0644]
client/Maestro/Maestro.csproj
client/Maestro/MaestroForm.Designer.cs
client/Maestro/MaestroForm.Source.cs
client/Maestro/MaestroForm.Target.cs
client/Maestro/MaestroForm.cs
client/Maestro/MaestroForm.resx
client/Maestro/Properties/AssemblyInfo.cs
client/Maestro/Sources/FileSystemSource.cs
client/Maestro/Sources/NexioRESTSource.cs
client/Maestro/Sources/NexioSourceItem.cs
client/MaestroShared/Configuration/ConfigurationInfo.cs
client/MaestroShared/Properties/AssemblyInfo.cs
client/MaestroShared/Targets/FXPTargetProcessor.cs
client/MaestroShared/Targets/UNCTargetProcessor.cs
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java

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