Plugin-specific event consumers do not run anymore if the plugin has been disabled for the current store

muratcakir · muratcakir · commit 5f8492fd72b5 · 2015-03-21T00:55:38.000+01:00
diff --git a/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs b/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs
@@ -1,10 +1,12 @@
 ﻿using System;
+using SmartStore.Core.Plugins;
 
 namespace SmartStore.Core.Events
 {
 	public class EventConsumerMetadata
 	{
 		public bool ExecuteAsync { get; set; }
 		public bool IsActive { get; set; }
+		public PluginDescriptor PluginDescriptor { get; set; }
 	}
 }
diff --git a/src/Libraries/SmartStore.Services/Events/DefaultConsumerFactory.cs b/src/Libraries/SmartStore.Services/Events/DefaultConsumerFactory.cs
@@ -3,17 +3,22 @@
 using System.Collections.Generic;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Events;
+using SmartStore.Core.Plugins;
 
 namespace SmartStore.Services.Events
 {
 
 	public class DefaultConsumerFactory<T> : IConsumerFactory<T>
 	{
 		private readonly IEnumerable<Lazy<IConsumer<T>, EventConsumerMetadata>> _consumers;
+		private readonly ICommonServices _services;
 
-		public DefaultConsumerFactory(IEnumerable<Lazy<IConsumer<T>, EventConsumerMetadata>> consumers)
+		public DefaultConsumerFactory(
+			IEnumerable<Lazy<IConsumer<T>, EventConsumerMetadata>> consumers,
+			ICommonServices services)
 		{
 			this._consumers = consumers;
+			this._services = services;
 		}
 
 		public IEnumerable<IConsumer<T>> GetConsumers(bool? resolveAsyncs = null)
@@ -22,9 +27,14 @@ public IEnumerable<IConsumer<T>> GetConsumers(bool? resolveAsyncs = null)
 			{
 				var isActive = consumer.Metadata.IsActive;
 				var isAsync = consumer.Metadata.ExecuteAsync;
+				var pluginDescriptor = consumer.Metadata.PluginDescriptor;
+
 				if (isActive && (resolveAsyncs == null || (resolveAsyncs.Value == isAsync)))
 				{
-					yield return consumer.Value;
+					if (pluginDescriptor == null || IsActiveForStore(pluginDescriptor, _services.StoreContext.CurrentStore.Id))
+					{
+						yield return consumer.Value;
+					}
 				}
 			}
 		}
@@ -37,6 +47,29 @@ public bool HasAsyncConsumer
 				return _consumers.Any(c => c.Metadata.IsActive == true && c.Metadata.ExecuteAsync == true); 
 			}
 		}
+
+		private bool IsActiveForStore(PluginDescriptor plugin, int storeId)
+		{
+			if (storeId == 0)
+			{
+				return true;
+			}
+
+			var limitedToStoresSetting = _services.Settings.GetSettingByKey<string>(plugin.GetSettingKey("LimitedToStores"));
+			if (limitedToStoresSetting.IsEmpty())
+			{
+				return true;
+			}
+
+			var limitedToStores = limitedToStoresSetting.ToIntArray();
+			if (limitedToStores.Length > 0)
+			{
+				var flag = limitedToStores.Contains(storeId);
+				return flag;
+			}
+
+			return true;
+		}
 	}
 
 }
diff --git a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs
@@ -90,7 +90,7 @@ public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder, b
 			builder.RegisterModule(new CachingModule());
 			builder.RegisterModule(new LocalizationModule());
 			builder.RegisterModule(new LoggingModule());
-			builder.RegisterModule(new EventModule(typeFinder));
+			builder.RegisterModule(new EventModule(typeFinder, pluginFinder));
 			builder.RegisterModule(new MessagingModule());
 			builder.RegisterModule(new WebModule(typeFinder));
 			builder.RegisterModule(new WebApiModule(typeFinder));
@@ -493,10 +493,12 @@ protected override void Load(ContainerBuilder builder)
 	public class EventModule : Module
 	{
 		private readonly ITypeFinder _typeFinder;
+		private readonly IPluginFinder _pluginFinder;
 
-		public EventModule(ITypeFinder typeFinder)
+		public EventModule(ITypeFinder typeFinder, IPluginFinder pluginFinder)
 		{
 			_typeFinder = typeFinder;
+			_pluginFinder = pluginFinder;
 		}
 
 		protected override void Load(ContainerBuilder builder)
@@ -512,12 +514,14 @@ protected override void Load(ContainerBuilder builder)
 
 				var registration = builder.RegisterType(consumerType).As(implementedInterfaces);
 
+				var pluginDescriptor = _pluginFinder.GetPluginDescriptorByAssembly(consumerType.Assembly);
 				var isActive = PluginManager.IsActivePluginAssembly(consumerType.Assembly);
 				var shouldExecuteAsync = consumerType.GetAttribute<AsyncConsumerAttribute>(false) != null;
 
 				registration.WithMetadata<EventConsumerMetadata>(m => {
 					m.For(em => em.IsActive, isActive);
 					m.For(em => em.ExecuteAsync, shouldExecuteAsync);
+					m.For(em => em.PluginDescriptor, pluginDescriptor);
 				});
 
 				if (!shouldExecuteAsync)

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`using System;`
	`2`	`+using SmartStore.Core.Plugins;`
`2`	`3`
`3`	`4`	`namespace SmartStore.Core.Events`
`4`	`5`	`{`
`5`	`6`	`public class EventConsumerMetadata`
`6`	`7`	`{`
`7`	`8`	`public bool ExecuteAsync { get; set; }`
`8`	`9`	`public bool IsActive { get; set; }`
	`10`	`+ public PluginDescriptor PluginDescriptor { get; set; }`
`9`	`11`	`}`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,22 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using SmartStore.Core.Infrastructure;`
`5`	`5`	`using SmartStore.Core.Events;`
	`6`	`+using SmartStore.Core.Plugins;`
`6`	`7`
`7`	`8`	`namespace SmartStore.Services.Events`
`8`	`9`	`{`
`9`	`10`
`10`	`11`	`public class DefaultConsumerFactory<T> : IConsumerFactory<T>`
`11`	`12`	`{`
`12`	`13`	`private readonly IEnumerable<Lazy<IConsumer<T>, EventConsumerMetadata>> _consumers;`
	`14`	`+ private readonly ICommonServices _services;`
`13`	`15`
`14`		`- public DefaultConsumerFactory(IEnumerable<Lazy<IConsumer<T>, EventConsumerMetadata>> consumers)`
	`16`	`+ public DefaultConsumerFactory(`
	`17`	`+ IEnumerable<Lazy<IConsumer<T>, EventConsumerMetadata>> consumers,`
	`18`	`+ ICommonServices services)`
`15`	`19`	`{`
`16`	`20`	`this._consumers = consumers;`
	`21`	`+ this._services = services;`
`17`	`22`	`}`
`18`	`23`
`19`	`24`	`public IEnumerable<IConsumer<T>> GetConsumers(bool? resolveAsyncs = null)`
`@@ -22,9 +27,14 @@ public IEnumerable<IConsumer<T>> GetConsumers(bool? resolveAsyncs = null)`
`22`	`27`	`{`
`23`	`28`	`var isActive = consumer.Metadata.IsActive;`
`24`	`29`	`var isAsync = consumer.Metadata.ExecuteAsync;`
	`30`	`+ var pluginDescriptor = consumer.Metadata.PluginDescriptor;`
	`31`	`+`
`25`	`32`	`if (isActive && (resolveAsyncs == null \|\| (resolveAsyncs.Value == isAsync)))`
`26`	`33`	`{`
`27`		`- yield return consumer.Value;`
	`34`	`+ if (pluginDescriptor == null \|\| IsActiveForStore(pluginDescriptor, _services.StoreContext.CurrentStore.Id))`
	`35`	`+ {`
	`36`	`+ yield return consumer.Value;`
	`37`	`+ }`
`28`	`38`	`}`
`29`	`39`	`}`
`30`	`40`	`}`
`@@ -37,6 +47,29 @@ public bool HasAsyncConsumer`
`37`	`47`	`return _consumers.Any(c => c.Metadata.IsActive == true && c.Metadata.ExecuteAsync == true);`
`38`	`48`	`}`
`39`	`49`	`}`
	`50`	`+`
	`51`	`+ private bool IsActiveForStore(PluginDescriptor plugin, int storeId)`
	`52`	`+ {`
	`53`	`+ if (storeId == 0)`
	`54`	`+ {`
	`55`	`+ return true;`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ var limitedToStoresSetting = _services.Settings.GetSettingByKey<string>(plugin.GetSettingKey("LimitedToStores"));`
	`59`	`+ if (limitedToStoresSetting.IsEmpty())`
	`60`	`+ {`
	`61`	`+ return true;`
	`62`	`+ }`
	`63`	`+`
	`64`	`+ var limitedToStores = limitedToStoresSetting.ToIntArray();`
	`65`	`+ if (limitedToStores.Length > 0)`
	`66`	`+ {`
	`67`	`+ var flag = limitedToStores.Contains(storeId);`
	`68`	`+ return flag;`
	`69`	`+ }`
	`70`	`+`
	`71`	`+ return true;`
	`72`	`+ }`
`40`	`73`	`}`
`41`	`74`
`42`	`75`	`}`