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

diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs
index fecc2459c5d4d428d8b76cfba8010765f59bdb94..921010f61a518a6c4a9c094ee196eefccdda8c6f 100644 (file)
--- a/client/DxPlay/PlayerGraph.cs
+++ b/client/DxPlay/PlayerGraph.cs
@@ -55,6 +55,9 @@ namespace DxPlay {
                         case VideoRendererType.DEFAULT:\r
                             AddDefaultRenderer(graphBuilder, sampleGrabber);\r
                             break;\r
+                        case VideoRendererType.AUTO:\r
+                            //AddDefaultRenderer(graphBuilder, sampleGrabber);\r
+                            break;\r
                     }\r
                     FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output");\r
                     ConfigureSimpleRenderer(handle);\r

diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json
index 253859b73c422093807d1dd6df4c7d4ff644d9c9..fe511d5e96e8e3619b4d264faa5c8229a5e2ed61 100644 (file)
--- a/client/Maestro/Configuration/configuration.json
+++ b/client/Maestro/Configuration/configuration.json
@@ -15,6 +15,7 @@
     "useAlternateCopy": false,\r
     "autoTarget": "AUTOTARGET",\r
     "autoTags": [ "AUTOTAG" ],\r
+    "disableAutoRefresh":  true,\r
     "local": {\r
       "address": "file://c:/_video/x",\r
       "userName": "mediacube",\r

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index 08c2527a54246505313d058965da220764ac23ae..1a32df9b06a04414bf70bf7e2df3caeb60b55225 100644 (file)
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -13,8 +13,9 @@
     "$type": "UNCSource",\r
     "filter": "avi,wav,mxf,mts,mov",\r
     "useAlternateCopy": true,\r
+    "disableAutoRefresh": true,\r
     "local": {\r
-      "address": "file://c:/_video"\r
+      "address": "file://e:/_video"\r
     }\r
   },\r
   "metadatas": [\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index beb0f13a71a6c8605c956f1ee3cf9dfcf07ec471..3ee89135e58a602c68a269c24926a878c70ddcf4 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -420,9 +420,15 @@ namespace Maestro {
             SelectedMetadata = new MetadataInfo() {\r
                 Kind = metadataType,\r
                 ID = name,\r
-                MetadataText = text,\r
-                VariantID = int.Parse(id)\r
+                MetadataText = text\r
             };\r
+\r
+\r
+            //neha nem szam az id jo: 464947220 rossz: P122165A\r
+            try {\r
+                SelectedMetadata.VariantID = int.Parse(id);\r
+            } catch (Exception e) {\r
+            }\r
         }\r
 \r
         private void OnTrafficIDSelected(string id, int variantID, string serialID, string text, List<TrafficItem> selected) {\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index a5e7fa5b4022370e8fbdeb7a8185305ab38ea499..fe2c93ffbbd359df371c8be255711ea1b014b33a 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -69,8 +69,12 @@ namespace Maestro {
             if (Configuration?.Source is UNCSource) {\r
                 btnShowFolders.Enabled = true;\r
                 logger.Debug("UNC source initialization");\r
-                source = new FileSystemSource(this, MessageBus, Configuration.Player.Enabled, Configuration.Source.Filter);\r
-                ((FileSystemSource)source).OnListReadCompleted += MaestroForm_OnListReadCompleted;\r
+                var srcConf = Configuration?.Source as UNCSource;\r
+                source = new FileSystemSource(this, MessageBus, Configuration.Player.Enabled, srcConf.Filter, srcConf.DisableAutoRefresh);\r
+                FileSystemSource fsrc = (FileSystemSource)source;\r
+                fsrc.OnListReadCompleted += MaestroForm_OnListReadCompleted;\r
+                fsrc.OnListChanged += MaestroForm_OnListChanegd;\r
+\r
                 logger.Debug("UNC source created");\r
             }\r
             if (Configuration?.Source is NEXIOSource) {\r
@@ -87,8 +91,13 @@ namespace Maestro {
 \r
             treeFolders.NodeDoubleClick += OnDoubleClickFolder;\r
         }\r
+        private void MaestroForm_OnListChanegd()\r
+        {\r
+            logger.Info("List changed");\r
+            picRefreshFileList.BackColor = Color.Red;\r
+        }\r
 \r
-        private void MaestroForm_OnListReadCompleted(string[] files) {\r
+            private void MaestroForm_OnListReadCompleted(string[] files) {\r
             logger.Info("Checking AUTOTARGET");\r
 \r
             //nem UNC forras\r
@@ -490,6 +499,7 @@ namespace Maestro {
 \r
         // Kattintas a frissites gombon\r
         private void picRefreshFileList_Click(object sender, EventArgs e) {\r
+            picRefreshFileList.BackColor = Color.Transparent;\r
             RefreshSource();\r
         }\r
 \r

diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx
index 5ec29ae87d23ab1a413439b508242c7205dc17c6..7ca218c8a2bb3e746eeb1d7099c3949c9694015a 100644 (file)
--- a/client/Maestro/MaestroForm.resx
+++ b/client/Maestro/MaestroForm.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAcgBAgHIAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAdgBAgHYAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index 0f5ea85d6ff6c4fc2aca682a53ac68da4f1a9164..685180fbba81adeac06fdc1e35ada79f275e7aaf 100644 (file)
--- a/client/Maestro/Properties/AssemblyInfo.cs
+++ b/client/Maestro/Properties/AssemblyInfo.cs
@@ -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.1.1.2")]\r
-[assembly: AssemblyFileVersion("2.1.1.2")]\r
+[assembly: AssemblyVersion("2.1.1.4")]\r
+[assembly: AssemblyFileVersion("2.1.1.4")]\r

diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs
index c8390e87ebebed49bf8d8c520fa35f9af28fb844..1f5c22879bdcf9fda83954d56f4151361e6a02e4 100644 (file)
--- a/client/Maestro/Sources/FileSystemSource.cs
+++ b/client/Maestro/Sources/FileSystemSource.cs
@@ -16,6 +16,9 @@ namespace Maestro.Sources {
         public delegate void ListReadCompletedHandler(string[] files);\r
         public event ListReadCompletedHandler OnListReadCompleted;\r
 \r
+        public delegate void ListChangedHandler();\r
+        public event ListChangedHandler OnListChanged;\r
+\r
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();\r
         private IMessageBus messageBus;\r
         private List<CreatedFileMonitor> createdFileMonitors = new List<CreatedFileMonitor>();\r
@@ -97,6 +100,7 @@ namespace Maestro.Sources {
         }\r
 \r
         public bool PlayerEnabled { get; private set; }\r
+        public bool DisableAutoRefresh { get; }\r
         public string Path { get; private set; }\r
 \r
         private void Refresh() {\r
@@ -159,8 +163,9 @@ namespace Maestro.Sources {
             Shutdown();\r
         }\r
 \r
-        public FileSystemSource(Control parent, IMessageBus messageBus, bool playerEnabled, string fileExtensionFilter) {\r
+        public FileSystemSource(Control parent, IMessageBus messageBus, bool playerEnabled, string fileExtensionFilter, bool disableAutoRefresh) {\r
             PlayerEnabled = playerEnabled;\r
+            DisableAutoRefresh = disableAutoRefresh;\r
             SortProperty = TypeDescriptor.GetProperties(typeof(FileSourceItem)).Find("Created", false);\r
             SortDirection = ListSortDirection.Descending;\r
             this.parent = parent;\r
@@ -283,6 +288,11 @@ namespace Maestro.Sources {
         }\r
 \r
         public void OnRenamed(object sender, RenamedEventArgs e) {\r
+            if (DisableAutoRefresh) {\r
+                OnListChanged?.Invoke();\r
+                return;\r
+            }\r
+\r
             if (!string.IsNullOrEmpty(filter))\r
                 return;\r
             logger.Trace("Entry");\r
@@ -317,6 +327,11 @@ namespace Maestro.Sources {
         }\r
 \r
         private void OnChanged(object sender, FileSystemEventArgs e) {\r
+            if (DisableAutoRefresh) {\r
+                OnListChanged?.Invoke();\r
+                return;\r
+            }\r
+\r
             if (!string.IsNullOrEmpty(filter))\r
                 return;\r
             logger.Trace("Entry");\r
@@ -339,6 +354,11 @@ namespace Maestro.Sources {
 \r
 \r
         private void OnCreated(object sender, FileSystemEventArgs e) {\r
+            if (DisableAutoRefresh) {\r
+                OnListChanged?.Invoke();\r
+                return;\r
+            }\r
+\r
             if (!String.IsNullOrEmpty(filter))\r
                 return;\r
             logger.Trace("Entry");\r
@@ -359,6 +379,11 @@ namespace Maestro.Sources {
         }\r
 \r
         private void OnDeleted(object sender, FileSystemEventArgs e) {\r
+            if (DisableAutoRefresh) {\r
+                OnListChanged?.Invoke();\r
+                return;\r
+            }\r
+\r
             if (!string.IsNullOrEmpty(filter))\r
                 return;\r
             logger.Trace("Entry");\r
@@ -382,11 +407,17 @@ namespace Maestro.Sources {
 \r
         private void SafeDeleteItem(FileSourceItem item) {\r
             parent.SafeCall(() => {\r
-                Remove(item);\r
-                messageBus.Send(new RemoveFileActionMsg() {\r
-                    FileName = item.Name,\r
-                    Source = parent\r
-                });\r
+                try {\r
+\r
+                    logger.Info(@"Removing " + item.Name);\r
+                    Remove(item);\r
+                    messageBus.Send(new RemoveFileActionMsg() {\r
+                        FileName = item.Name,\r
+                        Source = parent\r
+                    });\r
+                } catch (Exception e) {\r
+                    logger.Error(e.Message);\r
+                }\r
             });\r
         }\r
 \r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index f53bcd4d4bdf83124eb0f0d856fdf1c554c62d9f..8089f56deece10f332184dc0709a7aae1b360198 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -153,6 +153,7 @@ namespace MaestroShared.Configuration {
     public class UNCSource : Source {\r
         public bool FoldersAutoExpand { get; set; }\r
         public bool UseAlternateCopy { get; set; }\r
+        public bool DisableAutoRefresh { get; set; }\r
     }\r
 \r
     public class NEXIOSource : Source {\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index e5e31e594b51b33182302169236fd0b2b26af26e..23e2543da5e3aff9be99786005256160c3b4c6cc 100644 (file)
--- a/client/MaestroShared/Properties/AssemblyInfo.cs
+++ b/client/MaestroShared/Properties/AssemblyInfo.cs
@@ -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.1.0.9")]\r
-[assembly: AssemblyFileVersion("2.1.0.9")]\r
+[assembly: AssemblyVersion("2.1.1.0")]\r
+[assembly: AssemblyFileVersion("2.1.1.0")]\r

diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataUpdater.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataUpdater.java
index 681618a71ff5a4a26acc962182ddd21316930ee8..a28abfa2745167f6077d265dabf70d7bb4196f4b 100644 (file)
--- a/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataUpdater.java
+++ b/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataUpdater.java
@@ -101,11 +101,11 @@ public class MetadataUpdater extends JobStep {
                        long[] current = new long[1];\r
                        current[0] = 0;\r
 \r
-                       logger.info(csvMarker, "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;"\r
-                                       + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;"\r
-                                       + "mediaDescription;P mediaDescription;mediaDescriptionEquals;");\r
-                       \r
-                       \r
+                       logger.info(csvMarker,\r
+                                       "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;"\r
+                                                       + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;"\r
+                                                       + "mediaDescription;P mediaDescription;mediaDescriptionEquals;");\r
+\r
                        sql = createQuery();\r
                        manager.executeQuery(sql, rs -> {\r
 \r
@@ -114,7 +114,7 @@ public class MetadataUpdater extends JobStep {
 \r
                                current[0]++;\r
                                processRecord(rs);\r
-                               int p = (int) current[0] * 100 / (int) count[0];\r
+                               int p = ((int) current[0] * 100) / ((int) count[0]);\r
                                setProgress(p);\r
                                return true;\r
                        }, null);\r
@@ -131,7 +131,7 @@ public class MetadataUpdater extends JobStep {
 \r
        private void processRecord(ResultSet rs) {\r
                try {\r
-                       String itemHouseId = set(rs.getString(ITEM_TITLE));\r
+                       String itemHouseId = set(rs.getString(ITEM_HOUSEID));\r
                        String itemTitle = set(rs.getString(ITEM_TITLE));\r
                        String mediaHouseId = set(rs.getString(MEDIA_HOUSEID));\r
                        String mediaTitle = set(rs.getString(MEDIA_TITLE));\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataUpdater.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataUpdater.java
index 681618a71ff5a4a26acc962182ddd21316930ee8..a28abfa2745167f6077d265dabf70d7bb4196f4b 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataUpdater.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataUpdater.java
@@ -101,11 +101,11 @@ public class MetadataUpdater extends JobStep {
                        long[] current = new long[1];\r
                        current[0] = 0;\r
 \r
-                       logger.info(csvMarker, "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;"\r
-                                       + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;"\r
-                                       + "mediaDescription;P mediaDescription;mediaDescriptionEquals;");\r
-                       \r
-                       \r
+                       logger.info(csvMarker,\r
+                                       "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;"\r
+                                                       + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;"\r
+                                                       + "mediaDescription;P mediaDescription;mediaDescriptionEquals;");\r
+\r
                        sql = createQuery();\r
                        manager.executeQuery(sql, rs -> {\r
 \r
@@ -114,7 +114,7 @@ public class MetadataUpdater extends JobStep {
 \r
                                current[0]++;\r
                                processRecord(rs);\r
-                               int p = (int) current[0] * 100 / (int) count[0];\r
+                               int p = ((int) current[0] * 100) / ((int) count[0]);\r
                                setProgress(p);\r
                                return true;\r
                        }, null);\r
@@ -131,7 +131,7 @@ public class MetadataUpdater extends JobStep {
 \r
        private void processRecord(ResultSet rs) {\r
                try {\r
-                       String itemHouseId = set(rs.getString(ITEM_TITLE));\r
+                       String itemHouseId = set(rs.getString(ITEM_HOUSEID));\r
                        String itemTitle = set(rs.getString(ITEM_TITLE));\r
                        String mediaHouseId = set(rs.getString(MEDIA_HOUSEID));\r
                        String mediaTitle = set(rs.getString(MEDIA_TITLE));\r