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

diff --git a/client/AudioRecorder/AudioRecorder.csproj b/client/AudioRecorder/AudioRecorder.csproj
index 235a09c18b009f8f34cdfe094fc4bca8c342717d..a210555b79a92f8ceab7c37fafeba8531f0a9b46 100644 (file)
--- a/client/AudioRecorder/AudioRecorder.csproj
+++ b/client/AudioRecorder/AudioRecorder.csproj
@@ -91,6 +91,7 @@
     <PlatformTarget>x64</PlatformTarget>\r
     <ErrorReport>prompt</ErrorReport>\r
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
+    <Deterministic>true</Deterministic>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <ApplicationIcon>maestro.ico</ApplicationIcon>\r
@@ -173,7 +174,7 @@
     <None Include="Configuration\audiorecorder.json1">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\audiorecorder.en">\r
+    <None Include="Configuration\audiorecorder.en1">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="nlog.config">\r

diff --git a/client/AudioRecorder/Configuration/audiorecorder.en b/client/AudioRecorder/Configuration/audiorecorder.en1
similarity index 100%
rename from client/AudioRecorder/Configuration/audiorecorder.en
rename to client/AudioRecorder/Configuration/audiorecorder.en1

diff --git a/client/AudioRecorder/Configuration/audiorecorder.json b/client/AudioRecorder/Configuration/audiorecorder.json
index 4e1f4341566ce2b75ce824ec5aa8e04224c5fa88..f6dd73c5d7124d3014e1e068346ad6d3ce48899e 100644 (file)
--- a/client/AudioRecorder/Configuration/audiorecorder.json
+++ b/client/AudioRecorder/Configuration/audiorecorder.json
@@ -10,6 +10,27 @@
       "address": "file://C:\\temp"\r
     }\r
   },\r
+  "trafficTarget": {\r
+    "processor": "UNCTargetProcessor",\r
+    "outputFormat": "%ID%",\r
+    "remote": {\r
+      "address": "file://C:\\temp"\r
+    }\r
+  },\r
+  "trafficPromoTarget": {\r
+    "processor": "UNCTargetProcessor",\r
+    "outputFormat": "%ID%",\r
+    "remote": {\r
+      "address": "file://C:\\temp"\r
+    }\r
+  },\r
+  "trafficADTarget": {\r
+    "processor": "UNCTargetProcessor",\r
+    "outputFormat": "%ID%",\r
+    "remote": {\r
+      "address": "file://C:\\temp"\r
+    }\r
+  },\r
   "freeTarget": {\r
     "processor": "UNCTargetProcessor",\r
     "outputFormat": "%ID%",\r

diff --git a/client/AudioRecorder/MainForm.cs b/client/AudioRecorder/MainForm.cs
index 69c3c75173f2a6450bbc5fa5a49b1a04b8a09436..0a2988f59f59abe28b3acd9da72cce5cff7c506b 100644 (file)
--- a/client/AudioRecorder/MainForm.cs
+++ b/client/AudioRecorder/MainForm.cs
@@ -1,20 +1,20 @@
-using System;\r
+using AudioRecorder.Properties;\r
+using MaestroShared.Commons;\r
+using MaestroShared.Configuration;\r
+using MaestroShared.Metadata;\r
+using MaestroShared.Target;\r
+using MaestroShared.Targets;\r
+using NAudio.CoreAudioApi;\r
+using System;\r
 using System.Collections.Generic;\r
+using System.ComponentModel;\r
 using System.Diagnostics;\r
 using System.Drawing;\r
-using NAudio.CoreAudioApi;\r
-using System.Windows.Forms;\r
 using System.IO;\r
-using MaestroShared.Configuration;\r
-using System.ComponentModel;\r
-using MaestroShared.Commons;\r
-using MaestroShared.Target;\r
 using System.Security.Principal;\r
-using MaestroShared.Targets;\r
-using static AudioRecorder.MetadataSelectorForm;\r
-using MaestroShared.Metadata;\r
-using AudioRecorder.Properties;\r
 using System.Threading;\r
+using System.Windows.Forms;\r
+using static AudioRecorder.MetadataSelectorForm;\r
 \r
 namespace AudioRecorder {\r
     public delegate void RefreshPanelDelegate();\r
@@ -92,8 +92,7 @@ namespace AudioRecorder {
                     SelectedDeviceIndex = audioDevicesNames.IndexOf(parameters.DeviceName);\r
                 if (SelectedDeviceIndex < 0)\r
                     ShowAudioDeviceSelectorForm();\r
-            }\r
-            catch (Exception ex) {\r
+            } catch (Exception ex) {\r
                 MsgBox.Error(ex.Message);\r
             }\r
         }\r
@@ -106,8 +105,7 @@ namespace AudioRecorder {
                     //Debug.WriteLine(String.Format($"Values {levels[0]}"));\r
                     pmVolume.SetData(levels, 0, 1);\r
                     System.Threading.Thread.Sleep(100);\r
-                }\r
-                catch (Exception ex) {\r
+                } catch (Exception ex) {\r
                     Debug.WriteLine(ex.Message);\r
                 }\r
             }\r
@@ -151,8 +149,7 @@ namespace AudioRecorder {
                 Directory.CreateDirectory(parameters.WorkingDirectory.LocalPath);\r
                 recorder = new WavRecorder(SelectedDeviceIndex, CurrentDevice);\r
                 currentDevice.AudioEndpointVolume.OnVolumeNotification += OnAudioEndpointVolumeChanged;\r
-            }\r
-            catch (Exception ex) {\r
+            } catch (Exception ex) {\r
                 MsgBox.Error(ex.Message);\r
             }\r
         }\r
@@ -169,8 +166,7 @@ namespace AudioRecorder {
                 playButton.Enabled = false;\r
                 stopButton.BackColor = Color.Red;\r
                 recordButton.BackColor = Color.White;\r
-            }\r
-            catch (Exception e) {\r
+            } catch (Exception e) {\r
                 MsgBox.Error(e.Message);\r
             }\r
         }\r
@@ -199,8 +195,7 @@ namespace AudioRecorder {
                 stopButton.BackColor = Color.White;\r
                 recordButton.BackColor = Color.Lime;\r
                 Export();\r
-            }\r
-            catch (Exception e) {\r
+            } catch (Exception e) {\r
                 MsgBox.Error(e.Message);\r
             }\r
         }\r
@@ -208,8 +203,7 @@ namespace AudioRecorder {
 \r
         public DialogResult ShowMTAFileSaveDialog(SaveFileDialog sd) {\r
             DialogResult dlgRes = DialogResult.Cancel;\r
-            Thread theThread = new Thread((ThreadStart)delegate\r
-            {\r
+            Thread theThread = new Thread((ThreadStart)delegate {\r
                 //Create a layout dialog instance on the current thread to align the file dialog Form \r
                 Form frmLayout = new Form();\r
                 frmLayout.StartPosition = FormStartPosition.Manual;\r
@@ -385,8 +379,7 @@ namespace AudioRecorder {
                 string path = Path.GetDirectoryName(processor.Output);\r
                 string name = Path.GetFileName(processor.Output);\r
                 MsgBox.Info(String.Format(parameters.Resource("SUCCESSMESSAGE", Resources.SUCCESSMESSAGE), path, name));\r
-            }\r
-            else\r
+            } else\r
                 MsgBox.Error(processor.Message);\r
         }\r
 \r

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json
index f13a4c19b872a1ebff8ec989b63293303a9b062f..93b3e282048d629c51e6bd72e85f7f26bce8c573 100644 (file)
--- a/client/Maestro/Configuration/configuration-nle.json
+++ b/client/Maestro/Configuration/configuration-nle.json
@@ -1,6 +1,6 @@
 {\r
   "title": "UNC2FTP_NEXIO_UNC",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "defaultWindowColor": "#E1BEE7",\r
@@ -22,34 +22,10 @@
   "metadatas": [\r
     {\r
       "$type": "OctopusMetadata",\r
-      "disableStoryCheck": true,\r
+      "disabled": 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%",\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

diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json
index dc505802ae226bdff366a62bad285d1502ba21a3..61909c4c523158f2e2c98af834fac805531a8713 100644 (file)
--- a/client/Maestro/Configuration/configuration-studio.json
+++ b/client/Maestro/Configuration/configuration-studio.json
@@ -1,7 +1,7 @@
 {\r
-  "title": "NEXIO2UNC_FXP",\r
+  "title": "Stúdió szerverről másolás",\r
   "active": true,\r
-  "startInTray": false,\r
+  "startInTray": true,\r
   "enableCustomMetadataId": true,\r
   "filter": "avi",\r
   "player": {\r
@@ -21,7 +21,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://localhost:8888/services/rest/octopus",\r
+        "address": "http://10.10.1.27/services/rest/octopus",\r
         "timeout": 1000\r
       }\r
     },\r
@@ -46,20 +46,111 @@
   ],\r
   "targets": [\r
     {\r
-      "label": "Archiválás",\r
+    "label": "Octopus mappába küldés",\r
+    "processor": "FXPTargetProcessor",\r
+    "subFolderFormat": "%IDROOT%-%TEXT%",\r
+    "outputFormat": "%ID%-%SOURCENAME%",\r
+    "killDateDays": 15,\r
+    "temporaryCopy": true,\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
+    "tag": "Betöltés"\r
+    },\r
+    {\r
+      "label": "Traffic mappába küldés",\r
       "processor": "FXPTargetProcessor",\r
-      "outputFormat": "%ID%",\r
-      "tag": "Archiválás",\r
-      "saveArchiveMetadata": true,\r
-      "deleteAfterCopy": false,\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "subFolderFormat": "%IDROOT%-%TEXT%",\r
+      "killDateDays": 7,\r
       "temporaryCopy": true,\r
-      "killDateDays": 5,\r
+      "saveArchiveMetadata": false,\r
       "remote": {\r
-        "address": "ftp://10.10.1.100:21/ARCHIVE/TESZT",\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
+    {\r
+      "label": "Promo 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": 30,\r
+      "temporaryCopy": true,\r
+      "saveArchiveMetadata": false,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/PROMO_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
+      "temporaryCopy": true,\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": "TQC check",\r
+      "processor": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "killDateDays": 7,\r
+      "temporaryCopy": true,\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": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "killDateDays": 7,\r
+      "temporaryCopy": true,\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": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "killDateDays": 7,\r
+      "temporaryCopy": true,\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

diff --git a/client/Maestro/Configuration/configuration-studio1.json b/client/Maestro/Configuration/configuration-studio1.json
new file mode 100644 (file)
index 0000000..575cc83
--- /dev/null
+++ b/client/Maestro/Configuration/configuration-studio1.json
@@ -0,0 +1,65 @@
+{\r
+  "title": "NEXIO2UNC_FXP",\r
+  "active": false,\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://localhost:8888/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": "Archiválás",\r
+      "processor": "FXPTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Archiválás",\r
+      "saveArchiveMetadata": true,\r
+      "deleteAfterCopy": false,\r
+      "temporaryCopy": true,\r
+      "killDateDays": 5,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100:21/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-tqc-archive.json b/client/Maestro/Configuration/configuration-tqc-archive.json
index 6c41a8bdace9ebb11cfd910e2a3c100564485dec..5fcb4d03b521366f5c96f47b2f23f9e78eec451c 100644 (file)
--- a/client/Maestro/Configuration/configuration-tqc-archive.json
+++ b/client/Maestro/Configuration/configuration-tqc-archive.json
@@ -1,6 +1,6 @@
 {\r
   "title": "Playout_NLE",\r
-  "active": true,\r
+  "active": false,\r
   "startInTray": false,\r
   "enableCustomMetadataId": true,\r
   "player": {\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 646d9390de19e9895e3973c97b21ce77cb8f70d8..059b858c1bd1138b6274531481a71a40f23cac46 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -111,7 +111,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">\r
-    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <OutputPath>..\bin\Maestro\x64\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <Optimize>true</Optimize>\r
     <DebugType>pdbonly</DebugType>\r
@@ -305,6 +305,9 @@
     <None Include="Configuration\-configuration-transcoder.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
+    <None Include="Configuration\configuration-studio.json">\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Configuration\global.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
@@ -367,7 +370,7 @@
     <None Include="Configuration\-configuration-sxs.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\configuration-studio.json">\r
+    <None Include="Configuration\configuration-studio1.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
   </ItemGroup>\r