Refactor file association to use data provider and not data factory #…

…1843
Analogy-LogViewer · Sep 15, 2023 · 0f1f5d7 · 0f1f5d7
1 parent af9cc85
commit 0f1f5d7
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 25 deletions.
diff --git a/Analogy.Common/Interfaces/IFactoriesManager.cs b/Analogy.Common/Interfaces/IFactoriesManager.cs
@@ -35,7 +35,7 @@ IEnumerable<IAnalogyOfflineDataProvider> GetSupportedOfflineDataSourcesFromFacto
         bool IsBuiltInFactory(Guid factoryId);
         List<IAnalogyDataProviderSettings> GetProvidersSettings();
         Image GetLargeImage(Guid componentId);
-        FactoryContainer GetFactoryContainer(Guid componentId);
+        List<FactoryContainer> GetFactoryContainer(Guid componentId);
         Image? GetSmallImage(Guid componentId);
         IEnumerable<IAnalogyExtension> GetExtensions(IAnalogyDataProvider dataProvider);
         IEnumerable<IAnalogyExtension> GetAllExtensions();

diff --git a/Analogy.Common/Managers/DefaultFactoriesManager.cs b/Analogy.Common/Managers/DefaultFactoriesManager.cs
@@ -74,9 +74,9 @@ public Image GetLargeImage(Guid componentId)
             return Resources.Analogy_image_32x32;
         }
 
-        public FactoryContainer GetFactoryContainer(Guid componentId)
+        public List<FactoryContainer> GetFactoryContainer(Guid componentId)
         {
-            return null;
+            return new List<FactoryContainer>();
         }
 
         public Image? GetSmallImage(Guid componentId)

diff --git a/Analogy/Forms/FluentDesignMainForm.cs b/Analogy/Forms/FluentDesignMainForm.cs
@@ -324,11 +324,11 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
                     var associations = Settings.GetDataProvidesForFilesAssociations(files);
                     if (associations.Any())
                     {
-                        var parser = FactoriesManager.GetAllOfflineDataSources(associations).ToList();
-                        if (parser.Count == 1)
+                        var parsers = FactoriesManager.GetAllOfflineDataSources(associations).ToList();
+                        if (parsers.Count == 1 || parsers.Select(p => p.Id).Distinct().Count() == 1)
                         {
-                            LoadFactoryInAccordion(parser.First().Id);
-                            await OpenOfflineLogs(files, parser.First());
+                            LoadFactoryInAccordion(parsers.First().Id);
+                            await OpenOfflineLogs(files, parsers.First());
                         }
                         else
                         {
@@ -691,7 +691,8 @@ private void LoadFactoryInAccordion(Guid factoryId)
             }
             accordionControl.BeginUpdate();
             accordionControl.Clear();
-            FactoryContainer fc = FactoriesManager.GetFactoryContainer(factoryId) ?? FactoriesManager.GetBuiltInFactoryContainer(factoryId);
+            var containers = FactoriesManager.GetFactoryContainer(factoryId);
+            var fc = containers.Count == 1 ? containers.First() : FactoriesManager.GetBuiltInFactoryContainer(factoryId);
             activeProvider = fc.Factory.FactoryId;
             Settings.LastOpenedDataProvider = activeProvider;
 
@@ -902,8 +903,8 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
 
                 #endregion
 
-                FactoryContainer container = FactoriesManager.GetFactoryContainer(offlineAnalogy.Id);
-                IAnalogyImages? images = container?.Images?.FirstOrDefault();
+                var containers = FactoriesManager.GetFactoryContainer(offlineAnalogy.Id);
+                IAnalogyImages? images = containers.Count == 1 ? containers.First()?.Images?.FirstOrDefault() : null;
 
                 var preDefinedFolderExist = !string.IsNullOrEmpty(offlineAnalogy.InitialFolderFullPath) &&
                                             Directory.Exists(offlineAnalogy.InitialFolderFullPath);

diff --git a/Analogy/Forms/MainForm.cs b/Analogy/Forms/MainForm.cs
@@ -664,26 +664,31 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
                 }
                 else
                 {
-                    //try  from file association:
+                    //try from file association:
                     var associations = Settings.GetDataProvidesForFilesAssociations(files);
                     if (associations.Any())
                     {
                         var parsers = FactoriesManager.GetAllOfflineDataSources(associations).ToList();
-                        if (parsers.Count == 1)
+                        if (parsers.Count == 1 || parsers.Select(p => p.Id).Distinct().Count() == 1)
                         {
                             var parser = parsers.First();
                             var fc = FactoriesManager.GetFactoryContainer(parser.Id);
-                            RibbonPage? page = Mapping.TryGetValue(fc.Factory.FactoryId, out RibbonPage? value)
-                                ? value
-                                : null;
-                            if (page is not null)
+                            RibbonPage? page = null;
+                            if (fc.Any())
                             {
-                                ribbonControlMain.SelectPage(page);
+                                page = Mapping.TryGetValue(fc.First().Factory.FactoryId, out RibbonPage? value)
+                                    ? value
+                                    : null;
+                                if (page is not null)
+                                {
+                                    ribbonControlMain.SelectPage(page);
+                                }
                             }
                             await OpenOfflineLogs(page, files, parser);
                         }
                         else
                         {
+
                             XtraMessageBox.Show($@"More than one data provider detected for this file.{Environment.NewLine}Please open it directly from the data provider menu", "Unable to open file",
                                 MessageBoxButtons.OK,
                                 MessageBoxIcon.Error);
@@ -1477,10 +1482,8 @@ private void AddMultiplesOfflineDataSource(IAnalogyFactory primaryFactory, Ribbo
 
             Guid factoryId = factory.FactoryId;
             string factoryTitle = factory.Title;
-            FactoryContainer container = FactoriesManager.GetFactoryContainer(factoryId);
-            IAnalogyImages? images = container?.Images?.FirstOrDefault();
-
-
+            var containers = FactoriesManager.GetFactoryContainer(factoryId);
+            IAnalogyImages? images = containers.Count == 1 ? containers.First().Images?.FirstOrDefault() : null;
 
             #region Actions
             async Task OpenOffline(string titleOfDataSource, IAnalogyOfflineDataProvider dataProvider, string initialFolder,
@@ -1914,8 +1917,8 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
                 dockManager1.ClosedPanel += OnXtcLogsOnControlRemoved;
             }
             #endregion
-            FactoryContainer container = FactoriesManager.GetFactoryContainer(offlineAnalogy.Id);
-            IAnalogyImages? images = container?.Images?.FirstOrDefault();
+            var containers = FactoriesManager.GetFactoryContainer(offlineAnalogy.Id);
+            IAnalogyImages? images = containers.Count == 1 ? containers.First().Images?.FirstOrDefault() : null;
 
             var preDefinedFolderExist = !string.IsNullOrEmpty(offlineAnalogy.InitialFolderFullPath) &&
                                         Directory.Exists(offlineAnalogy.InitialFolderFullPath);

diff --git a/Analogy/Managers/FactoriesManager.cs b/Analogy/Managers/FactoriesManager.cs
@@ -186,8 +186,8 @@ public List<IAnalogyDataProviderSettings> GetProvidersSettings() => Factories
             }
             return null;
         }
-        public FactoryContainer GetFactoryContainer(Guid componentId)
-            => Factories.SingleOrDefault(f => f.ContainsDataProviderOrDataFactory(componentId));
+        public List<FactoryContainer> GetFactoryContainer(Guid componentId)
+            => Factories.Where(f => f.ContainsDataProviderOrDataFactory(componentId)).ToList();
 
         public Image? GetSmallImage(Guid componentId)
         {
@@ -590,6 +590,10 @@ public IEnumerable<IAnalogyOfflineDataProvider> GetAllOfflineDataSources(IEnumer
         {
             foreach (var fc in Factories)
             {
+                if (fc.FactorySetting.Status == DataProviderFactoryStatus.Disabled)
+                {
+                    continue;
+                }
                 foreach (var dpf in fc.DataProvidersFactories)
                 {
                     IEnumerable<IAnalogyOfflineDataProvider> supported =