git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs
index 6816984a77ccbd9eb13a7bc35bcf750aa7690a69..ac6abe2ead81d647cf2e68b8b7180f203b464df6 100644 (file)
--- a/client/DxPlay/Properties/AssemblyInfo.cs
+++ b/client/DxPlay/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers \r
 // by using the '*' as shown below:\r
 \r
-[assembly: AssemblyVersion("2.0.9.1")]\r
+[assembly: AssemblyVersion("2.1.0.0")]\r
 \r
 //\r
 // In order to sign your assembly you must specify a key to use. Refer to the \r
@@ -56,5 +56,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDelaySign(false)]\r
 [assembly: AssemblyKeyFile("")]\r
 [assembly: AssemblyKeyName("")]\r
-[assembly: AssemblyFileVersion("2.0.9.1")]\r
+[assembly: AssemblyFileVersion("2.1.0.0")]\r
 \r

diff --git a/client/IntegrationTests/OctopusIT.cs b/client/IntegrationTests/OctopusIT.cs
index 41b43e51b0d476de4d403723fc0cac4e338dbb0a..9bc8cb4685aea79d99e829b667fc51b7e4ea19fa 100644 (file)
--- a/client/IntegrationTests/OctopusIT.cs
+++ b/client/IntegrationTests/OctopusIT.cs
@@ -20,9 +20,20 @@ namespace IntegrationTests {
 \r
         [TestMethod]\r
         public void TestGetRundowns() {\r
-            OctopusAPI client = new OctopusAPI("http://localhost:8080/rest/services/octopus/", null, null, 100, null);\r
+            OctopusAPI client = new OctopusAPI("http://localhost:8888/services/rest/octopus/", null, null, 2000, null);\r
             var actual = client.GetRundowns(DateTime.Now);\r
+            Debug.WriteLine("Count " + actual.ToList()?.Count);\r
         }\r
 \r
+        [TestMethod]\r
+        public void TestStressGetRundowns() {\r
+            OctopusAPI client = new OctopusAPI("http://localhost:8888/services/rest/octopus/", null, null, 2000, null);\r
+                \r
+            for (int i = 0; i < 10000; i++) { \r
+                var actual = client.GetRundowns(DateTime.Now);\r
+                Debug.WriteLine("Count " + actual.ToList().Count);\r
+            }\r
+\r
+        }\r
     }\r
 }\r

diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json
index 867041bcd6c043232d12656fb9ede033e7664101..253859b73c422093807d1dd6df4c7d4ff644d9c9 100644 (file)
--- a/client/Maestro/Configuration/configuration.json
+++ b/client/Maestro/Configuration/configuration.json
@@ -1,6 +1,6 @@
 {\r
   "title": "Development",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "filter": "avi",\r
@@ -24,13 +24,10 @@
   },\r
   "metadatas": [\r
     {\r
-      "$type": "TrafficMetadata",\r
-      "functionName": "clIFsp_ORI_MAM",\r
-      "version": 1,\r
+      "$type": "OctopusMetadata",\r
+      "disableStoryCheck": true,\r
       "server": {\r
-        "address": "Data Source=10.11.254.86;Initial Catalog=PA_Vivantis;Persist Security Info=True;",\r
-        "userName": "MAM",\r
-        "password": "1LCAeMAI5W5eWdtaN25mHX/9JkXjkr0JZDvTZp//HYtUPo/UKyJnuZoLKFo9G9FbAhUha8xnniV+v/9BQ6c/7e0phmCYUdeLEdQcg0hHvU9njMSqYBV75b6oB9jhvtoZ",\r
+        "address": "http://localhost:8888/services/rest/octopus/",\r
         "timeout": 1000\r
       }\r
     },\r

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
new file mode 100644 (file)
index 0000000..0cae128
--- /dev/null
+++ b/client/Maestro/Configuration/dev-local.json
@@ -0,0 +1,114 @@
+{\r
+  "title": "Development",\r
+  "active": true,\r
+  "startInTray": false,\r
+  "enableCustomMetadataId": true,\r
+  "filter": "avi",\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "filter": "avi,wav,mxf,mts,mov",\r
+    "useAlternateCopy": false,\r
+    "autoTarget": "AUTOTARGET",\r
+    "autoTags": [ "AUTOTAG" ],\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": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://localhost:8888/services/rest/jobengine",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      },\r
+      "wsserver": {\r
+        "address": "ws://10.10.1.27/services/wsapi",\r
+        "timeout": 1000\r
+      },\r
+      "jobTemplate": "retrieve-material.xml",\r
+      "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE",\r
+      "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE",\r
+      "restoreNamePattern": "%s_%GUID%",\r
+      "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE",\r
+      "killDateDays": 1\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Stúdióba küldés",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "TESZT",\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": 1,\r
+      "disableFileVersioning": true,\r
+      "agency": "ARCHIVED",\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": "Adáskész",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "killDateDays": 5,\r
+      "saveSegments": true,\r
+      "tag": "Adáskész",\r
+      "disableFileVersioning": true,\r
+      "enableOverride": false,\r
+      "saveMorpheusMetadata": true,\r
+      "pathMorpheusMetadata": "/TESZT/TC/CHECK/Input",\r
+      "deviceIdMorpheus": "ISILON",\r
+      "remote": {\r
+        "address": "ftp://10.10.1.105/TESZT/TC/CHECK",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "AUTOTARGET",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "killDateDays": 0,\r
+      "saveArchiveMetadata": true,\r
+      "remote": {\r
+        "address": "file://c:/_video/y",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "Napi megtekintőbe",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%-%TEXT%",\r
+      "tag": "Online",\r
+      "disableFileVersioning": true,\r
+      "killDateDays": 2,\r
+      "saveArchiveMetadata": false,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.105/TESZT/CHECK",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+\r
+  ]\r
+}\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 34febc2af6639353d64333f37bea0f847c625dd6..63600b00aa69425b330e1b9cefb7237536fec27a 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -304,6 +304,9 @@
     <None Include="Configuration\-configuration - Copy.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
+    <None Include="Configuration\dev-local.json">\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Configuration\configuration.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r