Refactor

Author: ethanhann

src/InEngine.Core/Plugin.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Reflection;
 
 namespace InEngine.Core
@@ -12,5 +13,13 @@ public Plugin(Assembly assembly)
         {
             Assembly = assembly;
         }
+
+        public IOptions MakeOptions()
+        {
+            var optionType = Assembly.GetTypes().FirstOrDefault(x => x.IsClass && typeof(IOptions).IsAssignableFrom(x));
+            if (optionType == null)
+                Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
+            return Assembly.CreateInstance(optionType.FullName) as IOptions;
+        }
     }
 }

src/InEngine.Net.userprefs

@@ -1,21 +1,20 @@
 <Properties StartupConfiguration="{DF1A45FD-4887-4D65-8BAD-EE17B70FE79D}|Default">
   <MonoDevelop.Ide.ItemProperties.InEngineScheduler PreferredExecutionTarget="MonoDevelop.Default" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="InEngineCli/ArgumentInterpreter.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="InEngine.Commands/Options.cs">
     <Files>
-      <File FileName="InEngineCli/ArgumentInterpreter.cs" Line="25" Column="1" />
-      <File FileName="InEngine.Commands/Options.cs" Line="19" Column="25" />
-      <File FileName="InEngineCli/Options.cs" Line="20" Column="1" />
-      <File FileName="InEngine.Core/Plugin.cs" Line="17" Column="1" />
+      <File FileName="InEngineCli/ArgumentInterpreter.cs" Line="46" Column="39" />
+      <File FileName="InEngine.Core/Plugin.cs" Line="15" Column="10" />
+      <File FileName="InEngine.Commands/Options.cs" Line="10" Column="22" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="InEngine.Net" expanded="True">
-            <Node name="InEngine.Commands" expanded="True" />
-            <Node name="InEngine.Core" expanded="True" />
-            <Node name="InEngineCli" expanded="True">
-              <Node name="ArgumentInterpreter.cs" selected="True" />
+            <Node name="InEngine.Commands" expanded="True">
+              <Node name="Options.cs" selected="True" />
             </Node>
+            <Node name="InEngine.Core" expanded="True" />
+            <Node name="InEngineCli" expanded="True" />
             <Node name="InEngineScheduler" expanded="True" />
           </Node>
         </State>

src/InEngineCli/ArgumentInterpreter.cs

@@ -20,10 +20,11 @@ public ArgumentInterpreter()
 
         public void Interpret(string[] args)
         {
+            var plugins = FindPlugins();
             if (!args.Any())
             {
                 Console.WriteLine("Available plugins... ");
-                FindPlugins().ForEach(x => Console.WriteLine(x.Name));
+                plugins.ForEach(x => Console.WriteLine(x.Name));
                 ExitWithSuccess();
             }
 
@@ -34,23 +35,11 @@ public void Interpret(string[] args)
             {
                 if (options == null)
                     Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
-
-                // Get plugins.
-                // If no arg is specified, list plugins
-
-                // Get possible types from plugin assembly.
-                var targetAssembly = Assembly.LoadFrom(options.PlugInName + ".dll");
-                var types = targetAssembly.GetTypes();
-                var optionType = types.FirstOrDefault(x => x.IsClass && typeof(IOptions).IsAssignableFrom(x));
-                if (optionType == null)
-                    Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
-
-                // Create an instance of the plugin's options class.
-                var pluginOptions = targetAssembly.CreateInstance(optionType.FullName) as IOptions;
-
-                // If the plugin's args are empty, print the plugin's help screen and exit.
+                
+                var pluginOptions = plugins.FirstOrDefault(x => x.Name == options.PlugInName).MakeOptions();
                 var pluginArgs = args.Skip(1).ToArray();
                 if (!pluginArgs.ToList().Any()) {
+                    // If the plugin's args are empty, print the plugin's help screen and exit.
                     CommandLine.Parser.Default.ParseArguments(pluginArgs, pluginOptions);
                     Console.WriteLine(pluginOptions.GetUsage(""));
                     ExitWithSuccess();