Minor perf optimization in PluginManager

muratcakir · muratcakir · commit b190dad3afad · 2014-10-08T21:31:00.000+02:00
diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs
@@ -143,10 +143,12 @@ public static void Initialize()
 									  where !x.IsMatch("bin") && !x.IsMatch("_Backup")
 									  select Path.Combine(pluginFolderPath, x);
 
+					var installedPluginSystemNames = PluginFileParser.ParseInstalledPluginsFile();
+					
 					// now activate all plugins
 					foreach (var pluginPath in pluginPaths)
 					{
-						var result = LoadPluginFromFolder(pluginPath);
+						var result = LoadPluginFromFolder(pluginPath, installedPluginSystemNames);
 						if (result != null)
 						{
 							if (result.IsIncompatible)
@@ -180,14 +182,6 @@ public static void Initialize()
             }
         }
 
-		public static LoadPluginResult LoadPluginFromFolder(string pluginFolderPath)
-		{
-			using (Locker.GetWriteLock())
-			{
-				return LoadPluginFromFolder(pluginFolderPath, null);
-			}
-		}
-
 		private static LoadPluginResult LoadPluginFromFolder(string pluginFolderPath, ICollection<string> installedPluginSystemNames)
 		{
 			Guard.ArgumentNotEmpty(() => pluginFolderPath);
@@ -241,7 +235,7 @@ private static LoadPluginResult LoadPluginFromFolder(string pluginFolderPath, IC
 			}
 
 			// set 'Installed' property
-			descriptor.Installed = installedPluginSystemNames.Any(x => x.Equals(descriptor.SystemName, StringComparison.InvariantCultureIgnoreCase));
+			descriptor.Installed = installedPluginSystemNames.Contains(descriptor.SystemName);
 
 			try
 			{

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,12 @@ public static void Initialize()`
`143`	`143`	`where !x.IsMatch("bin") && !x.IsMatch("_Backup")`
`144`	`144`	`select Path.Combine(pluginFolderPath, x);`
`145`	`145`
	`146`	`+ var installedPluginSystemNames = PluginFileParser.ParseInstalledPluginsFile();`
	`147`	`+`
`146`	`148`	`// now activate all plugins`
`147`	`149`	`foreach (var pluginPath in pluginPaths)`
`148`	`150`	`{`
`149`		`- var result = LoadPluginFromFolder(pluginPath);`
	`151`	`+ var result = LoadPluginFromFolder(pluginPath, installedPluginSystemNames);`
`150`	`152`	`if (result != null)`
`151`	`153`	`{`
`152`	`154`	`if (result.IsIncompatible)`
`@@ -180,14 +182,6 @@ public static void Initialize()`
`180`	`182`	`}`
`181`	`183`	`}`
`182`	`184`
`183`		`- public static LoadPluginResult LoadPluginFromFolder(string pluginFolderPath)`
`184`		`- {`
`185`		`- using (Locker.GetWriteLock())`
`186`		`- {`
`187`		`- return LoadPluginFromFolder(pluginFolderPath, null);`
`188`		`- }`
`189`		`- }`
`190`		`-`
`191`	`185`	`private static LoadPluginResult LoadPluginFromFolder(string pluginFolderPath, ICollection<string> installedPluginSystemNames)`
`192`	`186`	`{`
`193`	`187`	`Guard.ArgumentNotEmpty(() => pluginFolderPath);`
`@@ -241,7 +235,7 @@ private static LoadPluginResult LoadPluginFromFolder(string pluginFolderPath, IC`
`241`	`235`	`}`
`242`	`236`
`243`	`237`	`// set 'Installed' property`
`244`		`- descriptor.Installed = installedPluginSystemNames.Any(x => x.Equals(descriptor.SystemName, StringComparison.InvariantCultureIgnoreCase));`
	`238`	`+ descriptor.Installed = installedPluginSystemNames.Contains(descriptor.SystemName);`
`245`	`239`
`246`	`240`	`try`
`247`	`241`	`{`