From: vasary.daniel Date: Fri, 17 Sep 2021 09:02:04 +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=88e74a1d3199c0b9986481c6a0a8f17e43aa10a3;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32335 --- diff --git a/client/DxPlay/PlayerGraph.cs b/client/DxPlay/PlayerGraph.cs index fecc2459..921010f6 100644 --- a/client/DxPlay/PlayerGraph.cs +++ b/client/DxPlay/PlayerGraph.cs @@ -55,6 +55,9 @@ namespace DxPlay { case VideoRendererType.DEFAULT: AddDefaultRenderer(graphBuilder, sampleGrabber); break; + case VideoRendererType.AUTO: + //AddDefaultRenderer(graphBuilder, sampleGrabber); + break; } FilterGraphTools.RenderPin(graphBuilder, sampleGrabber, "Output"); ConfigureSimpleRenderer(handle); diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json index 253859b7..fe511d5e 100644 --- a/client/Maestro/Configuration/configuration.json +++ b/client/Maestro/Configuration/configuration.json @@ -15,6 +15,7 @@ "useAlternateCopy": false, "autoTarget": "AUTOTARGET", "autoTags": [ "AUTOTAG" ], + "disableAutoRefresh": true, "local": { "address": "file://c:/_video/x", "userName": "mediacube", diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json index 08c2527a..1a32df9b 100644 --- a/client/Maestro/Configuration/dev-local.json +++ b/client/Maestro/Configuration/dev-local.json @@ -13,8 +13,9 @@ "$type": "UNCSource", "filter": "avi,wav,mxf,mts,mov", "useAlternateCopy": true, + "disableAutoRefresh": true, "local": { - "address": "file://c:/_video" + "address": "file://e:/_video" } }, "metadatas": [ diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index beb0f13a..3ee89135 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -420,9 +420,15 @@ namespace Maestro { SelectedMetadata = new MetadataInfo() { Kind = metadataType, ID = name, - MetadataText = text, - VariantID = int.Parse(id) + MetadataText = text }; + + + //neha nem szam az id jo: 464947220 rossz: P122165A + try { + SelectedMetadata.VariantID = int.Parse(id); + } catch (Exception e) { + } } private void OnTrafficIDSelected(string id, int variantID, string serialID, string text, List selected) { diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index a5e7fa5b..fe2c93ff 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -69,8 +69,12 @@ namespace Maestro { if (Configuration?.Source is UNCSource) { btnShowFolders.Enabled = true; logger.Debug("UNC source initialization"); - source = new FileSystemSource(this, MessageBus, Configuration.Player.Enabled, Configuration.Source.Filter); - ((FileSystemSource)source).OnListReadCompleted += MaestroForm_OnListReadCompleted; + var srcConf = Configuration?.Source as UNCSource; + source = new FileSystemSource(this, MessageBus, Configuration.Player.Enabled, srcConf.Filter, srcConf.DisableAutoRefresh); + FileSystemSource fsrc = (FileSystemSource)source; + fsrc.OnListReadCompleted += MaestroForm_OnListReadCompleted; + fsrc.OnListChanged += MaestroForm_OnListChanegd; + logger.Debug("UNC source created"); } if (Configuration?.Source is NEXIOSource) { @@ -87,8 +91,13 @@ namespace Maestro { treeFolders.NodeDoubleClick += OnDoubleClickFolder; } + private void MaestroForm_OnListChanegd() + { + logger.Info("List changed"); + picRefreshFileList.BackColor = Color.Red; + } - private void MaestroForm_OnListReadCompleted(string[] files) { + private void MaestroForm_OnListReadCompleted(string[] files) { logger.Info("Checking AUTOTARGET"); //nem UNC forras @@ -490,6 +499,7 @@ namespace Maestro { // Kattintas a frissites gombon private void picRefreshFileList_Click(object sender, EventArgs e) { + picRefreshFileList.BackColor = Color.Transparent; RefreshSource(); } diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx index 5ec29ae8..7ca218c8 100644 --- a/client/Maestro/MaestroForm.resx +++ b/client/Maestro/MaestroForm.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS - CAAAAk1TRnQBSQFMAgEBAgEAAcgBAgHIAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAdgBAgHYAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 0f5ea85d..685180fb 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.1.2")] -[assembly: AssemblyFileVersion("2.1.1.2")] +[assembly: AssemblyVersion("2.1.1.4")] +[assembly: AssemblyFileVersion("2.1.1.4")] diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs index c8390e87..1f5c2287 100644 --- 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); public event ListReadCompletedHandler OnListReadCompleted; + public delegate void ListChangedHandler(); + public event ListChangedHandler OnListChanged; + private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private IMessageBus messageBus; private List createdFileMonitors = new List(); @@ -97,6 +100,7 @@ namespace Maestro.Sources { } public bool PlayerEnabled { get; private set; } + public bool DisableAutoRefresh { get; } public string Path { get; private set; } private void Refresh() { @@ -159,8 +163,9 @@ namespace Maestro.Sources { Shutdown(); } - public FileSystemSource(Control parent, IMessageBus messageBus, bool playerEnabled, string fileExtensionFilter) { + public FileSystemSource(Control parent, IMessageBus messageBus, bool playerEnabled, string fileExtensionFilter, bool disableAutoRefresh) { PlayerEnabled = playerEnabled; + DisableAutoRefresh = disableAutoRefresh; SortProperty = TypeDescriptor.GetProperties(typeof(FileSourceItem)).Find("Created", false); SortDirection = ListSortDirection.Descending; this.parent = parent; @@ -283,6 +288,11 @@ namespace Maestro.Sources { } public void OnRenamed(object sender, RenamedEventArgs e) { + if (DisableAutoRefresh) { + OnListChanged?.Invoke(); + return; + } + if (!string.IsNullOrEmpty(filter)) return; logger.Trace("Entry"); @@ -317,6 +327,11 @@ namespace Maestro.Sources { } private void OnChanged(object sender, FileSystemEventArgs e) { + if (DisableAutoRefresh) { + OnListChanged?.Invoke(); + return; + } + if (!string.IsNullOrEmpty(filter)) return; logger.Trace("Entry"); @@ -339,6 +354,11 @@ namespace Maestro.Sources { private void OnCreated(object sender, FileSystemEventArgs e) { + if (DisableAutoRefresh) { + OnListChanged?.Invoke(); + return; + } + if (!String.IsNullOrEmpty(filter)) return; logger.Trace("Entry"); @@ -359,6 +379,11 @@ namespace Maestro.Sources { } private void OnDeleted(object sender, FileSystemEventArgs e) { + if (DisableAutoRefresh) { + OnListChanged?.Invoke(); + return; + } + if (!string.IsNullOrEmpty(filter)) return; logger.Trace("Entry"); @@ -382,11 +407,17 @@ namespace Maestro.Sources { private void SafeDeleteItem(FileSourceItem item) { parent.SafeCall(() => { - Remove(item); - messageBus.Send(new RemoveFileActionMsg() { - FileName = item.Name, - Source = parent - }); + try { + + logger.Info(@"Removing " + item.Name); + Remove(item); + messageBus.Send(new RemoveFileActionMsg() { + FileName = item.Name, + Source = parent + }); + } catch (Exception e) { + logger.Error(e.Message); + } }); } diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index f53bcd4d..8089f56d 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -153,6 +153,7 @@ namespace MaestroShared.Configuration { public class UNCSource : Source { public bool FoldersAutoExpand { get; set; } public bool UseAlternateCopy { get; set; } + public bool DisableAutoRefresh { get; set; } } public class NEXIOSource : Source { diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index e5e31e59..23e2543d 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.0.9")] -[assembly: AssemblyFileVersion("2.1.0.9")] +[assembly: AssemblyVersion("2.1.1.0")] +[assembly: AssemblyFileVersion("2.1.1.0")] diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataUpdater.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataUpdater.java index 681618a7..a28abfa2 100644 --- 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]; current[0] = 0; - logger.info(csvMarker, "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;" - + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;" - + "mediaDescription;P mediaDescription;mediaDescriptionEquals;"); - - + logger.info(csvMarker, + "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;" + + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;" + + "mediaDescription;P mediaDescription;mediaDescriptionEquals;"); + sql = createQuery(); manager.executeQuery(sql, rs -> { @@ -114,7 +114,7 @@ public class MetadataUpdater extends JobStep { current[0]++; processRecord(rs); - int p = (int) current[0] * 100 / (int) count[0]; + int p = ((int) current[0] * 100) / ((int) count[0]); setProgress(p); return true; }, null); @@ -131,7 +131,7 @@ public class MetadataUpdater extends JobStep { private void processRecord(ResultSet rs) { try { - String itemHouseId = set(rs.getString(ITEM_TITLE)); + String itemHouseId = set(rs.getString(ITEM_HOUSEID)); String itemTitle = set(rs.getString(ITEM_TITLE)); String mediaHouseId = set(rs.getString(MEDIA_HOUSEID)); String mediaTitle = set(rs.getString(MEDIA_TITLE)); 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 681618a7..a28abfa2 100644 --- 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]; current[0] = 0; - logger.info(csvMarker, "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;" - + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;" - + "mediaDescription;P mediaDescription;mediaDescriptionEquals;"); - - + logger.info(csvMarker, + "Date;Name;isProgramById;includeContains;isMetadataEquals;itemHouseId;P itemHouseId;itemHouseIdEquals;itemTitle;P itemTitle;itemTitleEquals;mediaHouseId;" + + "P mediaHouseId;mediaHouseIdEquals;mediaTitle;P mediaTitle;mediaTitleEquals;" + + "mediaDescription;P mediaDescription;mediaDescriptionEquals;"); + sql = createQuery(); manager.executeQuery(sql, rs -> { @@ -114,7 +114,7 @@ public class MetadataUpdater extends JobStep { current[0]++; processRecord(rs); - int p = (int) current[0] * 100 / (int) count[0]; + int p = ((int) current[0] * 100) / ((int) count[0]); setProgress(p); return true; }, null); @@ -131,7 +131,7 @@ public class MetadataUpdater extends JobStep { private void processRecord(ResultSet rs) { try { - String itemHouseId = set(rs.getString(ITEM_TITLE)); + String itemHouseId = set(rs.getString(ITEM_HOUSEID)); String itemTitle = set(rs.getString(ITEM_TITLE)); String mediaHouseId = set(rs.getString(MEDIA_HOUSEID)); String mediaTitle = set(rs.getString(MEDIA_TITLE));