Changeset 2293

Timestamp:

1/4/2011 6:29:53 AM (2 years ago)

Author:

lowjoel

Message:

Rename the PluginInstance? class to be the PluginInfo? class.

Location:

branches/eraser6/pluginsRewrite

Files:

• Eraser.Manager/Settings.cs (modified) (1 diff)
• Eraser.Plugins/Eraser.Plugins.csproj (modified) (1 diff)
• Eraser.Plugins/PluginInfo.cs (moved) (moved from branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginInstance.cs) (7 diffs)
• Eraser.Plugins/PluginLoadEventArgs.cs (modified) (2 diffs)
• Eraser.Plugins/PluginLoadedEventArgs.cs (modified) (2 diffs)
• Eraser/SettingsPanel.cs (modified) (7 diffs)

branches/eraser6/pluginsRewrite/Eraser.Manager/Settings.cs

@@ -376 +376 @@
 
             //We have not computed the value. Compute the default.
-            Host pluginHost = Host.Instance;
-            IList<PluginInstance> plugins = pluginHost.Plugins;
+            IList<PluginInfo> plugins = Host.Instance.Plugins;
             SortedList<int, Guid> priorities = new SortedList<int, Guid>();
 
-            foreach (PluginInstance plugin in plugins)
+            foreach (PluginInfo plugin in plugins)
             {
                 //Check whether the plugin is signed by us.

branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj

@@ -54 +54 @@
     <Compile Include="IRegistrar.cs" />
     <Compile Include="LoadingPolicy.cs" />
-    <Compile Include="PluginInstance.cs" />
+    <Compile Include="PluginInfo.cs" />
     <Compile Include="PluginLoadedEventArgs.cs" />
     <Compile Include="PluginLoadEventArgs.cs" />

branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginInfo.cs

@@ -29 +29 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+using System.IO;
 
 using Eraser.Util;
@@ -38 +39 @@
     /// Structure holding the instance values of the plugin like handle and path.
     /// </summary>
-    public class PluginInstance
+    public class PluginInfo
     {
         /// <summary>
@@ -46 +47 @@
         /// <param name="path">The path to the ass</param>
         /// <param name="plugin"></param>
-        internal PluginInstance(Assembly assembly, IPlugin plugin)
+        internal PluginInfo(Assembly assembly, IPlugin plugin)
         {
             Assembly = assembly;
@@ -61 +62 @@
 
         /// <summary>
+        /// Executes the plugin's initialisation routine.
+        /// </summary>
+        /// <param name="host">The host for the plugin</param>
+        internal void Load(Host host)
+        {
+            Assembly = Assembly.Load(Assembly.GetName());
+
+            try
+            {
+                //Iterate over every exported type, checking for the IPlugin implementation
+                Type typePlugin = Assembly.GetExportedTypes().First(
+                    type => type.GetInterface("Eraser.Manager.Plugin.IPlugin", true) != null);
+                if (typePlugin == null)
+                    throw new FileLoadException(S._("Could not load the plugin."),
+                        Assembly.Location);
+
+                //Initialize the plugin
+                Plugin = (IPlugin)Activator.CreateInstance(Assembly.GetType(typePlugin.ToString()));
+                Plugin.Initialize(host);
+            }
+            catch (System.Security.SecurityException e)
+            {
+                throw new FileLoadException(S._("Could not load the plugin."),
+                    Assembly.Location, e);
+            }
+        }
+
+        /// <summary>
         /// Gets the Assembly this plugin instance came from.
         /// </summary>
@@ -69 +98 @@
                 return assembly;
             }
-            internal set
+            private set
             {
                 assembly = value;
@@ -106 +135 @@
         /// therefore cannot be disabled.)
         /// </summary>
-        public LoadingPolicy LoadingPolicy { get; internal set; }
+        public LoadingPolicy LoadingPolicy { get; private set; }
 
         /// <summary>
@@ -112 +141 @@
         /// if the plugin was not loaded.
         /// </summary>
-        public IPlugin Plugin { get; internal set; }
+        public IPlugin Plugin { get; private set; }
 
         /// <summary>

branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginLoadEventArgs.cs

@@ -38 +38 @@
         /// <param name="info">The plugin information to be passed to the approving
         /// delegate.</param>
-        internal PluginLoadEventArgs(PluginInstance info)
+        internal PluginLoadEventArgs(PluginInfo info)
         {
             Plugin = info;
@@ -47 +47 @@
         /// Gets the plugin associated with this event.
         /// </summary>
-        public PluginInstance Plugin { get; private set; }
+        public PluginInfo Plugin { get; private set; }
 
         /// <summary>

branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginLoadedEventArgs.cs

@@ -36 +36 @@
         /// </summary>
         /// <param name="instance">The plugin instance of the recently loaded plugin.</param>
-        public PluginLoadedEventArgs(PluginInstance instance)
+        public PluginLoadedEventArgs(PluginInfo info)
         {
-            Instance = instance;
+            Plugin = info;
         }
 
@@ -44 +44 @@
         /// The <see cref="PluginInstance"/> object representing the newly loaded plugin.
         /// </summary>
-        public PluginInstance Instance { get; private set; }
+        public PluginInfo Plugin { get; private set; }
     }
 }

branches/eraser6/pluginsRewrite/Eraser/SettingsPanel.cs

@@ -34 +34 @@
 
 using Eraser.Manager;
-using Eraser.Manager.Plugin;
+using Eraser.Plugins;
 using Eraser.Util;
 using Eraser.Util.ExtensionMethods;
@@ -59 +59 @@
         {
             ListViewItem item = new ListViewItem();
-            if (e.Instance.Plugin == null)
-            {
-                item.Text = System.IO.Path.GetFileNameWithoutExtension(e.Instance.Assembly.Location);
-                item.SubItems.Add(e.Instance.AssemblyInfo.Author);
+            if (e.Plugin.Loaded)
+            {
+                item.Text = e.Plugin.Plugin.Name;
+                item.SubItems.Add(e.Plugin.Plugin.Author);
             }
             else
             {
-                item.Text = e.Instance.Plugin.Name;
-                item.SubItems.Add(e.Instance.Plugin.Author);
-            }
-
+                item.Text = System.IO.Path.GetFileNameWithoutExtension(e.Plugin.Assembly.Location);
+                item.SubItems.Add(e.Plugin.AssemblyInfo.Author);
+            }
+            
             //The item is checked if the plugin was given the green light to load
-            item.Checked = e.Instance.Plugin != null ||
+            item.Checked = e.Plugin.Plugin != null ||
                 (Manager.ManagerLibrary.Settings.PluginApprovals.ContainsKey(
-                    e.Instance.AssemblyInfo.Guid) && Manager.ManagerLibrary.
-                    Settings.PluginApprovals[e.Instance.AssemblyInfo.Guid]
+                    e.Plugin.AssemblyInfo.Guid) && Manager.ManagerLibrary.
+                    Settings.PluginApprovals[e.Plugin.AssemblyInfo.Guid]
                 );
 
             //Visually display the other metadata associated with the assembly
-            item.ImageIndex = e.Instance.AssemblyAuthenticode == null ? -1 : 0;
-            item.Group = e.Instance.LoadingPolicy == LoadingPolicy.Core ?
+            item.ImageIndex = e.Plugin.AssemblyAuthenticode == null ? -1 : 0;
+            item.Group = e.Plugin.LoadingPolicy == LoadingPolicy.Core ?
                 pluginsManager.Groups[0] : pluginsManager.Groups[1];
-            item.SubItems.Add(e.Instance.Assembly.GetFileVersion().ToString());
-            item.SubItems.Add(e.Instance.Assembly.Location);
-            item.Tag = e.Instance;
+            item.SubItems.Add(e.Plugin.Assembly.GetFileVersion().ToString());
+            item.SubItems.Add(e.Plugin.Assembly.Location);
+            item.Tag = e.Plugin;
             pluginsManager.Items.Add(item);
         }
@@ -122 +122 @@
             //Load the list of plugins
             Host instance = Host.Instance;
-            IEnumerator<PluginInstance> i = instance.Plugins.GetEnumerator();
+            IEnumerator<PluginInfo> i = instance.Plugins.GetEnumerator();
             while (i.MoveNext())
                 OnNewPluginLoaded(this, new PluginLoadedEventArgs(i.Current));
@@ -309 +309 @@
         {
             ListViewItem item = pluginsManager.Items[e.Index];
-            PluginInstance instance = (PluginInstance)item.Tag;
-            if (instance.LoadingPolicy == LoadingPolicy.Core)
+            PluginInfo plugin = (PluginInfo)item.Tag;
+            if (plugin.LoadingPolicy == LoadingPolicy.Core)
                 e.NewValue = CheckState.Checked;
         }
@@ -318 +318 @@
             if (pluginsManager.SelectedItems.Count == 1)
             {
-                PluginInstance instance = (PluginInstance)pluginsManager.SelectedItems[0].Tag;
-                e.Cancel = instance.Plugin == null || !instance.Plugin.Configurable;
+                PluginInfo plugin = (PluginInfo)pluginsManager.SelectedItems[0].Tag;
+                e.Cancel = !(plugin.Loaded && plugin.Plugin.Configurable);
             }
             else
@@ -330 +330 @@
                 return;
 
-            PluginInstance instance = (PluginInstance)pluginsManager.SelectedItems[0].Tag;
-            instance.Plugin.DisplaySettings(this);
+            PluginInfo plugin = (PluginInfo)pluginsManager.SelectedItems[0].Tag;
+            plugin.Plugin.DisplaySettings(this);
         }
 
@@ -348 +348 @@
             foreach (ListViewItem item in pluginsManager.Items)
             {
-                PluginInstance plugin = (PluginInstance)item.Tag;
+                PluginInfo plugin = (PluginInfo)item.Tag;
                 Guid guid = plugin.AssemblyInfo.Guid;
                 if (!pluginApprovals.ContainsKey(guid))