3.0.5592.38336

Show plugins as "OutOfDate" if dependencies don't match.
FFXIVAPP · May 1, 2015 · 2a4de7d · 2a4de7d
1 parent c647174
commit 2a4de7d
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/FFXIVAPP.Client/Helpers/LocaleHelper.cs b/FFXIVAPP.Client/Helpers/LocaleHelper.cs
@@ -73,7 +73,7 @@ public static void Update(CultureInfo cultureInfo)
             var locale = dictionary.Cast<DictionaryEntry>()
                                    .ToDictionary(item => (string) item.Key, item => (string) item.Value);
             AppViewModel.Instance.Locale = locale;
-            foreach (PluginInstance pluginInstance in App.Plugins.Loaded)
+            foreach (var pluginInstance in App.Plugins.Loaded.Cast<PluginInstance>().Where(pluginInstance => pluginInstance.Loaded))
             {
                 pluginInstance.Instance.Locale = locale;
             }

diff --git a/FFXIVAPP.Client/Helpers/PluginCollectionHelper.cs b/FFXIVAPP.Client/Helpers/PluginCollectionHelper.cs
@@ -27,6 +27,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 // POSSIBILITY OF SUCH DAMAGE. 
 
+using System;
 using System.Collections;
 using System.Linq;
 using FFXIVAPP.Client.Models;
@@ -57,8 +58,15 @@ public void Remove(PluginInstance plugin)
         /// <returns> </returns>
         public PluginInstance Find(string plugin)
         {
-            return List.Cast<PluginInstance>()
-                       .FirstOrDefault(pluginInstance => (pluginInstance.Instance.Name.Equals(plugin, Constants.InvariantComparer)) || pluginInstance.AssemblyPath.Equals(plugin, Constants.InvariantComparer));
+            try
+            {
+                return List.Cast<PluginInstance>()
+                           .FirstOrDefault(pluginInstance => (pluginInstance.Instance.Name.Equals(plugin, Constants.InvariantComparer)) || pluginInstance.AssemblyPath.Equals(plugin, Constants.InvariantComparer));
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
         }
     }
 }
diff --git a/FFXIVAPP.Client/Helpers/TabItemHelper.cs b/FFXIVAPP.Client/Helpers/TabItemHelper.cs
@@ -80,6 +80,10 @@ public static void LoadPluginTabItem(PluginInstance pluginInstance)
         {
             try
             {
+                if (!pluginInstance.Loaded)
+                {
+                    return;
+                }
                 var pluginName = pluginInstance.Instance.FriendlyName;
                 if (SettingsViewModel.Instance.HomePluginList.Any(p => p.ToUpperInvariant()
                                                                         .StartsWith(pluginName.ToUpperInvariant())))

diff --git a/FFXIVAPP.Client/Initializer.cs b/FFXIVAPP.Client/Initializer.cs
@@ -404,6 +404,13 @@ where enabled
                                                 pluginDownload.Status = PluginStatus.UpdateAvailable;
                                                 AppViewModel.Instance.HasNewPluginUpdate = true;
                                             }
+                                            else
+                                            {
+                                                if (!found.Loaded)
+                                                {
+                                                    pluginDownload.Status = PluginStatus.OutOfDate;
+                                                }
+                                            }
                                         }
                                         DispatcherHelper.Invoke(() => UpdateViewModel.Instance.AvailablePlugins.Add(pluginDownload));
                                     }

diff --git a/FFXIVAPP.Client/Models/PluginInstance.cs b/FFXIVAPP.Client/Models/PluginInstance.cs
@@ -36,9 +36,11 @@ internal class PluginInstance
         public PluginInstance()
         {
             AssemblyPath = "";
+            Loaded = false;
         }
 
         public IPlugin Instance { get; set; }
         public string AssemblyPath { get; set; }
+        public bool Loaded { get; set; }
     }
 }
diff --git a/FFXIVAPP.Client/Models/PluginStatus.cs b/FFXIVAPP.Client/Models/PluginStatus.cs
@@ -33,6 +33,7 @@ public enum PluginStatus
     {
         NotInstalled,
         Installed,
-        UpdateAvailable
+        UpdateAvailable,
+        OutOfDate
     }
 }
diff --git a/FFXIVAPP.Client/PluginHost.cs b/FFXIVAPP.Client/PluginHost.cs
@@ -218,10 +218,6 @@ private void VerifyPlugin(string assemblyPath)
                 {
                     load = false;
                 }
-                if (!load)
-                {
-                    return;
-                }
                 var pType = pAssembly.GetType(pAssembly.GetName()
                                                        .Name + ".Plugin");
                 var implementsIPlugin = typeof (IPlugin).IsAssignableFrom(pType);
@@ -237,6 +233,7 @@ private void VerifyPlugin(string assemblyPath)
                     AssemblyPath = assemblyPath
                 };
                 plugin.Instance.Initialize(Instance);
+                plugin.Loaded = load;
                 Loaded.Add(plugin);
             }
             catch (Exception ex)

diff --git a/FFXIVAPP.Client/ShellView.xaml.cs b/FFXIVAPP.Client/ShellView.xaml.cs
@@ -31,6 +31,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Windows;
 using System.Windows.Threading;
 using FFXIVAPP.Client.Helpers;
@@ -140,7 +141,7 @@ public static void CloseApplication(bool update = false)
         {
             Application.Current.MainWindow.WindowState = WindowState.Normal;
             SettingsHelper.Save(update);
-            foreach (PluginInstance pluginInstance in App.Plugins.Loaded)
+            foreach (var pluginInstance in App.Plugins.Loaded.Cast<PluginInstance>().Where(pluginInstance => pluginInstance.Loaded))
             {
                 pluginInstance.Instance.Dispose(update);
             }

diff --git a/distribution/FFXIVAPP.Client.exe b/distribution/FFXIVAPP.Client.exe