From: vasary.daniel <TFS\vasary.daniel>
Date: Wed, 21 Apr 2021 07:50:36 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=27979e834ba254122c5d0397e9fa36f4b95bbde5;p=mediacube.git

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

diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs
index 6816984a..ac6abe2e 100644
--- 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 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.0.9.1")]
+[assembly: AssemblyVersion("2.1.0.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -56,5 +56,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersion("2.0.9.1")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
 
diff --git a/client/IntegrationTests/OctopusIT.cs b/client/IntegrationTests/OctopusIT.cs
index 41b43e51..9bc8cb46 100644
--- a/client/IntegrationTests/OctopusIT.cs
+++ b/client/IntegrationTests/OctopusIT.cs
@@ -20,9 +20,20 @@ namespace IntegrationTests {
 
         [TestMethod]
         public void TestGetRundowns() {
-            OctopusAPI client = new OctopusAPI("http://localhost:8080/rest/services/octopus/", null, null, 100, null);
+            OctopusAPI client = new OctopusAPI("http://localhost:8888/services/rest/octopus/", null, null, 2000, null);
             var actual = client.GetRundowns(DateTime.Now);
+            Debug.WriteLine("Count " + actual.ToList()?.Count);
         }
 
+        [TestMethod]
+        public void TestStressGetRundowns() {
+            OctopusAPI client = new OctopusAPI("http://localhost:8888/services/rest/octopus/", null, null, 2000, null);
+                
+            for (int i = 0; i < 10000; i++) { 
+                var actual = client.GetRundowns(DateTime.Now);
+                Debug.WriteLine("Count " + actual.ToList().Count);
+            }
+
+        }
     }
 }
diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json
index 867041bc..253859b7 100644
--- a/client/Maestro/Configuration/configuration.json
+++ b/client/Maestro/Configuration/configuration.json
@@ -1,6 +1,6 @@
 {
   "title": "Development",
-  "active": true,
+  "active": false,
   "startInTray": false,
   "enableCustomMetadataId": true,
   "filter": "avi",
@@ -24,13 +24,10 @@
   },
   "metadatas": [
     {
-      "$type": "TrafficMetadata",
-      "functionName": "clIFsp_ORI_MAM",
-      "version": 1,
+      "$type": "OctopusMetadata",
+      "disableStoryCheck": true,
       "server": {
-        "address": "Data Source=10.11.254.86;Initial Catalog=PA_Vivantis;Persist Security Info=True;",
-        "userName": "MAM",
-        "password": "1LCAeMAI5W5eWdtaN25mHX/9JkXjkr0JZDvTZp//HYtUPo/UKyJnuZoLKFo9G9FbAhUha8xnniV+v/9BQ6c/7e0phmCYUdeLEdQcg0hHvU9njMSqYBV75b6oB9jhvtoZ",
+        "address": "http://localhost:8888/services/rest/octopus/",
         "timeout": 1000
       }
     },
diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
new file mode 100644
index 00000000..0cae128b
--- /dev/null
+++ b/client/Maestro/Configuration/dev-local.json
@@ -0,0 +1,114 @@
+{
+  "title": "Development",
+  "active": true,
+  "startInTray": false,
+  "enableCustomMetadataId": true,
+  "filter": "avi",
+  "player": {
+    "enabled": true,
+    "autoStart": false,
+    "segmentEditor": true
+  },
+  "source": {
+    "$type": "UNCSource",
+    "filter": "avi,wav,mxf,mts,mov",
+    "useAlternateCopy": false,
+    "autoTarget": "AUTOTARGET",
+    "autoTags": [ "AUTOTAG" ],
+    "local": {
+      "address": "file://c:/_video",
+      "userName": "mediacube",
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",
+      "timeout": 1000
+    }
+  },
+  "metadatas": [
+    {
+      "$type": "MediaCubeMetadata",
+      "server": {
+        "address": "http://localhost:8888/services/rest/jobengine",
+        "userName": "mediacube",
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",
+        "timeout": 1000
+      },
+      "wsserver": {
+        "address": "ws://10.10.1.27/services/wsapi",
+        "timeout": 1000
+      },
+      "jobTemplate": "retrieve-material.xml",
+      "archiveFolder": "file://10.10.1.105/TESZT/TC/ARCHIVE",
+      "restoreFolder": "file://10.10.1.105/BRAAVOS/ARCHIVE_RESTORE",
+      "restoreNamePattern": "%s_%GUID%",
+      "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE",
+      "killDateDays": 1
+    }
+  ],
+  "targets": [
+    {
+      "label": "Stúdióba küldés",
+      "processor": "FTPTargetProcessor",
+      "outputFormat": "%ID%",
+      "tag": "TESZT",
+      "nexioServer": true,
+      "nexioFileExistsMessage": "A feltöltéshez új 'placeholder' generálása szükséges az Octopus rendszerben, az anyagon belül az ALT+1 billenytűkombináció segítségével.",
+      "killDateDays": 1,
+      "disableFileVersioning": true,
+      "agency": "ARCHIVED",
+      "remote": {
+        "address": "ftp://10.10.1.55:2098",
+        "userName": "administrator",
+        "password": "+QtkeQdCTiOvZOgK/kUND4pO4/D+//r7ZIyluwMMdiqMEgO8iJErAG10ooWhPfiljQeXrdeyMzo7gWEZtcWpNSomGeDIbdMyQwtpqmMo1VEM3A27ZfzigY09YD46ECRh",
+        "timeout": 1000
+      }
+    },
+    {
+      "label": "Adáskész",
+      "processor": "FTPTargetProcessor",
+      "outputFormat": "%ID%",
+      "killDateDays": 5,
+      "saveSegments": true,
+      "tag": "Adáskész",
+      "disableFileVersioning": true,
+      "enableOverride": false,
+      "saveMorpheusMetadata": true,
+      "pathMorpheusMetadata": "/TESZT/TC/CHECK/Input",
+      "deviceIdMorpheus": "ISILON",
+      "remote": {
+        "address": "ftp://10.10.1.105/TESZT/TC/CHECK",
+        "userName": "mediacube",
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",
+        "timeout": 1000
+      }
+    },
+    {
+      "label": "AUTOTARGET",
+      "processor": "UNCTargetProcessor",
+      "outputFormat": "%SOURCENAME%",
+      "tag": "Betöltés",
+      "killDateDays": 0,
+      "saveArchiveMetadata": true,
+      "remote": {
+        "address": "file://c:/_video/y",
+        "userName": "mediacube",
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",
+        "timeout": 1000
+      }
+    },
+    {
+      "label": "Napi megtekintőbe",
+      "processor": "FTPTargetProcessor",
+      "outputFormat": "%ID%-%TEXT%",
+      "tag": "Online",
+      "disableFileVersioning": true,
+      "killDateDays": 2,
+      "saveArchiveMetadata": false,
+      "remote": {
+        "address": "ftp://10.10.1.105/TESZT/CHECK",
+        "userName": "mediacube",
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",
+        "timeout": 1000
+      }
+    }
+
+  ]
+}
diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 34febc2a..63600b00 100644
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -304,6 +304,9 @@
     <None Include="Configuration\-configuration - Copy.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Configuration\dev-local.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Configuration\configuration.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>