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

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 5d7da90c5c9274bd3178f3e9f5f7f9a3aa51cf94..5e1eb7d3f2ef340befa848c100a8477fdb7121d1 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -86,19 +86,18 @@ namespace Maestro {
             form.ShowDialog();\r
         }\r
 \r
-        private IDTypes GetSelectedMetadataType() {\r
+        private IDTypes GetIDType(string id) {\r
             IDTypes result = IDTypes.None;\r
-            string id = textSelectedMetadata.Text;\r
-            if (String.IsNullOrEmpty(id))\r
-                return IDTypes.None;\r
-            string pattern = "[A-Z]{1}[0-9]{6}[A-Z]{1}";\r
-            Match match = Regex.Match(id, pattern);\r
-            if (match.Success) {\r
-                result = IDTypes.TrafficID;\r
-            } else {\r
-                pattern = "^[0-9]+$";\r
-                match = Regex.Match(id, pattern);\r
-                result = match.Success ? IDTypes.OctopusID : IDTypes.None;\r
+            if (!String.IsNullOrEmpty(id)) {\r
+                Match match = Regex.Match(id, "[A-Z]{1}[0-9]{6}[A-Z]{1}");\r
+                if (match.Success)\r
+                    result = IDTypes.TrafficID;\r
+                else {\r
+                    //"^[0-9]+$";\r
+                    match = Regex.Match(id, "[0-9]");\r
+                    if (match.Success)\r
+                        result = IDTypes.OctopusID;\r
+                }\r
             }\r
             return result;\r
         }\r
@@ -140,7 +139,7 @@ namespace Maestro {
 \r
         private void TrafficIDSelected(string selectedID, int variantID) {\r
             SelectedMetadata = new MetadataInfo() {\r
-                Kind = MetadataType.Traffic,\r
+                Kind = GetTrafficMetadataType(selectedID),\r
                 Tooltip = "Epizod ID",\r
                 ID = selectedID,\r
                 VariantID = variantID\r
@@ -148,6 +147,22 @@ namespace Maestro {
             // EnableArchiveMetadataButtonAndCreateMetadataModel();\r
         }\r
 \r
+        private MetadataType GetTrafficMetadataType(string id) {\r
+            MetadataType result = MetadataType.TrafficMaterial;\r
+            switch (id[0]) {\r
+                case 'M':\r
+                    result = MetadataType.TrafficMaterial;\r
+                    break;\r
+                case 'P':\r
+                    result = MetadataType.TrafficPromo;\r
+                    break;\r
+                case 'R':\r
+                    result = MetadataType.TrafficAD;\r
+                    break;\r
+            }\r
+            return result;\r
+        }\r
+\r
         private void EnableArchiveMetadataButtonAndCreateMetadataModel() {\r
             ctxiModifyArchiveMetadata.Enabled = selectedMetadata != null;\r
             if (ctxiModifyArchiveMetadata.Enabled) {\r
@@ -158,11 +173,11 @@ namespace Maestro {
 \r
         private ArchiveMetadata GetArchiveMetadata() {\r
             ArchiveMetadata result = null;\r
+            IDTypes idType = GetIDType(textSelectedMetadata.Text);\r
             Cursor.Current = Cursors.WaitCursor;\r
-            IDTypes idType = GetSelectedMetadataType();\r
             if (idType == IDTypes.OctopusID)\r
                 result = GetOctopusMetadata();\r
-            else //if (idType == IDTypes.TrafficID)\r
+            if (idType == IDTypes.TrafficID)\r
                 result = GetTrafficMetadata();\r
             Cursor.Current = Cursors.Default;\r
             return result;\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 66040d89862bffb08d8766ee9b342f148ec75bbb..15b8dcd4146ed3e1031608530dbb697e8fb989ad 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -9,7 +9,6 @@ using System.Collections.ObjectModel;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
-using System.Linq;\r
 \r
 namespace Maestro {\r
 \r
@@ -60,8 +59,6 @@ namespace Maestro {
             bindingSource.DataSource = source;\r
             dataGridSource.Columns.AddRange(new DataGridViewCheckBoxColumn());\r
             dataGridSource.Columns.AddRange(source.Columns);\r
-\r
-\r
         }\r
 \r
         private void SetSourceTitle(String text) {\r
@@ -112,7 +109,7 @@ namespace Maestro {
             if (selectedrows == null)\r
                 return;\r
             if (e.ColumnIndex == 0) {\r
-                SetSourceFromCheckBoxAction(selectedrows);\r
+                UpdateSelectedSources(selectedrows);\r
                 return;\r
             }\r
             if (IsPlayColumn(e.ColumnIndex)) {\r
@@ -130,7 +127,7 @@ namespace Maestro {
             }\r
         }\r
 \r
-        private void SetSourceFromCheckBoxAction(DataGridViewSelectedRowCollection selectedRows) {\r
+        private void UpdateSelectedSources(DataGridViewSelectedRowCollection selectedRows) {\r
             String name;\r
             bool valueOfCheckBoxes = GetValueOfCheckBoxes(selectedRows);\r
             int nameIndex = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
@@ -175,12 +172,13 @@ namespace Maestro {
             SetStartingName(checkBox);\r
             if (selectedSourceRows == null || selectedSourceRows.Count == 0) {\r
                 buttonMetadata.Enabled = false;\r
-                IsSelectedFileAnID();\r
+                \r
+                //IsSelectedFileAnID();\r
                 return;\r
             }\r
             if (selectedSourceRows.Count == 1) {\r
                 buttonMetadata.Enabled = true;\r
-                IsSelectedFileAnID();\r
+                //IsSelectedFileAnID();\r
                 return;\r
             }\r
             int index = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
@@ -194,7 +192,7 @@ namespace Maestro {
                 }\r
             }\r
             buttonMetadata.Enabled = true;\r
-            IsSelectedFileAnID();\r
+            //IsSelectedFileAnID();\r
         }\r
 \r
         private void SetStartingName(bool checkBox) {\r
@@ -266,7 +264,7 @@ namespace Maestro {
             if (e.RowIndex < 0)\r
                 return;\r
             var selectedRows = dataGridSource.SelectedRows;\r
-            SetSourceFromCheckBoxAction(selectedRows);\r
+            UpdateSelectedSources(selectedRows);\r
         }\r
 \r
         public void SourceDeleted(String fileName) {\r
@@ -293,7 +291,7 @@ namespace Maestro {
         private void dataGridSource_KeyDown(object sender, KeyEventArgs e) {\r
             if (e.KeyCode == Keys.Space && dataGridSource.CurrentCell.GetType() != typeof(DataGridViewCheckBoxCell)) {\r
                 var selectedRows = dataGridSource.SelectedRows;\r
-                SetSourceFromCheckBoxAction(selectedRows);\r
+                UpdateSelectedSources(selectedRows);\r
             }\r
         }\r
     }\r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index 365f30495914e121565fc9ca1f5af5034f775b46..067107aa066608176ff03c20d6bafe1b049fc0b2 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Windows.Forms;\r
 using Maestro.Metadata;\r
 using System.Collections.Generic;\r
-using System.Text.RegularExpressions;\r
 using TrafficClient;\r
 using JobEngineClient;\r
 \r
@@ -212,28 +211,20 @@ namespace Maestro {
                 ChangeProcessButtonsState(false);\r
             }\r
 \r
-            if (Configuration.Player != null)\r
-                ctxiDefineSegments.Enabled = SelectedSource?.FileInfo != null && Configuration.Player.SegmentEditor && MetadataType.Traffic.Equals(SelectedMetadata?.Kind);\r
-            IsSelectedFileAnID();\r
+            UpdateDefineSegmentEnabled();\r
             EnableArchiveMetadataButtonAndCreateMetadataModel();\r
         }\r
 \r
-\r
-        private void IsSelectedFileAnID() {\r
-            IDType = IDTypes.None;\r
-            if (String.IsNullOrEmpty(startingName))\r
-                return;\r
-            Match match = Regex.Match(startingName, "[A-Z]{1}[0-9]{6}[A-Z]{1}");\r
-            if (match.Success) {\r
-                IDType = IDTypes.TrafficID;\r
-                return;\r
-            }\r
-\r
-            match = Regex.Match(startingName, "[0-9]");\r
-            if (match.Success)\r
-                IDType = IDTypes.OctopusID;\r
-            \r
-            buttonMetadata.Enabled = IDType != IDTypes.None;\r
+        private void UpdateDefineSegmentEnabled() {\r
+            MetadataType[] validTypes = { MetadataType.TrafficAD, MetadataType.TrafficMaterial, MetadataType.TrafficPromo };\r
+            ctxiDefineSegments.Enabled =\r
+                                        Configuration.Player != null &&\r
+                                        Configuration.Player.SegmentEditor &&\r
+                                        SelectedSource != null &&\r
+                                        SelectedSource.FileInfo != null &&\r
+                                        SelectedMetadata != null &&\r
+                                        validTypes.ToList().Contains(SelectedMetadata.Kind);\r
+            buttonMetadata.Enabled = GetIDType(startingName) != IDTypes.None;\r
         }\r
 \r
         public void OnTargetPanelsMouseClick(object sender, MouseEventArgs e) {\r
@@ -265,8 +256,7 @@ namespace Maestro {
                 ChangeProcessButtonsState(false);\r
             }\r
 \r
-            if (Configuration.Player != null)\r
-                ctxiDefineSegments.Enabled = SelectedSource?.FileInfo != null && Configuration.Player.SegmentEditor && MetadataType.Traffic.Equals(SelectedMetadata?.Kind);\r
+            UpdateDefineSegmentEnabled();\r
         }\r
 \r
     }\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index f1b32cd77ee0fd5195efa701963df7967aaf9d59..5b8c3585b5fe36e583979ff19299c0ad7405129d 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -180,7 +180,6 @@ namespace Maestro {
         }\r
 \r
         private void buttonMetadata_Click(object sender, EventArgs e) {\r
-            IsSelectedFileAnID();\r
             switch (IDType) {\r
                 case Metadata.IDTypes.TrafficID:\r
                     SetTrafficIDToMetadataText();\r

diff --git a/client/Maestro/Metadata/MetaDataInfo.cs b/client/Maestro/Metadata/MetaDataInfo.cs
index 33eed301e310bd682c896ffbe2c60b75ae4bc88e..d0afc2349bad0e9c4f39114d2c2c70aaa832fcbf 100644 (file)
--- a/client/Maestro/Metadata/MetaDataInfo.cs
+++ b/client/Maestro/Metadata/MetaDataInfo.cs
@@ -4,5 +4,6 @@
         public string Tooltip { get; set; }\r
         public MetadataType Kind { get; set; }\r
         public int VariantID { get; set; }\r
+\r
     }\r
 }\r

diff --git a/client/Maestro/Metadata/MetadataType.cs b/client/Maestro/Metadata/MetadataType.cs
index 80088e7896ac5762e0c0a036a9fce3d8fe940cab..bfbd4ed5b594a9161fbcbfde1e5e72e7b4a3c37c 100644 (file)
--- a/client/Maestro/Metadata/MetadataType.cs
+++ b/client/Maestro/Metadata/MetadataType.cs
@@ -1,5 +1,5 @@
 namespace Maestro.Metadata {\r
     public enum MetadataType {\r
-        OctopusStory, OctopusPlaceHolder, Traffic, Archive\r
+        OctopusStory, OctopusPlaceHolder, TrafficMaterial, TrafficPromo, TrafficAD \r
     }\r
 }\r

diff --git a/client/Maestro/Targets/FTPTargetProcessor.cs b/client/Maestro/Targets/FTPTargetProcessor.cs
index 005b588bf7799ee8b2b767ebbd1a0dc039026440..39faad523cc627cb9c83e625bb6b73b7cef720fc 100644 (file)
--- a/client/Maestro/Targets/FTPTargetProcessor.cs
+++ b/client/Maestro/Targets/FTPTargetProcessor.cs
@@ -50,11 +50,14 @@ namespace Maestro.Targets {
                 }\r
             }\r
             FtpReply reply = targetFTP.GetReply();\r
-            if ((reply.Success && "226".Equals(reply.Code) && !FileExists(OutputName)) || \r
-                !reply.Success || \r
-                (reply.Success && !"226".Equals(reply.Code))) {\r
+            if (!reply.Success || !"226".Equals(reply.Code)) {\r
                 throw new Exception("Feltöltési hiba.");\r
             }\r
+            //if ((reply.Success && "226".Equals(reply.Code) && !FileExists(OutputName)) || \r
+            //    !reply.Success || \r
+            //    (reply.Success && !"226".Equals(reply.Code))) {\r
+            //    throw new Exception("Feltöltési hiba.");\r
+            //}\r
         }\r
 \r
         protected void reconnect() {\r
@@ -76,6 +79,10 @@ namespace Maestro.Targets {
                     ostream.Close();\r
                 }\r
             }\r
+            FtpReply reply = targetFTP.GetReply();\r
+            if (!reply.Success || !"226".Equals(reply.Code)) {\r
+                throw new Exception("Feltöltési hiba.");\r
+            }\r
         }\r
 \r
         protected override bool FileExists(string path) {\r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index 332270d94546a3e477e1f47555e4c84501f38a05..33ee24e94c4743a38030c0b3b0a0b8506e158890 100644 (file)
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -186,7 +186,7 @@ namespace Maestro.Targets {
             string fileName = String.Format(KILLDATE_FILE, OutputName, date.ToString("yyyyMMdd"));\r
             logger.Debug("Creating KILLDATE status file {0}", fileName);\r
             KillDatePath = Path.Combine(statusWorkDir, fileName);\r
-            UploadContent(KillDatePath, new byte[] { });\r
+            UploadContent(fileName, new byte[] { });\r
             KillDate = date.ToString("yyyy.MM.dd");\r
         }\r
 \r
@@ -200,7 +200,6 @@ namespace Maestro.Targets {
             UploadContent(Path.Combine(statusWorkDir, fileName), content);\r
         }\r
 \r
-\r
         protected void CopyStream(Stream istream, long ilength, Stream ostream) {\r
             byte[] buffer = new byte[32768];\r
             int read, overall = 0;\r

diff --git a/client/PasswordEncrypter/PasswordEncrypter.csproj.vspscc b/client/PasswordEncrypter/PasswordEncrypter.csproj.vspscc
new file mode 100644 (file)
index 0000000..feffdec
--- /dev/null
+++ b/client/PasswordEncrypter/PasswordEncrypter.csproj.vspscc
@@ -0,0 +1,10 @@
+""\r
+{\r
+"FILE_VERSION" = "9237"\r
+"ENLISTMENT_CHOICE" = "NEVER"\r
+"PROJECT_FILE_RELATIVE_PATH" = ""\r
+"NUMBER_OF_EXCLUDED_FILES" = "0"\r
+"ORIGINAL_PROJECT_FILE_PATH" = ""\r
+"NUMBER_OF_NESTED_PROJECTS" = "0"\r
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"\r
+}\r