diff --git a/.gitignore b/.gitignore
index 118d11be55..85bd82b7ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -300,6 +300,7 @@ Kopie von*
/src/Presentation/SmartStore.Web/App_Data/ImportProfiles/
/src/Presentation/SmartStore.Web/App_Data/Indexing/
/src/Presentation/SmartStore.Web/App_Data/Lucene/
+/src/Presentation/SmartStore.Web/App_Data/EfCache/
/src/Presentation/SmartStore.Web/App_Data/Settings.txt
/src/Presentation/SmartStore.Web/App_Data/InstalledPlugins.txt
/src/Presentation/SmartStore.Web/App_Data/Licenses.lic
diff --git a/README.md b/README.md
index aa25d27b32..f8e84aa9bb 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,60 @@
-## Overview
+
+
+
+
+
+
+
+Ready. Sell. Grow.
+
-
-SmartStore.NET is a free, open source, full-featured e-commerce solution for companies of any size. It is web standards compliant and incorporates the newest Microsoft web technology stack.
+
+ Try Online ∙
+ Docs ∙
+ Forum ∙
+ Marketplace ∙
+ Translations
+
+
+
+
+
## Highlights
@@ -35,6 +71,8 @@ The state-of-the-art architecture of SmartStore.NET - with `ASP.NET 4.5` + `MVC
### Features
+* NEW: CMS Page Builder
+* NEW: CMS Menu Builder
* Multi-Store support
* Unlimited number of products and categories
* Product Bundles
@@ -55,37 +93,28 @@ The state-of-the-art architecture of SmartStore.NET - with `ASP.NET 4.5` + `MVC
* CMS (Blog, Forum, custom pages & HTML content etc.)
* and many more...
+
+
## Project Status
-SmartStore.NET V3.1.0 has been released on April 20, 2018. The highlights are:
-* **Wallet \***: Enables full or partial order payment via credit account. Includes REST-Api.
-* **[Liquid](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers) template engine**: very flexible templating for e-mails and campaigns with autocompletion and syntax highlighting.
-* **Cash Rounding**: define money rounding rules on currency and payment method level.
-* **Modern, responsive backend**: migrated backend to Bootstrap 4, overhauled and improved the user interface.
-* **Enhanced MegaMenu \***: virtual dropdowns for surplus top-level categories and brands.
-* **RTL**: comprehensive RTL (Right-to-left) and bidi(rectional) support.
-* **Amazon Pay**:
- * Supports merchants registered in the USA and Japan
- * External authentication via *Login with Amazon* button in shop frontend
- * Several improvements through the new *Login and pay with Amazon* services
-* **Image processing**: new processing and caching strategy! Thumbnails are not created synchronously during the main request anymore, instead a new middleware route defers processing until an image is requested by any client.
-* **TinyImage \***: scores ultra-high image compression rates (up to 80 %!) and enables WebP support.
-* **UrlRewriter \***: define URL redirection rules in the backend using *mod_rewrite* notation.
-* **Address formatting** templates by country
-* **Language packs**: downloader & auto-importer for packages available online.
-* ...and a lot more new features, enhancements and fixes
+Smartstore.NET V3.2.0 has been released on 10 May, 2019. The highlights are:
-\* Commercial plugin
+* (NEW) **Page Builder**: Create fascinating content that will boost your sales. No coding is required thanks to a powerful WYSIWYG editor which utilizes the revolutionary *CSS Grid* system (commercial plugin)
+* (NEW) **Menu Builder**: Visual manager for all sorts of menus. Change existing menus or create your own and place them anywhere you want.
+* (Perf) **Faster MegaSearch** thanks to Lucene.NET 4.8
+* (Perf) **Huge performance increase** in discount resolution and calculation.
## Try it online
-We have set up a live online demo for you so you are able to test SmartStore.NET without local installation. Get a first impression and test all available features in the front- and in the backend. Please keep in mind that the backend demo is shared and other testers can modify data at the same time.
+We have set up a live online demo for you so you are able to test Smartstore.NET without local installation. Get a first impression and test all available features in the front- and in the backend. Please keep in mind that the backend demo is shared and other testers can modify data at the same time.
* [**Frontend**](http://frontend.smartstore.net/en) (User: demo, PWD: 1234)
* [**Backend**](http://backend.smartstore.net/en/login) (User: demo, PWD: 1234)
+
+
## How to install
* Download the latest stable release from the download tab and unzip it to your web folder
@@ -93,7 +122,7 @@ We have set up a live online demo for you so you are able to test SmartStore.NET
* Fire up your browser and follow the installation instructions
* Enjoy ;-)
-NOTE: SmartStore.NET 3 requires [Visual C++ Redistributable für Visual Studio 2015](https://www.microsoft.com/en-US/download/details.aspx?id=52685) which is already pre-installed on most systems. If, nevertheless, it is missing on your web server, just download and execute the installer or ask your hosting provider to do that for you.
+NOTE: Smartstore.NET 3 requires [Visual C++ Redistributable für Visual Studio 2015](https://www.microsoft.com/en-US/download/details.aspx?id=52685) which is already pre-installed on most systems. If, nevertheless, it is missing on your web server, just download and execute the installer or ask your hosting provider to do that for you.
### System requirements
@@ -104,6 +133,7 @@ NOTE: SmartStore.NET 3 requires [Visual C++ Redistributable für Visual Studio 2
* Full Trust
+
## License
-SmartStore.NET Community Edition is released under the [GPLv3 license](http://www.gnu.org/licenses/gpl-3.0.txt).
+Smartstore.NET Community Edition is released under the [GPLv3 license](http://www.gnu.org/licenses/gpl-3.0.txt).
diff --git a/SmartStoreNET.Tasks.Targets b/SmartStoreNET.Tasks.Targets
index fec484de68..080c78d497 100644
--- a/SmartStoreNET.Tasks.Targets
+++ b/SmartStoreNET.Tasks.Targets
@@ -39,7 +39,7 @@
x86
$(BUILD_NUMBER)
- 3.1.5
+ 3.2.2
$(StageFolder)
.$(Version)
-
@@ -126,6 +125,7 @@
-
+
+
` implements `IConsumer` but has been marked as `Obsolete`.
+* Better protection against XSS attacks
+* Updated to Bootstrap version 4.1.3
+* **Debitoor**:
+ * Partially update customer instead of full update to avoid all fields being overwritten.
+ * #1540 Place company name in front of customer name (according to address format of the particular country).
+ * #1565 Add a button to manually create a draft invoice.
* #1479 Show in messages the delivery time at the time of purchase
+* #1184 Sort current shopping carts & current wishlists by `ShoppingCartItem.CreatedOn`.
+* #1106 BMECat: import & export support for product keywords
+* #1499 Added hint to forms indicating that fields with an asterisk (*) are required
+* Added filter for newsletter subscriber export by working language
+* Refactored download section
+* Enhanced EntityPicker to pick from customers, manufacturers & categories
+* #1510 Breadcrumb of an associated product should include the grouped product if it has no assigned categories.
+* OpenTrans: added customer number to parties
+* Do not filter cookie using resources if cookie usage has not yet been consented to.
+* #1563 QueuedMessagesClearTask: add a setting for the age of the mails to be deleted.
+* #1569 Added a setting to show login note if no prices are displayed due to customer group permissions.
+* PayPal PLUS: Up to 10 more third party payment methods are allowed by PayPal now.
+* #1560 Tell-a-Friend and anonymous user: render alert box and tell guest to login to use this function
+* #1571 Compare products now shows all specification attribute options
+* #1539 Signing in is now allowed with e-mail and username
+* Trusted Shops: Trustbadge won't be displayed in Popups & Iframes anymore
+* #1461 Admin Grid: filter dialog will be displayed entirely even when grid has no data to display
+* Lots of minor enhancements for both frontend and admin theme
+* Many other minor improvements
### Bugfixes
-* In a multi-store environment, multiple topics with the same system name cannot be resolved reliably.
+* In a multi-store environment, multiple topics with the same system name can now be resolved reliably.
* **GMC**:
* Export the product images if no attribute images are defined
* Do not export the first image twice for additional images
* Export image URL of full size image (not default size) for additional images
+ * Custom labels are now being exported
* Media middleware: 0-byte files should be treated as missing.
-* Megamenu alpha/omega blends do not toggle correctly on touch devices
+* Megamenu alpha/omega blends do now toggle correctly on touch devices
* Summernote HTML editor exceeds parent container width when CodeMirror is activated
* Only display a zero search hits warning if at least one filter is activated
* #1436 Do not display delivery time in customer order completed messages
* "ArgumentNullException: The value must not be NULL" if a topic is password protected
* Tax by region: Fixes after inserting a tax rate country column shows "Unavailable"
* #1014 Switching to default language keeps specific URL alias of current page
-* Shipping by total: Fixes when inserting a record the country was not saved
-* #1460 Editing of the customer title is missing on customer and address pages in the backend
+* Shipping by total: When inserting a record the country now will be saved
+* #1460 Editing of the customer title was missing on customer and address pages in the backend
* #1447 Checkout button payment methods (Amazon, PayPal Express) won't work in conjunction with mandatory checkout attributes
-* When creating a topic, the widget zone input shows System.String[]
+* Fixed Autofac circularity error
+* When creating a topic, the widget zone input has shown System.String[]
* Switching the language always redirected to the home page if SEO friendly URLs was deactivated.
* File upload of a checkout attribute was not stored on cart page.
* Redirecting within checkout may have displayed an incorrect URL in the browser.
@@ -50,7 +195,27 @@
* In a multi-store, message templates may have loaded the wrong disclaimer and conditions-of-use text.
* NullReferenceException in manufacturer list when there is no manufacturer.
* Wrong order of featured products on category page.
-* #1504 Cart item price calculation wrong if attribute combinations with text types are involved.
+* #1504 Cart item price calculation was wrong if attribute combinations with text types were involved.
+* #1485 Dropdown list for product sorting didn't not work with Internet Explorer 11.
+* #1468 Twitter authentication wasn't working anymore.
+* Newsletter subscription didn't work when customer privacy setting DisplayGdprConsentOnForms was turned off
+* Fixed social media image detection
+* Fixed redirection of bots when several languages were active
+* Region cannot be selected in checkout when entering a billing or shipping address
+* Fixed invalid conversion of "System.Int32" to "SmartStore.Core.Domain.Tax.VatNumberStatus" when placing an order
+* MegaMenu: Improved item rendering for third tier elements
+* Product display order on category and manufacturer pages was sometimes wrong when using linq search.
+* Debitoor: Wrong invoice total if a subtotal discount has been applied.
+* Import: Fixes invalid conversion "System.Double" to "SmartStore.Core.Domain.Catalog.QuantityControlType".
+* Topics: Fixes "Cannot insert duplicate key row in object 'dbo.UrlRecord' with unique index 'IX_UrlRecord_Slug'".
+* #1566 Santander: eliminate the 1 cent rounding difference at amountTotalNet.
+* Fixed redirection to the homepage for pages which are loaded while the application is restarted.
+* #1570 Filter option "Only deactivated customers" filters deleted instead of deactivated customers.
+* #1475 select boxes must be wrapped on mobile devices if data-select-url is set
+* Fixed the redirection to the homepage for pages which were loaded while the application was restarted
+* Fixes product feeds expect a different base price formatting.
+* #1369 Shopping cart shows "Discount code applied", although it is not applied due to a lower tier price.
+* Many other fixes...
## SmartStore.NET 3.1.5
@@ -309,7 +474,7 @@
* Added config setting *sm:PdfEngineBaseUrl*. There are cases where the PDF converter exits with a network error, when it is unable to load automatically resolved URLs.
* (Dev) Added *Retry* utility class
* #1176 Admin > Product Search: It ain't possible to search for parts of a product name
-
+
### Bugfixes
* #1145: Fixed HTTP 404 after switching language
* Fixed null reference exception in product lists if sorting is not allowed
@@ -597,7 +762,8 @@
* #495 Implement option to search product detail description by default
### Improvements
-* (Perf) Implemented static caches for URL aliases and localized properties. Increases app startup and request speed by up to 30%.
+* (Perf) Implemented static caches for URL aliases and localized properties. Increases
+* and request speed by up to 30%.
* (Perf) Significantly reduced number of database reads during product list rendering. Increases request speed by up to 10%.
* (Perf) Implemented 2nd level cache for infrequently changed entities. Increases request speed by up to 10%.
* TaskScheduler: Rewritten from scratch to be suitable for Web Farms
@@ -1217,7 +1383,7 @@
* [SMNET-202] - SmartTabSelection mit verschachtelten Tabs fehlerhaft nach Reload einer Seite
### Improvement
-
+
* [SMNET-13] - Attributwerte: der Text "Aufpreis" muss um "Minderpreis" erweitert werden.
* [SMNET-15] - Umgestaltung der Darstellung der Staffelpreise (Popover ab dem fünften Element)
* [SMNET-30] - MessageTemplates teilweise auf Englisch
diff --git a/lib/SmartStore.Licensing/SmartStore.Licensing.dll b/lib/SmartStore.Licensing/SmartStore.Licensing.dll
index 2c82c7853f..17bf4e2ad9 100644
Binary files a/lib/SmartStore.Licensing/SmartStore.Licensing.dll and b/lib/SmartStore.Licensing/SmartStore.Licensing.dll differ
diff --git a/src/AssemblySharedInfo.cs b/src/AssemblySharedInfo.cs
index 79225de4c7..b58492422f 100644
--- a/src/AssemblySharedInfo.cs
+++ b/src/AssemblySharedInfo.cs
@@ -7,6 +7,6 @@
[assembly: AssemblyDescription("SmartStore.NET")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("SmartStore AG")]
-[assembly: AssemblyCopyright("Copyright © SmartStore AG 2016")]
+[assembly: AssemblyCopyright("Copyright © SmartStore AG 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/src/AssemblyVersionInfo.cs b/src/AssemblyVersionInfo.cs
index d9e092d65c..719cd1d6ff 100644
--- a/src/AssemblyVersionInfo.cs
+++ b/src/AssemblyVersionInfo.cs
@@ -9,7 +9,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("3.1.5.0")]
+[assembly: AssemblyVersion("3.2.2.0")]
-[assembly: AssemblyFileVersion("3.1.5.0")]
-[assembly: AssemblyInformationalVersion("3.1.5.0")]
+[assembly: AssemblyFileVersion("3.2.2.0")]
+[assembly: AssemblyInformationalVersion("3.2.2.0")]
diff --git a/src/Libraries/SmartStore.Core/Async/AsyncLock.cs b/src/Libraries/SmartStore.Core/Async/AsyncLock.cs
deleted file mode 100644
index b93da92afc..0000000000
--- a/src/Libraries/SmartStore.Core/Async/AsyncLock.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using SmartStore.Utilities;
-
-namespace SmartStore.Core.Async
-{
- public sealed class AsyncLock : DisposableObject
- {
- private static readonly TimeSpan _noTimeout = TimeSpan.FromMilliseconds(-1);
- private static readonly ConcurrentDictionary _keyLocks = new ConcurrentDictionary();
-
- private readonly SemaphoreSlim _semaphore;
- private readonly int _initialCount;
-
- public AsyncLock()
- : this(1, int.MaxValue)
- {
- }
-
- public AsyncLock(int initialCount)
- : this(initialCount, int.MaxValue)
- {
- }
-
- public AsyncLock(int initialCount, int maxCount)
- {
- _semaphore = new SemaphoreSlim(initialCount, maxCount);
- _initialCount = initialCount;
- }
-
- public static AsyncLock Acquire(object key)
- {
- Guard.NotNull(key, nameof(key));
-
- var asyncLock = _keyLocks.GetOrAdd(key, x => new AsyncLock());
-
- // Perf: once we have more than 100 lock objects in the storage, remove the idle ones.
- if (_keyLocks.Count > 100)
- {
- // never remove the current one and the locked ones
- var idles = _keyLocks.Where(kvp => kvp.Key != key && !kvp.Value.IsLockHeld).ToArray();
- foreach (var kvp in idles)
- {
- var value = kvp.Value;
- // double check for held lock
- if (!value.IsLockHeld)
- {
- _keyLocks.TryRemove(kvp.Key, out value);
- }
- }
- }
-
- return asyncLock;
- }
-
- public bool IsLockHeld
- {
- get { return _semaphore.CurrentCount < _initialCount; }
- }
-
- public int Release()
- {
- return _semaphore.Release();
- }
-
- public int Release(int releaseCount)
- {
- return _semaphore.Release(releaseCount);
- }
-
- public Task LockAsync()
- {
- return LockAsync(_noTimeout, CancellationToken.None);
- }
-
- public Task LockAsync(TimeSpan timeout)
- {
- return LockAsync(timeout, CancellationToken.None);
- }
-
- public Task LockAsync(CancellationToken cancellationToken)
- {
- return LockAsync(_noTimeout, cancellationToken);
- }
-
- public Task LockAsync(TimeSpan timeout, CancellationToken cancellationToken)
- {
- var wait = _semaphore.WaitAsync(timeout, cancellationToken);
-
- return wait.IsCompleted
- ? Task.FromResult(new ActionDisposable(() => _semaphore.Release()) as IDisposable)
- : wait.ContinueWith((t, s) => new ActionDisposable(() => ((SemaphoreSlim)s).Release()) as IDisposable,
- _semaphore,
- CancellationToken.None,
- TaskContinuationOptions.ExecuteSynchronously,
- TaskScheduler.Default);
- }
-
- protected override void OnDispose(bool disposing)
- {
- if (disposing)
- _semaphore.Dispose();
- }
- }
-}
diff --git a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs
index 1fce2cc436..2751259eef 100644
--- a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs
+++ b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
@@ -8,113 +9,166 @@
namespace SmartStore.Core.Async
{
- public static class AsyncRunner
+ using EventQueue = ConcurrentQueue>;
+
+ public class AsyncRunner : IDisposable
{
- private static readonly BackgroundWorkHost _host = new BackgroundWorkHost();
+ #region Instance members
- ///
- /// Gets the global cancellation token which signals the application shutdown
- ///
- public static CancellationToken AppShutdownCancellationToken
+ private ExclusiveSynchronizationContext CurrentContext;
+ private SynchronizationContext OldContext;
+ private int TaskCount;
+
+ private AsyncRunner()
{
- get { return _host.ShutdownCancellationTokenSource.Token; }
+ OldContext = SynchronizationContext.Current;
+ CurrentContext = new ExclusiveSynchronizationContext(OldContext);
+ SynchronizationContext.SetSynchronizationContext(CurrentContext);
+ }
+
+ public void Dispose()
+ {
+ try
+ {
+ CurrentContext.BeginMessageLoop();
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ finally
+ {
+ SynchronizationContext.SetSynchronizationContext(OldContext);
+ }
+ }
+
+ private void Increment()
+ {
+ Interlocked.Increment(ref TaskCount);
+ }
+
+ private void Decrement()
+ {
+ Interlocked.Decrement(ref TaskCount);
+ if (TaskCount == 0)
+ {
+ CurrentContext.EndMessageLoop();
+ }
}
///
/// Executes an async Task method which has a void return value synchronously
///
- /// func)
+ /// continuation = null)
{
- var oldContext = SynchronizationContext.Current;
- var synch = new ExclusiveSynchronizationContext();
- SynchronizationContext.SetSynchronizationContext(synch);
- synch.Post(async _ =>
+ CurrentContext.Post(async _ =>
{
try
{
- await func();
+ Increment();
+ await task;
+
+ continuation?.Invoke(task);
}
catch (Exception e)
{
- synch.InnerException = e;
- throw;
+ CurrentContext.InnerException = e;
}
finally
{
- synch.EndMessageLoop();
+ Decrement();
}
}, null);
- synch.BeginMessageLoop();
-
- SynchronizationContext.SetSynchronizationContext(oldContext);
}
///
/// Executes an async Task method which has a TResult return type synchronously
///
/// Return Type
- /// (Func> func)
+ /// (Task task, Action> continuation = null)
{
- var oldContext = SynchronizationContext.Current;
- var synch = new ExclusiveSynchronizationContext();
- SynchronizationContext.SetSynchronizationContext(synch);
- TResult ret = default(TResult);
- synch.Post(async _ =>
+ var result = default(TResult);
+
+ CurrentContext.Post(async _ =>
{
try
{
- ret = await func();
+ Increment();
+ result = await task;
+
+ continuation?.Invoke(task);
}
catch (Exception e)
{
- synch.InnerException = e;
- throw;
+ CurrentContext.InnerException = e;
}
finally
{
- synch.EndMessageLoop();
+ Decrement();
}
}, null);
- synch.BeginMessageLoop();
- SynchronizationContext.SetSynchronizationContext(oldContext);
- return ret;
- }
- public static Task Run(Action action)
- {
- return Run(action, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default);
+ return result;
}
- public static Task Run(Action action, CancellationToken cancellationToken)
+ #endregion
+
+ private static readonly BackgroundWorkHost _host = new BackgroundWorkHost();
+
+ ///
+ /// Gets the global cancellation token which signals the application shutdown
+ ///
+ public static CancellationToken AppShutdownCancellationToken
{
- return Run(action, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
+ get { return _host.ShutdownCancellationTokenSource.Token; }
}
- public static Task Run(Action action, TaskCreationOptions options)
+ public static AsyncRunner Create()
{
- return Run(action, CancellationToken.None, options, TaskScheduler.Default);
+ return new AsyncRunner();
}
- public static Task Run(Action action, CancellationToken cancellationToken, TaskCreationOptions options)
+ ///
+ /// Executes an async Task method which has a void return value synchronously
+ ///
+ /// func, Action continuation = null)
{
- return Run(action, cancellationToken, options, TaskScheduler.Default);
+ using (var runner = new AsyncRunner())
+ {
+ runner.Run(func(), continuation);
+ }
}
- public static Task Run(Action action, TaskScheduler scheduler)
+ ///
+ /// Executes an async Task method which has a TResult return type synchronously
+ ///
+ /// Return Type
+ /// (Func> func, Action> continuation = null)
{
- return Run(action, CancellationToken.None, TaskCreationOptions.None, scheduler);
+ var result = default(TResult);
+
+ using (var runner = new AsyncRunner())
+ {
+ result = runner.Run(func(), continuation);
+ }
+
+ return result;
}
- public static Task Run(Action action, CancellationToken cancellationToken, TaskCreationOptions options, TaskScheduler scheduler)
+ public static Task Run(
+ Action action,
+ CancellationToken cancellationToken = default(CancellationToken),
+ TaskCreationOptions options = TaskCreationOptions.LongRunning,
+ TaskScheduler scheduler = null)
{
Guard.NotNull(action, nameof(action));
- Guard.NotNull(scheduler, nameof(scheduler));
var ct = _host.CreateCompositeCancellationTokenSource(cancellationToken).Token;
- options |= TaskCreationOptions.LongRunning; // enforce an exclusive thread (not from pool)
var t = Task.Factory.StartNew(() => {
var accessor = EngineContext.Current.ContainerManager.ScopeAccessor;
@@ -122,21 +176,24 @@ public static Task Run(Action action, Cancell
{
action(accessor.GetLifetimeScope(null), ct);
}
- }, ct, options, scheduler);
+ }, ct, options, scheduler ?? TaskScheduler.Default);
_host.Register(t, ct);
return t;
}
- public static Task Run(Action action, object state, CancellationToken cancellationToken, TaskCreationOptions options, TaskScheduler scheduler)
+ public static Task Run(
+ Action action,
+ object state,
+ CancellationToken cancellationToken = default(CancellationToken),
+ TaskCreationOptions options = TaskCreationOptions.LongRunning,
+ TaskScheduler scheduler = null)
{
Guard.NotNull(state, nameof(state));
Guard.NotNull(action, nameof(action));
- Guard.NotNull(scheduler, nameof(scheduler));
var ct = _host.CreateCompositeCancellationTokenSource(cancellationToken).Token;
- options |= TaskCreationOptions.LongRunning; // enforce an exclusive thread (not from pool)
var t = Task.Factory.StartNew((o) =>
{
@@ -145,47 +202,22 @@ public static Task Run(Action action,
{
action(accessor.GetLifetimeScope(null), ct, o);
}
- }, state, ct, options, scheduler);
+ }, state, ct, options, scheduler ?? TaskScheduler.Default);
_host.Register(t, ct);
return t;
}
-
-
- public static Task Run(Func function)
- {
- return Run(function, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default);
- }
-
- public static Task Run(Func function, CancellationToken cancellationToken)
- {
- return Run(function, cancellationToken, TaskCreationOptions.None, TaskScheduler.Default);
- }
-
- public static Task Run(Func function, TaskCreationOptions options)
- {
- return Run(function, CancellationToken.None, options, TaskScheduler.Default);
- }
-
- public static Task Run(Func function, CancellationToken cancellationToken, TaskCreationOptions options)
- {
- return Run(function, cancellationToken, options, TaskScheduler.Default);
- }
-
- public static Task Run(Func function, TaskScheduler scheduler)
- {
- return Run(function, CancellationToken.None, TaskCreationOptions.None, scheduler);
- }
-
- public static Task Run(Func function, CancellationToken cancellationToken, TaskCreationOptions options, TaskScheduler scheduler)
+ public static Task Run(
+ Func function,
+ CancellationToken cancellationToken = default(CancellationToken),
+ TaskCreationOptions options = TaskCreationOptions.LongRunning,
+ TaskScheduler scheduler = null)
{
Guard.NotNull(function, nameof(function));
- Guard.NotNull(scheduler, nameof(scheduler));
var ct = _host.CreateCompositeCancellationTokenSource(cancellationToken).Token;
- options |= TaskCreationOptions.LongRunning; // enforce an exclusive thread (not from pool)
var t = Task.Factory.StartNew(() =>
{
@@ -194,21 +226,24 @@ public static Task Run(Func Run(Func function, object state, CancellationToken cancellationToken, TaskCreationOptions options, TaskScheduler scheduler)
+ public static Task Run(
+ Func function,
+ object state,
+ CancellationToken cancellationToken = default(CancellationToken),
+ TaskCreationOptions options = TaskCreationOptions.LongRunning,
+ TaskScheduler scheduler = null)
{
Guard.NotNull(state, nameof(state));
Guard.NotNull(function, nameof(function));
- Guard.NotNull(scheduler, nameof(scheduler));
var ct = _host.CreateCompositeCancellationTokenSource(cancellationToken).Token;
- options |= TaskCreationOptions.LongRunning; // enforce an exclusive thread (not from pool)
var t = Task.Factory.StartNew((o) =>
{
@@ -217,19 +252,61 @@ public static Task Run(Func function,
+ object state,
+ CancellationToken cancellationToken = default(CancellationToken))
+ {
+ Guard.NotNull(state, nameof(state));
+ Guard.NotNull(function, nameof(function));
+
+ var ct = _host.CreateCompositeCancellationTokenSource(cancellationToken).Token;
+
+ var accessor = EngineContext.Current.ContainerManager.ScopeAccessor;
+ var scope = accessor.BeginLifetimeScope(null);
+
+ Task task = null;
+
+ try
+ {
+ task = function(scope, ct).ContinueWith(x =>
+ {
+ scope.Dispose();
+ });
+ _host.Register(task, ct);
+ }
+ catch
+ {
+ scope.Dispose();
+ }
+
+ return task;
+ }
private class ExclusiveSynchronizationContext : SynchronizationContext
{
private bool _done;
- readonly AutoResetEvent _workItemsWaiting = new AutoResetEvent(false);
- readonly Queue> _items = new Queue>();
+ private readonly AutoResetEvent _workItemsWaiting = new AutoResetEvent(false);
+ private readonly EventQueue _items;
+
+ public ExclusiveSynchronizationContext(SynchronizationContext old)
+ {
+ if (old is ExclusiveSynchronizationContext oldEx)
+ {
+ this._items = oldEx._items;
+ }
+ else
+ {
+ this._items = new EventQueue();
+ }
+ }
public Exception InnerException { get; set; }
@@ -240,10 +317,7 @@ public override void Send(SendOrPostCallback d, object state)
public override void Post(SendOrPostCallback d, object state)
{
- lock (_items)
- {
- _items.Enqueue(Tuple.Create(d, state));
- }
+ _items.Enqueue(Tuple.Create(d, state));
_workItemsWaiting.Set();
}
@@ -256,26 +330,19 @@ public void BeginMessageLoop()
{
while (!_done)
{
- Tuple task = null;
- lock (_items)
+ if (!_items.TryDequeue(out var task))
{
- if (_items.Count > 0)
- {
- task = _items.Dequeue();
- }
+ _workItemsWaiting.WaitOne();
}
- if (task != null)
+ else
{
task.Item1(task.Item2);
- if (InnerException != null) // the method threw an exeption
+
+ if (InnerException != null) // method threw an exeption
{
throw new AggregateException("AsyncHelpers.Run method threw an exception.", InnerException);
}
}
- else
- {
- _workItemsWaiting.WaitOne();
- }
}
}
@@ -291,7 +358,7 @@ internal class BackgroundWorkHost : IRegisteredObject
{
private readonly CancellationTokenSource _shutdownCancellationTokenSource = new CancellationTokenSource();
private int _numRunningWorkItems;
-
+
public BackgroundWorkHost()
{
HostingEnvironment.RegisterObject(this);
@@ -337,7 +404,7 @@ public void Register(Task work, CancellationToken cancellationToken)
}
_numRunningWorkItems++;
}
-
+
work.ContinueWith(
WorkItemComplete,
CancellationToken.None,
@@ -353,7 +420,7 @@ private void WorkItemComplete(Task work)
lock (this)
{
num = --_numRunningWorkItems;
- isCancellationRequested = _shutdownCancellationTokenSource.IsCancellationRequested;
+ isCancellationRequested = _shutdownCancellationTokenSource.IsCancellationRequested;
}
if (num == 0 && isCancellationRequested)
{
diff --git a/src/Libraries/SmartStore.Core/BaseEntity.cs b/src/Libraries/SmartStore.Core/BaseEntity.cs
index b591189f8d..3fd0016909 100644
--- a/src/Libraries/SmartStore.Core/BaseEntity.cs
+++ b/src/Libraries/SmartStore.Core/BaseEntity.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
+using System.Data.Entity.Core.Objects;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Runtime.Serialization;
@@ -20,18 +21,27 @@ public abstract partial class BaseEntity : IEquatable
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; set; }
- [SuppressMessage("ReSharper", "PossibleNullReferenceException")]
+ [SuppressMessage("ReSharper", "PossibleNullReferenceException")]
+ public virtual string GetEntityName()
+ {
+ return GetUnproxiedType().Name;
+ }
+
public Type GetUnproxiedType()
{
- var t = GetType();
- if (t.AssemblyQualifiedName.StartsWith("System.Data.Entity."))
- {
- // it's a proxied type
- t = t.BaseType;
- }
+ #region Old
+ //var t = GetType();
+ //if (t.AssemblyQualifiedName.StartsWith("System.Data.Entity."))
+ //{
+ // // it's a proxied type
+ // t = t.BaseType;
+ //}
- return t;
- }
+ //return t;
+ #endregion
+
+ return ObjectContext.GetObjectType(GetType());
+ }
///
/// Transient objects are not associated with an item already in storage. For instance,
diff --git a/src/Libraries/SmartStore.Core/Caching/CacheScope.cs b/src/Libraries/SmartStore.Core/Caching/CacheScope.cs
new file mode 100644
index 0000000000..b705ab10b6
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Caching/CacheScope.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace SmartStore.Core.Caching
+{
+ public class CacheScope
+ {
+ private HashSet _dependencies;
+
+ public CacheScope(string key)
+ {
+ Key = key;
+ }
+
+ public string Key { get; private set; }
+
+ public void AddDependency(string key)
+ {
+ if (key == null)
+ {
+ return;
+ }
+
+ if (_dependencies == null)
+ {
+ _dependencies = new HashSet();
+ }
+
+ _dependencies.Add(key);
+ }
+
+ public IEnumerable Dependencies
+ {
+ get
+ {
+ return _dependencies ?? Enumerable.Empty();
+ }
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Caching/CacheScopeAccessor.cs b/src/Libraries/SmartStore.Core/Caching/CacheScopeAccessor.cs
new file mode 100644
index 0000000000..b04e0a7d45
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Caching/CacheScopeAccessor.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SmartStore.Utilities;
+
+namespace SmartStore.Core.Caching
+{
+ public class CacheScopeAccessor : ICacheScopeAccessor
+ {
+ private readonly Stack _stack = new Stack();
+
+ public CacheScopeAccessor()
+ {
+ }
+
+ public CacheScope Current
+ {
+ get
+ {
+ _stack.TryPeek(out var result);
+ return result;
+ }
+ }
+
+ public bool HasScope(string key)
+ {
+ return _stack.Any(x => x.Key.IsCaseInsensitiveEqual(key));
+ }
+
+ public void PropagateKey(string key)
+ {
+ var current = Current;
+ if (current != null)
+ {
+ current.AddDependency(key);
+ }
+ }
+
+ public IDisposable BeginScope(string key, bool independent = false)
+ {
+ if (Current?.Key == key)
+ {
+ // Void if parent scope has the same key.
+ return ActionDisposable.Empty;
+ }
+
+ _stack.Push(new CacheScope(key));
+
+ var action = new ActionDisposable(() =>
+ {
+ _stack.TryPop(out _);
+
+ if (!independent)
+ {
+ PropagateKey(key);
+ }
+ });
+
+ return action;
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Caching/ICacheManager.cs b/src/Libraries/SmartStore.Core/Caching/ICacheManager.cs
index c28fc3d0ff..855349106f 100644
--- a/src/Libraries/SmartStore.Core/Caching/ICacheManager.cs
+++ b/src/Libraries/SmartStore.Core/Caching/ICacheManager.cs
@@ -14,8 +14,9 @@ public interface ICacheManager
///
/// The type of the item to get
/// true , no attemp will be made to invalidate depending/parent cache entries.
/// Cached item value or null if item with specified key does not exist in the cache
- T Get(string key);
+ T Get(string key, bool independent = false);
///
/// Gets a cache item associated with the specified key or adds the item
@@ -25,8 +26,9 @@ public interface ICacheManager
/// true , no attemp will be made to invalidate depending/parent cache entries.
/// Cached item value
- T Get(string key, Func acquirer, TimeSpan? duration = null);
+ T Get(string key, Func acquirer, TimeSpan? duration = null, bool independent = false);
///
/// Gets a cache item associated with the specified key or - if it doesn't exist in the cache -
@@ -36,16 +38,18 @@ public interface ICacheManager
/// true , no attemp will be made to invalidate depending/parent cache entries.
/// Cached item value
- Task GetAsync(string key, Func> acquirer, TimeSpan? duration = null);
+ Task GetAsync(string key, Func> acquirer, TimeSpan? duration = null, bool independent = false);
///
/// Gets a hashset associated with the specified key or. If key does not exist,
/// a new set is created and put to cache automatically
///
/// Cached item value
- ISet GetHashSet(string key);
+ ISet GetHashSet(string key, Func> acquirer = null);
///
/// Adds a cache item with the specified key
@@ -53,7 +57,10 @@ public interface ICacheManager
/// dependencies = null);
///
/// Gets a value indicating whether the value associated with the specified key is cached
diff --git a/src/Libraries/SmartStore.Core/Caching/ICacheScopeAccessor.cs b/src/Libraries/SmartStore.Core/Caching/ICacheScopeAccessor.cs
new file mode 100644
index 0000000000..a640e6b200
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Caching/ICacheScopeAccessor.cs
@@ -0,0 +1,34 @@
+using System;
+
+namespace SmartStore.Core.Caching
+{
+ public interface ICacheScopeAccessor
+ {
+ ///
+ /// Returns the current cache acquire scope (for current thread)
+ ///
+ CacheScope Current { get; }
+
+ ///
+ /// Whether any scope with the passed
+ ///
+ /// Notifies the current scope about a cache dependency.
+ ///
+ ///
+ /// Begins a new cache acquire scope.
+ ///
+ /// true means that no key propagation will be performed, making the current cache entry independent from its parent.
+ /// Meaning: parent cache entries will not be auto-invalidated when this entry changes.
+ ///
+ IDisposable BeginScope(string key, bool independent = false);
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Caching/ISet.cs b/src/Libraries/SmartStore.Core/Caching/ISet.cs
index 59decb5d52..d0bff72bd7 100644
--- a/src/Libraries/SmartStore.Core/Caching/ISet.cs
+++ b/src/Libraries/SmartStore.Core/Caching/ISet.cs
@@ -6,6 +6,7 @@ namespace SmartStore.Core.Caching
public interface ISet : IEnumerable
{
bool Add(string item);
+ void AddRange(IEnumerable items);
void Clear();
bool Contains(string item);
bool Remove(string item);
diff --git a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs
index 89a2c707e6..a00224784d 100644
--- a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs
+++ b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs
@@ -4,27 +4,37 @@
using System.Threading.Tasks;
using System.Collections.Concurrent;
using System.Threading;
-using SmartStore.Core.Async;
-using System.Collections;
using System.Collections.Generic;
using SmartStore.Utilities;
using System.Text.RegularExpressions;
+using System.Diagnostics;
+using SmartStore.Utilities.Threading;
+using SmartStore.Core.Infrastructure.DependencyManagement;
namespace SmartStore.Core.Caching
{
public partial class MemoryCacheManager : DisposableObject, ICacheManager
{
+ const string LockRecursionExceptionMessage = "Acquiring identical cache items recursively is not supported. Key: {0}";
+
// Wwe put a special string into cache if value is null,
// otherwise our 'Contains()' would always return false,
// which is bad if we intentionally wanted to save NULL values.
public const string FakeNull = "__[NULL]__";
- private readonly MemoryCache _cache;
+ private readonly Work _scopeAccessor;
+ private MemoryCache _cache;
private readonly ConcurrentDictionary _keyLocks = new ConcurrentDictionary();
- public MemoryCacheManager()
+ public MemoryCacheManager(Work scopeAccessor)
{
- _cache = new MemoryCache("SmartStore");
+ _scopeAccessor = scopeAccessor;
+ _cache = CreateCache();
+ }
+
+ private MemoryCache CreateCache()
+ {
+ return new MemoryCache("SmartStore");
}
public bool IsDistributedCache
@@ -32,7 +42,7 @@ public bool IsDistributedCache
get { return false; }
}
- private bool TryGet(string key, out T value)
+ private bool TryGet(string key, bool independent, out T value)
{
value = default(T);
@@ -40,6 +50,12 @@ private bool TryGet(string key, out T value)
if (obj != null)
{
+ // Make the parent scope's entry depend on this
+ if (!independent)
+ {
+ _scopeAccessor.Value.PropagateKey(key);
+ }
+
if (obj.Equals(FakeNull))
{
return true;
@@ -52,65 +68,74 @@ private bool TryGet(string key, out T value)
return false;
}
- public T Get(string key)
+ public T Get(string key, bool independent = false)
{
- T value;
- TryGet(key, out value);
-
+ TryGet(key, independent, out T value);
return value;
}
- public T Get(string key, Func acquirer, TimeSpan? duration = null)
+ public T Get(string key, Func acquirer, TimeSpan? duration = null, bool independent = false)
{
- T value;
-
- if (TryGet(key, out value))
+ if (TryGet(key, independent, out T value))
{
return value;
}
- lock (String.Intern(key))
+ if (_scopeAccessor.Value.HasScope(key))
{
- // atomic operation must be outer locked
- if (!TryGet(key, out value))
+ throw new LockRecursionException(LockRecursionExceptionMessage.FormatInvariant(key));
+ }
+
+ // Get the (semaphore) locker specific to this key
+ using (KeyedLock.Lock("cache:" + key, TimeSpan.FromMinutes(1)))
+ {
+ // Atomic operation must be outer locked
+ if (!TryGet(key, independent, out value))
{
- value = acquirer();
- Put(key, value, duration);
- return value;
+ using (_scopeAccessor.Value.BeginScope(key))
+ {
+ value = acquirer();
+ Put(key, value, duration, _scopeAccessor.Value.Current.Dependencies);
+ return value;
+ }
}
}
return value;
}
- public async Task GetAsync(string key, Func> acquirer, TimeSpan? duration = null)
+ public async Task GetAsync(string key, Func> acquirer, TimeSpan? duration = null, bool independent = false)
{
- T value;
-
- if (TryGet(key, out value))
+ if (TryGet(key, independent, out T value))
{
return value;
}
- // get the async (semaphore) locker specific to this key
- var keyLock = AsyncLock.Acquire(key);
+ if (_scopeAccessor.Value.HasScope(key))
+ {
+ throw new LockRecursionException(LockRecursionExceptionMessage.FormatInvariant(key));
+ }
- using (await keyLock.LockAsync())
+ // Get the async (semaphore) locker specific to this key
+ using (await KeyedLock.LockAsync("cache:" + key, TimeSpan.FromMinutes(1)))
{
- if (!TryGet(key, out value))
+ if (!TryGet(key, independent, out value))
{
- value = await acquirer().ConfigureAwait(false);
- Put(key, value, duration);
- return value;
+ using (_scopeAccessor.Value.BeginScope(key))
+ {
+ value = await acquirer();
+ Put(key, value, duration, _scopeAccessor.Value.Current.Dependencies);
+ return value;
+ }
}
}
return value;
}
- public void Put(string key, object value, TimeSpan? duration = null)
+ public void Put(string key, object value, TimeSpan? duration = null, IEnumerable dependencies = null)
{
- _cache.Set(key, value ?? FakeNull, GetCacheItemPolicy(duration));
+ _cache.Set(key, value ?? FakeNull, GetCacheItemPolicy(duration, dependencies));
}
public bool Contains(string key)
@@ -135,39 +160,53 @@ public IEnumerable Keys(string pattern)
}
var wildcard = new Wildcard(pattern, RegexOptions.IgnoreCase);
- return keys.Where(x => wildcard.IsMatch(x));
+ return keys.Where(x => wildcard.IsMatch(x)).ToArray();
}
public int RemoveByPattern(string pattern)
{
- var keysToRemove = Keys(pattern);
- int count = 0;
-
lock (_cache)
{
+ var keysToRemove = Keys(pattern);
+ int count = 0;
+
// lock atomic operation
foreach (string key in keysToRemove)
{
_cache.Remove(key);
count++;
}
- }
- return count;
+ return count;
+ }
}
public void Clear()
{
- RemoveByPattern("*");
- }
+ // Faster way of clearing cache: https://stackoverflow.com/questions/8043381/how-do-i-clear-a-system-runtime-caching-memorycache
+ var oldCache = Interlocked.Exchange(ref _cache, CreateCache());
+ oldCache.Dispose();
+ GC.Collect();
+ }
- public virtual ISet GetHashSet(string key)
+ public virtual ISet GetHashSet(string key, Func> acquirer = null)
{
- var set = Get(key, () => new MemorySet(this));
- return set;
+ var result = Get(key, () =>
+ {
+ var set = new MemorySet(this);
+ var items = acquirer?.Invoke();
+ if (items != null)
+ {
+ set.AddRange(items);
+ }
+
+ return set;
+ });
+
+ return result;
}
- private CacheItemPolicy GetCacheItemPolicy(TimeSpan? duration)
+ private CacheItemPolicy GetCacheItemPolicy(TimeSpan? duration, IEnumerable dependencies)
{
var absoluteExpiration = ObjectCache.InfiniteAbsoluteExpiration;
@@ -175,16 +214,35 @@ private CacheItemPolicy GetCacheItemPolicy(TimeSpan? duration)
{
absoluteExpiration = DateTime.UtcNow + duration.Value;
}
-
+
var cacheItemPolicy = new CacheItemPolicy
{
AbsoluteExpiration = absoluteExpiration,
SlidingExpiration = ObjectCache.NoSlidingExpiration
};
+
+ if (dependencies != null && dependencies.Any())
+ {
+ // INFO: we can only depend on existing items, otherwise this entry will be removed immediately.
+ dependencies = dependencies.Where(x => x != null && _cache.Contains(x));
+ if (dependencies.Any())
+ {
+ cacheItemPolicy.ChangeMonitors.Add(_cache.CreateCacheEntryChangeMonitor(dependencies));
+ }
+ }
+
+ //cacheItemPolicy.RemovedCallback = OnRemoveEntry;
return cacheItemPolicy;
}
+ //private void OnRemoveEntry(CacheEntryRemovedArguments args)
+ //{
+ // if (args.RemovedReason == CacheEntryRemovedReason.ChangeMonitorChanged)
+ // {
+ // Debug.WriteLine("MEMCACHE: remove depending entry '{0}'.".FormatInvariant(args.CacheItem.Key));
+ // }
+ //}
protected override void OnDispose(bool disposing)
{
diff --git a/src/Libraries/SmartStore.Core/Caching/MemorySet.cs b/src/Libraries/SmartStore.Core/Caching/MemorySet.cs
index 51254daa26..c88cacd703 100644
--- a/src/Libraries/SmartStore.Core/Caching/MemorySet.cs
+++ b/src/Libraries/SmartStore.Core/Caching/MemorySet.cs
@@ -16,6 +16,11 @@ public MemorySet(ICacheManager cache)
_cache = cache;
}
+ public void AddRange(IEnumerable items)
+ {
+ base.UnionWith(items);
+ }
+
public bool Move(string destinationKey, string item)
{
if (this.Contains(item))
diff --git a/src/Libraries/SmartStore.Core/Caching/NullCache.cs b/src/Libraries/SmartStore.Core/Caching/NullCache.cs
index ae8d19b285..e75abfd91d 100644
--- a/src/Libraries/SmartStore.Core/Caching/NullCache.cs
+++ b/src/Libraries/SmartStore.Core/Caching/NullCache.cs
@@ -23,12 +23,12 @@ public bool IsDistributedCache
get { return false; }
}
- public T Get(string key)
+ public T Get(string key, bool independent = false)
{
return default(T);
}
- public T Get(string key, Func acquirer, TimeSpan? duration = null)
+ public T Get(string key, Func acquirer, TimeSpan? duration = null, bool independent = false)
{
if (acquirer == null)
{
@@ -37,7 +37,7 @@ public T Get(string key, Func acquirer, TimeSpan? duration = null)
return acquirer();
}
- public Task GetAsync(string key, Func> acquirer, TimeSpan? duration = null)
+ public Task GetAsync(string key, Func> acquirer, TimeSpan? duration = null, bool independent = false)
{
if (acquirer == null)
{
@@ -47,12 +47,12 @@ public Task GetAsync(string key, Func> acquirer, TimeSpan? duratio
}
- public ISet GetHashSet(string key)
+ public ISet GetHashSet(string key, Func> acquirer = null)
{
return new MemorySet(this);
}
- public void Put(string key, object value, TimeSpan? duration = null)
+ public void Put(string key, object value, TimeSpan? duration = null, IEnumerable dependencies = null)
{
}
diff --git a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs
index cb05f3f288..5fb74d2400 100644
--- a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs
+++ b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs
@@ -8,7 +8,7 @@
namespace SmartStore.Core.Caching
{
- public class RequestCache : IRequestCache
+ public class RequestCache : DisposableObject, IRequestCache
{
const string RegionName = "SmartStoreNET:";
@@ -124,5 +124,11 @@ private string BuildKey(string key)
{
return RegionName + key.EmptyNull();
}
+
+ protected override void OnDispose(bool disposing)
+ {
+ if (disposing)
+ Clear();
+ }
}
}
diff --git a/src/Libraries/SmartStore.Core/Collections/ConcurrentMultimap.cs b/src/Libraries/SmartStore.Core/Collections/ConcurrentMultimap.cs
index 0e02723ec4..86d5b00249 100644
--- a/src/Libraries/SmartStore.Core/Collections/ConcurrentMultimap.cs
+++ b/src/Libraries/SmartStore.Core/Collections/ConcurrentMultimap.cs
@@ -4,6 +4,8 @@
using System.Collections.Concurrent;
using System.Linq;
using Newtonsoft.Json;
+using SmartStore.Utilities;
+using System.Threading;
namespace SmartStore.Collections
{
@@ -14,40 +16,65 @@ namespace SmartStore.Collections
/// The type of value.
[JsonConverter(typeof(ConcurrentMultiMapConverter))]
[Serializable]
- public class ConcurrentMultimap : IEnumerable>>
+ public class ConcurrentMultimap : IEnumerable>>
{
- private readonly ConcurrentDictionary> _items;
- private static readonly Func, IProducerConsumerCollection> _bagCreator = (col) => new ConcurrentBag(col);
+ private readonly ConcurrentDictionary> _dict;
+ private readonly Func, ICollection> _collectionCreator;
public ConcurrentMultimap()
- : this(null, null)
+ : this(null, null, null)
{
}
public ConcurrentMultimap(IEqualityComparer comparer)
- : this(null, comparer)
+ : this(null, comparer, null)
{
}
- public ConcurrentMultimap(IEnumerable>> items)
- : this(items, null)
+ public ConcurrentMultimap(IEnumerable>> items)
+ : this(items, null, null)
{
// for serialization
}
- public ConcurrentMultimap(IEnumerable>> items, IEqualityComparer comparer)
+ public ConcurrentMultimap(
+ IEnumerable>> items,
+ IEqualityComparer comparer)
+ : this(items, comparer, null)
{
- _items = new ConcurrentDictionary>(comparer ?? EqualityComparer.Default);
+ // for serialization
+ }
+
+ public ConcurrentMultimap(
+ IEnumerable>> items,
+ IEqualityComparer comparer,
+ Func, ICollection> collectionCreator)
+ {
+ _collectionCreator = collectionCreator;
+ _dict = new ConcurrentDictionary>(
+ ConvertItems(items),
+ comparer ?? EqualityComparer.Default);
+ }
+
+ private IEnumerable>> ConvertItems(IEnumerable>> items)
+ {
+ if (items == null)
+ yield break;
- if (items != null)
+ foreach (var item in items)
{
- foreach (var kvp in items)
- {
- _items.TryAdd(kvp.Key, _bagCreator(kvp.Value ?? Enumerable.Empty()));
- }
+ yield return new KeyValuePair>(item.Key, CreateCollection(item.Value));
}
}
+ protected virtual SyncedCollection CreateCollection(IEnumerable values)
+ {
+ var creator = _collectionCreator ?? Multimap.DefaultCollectionCreator;
+ var col = creator(values ?? Enumerable.Empty());
+
+ return col.AsSynchronized();
+ }
+
///
/// Gets the count of groups/keys.
///
@@ -55,7 +82,7 @@ public int Count
{
get
{
- return _items.Keys.Count;
+ return _dict.Keys.Count;
}
}
@@ -66,25 +93,33 @@ public int TotalValueCount
{
get
{
- return this._items.Values.Sum(x => x.Count);
+ return this._dict.Values.Sum(x => x.Count);
}
}
+ ///
+ /// Gets the count of items in the requested group.
+ ///
+ public int ValueCount(TKey key)
+ {
+ if (_dict.TryGetValue(key, out var col))
+ {
+ return col.Count;
+ }
+
+ return 0;
+ }
+
///
/// Gets the collection of values stored under the specified key.
///
/// this[TKey key]
+ public virtual SyncedCollection this[TKey key]
{
get
{
- IProducerConsumerCollection value;
- if (!_items.TryGetValue(key, out value))
- {
- _items.TryAdd(key, _bagCreator(Enumerable.Empty()));
- }
-
- return value;
+ GetOrCreateValues(key, null, out var col);
+ return col;
}
}
@@ -93,15 +128,15 @@ public virtual IProducerConsumerCollection this[TKey key]
///
public virtual ICollection Keys
{
- get { return _items.Keys; }
+ get { return _dict.Keys; }
}
///
- /// Gets the collection of collections of values.
+ /// Gets all value collections.
///
- public virtual ICollection> Values
+ public virtual ICollection> Values
{
- get { return _items.Values; }
+ get { return _dict.Values; }
}
///
@@ -111,7 +146,10 @@ public virtual ICollection> Values
///
@@ -123,18 +161,63 @@ public virtual void TryAddRange(TKey key, IEnumerable values)
{
Guard.NotNull(values, nameof(values));
- values.Each(x => this[key].TryAdd(x));
+ if (!GetOrCreateValues(key, values, out var col))
+ {
+ col.AddRange(values);
+ }
+ }
+
+ ///
+ /// Attempts to remove the specified value for the specified key.
+ ///
+ /// True if such a value existed and was removed; otherwise false .
+ /// Attempts to remove a range of values for the specified key.
+ ///
+ /// True if at least one item in group false . values)
+ {
+ Guard.NotNull(values, nameof(values));
+
+ int numRemoved = 0;
+
+ if (_dict.TryGetValue(key, out var col))
+ {
+ numRemoved = col.RemoveRange(values);
+ }
+
+ return numRemoved > 0;
}
///
- /// Attempts to remove all values for the specified key.
+ /// Attempts to remove and return all values for the specified key.
///
/// True if any such values existed; otherwise false . collection)
{
- IProducerConsumerCollection collection;
- return _items.TryRemove(key, out collection);
+ return _dict.TryRemove(key, out collection);
}
///
@@ -142,7 +225,7 @@ public virtual bool TryRemoveAll(TKey key)
///
public virtual void Clear()
{
- _items.Clear();
+ _dict.Clear();
}
///
@@ -152,7 +235,7 @@ public virtual void Clear()
/// True if the multimap has one or more values for the specified key, otherwise false .
@@ -163,7 +246,7 @@ public virtual bool ContainsKey(TKey key)
/// True if the multimap contains such a value; otherwise, false .
@@ -179,12 +262,26 @@ IEnumerator IEnumerable.GetEnumerator()
/// Returns an enumerator that iterates through the multimap.
///
/// An
- public virtual IEnumerator>> GetEnumerator()
+ public virtual IEnumerator>> GetEnumerator()
{
- foreach (var pair in _items)
+ foreach (var pair in _dict)
yield return pair;
}
+ private bool GetOrCreateValues(TKey key, IEnumerable initial, out SyncedCollection col)
+ {
+ // Return true when created
+ var created = false;
+
+ col = _dict.GetOrAdd(key, k =>
+ {
+ created = true;
+ return CreateCollection(initial);
+ });
+
+ return created;
+ }
+
#region Static members
public static ConcurrentMultimap CreateFromLookup(ILookup source)
diff --git a/src/Libraries/SmartStore.Core/Collections/MostRecentlyUsedList.cs b/src/Libraries/SmartStore.Core/Collections/MostRecentlyUsedList.cs
deleted file mode 100644
index 114c4e24bf..0000000000
--- a/src/Libraries/SmartStore.Core/Collections/MostRecentlyUsedList.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace SmartStore.Collections
-{
- public class MostRecentlyUsedList : IEnumerable
- {
- private readonly int _maxSize;
- private readonly List _mru;
-
- public MostRecentlyUsedList(int maxSize)
- {
- _maxSize = maxSize;
- _mru = new List();
- }
-
- public MostRecentlyUsedList(IEnumerable collection, int maxSize)
- {
- _maxSize = maxSize;
- _mru = collection.ToList();
-
- Normalize();
- }
-
- public MostRecentlyUsedList(string collection, int maxSize)
- {
- _maxSize = maxSize;
- _mru = collection.SplitSafe(Delimiter).Cast().ToList();
-
- Normalize();
- }
-
- public MostRecentlyUsedList(IEnumerable collection, T newItem, int maxSize)
- {
- _maxSize = maxSize;
- _mru = collection.ToList();
-
- Add(newItem);
- }
-
- public MostRecentlyUsedList(string collection, T newItem, int maxSize)
- {
- _maxSize = maxSize;
- _mru = collection.SplitSafe(Delimiter).Cast().Distinct().ToList();
-
- Add(newItem);
- }
-
- public static string Delimiter { get { return ";"; } }
-
- private void Normalize()
- {
- if (_maxSize >= 0)
- {
- while (_mru.Count > _maxSize)
- _mru.RemoveAt(_mru.Count - 1);
- }
- }
-
- public IEnumerator GetEnumerator()
- {
- return _mru.GetEnumerator();
- }
-
- IEnumerator IEnumerable.GetEnumerator()
- {
- return _mru.GetEnumerator();
- }
-
- public override string ToString()
- {
- return string.Join(Delimiter, _mru);
- }
-
- public T this[int key]
- {
- get
- {
- return _mru[key];
- }
- set
- {
- _mru[key] = value;
- }
- }
-
- public int Count { get { return _mru.Count; } }
-
- public void Add(T item)
- {
- int i = _mru.IndexOf(item);
- if (i > -1)
- _mru.RemoveAt(i);
-
- _mru.Insert(0, item);
-
- Normalize();
- }
- }
-}
diff --git a/src/Libraries/SmartStore.Core/Collections/MultiMap.cs b/src/Libraries/SmartStore.Core/Collections/MultiMap.cs
index 6c8f85fc78..738ffab5fa 100644
--- a/src/Libraries/SmartStore.Core/Collections/MultiMap.cs
+++ b/src/Libraries/SmartStore.Core/Collections/MultiMap.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using System.Collections.Concurrent;
using System.Linq;
using System.Linq.Expressions;
using Newtonsoft.Json;
@@ -17,11 +16,12 @@ namespace SmartStore.Collections
[Serializable]
public class Multimap : IEnumerable>>
{
- private readonly IDictionary> _items;
+ private readonly IDictionary> _dict;
private readonly Func, ICollection> _collectionCreator;
private readonly bool _isReadonly = false;
- private readonly static Func, ICollection> _defaultCollectionCreator = x => new List(x ?? Enumerable.Empty());
+ internal readonly static Func, ICollection> DefaultCollectionCreator =
+ x => new List(x ?? Enumerable.Empty());
public Multimap()
: this(EqualityComparer.Default)
@@ -30,8 +30,8 @@ public Multimap()
public Multimap(IEqualityComparer comparer)
{
- _items = new Dictionary>(comparer ?? EqualityComparer.Default);
- _collectionCreator = _defaultCollectionCreator;
+ _dict = new Dictionary>(comparer ?? EqualityComparer.Default);
+ _collectionCreator = DefaultCollectionCreator;
}
public Multimap(Func, ICollection> collectionCreator)
@@ -49,7 +49,7 @@ internal Multimap(IDictionary> dictionary, Func> dictionary, bool isRea
{
Guard.NotNull(dictionary, nameof(dictionary));
- _items = dictionary;
+ _dict = dictionary;
if (isReadonly && dictionary != null)
{
@@ -81,21 +81,20 @@ public Multimap(IEnumerable>> items, IEqu
// for serialization
Guard.NotNull(items, nameof(items));
- _items = new Dictionary>(comparer ?? EqualityComparer.Default);
- _collectionCreator = _defaultCollectionCreator;
+ _dict = new Dictionary>(comparer ?? EqualityComparer.Default);
if (items != null)
{
foreach (var kvp in items)
{
- _items[kvp.Key] = CreateCollection(kvp.Value);
+ _dict[kvp.Key] = CreateCollection(kvp.Value);
}
}
}
protected virtual ICollection CreateCollection(IEnumerable values)
{
- return (_collectionCreator ?? _defaultCollectionCreator)(values ?? Enumerable.Empty());
+ return (_collectionCreator ?? DefaultCollectionCreator)(values ?? Enumerable.Empty());
}
///
@@ -105,7 +104,7 @@ public int Count
{
get
{
- return this._items.Keys.Count;
+ return this._dict.Keys.Count;
}
}
@@ -116,7 +115,7 @@ public int TotalValueCount
{
get
{
- return this._items.Values.Sum(x => x.Count);
+ return this._dict.Values.Sum(x => x.Count);
}
}
@@ -128,15 +127,15 @@ public virtual ICollection this[TKey key]
{
get
{
- if (!_items.ContainsKey(key))
+ if (!_dict.ContainsKey(key))
{
if (!_isReadonly)
- _items[key] = CreateCollection(null);
+ _dict[key] = CreateCollection(null);
else
return null;
}
- return _items[key];
+ return _dict[key];
}
}
@@ -145,15 +144,15 @@ public virtual ICollection this[TKey key]
///
public virtual ICollection Keys
{
- get { return _items.Keys; }
+ get { return _dict.Keys; }
}
- ///
- /// Gets the collection of collections of values.
- ///
+ ///
+ /// Gets all value collections.
+ ///
public virtual ICollection> Values
{
- get { return _items.Values; }
+ get { return _dict.Values; }
}
public IEnumerable Find(TKey key, Expression> predicate)
@@ -161,9 +160,9 @@ public IEnumerable Find(TKey key, Expression> predica
Guard.NotNull(key, nameof(key));
Guard.NotNull(predicate, nameof(predicate));
- if (_items.ContainsKey(key))
+ if (_dict.ContainsKey(key))
{
- return _items[key].Where(predicate.Compile());
+ return _dict[key].Where(predicate.Compile());
}
return Enumerable.Empty();
@@ -188,7 +187,10 @@ public virtual void Add(TKey key, TValue value)
/// values)
{
- CheckNotReadonly();
+ if (values == null || !values.Any())
+ return;
+
+ CheckNotReadonly();
this[key].AddRange(values);
}
@@ -203,12 +205,12 @@ public virtual bool Remove(TKey key, TValue value)
{
CheckNotReadonly();
- if (!_items.ContainsKey(key))
+ if (!_dict.ContainsKey(key))
return false;
- bool result = _items[key].Remove(value);
- if (_items[key].Count == 0)
- _items.Remove(key);
+ bool result = _dict[key].Remove(value);
+ if (_dict[key].Count == 0)
+ _dict.Remove(key);
return result;
}
@@ -221,7 +223,7 @@ public virtual bool Remove(TKey key, TValue value)
public virtual bool RemoveAll(TKey key)
{
CheckNotReadonly();
- return _items.Remove(key);
+ return _dict.Remove(key);
}
///
@@ -230,7 +232,7 @@ public virtual bool RemoveAll(TKey key)
public virtual void Clear()
{
CheckNotReadonly();
- _items.Clear();
+ _dict.Clear();
}
///
@@ -240,7 +242,7 @@ public virtual void Clear()
/// True if the multimap has one or more values for the specified key, otherwise false .
@@ -251,7 +253,7 @@ public virtual bool ContainsKey(TKey key)
/// True if the multimap contains such a value; otherwise, false .
@@ -269,7 +271,7 @@ IEnumerator IEnumerable.GetEnumerator()
/// An
public virtual IEnumerator>> GetEnumerator()
{
- foreach (KeyValuePair> pair in _items)
+ foreach (KeyValuePair> pair in _dict)
yield return pair;
}
diff --git a/src/Libraries/SmartStore.Core/Collections/SyncedCollection.cs b/src/Libraries/SmartStore.Core/Collections/SyncedCollection.cs
new file mode 100644
index 0000000000..d8100effd8
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Collections/SyncedCollection.cs
@@ -0,0 +1,222 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace SmartStore.Collections
+{
+ public sealed class SyncedCollection : ICollection
+ {
+ // INFO: Don't call it SynchronizedCollection because of framework dupe.
+ private readonly ICollection _col;
+
+ public SyncedCollection(ICollection wrappedCollection)
+ : this(wrappedCollection, new object())
+ {
+ }
+
+ public SyncedCollection(ICollection wrappedCollection, object syncRoot)
+ {
+ Guard.NotNull(wrappedCollection, nameof(wrappedCollection));
+ Guard.NotNull(syncRoot, nameof(syncRoot));
+
+ _col = wrappedCollection;
+ SyncRoot = syncRoot;
+ }
+
+ public object SyncRoot { get; }
+
+ public bool ReadLockFree { get; set; }
+
+ public void AddRange(IEnumerable collection)
+ {
+ lock (SyncRoot)
+ {
+ _col.AddRange(collection);
+ }
+ }
+
+ public void Insert(int index, T item)
+ {
+ if (_col is List list)
+ {
+ lock (SyncRoot)
+ {
+ list.Insert(index, item);
+ }
+ }
+
+ throw new NotSupportedException();
+ }
+
+ public void InsertRange(int index, IEnumerable values)
+ {
+ if (_col is List list)
+ {
+ lock (SyncRoot)
+ {
+ list.InsertRange(index, values);
+ }
+ }
+
+ throw new NotSupportedException();
+ }
+
+ public int RemoveRange(IEnumerable values)
+ {
+ int numRemoved = 0;
+
+ lock (SyncRoot)
+ {
+ foreach (var value in values)
+ {
+ if (_col.Remove(value))
+ numRemoved++;
+ }
+ }
+
+ return numRemoved;
+ }
+
+ public void RemoveRange(int index, int count)
+ {
+ if (_col is List list)
+ {
+ lock (SyncRoot)
+ {
+ list.RemoveRange(index, count);
+ }
+ }
+
+ throw new NotSupportedException();
+ }
+
+ public void RemoveAt(int index)
+ {
+ lock (SyncRoot)
+ {
+ if (_col is List list)
+ {
+ list.RemoveAt(index);
+ }
+ else
+ {
+ var item = _col.ElementAtOrDefault(index);
+ if (item != null)
+ {
+ _col.Remove(item);
+ }
+ }
+ }
+ }
+
+ public T this[int index]
+ {
+ get
+ {
+ if (ReadLockFree)
+ {
+ return _col.ElementAt(index);
+ }
+ else
+ {
+ lock (SyncRoot)
+ {
+ return _col.ElementAt(index);
+ }
+ }
+ }
+ }
+
+ #region ICollection
+
+ public int Count
+ {
+ get
+ {
+ if (ReadLockFree)
+ {
+ return _col.Count();
+ }
+ else
+ {
+ lock (SyncRoot)
+ {
+ return _col.Count();
+ }
+ }
+ }
+ }
+
+ public bool IsReadOnly => _col.IsReadOnly;
+
+ public void Add(T item)
+ {
+ lock (SyncRoot)
+ {
+ _col.Add(item);
+ }
+ }
+
+ public void Clear()
+ {
+ lock (SyncRoot)
+ {
+ _col.Clear();
+ }
+ }
+
+ public bool Contains(T item)
+ {
+ if (ReadLockFree)
+ {
+ return _col.Contains(item);
+ }
+ else
+ {
+ lock (SyncRoot)
+ {
+ return _col.Contains(item);
+ }
+ }
+ }
+
+ public void CopyTo(T[] array, int arrayIndex)
+ {
+ lock (SyncRoot)
+ {
+ _col.CopyTo(array, arrayIndex);
+ }
+ }
+
+ public bool Remove(T item)
+ {
+ lock (SyncRoot)
+ {
+ return _col.Remove(item);
+ }
+ }
+
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ return this.GetEnumerator();
+ }
+
+ public IEnumerator GetEnumerator()
+ {
+ if (ReadLockFree)
+ {
+ return _col.GetEnumerator();
+ }
+ else
+ {
+ lock (SyncRoot)
+ {
+ return _col.GetEnumerator();
+ }
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Collections/TreeNode.cs b/src/Libraries/SmartStore.Core/Collections/TreeNode.cs
index 19cf141de9..00034d0778 100644
--- a/src/Libraries/SmartStore.Core/Collections/TreeNode.cs
+++ b/src/Libraries/SmartStore.Core/Collections/TreeNode.cs
@@ -227,7 +227,17 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
if (GetPropValue("Metadata", value) is IDictionary dict && dict.Count > 0)
{
writer.WritePropertyName("Metadata");
- serializer.Serialize(writer, dict);
+
+ var typeNameHandling = serializer.TypeNameHandling;
+ try
+ {
+ serializer.TypeNameHandling = TypeNameHandling.All;
+ serializer.Serialize(writer, dict);
+ }
+ finally
+ {
+ serializer.TypeNameHandling = typeNameHandling;
+ }
}
// Children
diff --git a/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs b/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs
index 8dd7bee9b2..8264db12e1 100644
--- a/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs
+++ b/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs
@@ -40,13 +40,10 @@ public object Id
{
var map = GetIdNodeMap();
- if (_id != value)
+ if (_id != null && map.ContainsKey(_id))
{
- if (_id != null && map.ContainsKey(_id))
- {
- // Remove old id from map
- map.Remove(_id);
- }
+ // Remove old id from map
+ map.Remove(_id);
}
if (value != null)
@@ -142,7 +139,12 @@ public TMetadata GetMetadata(string key, bool recursive = true)
break;
}
- return (TMetadata)metadata;
+ if (metadata != null)
+ {
+ return (TMetadata)metadata;
+ }
+
+ return default(TMetadata);
}
private bool TryGetMetadataForNode(TreeNodeBase node, string key, out object metadata)
diff --git a/src/Libraries/SmartStore.Core/Collections/TrimmedBuffer.cs b/src/Libraries/SmartStore.Core/Collections/TrimmedBuffer.cs
new file mode 100644
index 0000000000..db54bf8936
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Collections/TrimmedBuffer.cs
@@ -0,0 +1,106 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace SmartStore.Collections
+{
+ public sealed class TrimmedBuffer : ICollection
+ {
+ private readonly int _maxSize;
+ private readonly List _list;
+
+ public TrimmedBuffer(int maxSize)
+ : this((IEnumerable)null, default(T), maxSize)
+ {
+ }
+
+ public TrimmedBuffer(IEnumerable collection, int maxSize)
+ : this(collection, default(T), maxSize)
+ {
+ }
+
+ public TrimmedBuffer(string collection, int maxSize)
+ : this(collection.NullEmpty()?.Convert>()?.Distinct(), default(T), maxSize)
+ {
+ }
+
+ public TrimmedBuffer(string collection, T newItem, int maxSize)
+ : this(collection.NullEmpty()?.Convert>()?.Distinct(), newItem, maxSize)
+ {
+ }
+
+ public TrimmedBuffer(IEnumerable collection, T newItem, int maxSize)
+ {
+ Guard.IsTrue(maxSize >= 0, nameof(maxSize));
+
+ _maxSize = maxSize;
+ _list = new List(collection ?? Enumerable.Empty());
+
+ if (newItem != null)
+ {
+ Add(newItem);
+ }
+
+ Trim();
+ }
+
+ private void Trim()
+ {
+ if (_maxSize >= 0)
+ {
+ while (_list.Count > _maxSize)
+ _list.RemoveAt(_list.Count - 1);
+ }
+ }
+
+ public T this[int index]
+ {
+ get
+ {
+ return _list[index];
+ }
+ set
+ {
+ _list[index] = value;
+ }
+ }
+
+ public void Add(T item)
+ {
+ var i = _list.IndexOf(item);
+ if (i > -1)
+ _list.RemoveAt(i);
+
+ _list.Insert(0, item);
+
+ Trim();
+ }
+
+ public void Clear() => _list.Clear();
+
+ public bool Contains(T item) => _list.Contains(item);
+
+ public void CopyTo(T[] array, int arrayIndex) => _list.CopyTo(array, arrayIndex);
+
+ public bool Remove(T item) => _list.Remove(item);
+
+ public int Count => _list.Count;
+
+ public bool IsReadOnly => false;
+
+ public IEnumerator GetEnumerator()
+ {
+ return _list.GetEnumerator();
+ }
+
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ return _list.GetEnumerator();
+ }
+
+ public override string ToString()
+ {
+ return string.Join(";", _list);
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/FastActivator.cs b/src/Libraries/SmartStore.Core/ComponentModel/FastActivator.cs
index d37ec07015..85419958d3 100644
--- a/src/Libraries/SmartStore.Core/ComponentModel/FastActivator.cs
+++ b/src/Libraries/SmartStore.Core/ComponentModel/FastActivator.cs
@@ -44,6 +44,8 @@ public object Activate(params object[] parameters)
return Invoker(parameters);
}
+ #region Static
+
///
/// Creates a single fast constructor invoker. The result is not cached.
///
@@ -78,8 +80,6 @@ public static Func MakeFastInvoker(ConstructorInfo constructor
return lambda.Compile();
}
- #region Static
-
///
/// Creates and caches fast constructor invokers
///
@@ -93,8 +93,7 @@ public static FastActivator[] GetActivators(Type type)
private static FastActivator[] GetActivatorsCore(Type type)
{
- FastActivator[] activators;
- if (!_activatorsCache.TryGetValue(type, out activators))
+ if (!_activatorsCache.TryGetValue(type, out FastActivator[] activators))
{
var candidates = GetCandidateConstructors(type);
activators = candidates.Select(c => new FastActivator(c)).ToArray();
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/FastInvoker.cs b/src/Libraries/SmartStore.Core/ComponentModel/FastInvoker.cs
new file mode 100644
index 0000000000..ba43358e1a
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/ComponentModel/FastInvoker.cs
@@ -0,0 +1,293 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Linq.Expressions;
+using System.Collections.Concurrent;
+using SmartStore.Utilities;
+
+namespace SmartStore.ComponentModel
+{
+ public class FastInvoker
+ {
+ private static readonly ConcurrentDictionary _invokersCache = new ConcurrentDictionary();
+
+ public FastInvoker(MethodInfo methodInfo)
+ {
+ Guard.NotNull(methodInfo, nameof(methodInfo));
+
+ Method = methodInfo;
+ Invoker = MakeFastInvoker(methodInfo);
+ ParameterTypes = methodInfo.GetParameters().Select(p => p.ParameterType).ToArray();
+ }
+
+ ///
+ /// Gets the backing
+ public MethodInfo Method { get; private set; }
+
+ ///
+ /// Gets the parameter types from the backing
+ public Type[] ParameterTypes { get; private set; }
+
+ ///
+ /// Gets the method invoker.
+ ///
+ public Func Invoker { get; private set; }
+
+ ///
+ /// Invokes the method using the specified parameters.
+ ///
+ /// The method invocation result.
+ public object Invoke(object obj, params object[] parameters)
+ {
+ return Invoker(obj, parameters);
+ }
+
+ #region Static
+
+ ///
+ /// Creates a single fast method invoker. The result is not cached.
+ ///
+ /// The fast method invoker delegate.
+ public static Func MakeFastInvoker(MethodInfo method)
+ {
+ Guard.NotNull(method, nameof(method));
+
+ var instanceParameterExpression = Expression.Parameter(typeof(object), "instance");
+ var argumentsParameterExpression = Expression.Parameter(typeof(object[]), "args");
+ var index = 0;
+
+ var argumentExtractionExpressions =
+ method
+ .GetParameters()
+ .Select(parameter =>
+ Expression.Convert(
+ Expression.ArrayAccess(
+ argumentsParameterExpression,
+ Expression.Constant(index++)
+ ),
+ parameter.ParameterType
+ )
+ ).ToList();
+
+ var callExpression = method.IsStatic
+ ? Expression.Call(method, argumentExtractionExpressions)
+ : Expression.Call(
+ Expression.Convert(
+ instanceParameterExpression,
+ method.DeclaringType
+ ),
+ method,
+ argumentExtractionExpressions
+ );
+
+ var endLabel = Expression.Label(typeof(object));
+
+ var finalExpression = method.ReturnType == typeof(void)
+ ? (Expression)Expression.Block(
+ callExpression,
+ Expression.Return(endLabel, Expression.Constant(null)),
+ Expression.Label(endLabel, Expression.Constant(null))
+ )
+ : Expression.Convert(callExpression, typeof(object));
+
+ var lambdaExpression = Expression.Lambda>(
+ finalExpression,
+ instanceParameterExpression,
+ argumentsParameterExpression
+ );
+
+ var lamdba = lambdaExpression.Compile();
+ return lamdba;
+ }
+
+ ///
+ /// Invokes a method using the specified object and parameter instances.
+ ///
+ /// The method invocation result.
+ public static object Invoke(object obj, string methodName, Type[] parameterTypes, object[] parameters)
+ {
+ Guard.NotNull(obj, nameof(obj));
+
+ FastInvoker invoker;
+
+ if (parameterTypes == null || parameterTypes.Length == 0)
+ {
+ invoker = GetInvoker(obj.GetType(), methodName);
+ }
+ else
+ {
+ invoker = GetInvoker(obj.GetType(), methodName, parameterTypes);
+ }
+
+ //var hasAnyNullParam = parameters.Any(x => x == null);
+ //if (hasAnyNullParam)
+ //{
+ // throw new ArgumentException("When invoking a method with parameter instances, no instance must be null.", nameof(parameters));
+ //}
+
+ return invoker.Invoke(obj, parameters ?? Array.Empty());
+ }
+
+ ///
+ /// Creates and caches a fast method invoker.
+ ///
+ /// The fast method invoker.
+ public static FastInvoker GetInvoker(string methodName, params Type[] argTypes)
+ {
+ return GetInvoker(typeof(T), methodName, argTypes);
+ }
+
+ ///
+ /// Creates and caches a fast method invoker.
+ ///
+ /// The fast method invoker.
+ public static FastInvoker GetInvoker(Type type, string methodName, params Type[] argTypes)
+ {
+ Guard.NotNull(type, nameof(type));
+ Guard.NotEmpty(methodName, nameof(methodName));
+
+ var cacheKey = MethodKey.Create(type, methodName, argTypes);
+
+ if (!_invokersCache.TryGetValue(cacheKey, out var invoker))
+ {
+ var method = FindMatchingMethod(type, methodName, argTypes);
+
+ if (method == null)
+ {
+ throw new MethodAccessException("Could not find a matching method '{0}' in type {1}.".FormatInvariant(methodName, type));
+ }
+
+ invoker = new FastInvoker(method);
+ _invokersCache.TryAdd(cacheKey, invoker);
+ }
+
+ return invoker;
+ }
+
+ ///
+ /// Creates and caches a fast method invoker.
+ ///
+ /// The fast method invoker.
+ public static FastInvoker GetInvoker(MethodInfo method)
+ {
+ Guard.NotNull(method, nameof(method));
+
+ var cacheKey = MethodKey.Create(method);
+
+ if (!_invokersCache.TryGetValue(cacheKey, out var invoker))
+ {
+ invoker = new FastInvoker(method);
+ _invokersCache.TryAdd(cacheKey, invoker);
+ }
+
+ return invoker;
+ }
+
+ private static MethodInfo FindMatchingMethod(Type type, string methodName, Type[] argTypes)
+ {
+ var method = argTypes == null || argTypes.Length == 0
+ ? type.GetMethod(methodName)
+ : type.GetMethod(
+ methodName,
+ BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+ null,
+ argTypes ?? new Type[0],
+ null);
+
+ return method;
+ }
+
+ #endregion
+
+ abstract class MethodKey
+ {
+ public override bool Equals(object obj) =>
+ throw new NotImplementedException();
+
+ public override int GetHashCode() =>
+ throw new NotImplementedException();
+
+ public static bool operator ==(MethodKey left, MethodKey right) =>
+ object.Equals(left, right);
+
+ public static bool operator !=(MethodKey left, MethodKey right) =>
+ !(left == right);
+
+ internal static MethodKey Create(Type type, string methodName, IEnumerable parameterTypes)
+ {
+ return new HashMethodKey(type, methodName, parameterTypes);
+ }
+
+ internal static MethodKey Create(MethodInfo method)
+ {
+ return new MethodInfoKey(method);
+ }
+ }
+
+ class HashMethodKey : MethodKey, IEquatable
+ {
+ private readonly int _hash;
+
+ public HashMethodKey(Type type, string methodName, IEnumerable parameterTypes)
+ {
+ _hash = HashCodeCombiner.Start().Add(type).Add(methodName).Add(parameterTypes).CombinedHash;
+ }
+
+ public override bool Equals(object obj) =>
+ this.Equals(obj as HashMethodKey);
+
+ public bool Equals(HashMethodKey other)
+ {
+ if (other == null)
+ return false;
+
+ return this._hash == other._hash;
+ }
+
+ public override int GetHashCode()
+ {
+ return _hash;
+ }
+ }
+
+ class MethodInfoKey : MethodKey, IEquatable
+ {
+ private readonly MethodInfo _method;
+
+ public MethodInfoKey(MethodInfo method)
+ {
+ _method = method;
+ }
+
+ public override bool Equals(object obj) =>
+ this.Equals(obj as MethodInfoKey);
+
+ public bool Equals(MethodInfoKey other)
+ {
+ if (other == null)
+ return false;
+
+ return this._method == other._method;
+ }
+
+ public override int GetHashCode()
+ {
+ return _method.GetHashCode();
+ }
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs b/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs
index 4ad5aebee4..7aafa809cd 100644
--- a/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs
+++ b/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs
@@ -543,7 +543,7 @@ protected static IDictionary GetVisibleProperties(
{
return result;
}
-
+
// The simple and common case, this is normal POCO object - no need to allocate.
var allPropertiesDefinedOnType = true;
var allProperties = GetProperties(type, createPropertyHelper, allPropertiesCache);
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/EnumerableConverter.cs b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/EnumerableConverter.cs
index 5687317362..ae60b58488 100644
--- a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/EnumerableConverter.cs
+++ b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/EnumerableConverter.cs
@@ -125,7 +125,7 @@ public override object ConvertTo(CultureInfo culture, string format, object valu
if (value is IEnumerable enumerable)
{
- // we don't use string.Join() because it doesn't support invariant culture
+ // We don't use string.Join() because it doesn't support invariant culture
foreach (var token in enumerable)
{
var str = _elementTypeConverter.ConvertTo(culture, format, token, typeof(string));
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs
index 299ab07a07..ee6c50e474 100644
--- a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs
+++ b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs
@@ -86,7 +86,8 @@ public static ITypeConverter GetConverter(object component)
public static ITypeConverter GetConverter(Type type)
{
- Guard.NotNull(type, nameof(type));
+ if (type == null)
+ throw new ArgumentNullException(nameof(type));
if (_typeConverters.TryGetValue(type, out var converter))
{
diff --git a/src/Libraries/SmartStore.Core/Configuration/JsonPersistAttribute.cs b/src/Libraries/SmartStore.Core/Configuration/JsonPersistAttribute.cs
index 1e467280a9..00d96fe9ba 100644
--- a/src/Libraries/SmartStore.Core/Configuration/JsonPersistAttribute.cs
+++ b/src/Libraries/SmartStore.Core/Configuration/JsonPersistAttribute.cs
@@ -11,6 +11,7 @@ namespace SmartStore.Core.Configuration
/// into single properties.
///
[AttributeUsage(AttributeTargets.Class)]
+ [Obsolete]
public class JsonPersistAttribute : Attribute
{
}
diff --git a/src/Libraries/SmartStore.Core/Data/DbContextScope.cs b/src/Libraries/SmartStore.Core/Data/DbContextScope.cs
index 93a7552c50..7d3b433e8e 100644
--- a/src/Libraries/SmartStore.Core/Data/DbContextScope.cs
+++ b/src/Libraries/SmartStore.Core/Data/DbContextScope.cs
@@ -3,6 +3,7 @@
using System.Linq.Expressions;
using System.Collections.Generic;
using System.Linq;
+using System.Threading.Tasks;
namespace SmartStore.Core.Data
{
@@ -89,7 +90,12 @@ public int Commit()
return _ctx.SaveChanges();
}
- public void Dispose()
+ public async Task CommitAsync()
+ {
+ return await _ctx.SaveChangesAsync();
+ }
+
+ public void Dispose()
{
_ctx.AutoDetectChangesEnabled = _autoDetectChangesEnabled;
_ctx.ProxyCreationEnabled = _proxyCreationEnabled;
diff --git a/src/Libraries/SmartStore.Core/Data/DbQuerySettings.cs b/src/Libraries/SmartStore.Core/Data/DbQuerySettings.cs
index d1e22d6965..3e2318e4f0 100644
--- a/src/Libraries/SmartStore.Core/Data/DbQuerySettings.cs
+++ b/src/Libraries/SmartStore.Core/Data/DbQuerySettings.cs
@@ -4,8 +4,6 @@ namespace SmartStore.Core.Data
{
public class DbQuerySettings
{
- private readonly static DbQuerySettings s_default = new DbQuerySettings(false, false);
-
public DbQuerySettings(bool ignoreAcl, bool ignoreMultiStore)
{
this.IgnoreAcl = ignoreAcl;
@@ -15,9 +13,6 @@ public DbQuerySettings(bool ignoreAcl, bool ignoreMultiStore)
public bool IgnoreAcl { get; private set; }
public bool IgnoreMultiStore { get; private set; }
- public static DbQuerySettings Default
- {
- get { return s_default; }
- }
+ public static DbQuerySettings Default { get; } = new DbQuerySettings(false, false);
}
}
diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/DbLoadHook.cs b/src/Libraries/SmartStore.Core/Data/Hooks/DbLoadHook.cs
deleted file mode 100644
index b2e9d20731..0000000000
--- a/src/Libraries/SmartStore.Core/Data/Hooks/DbLoadHook.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace SmartStore.Core.Data.Hooks
-{
- public abstract class DbLoadHook : IDbLoadHook
- {
- public virtual void OnLoaded(BaseEntity entity)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs b/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs
index 656ebc60be..09b74716ac 100644
--- a/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs
+++ b/src/Libraries/SmartStore.Core/Data/Hooks/DbSaveHook.cs
@@ -40,7 +40,6 @@ public virtual void OnBeforeSaveCompleted()
{
}
-
public virtual void OnAfterSave(IHookedEntity entry)
{
var entity = entry.Entity as TEntity;
diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs b/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs
index 8152d3fd3e..39126f48f8 100644
--- a/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs
+++ b/src/Libraries/SmartStore.Core/Data/Hooks/DefaultDbHookHandler.cs
@@ -8,8 +8,6 @@ namespace SmartStore.Core.Data.Hooks
{
public class DefaultDbHookHandler : IDbHookHandler
{
- private readonly IEnumerable> _hooks;
- private readonly IList> _loadHooks;
private readonly IList> _saveHooks;
private readonly Multimap _hooksRequestCache = new Multimap();
@@ -17,7 +15,6 @@ public class DefaultDbHookHandler : IDbHookHandler
// Prevents repetitive hooking of the same entity/state/[pre|post] combination within a single request
private readonly HashSet _hookedEntities = new HashSet();
- private static HashSet _importantLoadHookTypes;
private static HashSet _importantSaveHookTypes;
private readonly static object _lock = new object();
@@ -29,8 +26,6 @@ public class DefaultDbHookHandler : IDbHookHandler
public DefaultDbHookHandler(IEnumerable> hooks)
{
- _hooks = hooks;
- _loadHooks = hooks.Where(x => x.Metadata.IsLoadHook == true).ToList();
_saveHooks = hooks.Where(x => x.Metadata.IsLoadHook == false).ToList();
}
@@ -38,24 +33,7 @@ public ILogger Logger
{
get;
set;
- }
-
- public bool HasImportantLoadHooks()
- {
- if (_importantLoadHookTypes == null)
- {
- lock (_lock)
- {
- if (_importantLoadHookTypes == null)
- {
- _importantLoadHookTypes = new HashSet();
- _importantLoadHookTypes.AddRange(_loadHooks.Where(x => x.Metadata.Important).Select(x => x.Metadata.ImplType));
- }
- }
- }
-
- return _importantLoadHookTypes.Any();
- }
+ } = NullLogger.Instance;
public bool HasImportantSaveHooks()
{
@@ -74,41 +52,6 @@ public bool HasImportantSaveHooks()
return _importantSaveHookTypes.Any();
}
- public IEnumerable TriggerLoadHooks(BaseEntity entity, bool importantHooksOnly)
- {
- Guard.NotNull(entity, nameof(entity));
-
- var processedHooks = new HashSet();
-
- if (!_loadHooks.Any() || (importantHooksOnly && !this.HasImportantLoadHooks()))
- {
- return processedHooks;
- }
-
- var entityType = entity.GetUnproxiedType();
-
- var hooks = GetLoadHookInstancesFor(entityType, importantHooksOnly);
- foreach (var hook in hooks)
- {
- // call hook
- try
- {
- hook.OnLoaded(entity);
- processedHooks.Add(hook);
- }
- catch (Exception ex) when (ex is NotImplementedException || ex is NotSupportedException)
- {
- RegisterVoidHook(hook, entityType, EntityState.Unchanged, HookStage.Load);
- }
- catch (Exception ex)
- {
- Logger.ErrorFormat(ex, "LoadHook exception ({0})", hook.GetType().FullName);
- }
- }
-
- return processedHooks;
- }
-
public IEnumerable TriggerPreSaveHooks(IEnumerable entries, bool importantHooksOnly, out bool anyStateChanged)
{
Guard.NotNull(entries, nameof(entries));
@@ -210,17 +153,6 @@ public IEnumerable TriggerPostSaveHooks(IEnumerable
return processedHooks;
}
- private IEnumerable GetLoadHookInstancesFor(Type entityType, bool importantOnly)
- {
- return GetHookInstancesFor(
- entityType,
- EntityState.Unchanged,
- HookStage.Load,
- importantOnly,
- _loadHooks,
- _importantLoadHookTypes);
- }
-
private IEnumerable GetSaveHookInstancesFor(IHookedEntity entry, HookStage stage, bool importantOnly)
{
return GetHookInstancesFor(
diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs b/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs
index 2c07d9e699..f1f81574a2 100644
--- a/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs
+++ b/src/Libraries/SmartStore.Core/Data/Hooks/HookMetadata.cs
@@ -29,8 +29,7 @@ public static HookMetadata Create(Type hookedType, bool important = false
{
ImplType = typeof(THook),
HookedType = hookedType,
- Important = important,
- IsLoadHook = typeof(IDbLoadHook).IsAssignableFrom(hookedType)
+ Important = important
};
}
}
diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/IDbHookHandler.cs b/src/Libraries/SmartStore.Core/Data/Hooks/IDbHookHandler.cs
index ed010a5313..9e46634c86 100644
--- a/src/Libraries/SmartStore.Core/Data/Hooks/IDbHookHandler.cs
+++ b/src/Libraries/SmartStore.Core/Data/Hooks/IDbHookHandler.cs
@@ -6,17 +6,8 @@ namespace SmartStore.Core.Data.Hooks
{
public interface IDbHookHandler
{
- bool HasImportantLoadHooks();
bool HasImportantSaveHooks();
- ///
- /// Triggers all load hooks for a single entity
- ///
- /// The list of actually processed hook instances
- IEnumerable TriggerLoadHooks(BaseEntity entity, bool importantHooksOnly);
-
///
/// Triggers all pre action hooks
///
@@ -44,21 +35,11 @@ public static IDbHookHandler Instance
get { return s_instance; }
}
- public bool HasImportantLoadHooks()
- {
- return false;
- }
-
public bool HasImportantSaveHooks()
{
return false;
}
- public IEnumerable TriggerLoadHooks(BaseEntity entity, bool importantHooksOnly)
- {
- return Enumerable.Empty();
- }
-
public IEnumerable TriggerPreSaveHooks(IEnumerable entries, bool importantHooksOnly, out bool anyStateChanged)
{
anyStateChanged = false;
diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs b/src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs
index 843fe689cc..669ffc9dec 100644
--- a/src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs
+++ b/src/Libraries/SmartStore.Core/Data/Hooks/IDbLoadHook.cs
@@ -5,6 +5,7 @@ namespace SmartStore.Core.Data.Hooks
///
/// A hook that is executed right after an entity has been loaded from database and materialized.
///
+ [Obsolete("Not called anymore for performance reasons.")]
public interface IDbLoadHook : IDbHook
{
void OnLoaded(BaseEntity entity);
diff --git a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs
index b4426b1ec8..d9534c06ea 100644
--- a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs
@@ -9,7 +9,6 @@ namespace SmartStore
{
public static class IQueryableExtensions
{
-
///
/// Instructs the repository to eager load entities that may be in the type's association path.
///
@@ -40,6 +39,5 @@ public static IQueryable Expand(this IQueryable query, Expre
return query.Include(path);
}
-
}
}
diff --git a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs
index a3d54c9f75..5041bebcdf 100644
--- a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs
@@ -4,6 +4,7 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
+using System.Threading.Tasks;
namespace SmartStore.Core.Data
{
@@ -95,7 +96,57 @@ public static int DeleteAll(this IRepository rs, Expression>
return count;
}
- public static IQueryable Get(
+ ///
+ /// Truncates the table asynchronously.
+ ///
+ /// Entity type
+ /// false : does not make any attempts to determine dependant entities, just deletes ONLY them (faster).
+ /// true : loads all entities into the context first and deletes them, along with their dependencies (slower).
+ ///
+ /// The total number of affected entities
+ ///
+ /// This method turns off auto detection, validation and hooking.
+ ///
+ [SuppressMessage("ReSharper", "UnusedVariable")]
+ public async static Task DeleteAllAsync(this IRepository rs, Expression> predicate = null, bool cascade = false) where T : BaseEntity
+ {
+ var count = 0;
+
+ using (var scope = new DbContextScope(ctx: rs.Context, autoDetectChanges: false, validateOnSave: false, hooksEnabled: false, autoCommit: false))
+ {
+ var query = rs.Table;
+ if (predicate != null)
+ {
+ query = query.Where(predicate);
+ }
+
+ if (cascade)
+ {
+ var records = query.ToList();
+ foreach (var chunk in records.Slice(500))
+ {
+ rs.DeleteRange(chunk.ToList());
+ count += await rs.Context.SaveChangesAsync();
+ }
+ }
+ else
+ {
+ var ids = query.Select(x => new { x.Id }).ToList();
+ foreach (var chunk in ids.Slice(500))
+ {
+ rs.DeleteRange(chunk.Select(x => x.Id));
+ count += await rs.Context.SaveChangesAsync();
+ }
+ }
+ }
+
+ return count;
+ }
+
+ public static IQueryable Get(
this IRepository rs,
Expression> predicate = null,
Func, IOrderedQueryable> orderBy = null,
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs
index 0be6f2d778..394e9e4e9e 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/CatalogSettings.cs
@@ -68,7 +68,7 @@ public CatalogSettings()
ShowColorSquaresInLists = true;
ShowDiscountSign = true;
ShowVariantCombinationPriceAdjustment = true;
- ShowLinkedAttributeValueImage = true;
+ ShowLinkedAttributeValueImage = true;
EnableDynamicPriceUpdate = true;
ShowProductReviewsInProductDetail = true;
EnableHtmlTextCollapser = true;
@@ -129,10 +129,15 @@ public CatalogSettings()
///
public bool ShowVariantCombinationPriceAdjustment { get; set; }
- ///
- /// Gets or sets a value indicating whether to display quantity of linked product at attribute values
- ///
- public bool ShowLinkedAttributeValueQuantity { get; set; }
+ ///
+ /// Indicates whether to show a login note if the user is not authorized to see prices.
+ ///
+ public bool ShowLoginForPriceNote { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether to display quantity of linked product at attribute values
+ ///
+ public bool ShowLinkedAttributeValueQuantity { get; set; }
///
/// Gets or sets a value indicating whether to display the image of linked product at attribute values
@@ -188,11 +193,21 @@ public CatalogSettings()
/// Gets or sets a value indicating whether and where to display a list of subcategories
///
public SubCategoryDisplayType SubCategoryDisplayType { get; set; }
-
- ///
- /// Gets or sets a value indicating whether a 'Share button' is enabled
- ///
- public bool ShowShareButton { get; set; }
+
+ ///
+ /// An option indicating whether sub pages should display the subcategories
+ ///
+ public bool ShowSubCategoriesInSubPages { get; set; }
+
+ ///
+ /// An option indicating whether sub pages should display the category/manufacturer description
+ ///
+ public bool ShowDescriptionInSubPages { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether a 'Share button' is enabled
+ ///
+ public bool ShowShareButton { get; set; }
///
/// Gets or sets a share code (e.g. AddThis button code)
@@ -440,11 +455,16 @@ public CatalogSettings()
/// An option indicating whether products on category and manufacturer pages should include featured products as well
///
public bool IncludeFeaturedProductsInNormalLists { get; set; }
-
- ///
- /// Gets or sets a value indicating whether tier prices should be displayed with applied discounts (if available)
- ///
- public bool DisplayTierPricesWithDiscounts { get; set; }
+
+ ///
+ /// An option indicating whether products on category and manufacturer pages should include featured products in sub pages as well
+ ///
+ public bool IncludeFeaturedProductsInSubPages { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether tier prices should be displayed with applied discounts (if available)
+ ///
+ public bool DisplayTierPricesWithDiscounts { get; set; }
///
/// Gets or sets a value indicating whether to ignore discounts (side-wide)
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs
index 5a895b03a8..d74e7c0c73 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs
@@ -42,6 +42,12 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele
[DataMember]
public string BottomDescription { get; set; }
+ ///
+ /// Gets or sets the external link expression. If set, any category menu item will navigate to the specified link.
+ ///
+ [DataMember]
+ public string ExternalLink { get; set; }
+
///
/// Gets or sets a text displayed in a badge next to the category within menus
///
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs
index 1450373772..c07c9fe69e 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/CategoryNode.cs
@@ -8,10 +8,10 @@ namespace SmartStore.Core.Domain.Catalog
{
public interface ICategoryNode : ILocalizedEntity, ISlugSupported, IAclSupported, IStoreMappingSupported
{
- int Id { get; }
int ParentCategoryId { get; }
string Name { get; }
- string Alias { get; }
+ string ExternalLink { get; }
+ string Alias { get; }
int? PictureId { get; }
bool Published { get; }
int DisplayOrder { get; }
@@ -26,7 +26,8 @@ public class CategoryNode : ICategoryNode
public int Id { get; set; }
public int ParentCategoryId { get; set; }
public string Name { get; set; }
- public string Alias { get; set; }
+ public string ExternalLink { get; set; }
+ public string Alias { get; set; }
public int? PictureId { get; set; }
public bool Published { get; set; }
public int DisplayOrder { get; set; }
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs
index a4bc4c5251..6f18a1722d 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs
@@ -22,32 +22,21 @@ public partial class Product : BaseEntity, IAuditable, ISoftDeletable, ILocalize
{
#region static
- private static readonly HashSet _visibilityAffectingProductProps = new HashSet();
-
- static Product()
- {
- AddPropsToSet(_visibilityAffectingProductProps,
- x => x.AvailableEndDateTimeUtc,
- x => x.AvailableStartDateTimeUtc,
- x => x.Deleted,
- x => x.LowStockActivityId,
- x => x.LimitedToStores,
- x => x.ManageInventoryMethodId,
- x => x.MinStockQuantity,
- x => x.Published,
- x => x.SubjectToAcl,
- x => x.VisibleIndividually);
- }
-
- static void AddPropsToSet(HashSet props, params Expression>[] lambdas)
+ private static readonly HashSet _visibilityAffectingProductProps = new HashSet
{
- foreach (var lambda in lambdas)
- {
- props.Add(lambda.ExtractPropertyInfo().Name);
- }
- }
-
- public static HashSet GetVisibilityAffectingPropertyNames()
+ nameof(Product.AvailableEndDateTimeUtc),
+ nameof(Product.AvailableStartDateTimeUtc),
+ nameof(Product.Deleted),
+ nameof(Product.LowStockActivityId),
+ nameof(Product.LimitedToStores),
+ nameof(Product.ManageInventoryMethodId),
+ nameof(Product.MinStockQuantity),
+ nameof(Product.Published),
+ nameof(Product.SubjectToAcl),
+ nameof(Product.VisibleIndividually)
+ };
+
+ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames()
{
return _visibilityAffectingProductProps;
}
@@ -721,26 +710,29 @@ public decimal Height
/// Gets or sets a value indicating whether the entity is published
///
[DataMember]
+ [Index("IX_Product_Published_Deleted_IsSystemProduct", 1)]
public bool Published { get; set; }
///
/// Gets or sets a value indicating whether the entity has been deleted
///
[Index]
- public bool Deleted { get; set; }
+ [Index("IX_Product_Published_Deleted_IsSystemProduct", 2)]
+ public bool Deleted { get; set; }
///
/// Gets or sets a value indicating whether the entity is a system product.
///
[DataMember]
- [Index("Product_SystemName_IsSystemProduct", 2)]
+ [Index("IX_Product_SystemName_IsSystemProduct", 2)]
+ [Index("IX_Product_Published_Deleted_IsSystemProduct", 3)]
public bool IsSystemProduct { get; set; }
///
/// Gets or sets the product system name.
///
[DataMember]
- [Index("Product_SystemName_IsSystemProduct", 1)]
+ [Index("IX_Product_SystemName_IsSystemProduct", 1)]
public string SystemName { get; set; }
///
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs
index 354720c7ea..60373a2d15 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductBundleData.cs
@@ -1,18 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Xml.Serialization;
-
-namespace SmartStore.Core.Domain.Catalog
+namespace SmartStore.Core.Domain.Catalog
{
- public partial class ProductBundleItemData
+ public partial class ProductBundleItemData
{
public ProductBundleItemData(ProductBundleItem item)
{
- Item = item; // can be null... test with IsValid
+ Item = item; // Can be null.
}
public ProductBundleItem Item { get; private set; }
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs
index 5cb9acaa5f..ee5adfe594 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs
@@ -33,15 +33,17 @@ public partial class ProductCategory : BaseEntity
///
[DataMember]
public int DisplayOrder { get; set; }
-
+
///
/// Gets the category
///
+ [DataMember]
public virtual Category Category { get; set; }
///
/// Gets the product
///
+ [DataMember]
public virtual Product Product { get; set; }
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs
index 087a1f9351..73edaec790 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs
@@ -37,11 +37,13 @@ public partial class ProductManufacturer : BaseEntity
///
/// Gets or sets the manufacturer
///
+ [DataMember]
public virtual Manufacturer Manufacturer { get; set; }
///
/// Gets or sets the product
///
+ [DataMember]
public virtual Product Product { get; set; }
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReviewHelpfulness.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReviewHelpfulness.cs
index e6b612e382..7d9cd545d1 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReviewHelpfulness.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductReviewHelpfulness.cs
@@ -1,25 +1,24 @@
-
using SmartStore.Core.Domain.Customers;
namespace SmartStore.Core.Domain.Catalog
{
///
- /// Represents a product review helpfulness
+ /// Represents a product review helpfulness.
///
public partial class ProductReviewHelpfulness : CustomerContent
{
///
- /// Gets or sets the product review identifier
+ /// Gets or sets the product review identifier.
///
public int ProductReviewId { get; set; }
///
- /// A value indicating whether a review a helpful
+ /// A value indicating whether a review is helpful.
///
public bool WasHelpful { get; set; }
///
- /// Gets the product
+ /// Gets the product review.
///
public virtual ProductReview ProductReview { get; set; }
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs
index 132e767131..eb8595b3af 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductSpecificationAttribute.cs
@@ -46,6 +46,7 @@ public partial class ProductSpecificationAttribute : BaseEntity
///
/// Gets or sets the specification attribute option
///
+ [DataMember]
public virtual SpecificationAttributeOption SpecificationAttributeOption { get; set; }
}
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs
index 64827d8ce4..47b5a55cef 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttributeOption.cs
@@ -50,7 +50,7 @@ public partial class SpecificationAttributeOption : BaseEntity, ILocalizedEntity
public virtual SpecificationAttribute SpecificationAttribute { get; set; }
///
- /// Gets or sets the product specification attribute
+ /// Gets or sets the product specification attributes
///
[DataMember]
public virtual ICollection ProductSpecificationAttributes
diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs
new file mode 100644
index 0000000000..9aab96cc35
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs
@@ -0,0 +1,117 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using SmartStore.Core.Domain.Localization;
+
+namespace SmartStore.Core.Domain.Cms
+{
+ ///
+ /// Represents a menu item.
+ ///
+ [Table("MenuItemRecord")]
+ public class MenuItemRecord : BaseEntity, ILocalizedEntity
+ {
+ ///
+ /// Gets or sets the menu identifier.
+ ///
+ [Required]
+ public int MenuId { get; set; }
+
+ ///
+ /// Gets the menu.
+ ///
+ [ForeignKey("MenuId")]
+ public virtual MenuRecord Menu { get; set; }
+
+ ///
+ /// Gets or sets the parent menu item identifier. 0 if the item has no parent.
+ ///
+ [Index("IX_MenuItem_ParentItemId")]
+ public int ParentItemId { get; set; }
+
+ ///
+ /// Gets or sets the provider name.
+ ///
+ [StringLength(100)]
+ public string ProviderName { get; set; }
+
+ ///
+ /// Gets or sets the model.
+ ///
+ [MaxLength]
+ public string Model { get; set; }
+
+ ///
+ /// Gets or sets the title.
+ ///
+ [StringLength(400)]
+ public string Title { get; set; }
+
+ ///
+ /// Gets or sets the short description. It is used for the link title attribute.
+ ///
+ [StringLength(400)]
+ public string ShortDescription { get; set; }
+
+ ///
+ /// Gets or sets permission names.
+ ///
+ [MaxLength]
+ public string PermissionNames { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the menu item is published.
+ ///
+ [Index("IX_MenuItem_Published")]
+ public bool Published { get; set; } = true;
+
+ ///
+ /// Gets or sets the display order.
+ ///
+ [Index("IX_MenuItem_DisplayOrder")]
+ public int DisplayOrder { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the menu item has a divider or a group header.
+ ///
+ public bool BeginGroup { get; set; }
+
+ ///
+ /// If selected and this menu item has children, the menu will initially appear expanded.
+ ///
+ public bool ShowExpanded { get; set; }
+
+ ///
+ /// Gets or sets the no-follow link attribute.
+ ///
+ public bool NoFollow { get; set; }
+
+ ///
+ /// Gets or sets the blank target link attribute.
+ ///
+ public bool NewWindow { get; set; }
+
+ ///
+ /// Gets or sets fontawesome icon class.
+ ///
+ [StringLength(100)]
+ public string Icon { get; set; }
+
+ ///
+ /// Gets or sets fontawesome icon style.
+ ///
+ [StringLength(10)]
+ public string Style { get; set; }
+
+ ///
+ /// Gets or sets HTML id attribute.
+ ///
+ [StringLength(100)]
+ public string HtmlId { get; set; }
+
+ ///
+ /// Gets or sets the CSS class.
+ ///
+ [StringLength(100)]
+ public string CssClass { get; set; }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs
new file mode 100644
index 0000000000..c8ebedf1c1
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using SmartStore.Core.Domain.Localization;
+using SmartStore.Core.Domain.Security;
+using SmartStore.Core.Domain.Stores;
+
+namespace SmartStore.Core.Domain.Cms
+{
+ ///
+ /// Represents a menu.
+ ///
+ [Table("MenuRecord")]
+ public class MenuRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupported, IAclSupported
+ {
+ private ICollection _items;
+
+ ///
+ /// /// Gets or sets the menu items.
+ ///
+ public virtual ICollection Items
+ {
+ get { return _items ?? (_items = new HashSet()); }
+ protected set { _items = value; }
+ }
+
+ ///
+ /// Gets or sets the system name. It identifies the menu.
+ ///
+ [Required, StringLength(400), Index("IX_Menu_SystemName_IsSystemMenu", Order = 0)]
+ public string SystemName { get; set; }
+
+ ///
+ /// Gets or sets the value indicating whether this menu is deleteable by a user.
+ ///
+ [Index("IX_Menu_SystemName_IsSystemMenu", Order = 1)]
+ public bool IsSystemMenu { get; set; }
+
+ ///
+ /// Gets or sets the menu template name.
+ ///
+ [StringLength(400)]
+ public string Template { get; set; }
+
+ ///
+ /// Gets or sets the widget zone name.
+ ///
+ [StringLength(4000)]
+ public string WidgetZone { get; set; }
+
+ ///
+ /// Gets or sets the title.
+ ///
+ [StringLength(400)]
+ public string Title { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the menu is published.
+ ///
+ [Index("IX_Menu_Published")]
+ public bool Published { get; set; } = true;
+
+ ///
+ /// Gets or sets the order for widget registration.
+ ///
+ public int DisplayOrder { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores.
+ ///
+ [Index("IX_Menu_LimitedToStores")]
+ public bool LimitedToStores { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the entity is subject to ACL.
+ ///
+ [Index("IX_Menu_SubjectToAcl")]
+ public bool SubjectToAcl { get; set; }
+
+ ///
+ /// Helper function to get the comma-separated WidgetZone property as an enumerable of strings.
+ ///
+ /// Widget zones.
+ public IEnumerable GetWidgetZones()
+ {
+ if (WidgetZone.IsEmpty())
+ {
+ return Enumerable.Empty();
+ }
+
+ return WidgetZone.Trim().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs
index 46d94f8c98..523a5dbe52 100644
--- a/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Common/CommonSettings.cs
@@ -11,6 +11,7 @@ public CommonSettings()
EntityPickerPageSize = 48;
MaxScheduleHistoryAgeInDays = 30;
MaxNumberOfScheduleHistoryEntries = 100;
+ MaxQueuedMessagesAgeInDays = 14;
}
public bool UseSystemEmailForContactUsForm { get; set; }
@@ -40,5 +41,10 @@ public CommonSettings()
/// Gets or sets the maximum number of schedule history entries per task.
///
public int MaxNumberOfScheduleHistoryEntries { get; set; }
+
+ ///
+ /// Gets or sets the maximum age of sent queued messages (in days).
+ ///
+ public int MaxQueuedMessagesAgeInDays { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Libraries/SmartStore.Core/Domain/Common/PerformanceSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/PerformanceSettings.cs
new file mode 100644
index 0000000000..8acd3065db
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Domain/Common/PerformanceSettings.cs
@@ -0,0 +1,34 @@
+using System;
+using SmartStore.Core.Configuration;
+
+namespace SmartStore.Core.Domain.Common
+{
+ public class PerformanceSettings : ISettings
+ {
+ ///
+ /// The number of entries in a single cache segment
+ /// when greedy loading is disabled. The larger the catalog,
+ /// the smaller this value should be. We recommend segment
+ /// size 500 for catalogs smaller than 100.000 items.
+ ///
+ public int CacheSegmentSize { get; set; } = 500;
+
+ ///
+ /// By default only instant search prefetches translations.
+ /// All other product listings work against the segmented cache.
+ /// In very large multilingual catalogs (> 500.000) setting this to true
+ /// can result in higher request performance as well as less
+ /// resource usage.
+ ///
+ public bool AlwaysPrefetchTranslations { get; set; }
+
+ ///
+ /// By default only instant search prefetches url slugs.
+ /// All other product listings work against the segmented cache.
+ /// In very large catalogs (> 500.000) setting this to true
+ /// can result in higher request performance as well as less
+ /// resource usage.
+ ///
+ public bool AlwaysPrefetchUrlSlugs { get; set; }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Domain/Common/SocialSettings.cs b/src/Libraries/SmartStore.Core/Domain/Common/SocialSettings.cs
index 46980652d0..1a45382602 100644
--- a/src/Libraries/SmartStore.Core/Domain/Common/SocialSettings.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Common/SocialSettings.cs
@@ -4,50 +4,34 @@ namespace SmartStore.Core.Domain.Common
{
public class SocialSettings : ISettings
{
- public SocialSettings()
- {
- ShowSocialLinksInFooter = true;
- FacebookLink = "#";
- GooglePlusLink = "#";
- TwitterLink = "#";
- PinterestLink = "#";
- //YoutubeLink = "#";
- //InstagramLink = "#";
- }
-
- ///
+ ///
/// Gets or sets the value that determines whether social links should be show in the footer
///
- public bool ShowSocialLinksInFooter { get; set; }
+ public bool ShowSocialLinksInFooter { get; set; } = true;
///
/// Gets or sets the facebook link
///
- public string FacebookLink { get; set; }
-
- ///
- /// Gets or sets the google plus link
- ///
- public string GooglePlusLink { get; set; }
+ public string FacebookLink { get; set; } = "#";
///
/// Gets or sets the twitter link
///
- public string TwitterLink { get; set; }
+ public string TwitterLink { get; set; } = "#";
///
/// Gets or sets the pinterest link
///
- public string PinterestLink { get; set; }
+ public string PinterestLink { get; set; } = "#";
///
/// Gets or sets the youtube link
///
- public string YoutubeLink { get; set; }
+ public string YoutubeLink { get; set; } = "#";
- ///
- /// Gets or sets the instagram link
- ///
- public string InstagramLink { get; set; }
- }
+ ///
+ /// Gets or sets the instagram link
+ ///
+ public string InstagramLink { get; set; } = "#";
+ }
}
\ No newline at end of file
diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerLoginType.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerLoginType.cs
new file mode 100644
index 0000000000..a9c9479506
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerLoginType.cs
@@ -0,0 +1,23 @@
+namespace SmartStore.Core.Domain.Customers
+{
+ ///
+ /// Represents the customer login type
+ ///
+ public enum CustomerLoginType
+ {
+ ///
+ /// The username will be used to login
+ ///
+ Username = 10,
+
+ ///
+ /// The email will be used to login
+ ///
+ Email = 20,
+
+ ///
+ /// The username or the email address can be used to login
+ ///
+ UsernameOrEmail = 30
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs
index 74beb552c2..20033f0c21 100644
--- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs
@@ -6,7 +6,7 @@ public class CustomerSettings : ISettings
{
public CustomerSettings()
{
- UsernamesEnabled = true;
+ CustomerLoginType = CustomerLoginType.UsernameOrEmail;
CustomerNumberMethod = CustomerNumberMethod.Disabled;
CustomerNumberVisibility = CustomerNumberVisibility.None;
DefaultPasswordFormat = PasswordFormat.Hashed;
@@ -14,7 +14,6 @@ public CustomerSettings()
PasswordMinLength = 6;
UserRegistrationType = UserRegistrationType.Standard;
AvatarMaximumSizeBytes = 512000;
- DefaultAvatarEnabled = false;
CustomerNameFormat = CustomerNameFormat.ShowFirstName;
CustomerNameFormatMaxLength = 64;
GenderEnabled = true;
@@ -26,11 +25,11 @@ public CustomerSettings()
FirstNameRequired = false;
LastNameRequired = false;
}
-
- ///
- /// Gets or sets a value indicating whether usernames are used instead of emails
+
+ ///
+ /// Gets or sets a value indicating the customer login type
///
- public bool UsernamesEnabled { get; set; }
+ public CustomerLoginType CustomerLoginType { get; set; }
///
/// Gets or sets the customer number method
@@ -82,11 +81,6 @@ public CustomerSettings()
///
public int AvatarMaximumSizeBytes { get; set; }
- ///
- /// Gets or sets a value indicating whether to display default user avatar.
- ///
- public bool DefaultAvatarEnabled { get; set; }
-
///
/// Gets or sets a value indicating whether customers location is shown
///
@@ -261,9 +255,6 @@ public CustomerSettings()
#endregion
- public string PrefillLoginUsername { get; set; }
- public string PrefillLoginPwd { get; set; }
-
///
/// Identifier of a customer role that new registered customers will be assigned to
///
diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs
index c795d66377..4bd1648beb 100644
--- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs
+++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportEnums.cs
@@ -14,12 +14,22 @@ public enum ExportEntityType
Order,
NewsLetterSubscription,
ShoppingCartItem
- }
-
- ///
- /// Supported deployment types
- ///
- public enum ExportDeploymentType
+ }
+
+ ///
+ /// Supported related entity types (data without own export provider or importer).
+ ///
+ public enum RelatedEntityType
+ {
+ TierPrice = 0,
+ ProductVariantAttributeValue,
+ ProductVariantAttributeCombination
+ }
+
+ ///
+ /// Supported deployment types
+ ///
+ public enum ExportDeploymentType
{
FileSystem = 0,
Email,
@@ -137,7 +147,12 @@ public enum ExportFeatures
///
/// Whether to export attribute combinations as products including parent product. Only effective with CanProjectAttributeCombinations.
///
- UsesAttributeCombinationParent = 1 << 14
+ UsesAttributeCombinationParent = 1 << 14,
+
+ ///
+ /// Whether to provide extra data units for related data
+ ///
+ UsesRelatedDataUnits = 1 << 15
}
///
diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs
index 3161d1ea94..3d75cf06ef 100644
--- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs
+++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
-using SmartStore.Core.Domain.DataExchange;
using SmartStore.Core.Domain.Tasks;
namespace SmartStore.Core.Domain
{
- public class ExportProfile : BaseEntity, ICloneable
+ public class ExportProfile : BaseEntity, ICloneable
{
private ICollection _deployments;
@@ -52,10 +51,15 @@ public ExportProfile()
///
public bool Enabled { get; set; }
- ///
- /// The scheduling task identifier
- ///
- public int SchedulingTaskId { get; set; }
+ ///
+ /// Whether the export related data
+ ///
+ public bool ExportRelatedData { get; set; }
+
+ ///
+ /// The scheduling task identifier
+ ///
+ public int SchedulingTaskId { get; set; }
///
/// XML with filtering information
diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs
index 1139496b4a..4322a88f2f 100644
--- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs
+++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ImportProfile.cs
@@ -60,10 +60,15 @@ public ImportEntityType EntityType
///
public bool Enabled { get; set; }
- ///
- /// Number of records to bypass
- ///
- public int Skip { get; set; }
+ ///
+ /// Whether the import related data
+ ///
+ public bool ImportRelatedData { get; set; }
+
+ ///
+ /// Number of records to bypass
+ ///
+ public int Skip { get; set; }
///
/// Maximum number of records to return
diff --git a/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs b/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs
index f10f0543c3..4e671a5384 100644
--- a/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Directory/QuantityUnit.cs
@@ -1,6 +1,5 @@
-using System;
-using SmartStore.Core.Domain.Localization;
using System.Runtime.Serialization;
+using SmartStore.Core.Domain.Localization;
namespace SmartStore.Core.Domain.Directory
{
@@ -16,6 +15,12 @@ public partial class QuantityUnit : BaseEntity, ILocalizedEntity
[DataMember]
public string Name { get; set; }
+ ///
+ /// Gets or sets the name plural.
+ ///
+ [DataMember]
+ public string NamePlural { get; set; }
+
///
/// Gets or sets the description
///
@@ -38,7 +43,6 @@ public partial class QuantityUnit : BaseEntity, ILocalizedEntity
/// Gets or sets the default quantity unit
///
[DataMember]
- public bool IsDefault { get; set; }
-
+ public bool IsDefault { get; set; }
}
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs b/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs
index d0f24134ae..f7b116da84 100644
--- a/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Discounts/Discount.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Runtime.Serialization;
using SmartStore.Core.Domain.Catalog;
@@ -9,6 +10,7 @@ namespace SmartStore.Core.Domain.Discounts
/// Represents a discount
///
[DataContract]
+ [DebuggerDisplay("{Name} - {DiscountType}")]
public partial class Discount : BaseEntity
{
private ICollection _discountRequirements;
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs
index 0b268be1f1..b4cedb8d01 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs
@@ -1,4 +1,5 @@
using System;
+using System.ComponentModel.DataAnnotations.Schema;
using SmartStore.Core.Domain.Localization;
using SmartStore.Core.Domain.Seo;
@@ -12,6 +13,7 @@ public partial class Forum : BaseEntity, IAuditable, ILocalizedEntity, ISlugSupp
///
/// Gets or sets the forum group identifier
///
+ [Index("IX_ForumGroupId_DisplayOrder", Order = 0)]
public int ForumGroupId { get; set; }
///
@@ -57,6 +59,7 @@ public partial class Forum : BaseEntity, IAuditable, ILocalizedEntity, ISlugSupp
///
/// Gets or sets the display order
///
+ [Index("IX_ForumGroupId_DisplayOrder", Order = 1)]
public int DisplayOrder { get; set; }
///
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs
index d68dceb19c..ae83f4f8f9 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
using SmartStore.Core.Domain.Localization;
+using SmartStore.Core.Domain.Security;
using SmartStore.Core.Domain.Seo;
using SmartStore.Core.Domain.Stores;
@@ -9,7 +11,7 @@ namespace SmartStore.Core.Domain.Forums
///
/// Represents a forum group
///
- public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported, ILocalizedEntity, ISlugSupported
+ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported, IAclSupported, ILocalizedEntity, ISlugSupported
{
private ICollection _forums;
@@ -26,6 +28,7 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported
///
/// Gets or sets the display order
///
+ [Index]
public int DisplayOrder { get; set; }
///
@@ -38,10 +41,17 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported
///
public DateTime UpdatedOnUtc { get; set; }
- ///
- /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
- ///
- public bool LimitedToStores { get; set; }
+ ///
+ /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
+ ///
+ [Index]
+ public bool LimitedToStores { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the entity is subject to ACL
+ ///
+ [Index]
+ public bool SubjectToAcl { get; set; }
///
/// Gets or sets the collection of Forums
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs
index 087c6205a2..e65c80573d 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
using SmartStore.Core.Domain.Customers;
namespace SmartStore.Core.Domain.Forums
@@ -8,6 +10,8 @@ namespace SmartStore.Core.Domain.Forums
///
public partial class ForumPost : BaseEntity, IAuditable
{
+ private ICollection _forumPostVotes;
+
///
/// Gets or sets the forum topic identifier
///
@@ -31,6 +35,7 @@ public partial class ForumPost : BaseEntity, IAuditable
///
/// Gets or sets the date and time of instance creation
///
+ [Index]
public DateTime CreatedOnUtc { get; set; }
///
@@ -38,6 +43,12 @@ public partial class ForumPost : BaseEntity, IAuditable
///
public DateTime UpdatedOnUtc { get; set; }
+ ///
+ /// Gets or sets a value indicating whether the entity is published
+ ///
+ [Index]
+ public bool Published { get; set; }
+
///
/// Gets the topic
///
@@ -48,5 +59,13 @@ public partial class ForumPost : BaseEntity, IAuditable
///
public virtual Customer Customer { get; set; }
+ ///
+ /// Forum post votes.
+ ///
+ public virtual ICollection ForumPostVotes
+ {
+ get { return _forumPostVotes ?? (_forumPostVotes = new HashSet()); }
+ protected set { _forumPostVotes = value; }
+ }
}
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPostVote.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPostVote.cs
new file mode 100644
index 0000000000..1799d22dd3
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPostVote.cs
@@ -0,0 +1,25 @@
+using SmartStore.Core.Domain.Customers;
+
+namespace SmartStore.Core.Domain.Forums
+{
+ ///
+ /// Represents a vote for a forum post.
+ ///
+ public partial class ForumPostVote : CustomerContent
+ {
+ ///
+ /// Forum post identifier.
+ ///
+ public int ForumPostId { get; set; }
+
+ ///
+ /// A value indicating whether the customer voted for or against a forum post.
+ ///
+ public bool Vote { get; set; }
+
+ ///
+ /// Forum post entity.
+ ///
+ public virtual ForumPost ForumPost { get; set; }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs
index 89406566f7..86a2b5e423 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumSettings.cs
@@ -11,23 +11,24 @@ public ForumSettings()
TopicSubjectMaxLength = 450;
PostMaxLength = 4000;
StrippedTopicMaxLength = 45;
- TopicsPageSize = 10;
- PostsPageSize = 10;
- SearchResultsPageSize = 12;
+ TopicsPageSize = 20;
+ PostsPageSize = 20;
+ ForumFeedCount = 20;
+ SearchResultsPageSize = 20;
+ LatestCustomerPostsPageSize = 20;
AllowSorting = true;
- LatestCustomerPostsPageSize = 10;
- ShowCustomersPostCount = true;
+ ShowCustomersPostCount = true;
ForumEditor = EditorType.BBCodeEditor;
SignaturesEnabled = true;
- PrivateMessagesPageSize = 10;
- ForumSubscriptionsPageSize = 10;
+ PrivateMessagesPageSize = 20;
+ ForumSubscriptionsPageSize = 20;
PMSubjectMaxLength = 450;
PMTextMaxLength = 4000;
HomePageActiveDiscussionsTopicCount = 5;
ActiveDiscussionsPageTopicCount = 50;
ActiveDiscussionsFeedCount = 25;
- ForumFeedCount = 10;
- }
+ AllowCustomersToVoteOnPosts = true;
+ }
///
/// Gets or sets a value indicating whether forums are enabled
@@ -64,6 +65,16 @@ public ForumSettings()
///
public bool AllowCustomersToDeletePosts { get; set; }
+ ///
+ /// Gets or sets a value indicating whether customer can vote on posts
+ ///
+ public bool AllowCustomersToVoteOnPosts { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether guests are allowed to vote on posts
+ ///
+ public bool AllowGuestsToVoteOnPosts { get; set; }
+
///
/// Gets or sets maximum length of topic subject
///
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs
index 4b30ac9b02..63d6134530 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs
@@ -1,4 +1,5 @@
using System;
+using System.ComponentModel.DataAnnotations.Schema;
using SmartStore.Core.Domain.Customers;
namespace SmartStore.Core.Domain.Forums
@@ -11,6 +12,7 @@ public partial class ForumTopic : BaseEntity, IAuditable
///
/// Gets or sets the forum identifier
///
+ [Index("IX_ForumId_Published", Order = 0)]
public int ForumId { get; set; }
///
@@ -21,16 +23,19 @@ public partial class ForumTopic : BaseEntity, IAuditable
///
/// Gets or sets the topic type identifier
///
+ [Index("IX_TopicTypeId_LastPostTime", Order = 0)]
public int TopicTypeId { get; set; }
///
/// Gets or sets the subject
///
+ [Index]
public string Subject { get; set; }
///
/// Gets or sets the number of posts
///
+ [Index]
public int NumPosts { get; set; }
///
@@ -57,11 +62,13 @@ public partial class ForumTopic : BaseEntity, IAuditable
///
/// Gets or sets the last post date and time
///
+ [Index("IX_TopicTypeId_LastPostTime", Order = 1)]
public DateTime? LastPostTime { get; set; }
///
/// Gets or sets the date and time of instance creation
///
+ [Index]
public DateTime CreatedOnUtc { get; set; }
///
@@ -69,6 +76,12 @@ public partial class ForumTopic : BaseEntity, IAuditable
///
public DateTime UpdatedOnUtc { get; set; }
+ ///
+ /// Gets or sets a value indicating whether the entity is published
+ ///
+ [Index("IX_ForumId_Published", Order = 1)]
+ public bool Published { get; set; }
+
///
/// Gets or sets the forum topic type
///
@@ -101,10 +114,12 @@ public int NumReplies
{
get
{
- int result = 0;
if (NumPosts > 0)
- result = NumPosts - 1;
- return result;
+ {
+ return NumPosts - 1;
+ }
+
+ return 0;
}
}
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs b/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs
index 9a873cc70b..5f022ea319 100644
--- a/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Localization/ILocalizedEntity.cs
@@ -6,5 +6,6 @@ namespace SmartStore.Core.Domain.Localization
///
public interface ILocalizedEntity
{
+ int Id { get; }
}
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs
index f0d0406fb4..6996cf8549 100644
--- a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs
@@ -28,6 +28,7 @@ public partial class LocalizedProperty : BaseEntity
///
[DataMember]
[Index("IX_LocalizedProperty_Compound", Order = 3)]
+ [Index("IX_LocalizedProperty_LocaleKeyGroup")]
public string LocaleKeyGroup { get; set; }
///
diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedPropertyCollection.cs b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedPropertyCollection.cs
new file mode 100644
index 0000000000..9cd5549e0f
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedPropertyCollection.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Globalization;
+
+namespace SmartStore.Core.Domain.Localization
+{
+ public class LocalizedPropertyCollection : IReadOnlyCollection
+ {
+ private readonly string _keyGroup;
+ private readonly IDictionary _dict;
+ private HashSet _requestedSet;
+
+ public LocalizedPropertyCollection(string keyGroup, int[] requestedSet, IEnumerable items)
+ {
+ Guard.NotEmpty(keyGroup, nameof(keyGroup));
+ Guard.NotNull(items, nameof(items));
+
+ _keyGroup = keyGroup;
+ _dict = items.ToDictionarySafe(x => CreateKey(x.LocaleKey, x.EntityId, x.LanguageId), StringComparer.OrdinalIgnoreCase);
+
+ if (requestedSet != null && requestedSet.Length > 0)
+ {
+ _requestedSet = new HashSet(requestedSet);
+ }
+ }
+
+ public void MergeWith(LocalizedPropertyCollection other)
+ {
+ Guard.NotNull(other, nameof(other));
+
+ if (!this._keyGroup.IsCaseInsensitiveEqual(other._keyGroup))
+ {
+ throw new InvalidOperationException("Expected keygroup '{0}', but was '{1}'".FormatInvariant(this._keyGroup, other._keyGroup));
+ }
+
+ // Merge dictionary
+ other._dict.Merge(this._dict, true);
+
+ // Merge requested set (entity ids)
+ if (this._requestedSet != null)
+ {
+ if (other._requestedSet == null)
+ {
+ other._requestedSet = new HashSet(this._requestedSet);
+ }
+ else
+ {
+ other._requestedSet.AddRange(this._requestedSet);
+ }
+ }
+ }
+
+ public string GetValue(int languageId, int entityId, string localeKey)
+ {
+ return Find(languageId, entityId, localeKey)?.LocaleValue;
+ }
+
+ public LocalizedProperty Find(int languageId, int entityId, string localeKey)
+ {
+ var item = _dict.Get(CreateKey(localeKey, entityId, languageId));
+
+ if (item == null && (_requestedSet == null || _requestedSet.Contains(entityId)))
+ {
+ // Although the item does not exist in the local dictionary it has been requested
+ // from the database, which means it does not exist in the db either.
+ // Avoid the upcoming roundtrip.
+ return new LocalizedProperty
+ {
+ LocaleKeyGroup = _keyGroup,
+ EntityId = entityId,
+ LanguageId = languageId,
+ LocaleKey = localeKey
+ };
+ }
+
+ return item;
+ }
+
+ private string CreateKey(string localeKey, int entityId, int languageId)
+ {
+ return string.Concat(localeKey, "-", entityId.ToString(CultureInfo.InvariantCulture), "-", languageId);
+ }
+
+ public int Count => _dict.Values.Count;
+ public IEnumerator GetEnumerator() => _dict.Values.GetEnumerator();
+ IEnumerator IEnumerable.GetEnumerator() => _dict.Values.GetEnumerator();
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Domain/Media/PictureType.cs b/src/Libraries/SmartStore.Core/Domain/Media/PictureType.cs
index 84d245f3be..94eb05184c 100644
--- a/src/Libraries/SmartStore.Core/Domain/Media/PictureType.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Media/PictureType.cs
@@ -6,14 +6,11 @@ namespace SmartStore.Core.Domain.Media
public enum FallbackPictureType
{
NoFallback = 0,
+
///
/// Entities (products, categories, manufacturers)
///
Entity = 1,
- ///
- /// Avatar
- ///
- Avatar = 10,
}
public enum ThumbnailScaleMode
diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs
index 7160bcf30c..9d1d5f5bce 100644
--- a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs
@@ -81,7 +81,7 @@ public SeoSettings()
public string SeoNameCharConversion { get; set; }
public bool CanonicalUrlsEnabled { get; set; }
- public CanonicalHostNameRule CanonicalHostNameRule { get; set; }
+ public CanonicalHostNameRule CanonicalHostNameRule { get; set; }
///
/// Slugs (sename) reserved for some other needs
diff --git a/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecordCollection.cs b/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecordCollection.cs
new file mode 100644
index 0000000000..733e800f7a
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Domain/Seo/UrlRecordCollection.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace SmartStore.Core.Domain.Seo
+{
+ public class UrlRecordCollection : IReadOnlyCollection
+ {
+ private readonly string _entityName;
+ private readonly IDictionary _dict;
+ private HashSet _requestedSet;
+
+ public UrlRecordCollection(string entityName, int[] requestedSet, IEnumerable items)
+ {
+ Guard.NotEmpty(entityName, nameof(entityName));
+ Guard.NotNull(items, nameof(items));
+
+ _entityName = entityName;
+ _dict = items.ToDictionarySafe(x => CreateKey(x.EntityId, x.LanguageId));
+
+ if (requestedSet != null && requestedSet.Length > 0)
+ {
+ _requestedSet = new HashSet(requestedSet);
+ }
+ }
+
+ public void MergeWith(UrlRecordCollection other)
+ {
+ Guard.NotNull(other, nameof(other));
+
+ if (!this._entityName.IsCaseInsensitiveEqual(other._entityName))
+ {
+ throw new InvalidOperationException("Expected group '{0}', but was '{1}'".FormatInvariant(this._entityName, other._entityName));
+ }
+
+ // Merge dictionary
+ other._dict.Merge(this._dict, true);
+
+ // Merge requested set (entity ids)
+ if (this._requestedSet != null)
+ {
+ if (other._requestedSet == null)
+ {
+ other._requestedSet = new HashSet(this._requestedSet);
+ }
+ else
+ {
+ other._requestedSet.AddRange(this._requestedSet);
+ }
+ }
+ }
+
+ public string GetSlug(int languageId, int entityId, bool returnDefaultValue = true)
+ {
+ var slug = Find(languageId, entityId)?.Slug;
+
+ if (returnDefaultValue && languageId != 0 && string.IsNullOrEmpty(slug))
+ {
+ slug = Find(0, entityId)?.Slug;
+ }
+
+ return slug;
+ }
+
+ public UrlRecord Find(int languageId, int entityId)
+ {
+ var item = _dict.Get(CreateKey(entityId, languageId));
+
+ if (item == null && (_requestedSet == null || _requestedSet.Contains(entityId)))
+ {
+ // Although the item does not exist in the local dictionary it has been requested
+ // from the database, which means it does not exist in the db either.
+ // Avoid the upcoming roundtrip.
+ return new UrlRecord
+ {
+ EntityName = _entityName,
+ EntityId = entityId,
+ LanguageId = languageId
+ };
+ }
+
+ return item;
+ }
+
+ private string CreateKey(int entityId, int languageId)
+ {
+ return string.Concat(entityId.ToString(CultureInfo.InvariantCulture), "-", languageId);
+ }
+
+ public int Count => _dict.Values.Count;
+ public IEnumerator GetEnumerator() => _dict.Values.GetEnumerator();
+ IEnumerator IEnumerable.GetEnumerator() => _dict.Values.GetEnumerator();
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs
index 0fb734efbd..d9325aa60a 100644
--- a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs
@@ -97,7 +97,7 @@ public partial class Store : BaseEntity
///
/// Gets the security mode for the store
///
- public HttpSecurityMode GetSecurityMode(bool? useSsl = null)
+ public virtual HttpSecurityMode GetSecurityMode(bool? useSsl = null)
{
if (useSsl ?? SslEnabled)
{
diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs b/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs
index 3273ab21da..1185f4b399 100644
--- a/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Stores/StoreExtensions.cs
@@ -7,42 +7,44 @@ namespace SmartStore.Core.Domain.Stores
public static class StoreExtensions
{
///
- /// Parse comma-separated Hosts
+ /// Indicates whether a store contains a specified host
///
/// Comma-separated hosts
- public static string[] ParseHostValues(this Store store)
+ /// true - contains, false - no
+ public static bool ContainsHostValue(this Store store, string host)
{
- if (store == null)
- throw new ArgumentNullException("store");
+ Guard.NotNull(store, nameof(store));
- var parsedValues = new List();
- if (!string.IsNullOrEmpty(store.Hosts))
+ if (string.IsNullOrEmpty(host))
{
- var hosts = store.Hosts.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- parsedValues.AddRange(hosts.Select(host => host.Trim()).Where(tmp => !string.IsNullOrEmpty(tmp)));
- }
+ return false;
+ }
- return parsedValues.ToArray();
+ var contains = store.ParseHostValues()
+ .FirstOrDefault(x => x.Equals(host, StringComparison.InvariantCultureIgnoreCase)) != null;
+ return contains;
}
///
- /// Indicates whether a store contains a specified host
+ /// Parse comma-separated hosts
///
/// true - contains, false - no
- public static bool ContainsHostValue(this Store store, string host)
+ /// Comma-separated hosts
+ public static string[] ParseHostValues(this Store store)
{
- if (store == null)
- throw new ArgumentNullException("store");
+ Guard.NotNull(store, nameof(store));
- if (String.IsNullOrEmpty(host))
- return false;
+ if (string.IsNullOrWhiteSpace(store.Hosts))
+ {
+ return Array.Empty();
+ }
- var contains = store.ParseHostValues()
- .FirstOrDefault(x => x.Equals(host, StringComparison.InvariantCultureIgnoreCase)) != null;
- return contains;
+ return store.Hosts
+ .Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+ .Select(host => host.Trim())
+ .Where(host => !string.IsNullOrWhiteSpace(host))
+ .ToArray();
}
}
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs
index c6d22dd2e0..f516fc53da 100644
--- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs
@@ -88,12 +88,25 @@ protected set
public ScheduleTask Clone()
{
- return (ScheduleTask)this.MemberwiseClone();
+ var task = new ScheduleTask
+ {
+ Name = Name,
+ Alias = Alias,
+ CronExpression = CronExpression,
+ Type = Type,
+ Enabled = Enabled,
+ StopOnError = StopOnError,
+ NextRunUtc = NextRunUtc,
+ IsHidden = IsHidden,
+ RunPerMachine = RunPerMachine
+ };
+
+ return task;
}
object ICloneable.Clone()
{
- return this.MemberwiseClone();
+ return this.Clone();
}
}
}
diff --git a/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs b/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs
index 1d79ba018b..28fd36b269 100644
--- a/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Tax/TaxSettings.cs
@@ -12,7 +12,8 @@ public TaxSettings()
DisplayTaxSuffix = true;
PricesIncludeTax = true;
EuVatAllowVatExemption = true;
- ShowLegalHintsInFooter = true;
+ ShippingPriceIncludesTax = true;
+ ShowLegalHintsInFooter = true;
ShowLegalHintsInProductDetails = true;
ShowLegalHintsInProductList = true;
AuxiliaryServicesTaxingType = AuxiliaryServicesTaxType.SpecifiedTaxCategory;
diff --git a/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs b/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs
index 36a6d95ac3..d05d74c975 100644
--- a/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Topics/Topic.cs
@@ -32,10 +32,22 @@ public Topic()
[DataMember]
public bool IsSystemTopic { get; set; }
- ///
- /// Gets or sets the value indicating whether this topic should be included in sitemap
- ///
- [DataMember]
+ ///
+ /// Gets or sets the html id
+ ///
+ [DataMember]
+ public string HtmlId { get; set; }
+
+ ///
+ /// Gets or sets the body css class
+ ///
+ [DataMember]
+ public string BodyCssClass { get; set; }
+
+ ///
+ /// Gets or sets the value indicating whether this topic should be included in sitemap
+ ///
+ [DataMember]
public bool IncludeInSitemap { get; set; }
///
diff --git a/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs b/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs
index 15fc63095f..5492f4631f 100644
--- a/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs
+++ b/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs
@@ -83,20 +83,19 @@ public void SendEmail(SmtpContext context, EmailMessage message)
}
}
- public Task SendEmailAsync(SmtpContext context, EmailMessage message)
+ public async Task SendEmailAsync(SmtpContext context, EmailMessage message)
{
Guard.NotNull(context, nameof(context));
Guard.NotNull(message, nameof(message));
- var client = context.ToSmtpClient();
- ApplySettings(client);
- var msg = this.BuildMailMessage(message);
-
- return client.SendMailAsync(msg).ContinueWith(t =>
+ using (var msg = this.BuildMailMessage(message))
{
- client.Dispose();
- msg.Dispose();
- });
+ using (var client = context.ToSmtpClient())
+ {
+ ApplySettings(client);
+ await client.SendMailAsync(msg);
+ }
+ }
}
private void ApplySettings(SmtpClient client)
diff --git a/src/Libraries/SmartStore.Core/Email/SmtpContext.cs b/src/Libraries/SmartStore.Core/Email/SmtpContext.cs
index c3745c1e38..e1fde3c68a 100644
--- a/src/Libraries/SmartStore.Core/Email/SmtpContext.cs
+++ b/src/Libraries/SmartStore.Core/Email/SmtpContext.cs
@@ -81,7 +81,8 @@ public SmtpClient ToSmtpClient()
}
else
{
- smtpClient.Credentials = new NetworkCredential(this.Username, this.Password);
+ if (!String.IsNullOrEmpty(this.Username))
+ smtpClient.Credentials = new NetworkCredential(this.Username, this.Password);
}
return smtpClient;
diff --git a/src/Libraries/SmartStore.Core/Events/AmbigousConsumerException.cs b/src/Libraries/SmartStore.Core/Events/AmbigousConsumerException.cs
new file mode 100644
index 0000000000..18b72d94da
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/AmbigousConsumerException.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Reflection;
+
+namespace SmartStore.Core.Events
+{
+ public sealed class AmbigousConsumerException : Exception
+ {
+ public AmbigousConsumerException(MethodInfo method1, MethodInfo method2)
+ : base("Ambigous consumer methods detected in '{0}'. Method 1: '{1}', Method 2: '{2}'.".FormatInvariant(method1.DeclaringType.FullName, method1.ToString(), method2.ToString()))
+ {
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/AsyncConsumerAttribute.cs b/src/Libraries/SmartStore.Core/Events/AsyncConsumerAttribute.cs
deleted file mode 100644
index 4a33b18f31..0000000000
--- a/src/Libraries/SmartStore.Core/Events/AsyncConsumerAttribute.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace SmartStore.Core.Events
-{
- [AttributeUsage(AttributeTargets.Class, Inherited=true, AllowMultiple=false)]
- public class AsyncConsumerAttribute : Attribute
- {
- }
-}
diff --git a/src/Libraries/SmartStore.Core/Events/ConsumeContext.cs b/src/Libraries/SmartStore.Core/Events/ConsumeContext.cs
new file mode 100644
index 0000000000..d52607845a
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/ConsumeContext.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace SmartStore.Core.Events
+{
+ ///
+ /// Wrapper/Envelope for event message objects. For now, only wraps
+ /// the message. There may be other context data in future.
+ ///
+ /// Type of message.
+ public class ConsumeContext
+ {
+ public ConsumeContext(TMessage message)
+ {
+ Message = message;
+ }
+
+ public TMessage Message
+ {
+ get;
+ private set;
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/ConsumerDescriptor.cs b/src/Libraries/SmartStore.Core/Events/ConsumerDescriptor.cs
new file mode 100644
index 0000000000..f990c1e61c
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/ConsumerDescriptor.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using SmartStore.ComponentModel;
+using SmartStore.Core.Plugins;
+
+namespace SmartStore.Core.Events
+{
+ ///
+ /// Contains metadata about a consumer / event handler method.
+ ///
+ public class ConsumerDescriptor
+ {
+ public ConsumerDescriptor()
+ {
+ }
+
+ public ConsumerDescriptor(EventConsumerMetadata metadata)
+ {
+ ContainerType = metadata.ContainerType;
+ PluginDescriptor = metadata.PluginDescriptor;
+ }
+
+ public bool WithEnvelope { get; set; }
+ public bool IsAsync { get; set; }
+ public bool FireForget { get; set; }
+ public PluginDescriptor PluginDescriptor { get; set; }
+
+ public Type MessageType { get; set; }
+ public Type ContainerType { get; set; }
+
+ public MethodInfo Method { get; set; }
+ public ParameterInfo MessageParameter { get; set; }
+
+ ///
+ /// All method parameters except
+ public ParameterInfo[] Parameters { get; set; }
+
+ public override string ToString()
+ {
+ return "MessageType: {0} - Consumer: {1}.{2}".FormatCurrent(MessageType.Name, ContainerType.FullName, Method.Name);
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/ConsumerInvoker.cs b/src/Libraries/SmartStore.Core/Events/ConsumerInvoker.cs
new file mode 100644
index 0000000000..9eb50ecb00
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/ConsumerInvoker.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
+using Autofac;
+using SmartStore.ComponentModel;
+using SmartStore.Core.Async;
+using SmartStore.Core.Logging;
+
+namespace SmartStore.Core.Events
+{
+ public class ConsumerInvoker : IConsumerInvoker
+ {
+ private readonly IConsumerResolver _resolver;
+
+ public ConsumerInvoker(IConsumerResolver resolver)
+ {
+ _resolver = resolver;
+
+ Logger = NullLogger.Instance;
+ }
+
+ public ILogger Logger { get; set; }
+
+ public void Invoke(ConsumerDescriptor descriptor, IConsumer consumer, ConsumeContext envelope) where TMessage : class
+ {
+ var d = descriptor;
+ var p = descriptor.WithEnvelope ? (object)envelope : envelope.Message;
+ var fastInvoker = FastInvoker.GetInvoker(d.Method);
+
+ if (!d.FireForget && !d.IsAsync)
+ {
+ // The all synch case
+ try
+ {
+ InvokeCore();
+ }
+ catch (Exception ex)
+ {
+ HandleException(ex, d);
+ }
+ }
+ else if (!d.FireForget && d.IsAsync)
+ {
+ //// The awaitable Task case
+ //BeginInvoke((Task)InvokeCore(cancelToken: AsyncRunner.AppShutdownCancellationToken), EndInvoke, d);
+
+ // For now we must go with the AsyncRunner, the above call to BeginInvoke (APM > TPL) does not always
+ // guarantee that the task is awaited and throws exceptions especially when EF is involved.
+ using (var runner = AsyncRunner.Create())
+ {
+ try
+ {
+ runner.Run((Task)InvokeCore(cancelToken: AsyncRunner.AppShutdownCancellationToken));
+ }
+ catch (Exception ex)
+ {
+ HandleException(ex, d);
+ }
+ }
+ }
+ else if (d.FireForget && !d.IsAsync)
+ {
+ // A synch method should be executed async (without awaiting)
+ AsyncRunner.Run((c, ct, state) => InvokeCore(c, ct), d)
+ .ContinueWith(t => EndInvoke(t), /*TaskContinuationOptions.OnlyOnFaulted*/ TaskContinuationOptions.None)
+ .ConfigureAwait(false);
+ }
+ else if (d.FireForget && d.IsAsync)
+ {
+ // An async (Task) method should be executed without awaiting
+ AsyncRunner.Run((c, ct) => (Task)InvokeCore(c, ct), d)
+ .ContinueWith(t => EndInvoke(t), TaskContinuationOptions.OnlyOnFaulted)
+ .ConfigureAwait(false);
+ }
+
+ object InvokeCore(IComponentContext c = null, CancellationToken cancelToken = default(CancellationToken))
+ {
+ if (d.Parameters.Length == 0)
+ {
+ // Only one method param: the message!
+ return fastInvoker.Invoke(consumer, p);
+ }
+
+ var parameters = new object[d.Parameters.Length + 1];
+ parameters[0] = p;
+
+ int i = 0;
+ foreach (var obj in ResolveParameters(c, d, cancelToken).ToArray())
+ {
+ i++;
+ parameters[i] = obj;
+ }
+
+ return fastInvoker.Invoke(consumer, parameters);
+ }
+ }
+
+ private void HandleException(Exception ex, ConsumerDescriptor descriptor)
+ {
+ if (ex is AggregateException ae)
+ {
+ ae.InnerExceptions.Each(x => Logger.Error(x));
+ }
+ else
+ {
+ Logger.Error(ex);
+ }
+
+ if (!descriptor.FireForget)
+ {
+ throw ex;
+ }
+ }
+
+ protected internal virtual IEnumerable ResolveParameters(
+ IComponentContext container,
+ ConsumerDescriptor descriptor,
+ CancellationToken cancelToken)
+ {
+ foreach (var p in descriptor.Parameters)
+ {
+ if (p.ParameterType == typeof(CancellationToken))
+ {
+ yield return cancelToken;
+ }
+ else
+ {
+ yield return _resolver.ResolveParameter(p, container);
+ }
+ }
+ }
+
+ #region APM > TPL pattern (does not always work stable)
+
+ ///
+ /// Wraps a
+ /// The asynchronous operation, to be returned by the Begin method of the APM pattern.
+ protected IAsyncResult BeginInvoke(Task task, AsyncCallback callback, ConsumerDescriptor descriptor)
+ {
+ var options = TaskCreationOptions.RunContinuationsAsynchronously;
+ var tcs = new TaskCompletionSource(descriptor, options);
+
+ // "_ =" to discard 'async/await' compiler warning
+ _ = AwaitCompletionAsync(task, callback, tcs, descriptor);
+
+ return tcs.Task;
+ }
+
+ private async Task AwaitCompletionAsync(
+ Task task,
+ AsyncCallback callback,
+ TaskCompletionSource tcs,
+ ConsumerDescriptor descriptor)
+ {
+ try
+ {
+ await task;
+ tcs.TrySetResult(null);
+ }
+ catch (OperationCanceledException ex)
+ {
+ tcs.TrySetCanceled(ex.CancellationToken);
+ }
+ catch (Exception ex)
+ {
+ tcs.TrySetException(ex);
+ }
+ finally
+ {
+ callback?.Invoke(tcs.Task);
+ }
+ }
+
+ protected virtual void EndInvoke(IAsyncResult asyncResult)
+ {
+ var task = (Task)asyncResult;
+
+ if (task.IsFaulted && task.Exception != null)
+ {
+ HandleException(task.Exception, (ConsumerDescriptor)asyncResult.AsyncState);
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs b/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs
index 1ae4f063fb..0c233e9da1 100644
--- a/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs
+++ b/src/Libraries/SmartStore.Core/Events/EventConsumerMetadata.cs
@@ -5,8 +5,8 @@ namespace SmartStore.Core.Events
{
public class EventConsumerMetadata
{
- public bool ExecuteAsync { get; set; }
public bool IsActive { get; set; }
+ public Type ContainerType { get; set; }
public PluginDescriptor PluginDescriptor { get; set; }
}
}
diff --git a/src/Libraries/SmartStore.Core/Events/FireForgetAttribute.cs b/src/Libraries/SmartStore.Core/Events/FireForgetAttribute.cs
new file mode 100644
index 0000000000..a5076473c9
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/FireForgetAttribute.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace SmartStore.Core.Events
+{
+ ///
+ /// Specifies whether an event consumer method should be invoked asynchronously without awaiting.
+ /// This can be advantegous in long running processes, because the current request thread will not 'block'
+ /// until method completion.
+ ///
+ ///
+ /// Use this with caution and only if you know what you are doing :-)
+ /// A class containing a fire & forget consumer should NOT take dependencies on request scoped services, because task continuation
+ /// happens on another thread and context gets lost. Pass required dependencies as method parameters instead, the consumer invoker
+ /// will spawn a new private context for the unit of work and resolve dependencies from this context.
+ ///
+ [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+ public sealed class FireForgetAttribute : Attribute
+ {
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/IConsumer.cs b/src/Libraries/SmartStore.Core/Events/IConsumer.cs
index 5fee38c56e..da2ff66d89 100644
--- a/src/Libraries/SmartStore.Core/Events/IConsumer.cs
+++ b/src/Libraries/SmartStore.Core/Events/IConsumer.cs
@@ -1,8 +1,45 @@
-
+using System;
+
namespace SmartStore.Core.Events
{
- public interface IConsumer
- {
- void HandleEvent(T message);
- }
+ ///
+ /// Marker interface for classes that contain one or more
+ /// event message handlers. A handler is a public instance method following some conventions.
+ /// The name of the handler method must be one of:
+ ///
+ /// - void Handle(TMessage msg)
+ /// - void HandleEvent(TMessage msg)
+ /// - void Consume(TMessage msg)
+ /// - Task HandleAsync(TMessage msg)
+ /// - Task HandleEventAsync(TMessage msg)
+ /// - Task ConsumeAsync(TMessage msg)
+ ///
+ /// Alternatively, the TMessage param can be the generic
+ /// The
+ /// void method are invoked synchronously.- The
+ ///
+ ///
+ ///
+ /// You can declare additional dependency parameters in the handler method, e.g.:
+ ///
+ /// Task HandleEventAsync(SomeEvent message, IDbContext dbContext, ICacheManager cache, CancellationToken cancelToken)
+ ///
+ /// Order does not matter. The invoker will auto-resolve appropriate instances and pass them to the method. But any unregistered
+ /// dependency or a primitive type will result in an exception (except of ).
+ ///
+ ///
+ public interface IConsumer
+ {
+ }
+
+ [Obsolete("Implement the non-generic 'IConsumer' interface instead.")]
+ public interface IConsumer : IConsumer
+ {
+ void HandleEvent(T message);
+ }
}
diff --git a/src/Libraries/SmartStore.Core/Events/IConsumerFactory.cs b/src/Libraries/SmartStore.Core/Events/IConsumerFactory.cs
deleted file mode 100644
index a55c9fce79..0000000000
--- a/src/Libraries/SmartStore.Core/Events/IConsumerFactory.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-namespace SmartStore.Core.Events
-{
-
- public interface IConsumerFactory
- {
- ///
- /// Resolves all event consumers of type
- /// null = all, true = only async, false = only sync)
- ///
- /// The consumer instances
- IEnumerable> GetConsumers(bool? resolveAsyncs = null);
-
- bool HasAsyncConsumer { get; }
- }
-
-}
diff --git a/src/Libraries/SmartStore.Core/Events/IConsumerInvoker.cs b/src/Libraries/SmartStore.Core/Events/IConsumerInvoker.cs
new file mode 100644
index 0000000000..85036e7528
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/IConsumerInvoker.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace SmartStore.Core.Events
+{
+ ///
+ /// Responsible for invoking event message handler methods.
+ ///
+ public interface IConsumerInvoker
+ {
+ void Invoke(ConsumerDescriptor descriptor, IConsumer consumer, ConsumeContext envelope) where TMessage : class;
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/IConsumerRegistry.cs b/src/Libraries/SmartStore.Core/Events/IConsumerRegistry.cs
new file mode 100644
index 0000000000..4339d6fb4f
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/IConsumerRegistry.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace SmartStore.Core.Events
+{
+ ///
+ /// A registry for fast
+ public interface IConsumerRegistry
+ {
+ IEnumerable GetConsumers(object message);
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/IConsumerResolver.cs b/src/Libraries/SmartStore.Core/Events/IConsumerResolver.cs
new file mode 100644
index 0000000000..7a7be293d7
--- /dev/null
+++ b/src/Libraries/SmartStore.Core/Events/IConsumerResolver.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Reflection;
+using Autofac;
+
+namespace SmartStore.Core.Events
+{
+ ///
+ /// Resolves the concrete
+ public interface IConsumerResolver
+ {
+ IConsumer Resolve(ConsumerDescriptor descriptor);
+ object ResolveParameter(ParameterInfo p, IComponentContext c = null);
+ }
+}
diff --git a/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs b/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs
index 54fb88e357..21f0f6ebe6 100644
--- a/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs
+++ b/src/Libraries/SmartStore.Core/Events/IEventPublisher.cs
@@ -1,8 +1,9 @@
-
+using System;
+
namespace SmartStore.Core.Events
{
- public interface IEventPublisher
- {
- void Publish(T eventMessage);
- }
+ public interface IEventPublisher
+ {
+ void Publish(T message) where T : class;
+ }
}
diff --git a/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs b/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs
index d0bff29ca8..07d7ae6e11 100644
--- a/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs
+++ b/src/Libraries/SmartStore.Core/Events/NullEventPublisher.cs
@@ -10,7 +10,7 @@ public static IEventPublisher Instance
get { return s_instance; }
}
- public void Publish(T eventMessage)
+ public void Publish(T eventMessage) where T : class
{
// Noop
}
diff --git a/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs
index b6fec3780a..5bd474e782 100644
--- a/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/CollectionExtensions.cs
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.Routing;
+using SmartStore.Collections;
namespace SmartStore
{
@@ -14,20 +11,36 @@ public static void AddRange(this ICollection initial, IEnumerable other
if (other == null)
return;
- var list = initial as List;
+ if (initial is List list)
+ {
+ list.AddRange(other);
+ return;
+ }
- if (list != null)
- {
- list.AddRange(other);
- return;
- }
-
- other.Each(x => initial.Add(x));
+ foreach (var local in other)
+ {
+ initial.Add(local);
+ }
}
- public static bool IsNullOrEmpty(this ICollection source)
+ public static SyncedCollection AsSynchronized(this ICollection source)
+ {
+ return AsSynchronized(source, new object());
+ }
+
+ public static SyncedCollection AsSynchronized(this ICollection source, object syncRoot)
+ {
+ if (source is SyncedCollection sc)
+ {
+ return sc;
+ }
+
+ return new SyncedCollection(source, syncRoot);
+ }
+
+ public static bool IsNullOrEmpty(this ICollection source)
{
- return (source == null || source.Count == 0);
+ return source == null || source.Count == 0;
}
}
}
diff --git a/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs
index d95b37af6d..58992963be 100644
--- a/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/ConversionExtensions.cs
@@ -45,7 +45,8 @@ public static object Convert(this object value, Type to)
public static object Convert(this object value, Type to, CultureInfo culture)
{
- Guard.NotNull(to, nameof(to));
+ if (to == null)
+ throw new ArgumentNullException(nameof(to));
if (value == null || value == DBNull.Value || to.IsInstanceOfType(value))
{
@@ -92,6 +93,7 @@ public static char ToHex(this int value)
{
return (char)(value + 48);
}
+
return (char)((value - 10) + 97);
}
@@ -101,8 +103,7 @@ public static char ToHex(this int value)
public static int ToInt(this string value, int defaultValue = 0)
{
- int result;
- if (CommonHelper.TryConvert(value, out result))
+ if (CommonHelper.TryConvert(value, out int result))
{
return result;
}
@@ -112,18 +113,17 @@ public static int ToInt(this string value, int defaultValue = 0)
public static char ToChar(this string value, bool unescape = false, char defaultValue = '\0')
{
- char result;
- if (value.HasValue() && char.TryParse(unescape ? Regex.Unescape(value) : value, out result))
+ if (value.HasValue() && char.TryParse(unescape ? Regex.Unescape(value) : value, out char result))
{
return result;
}
+
return defaultValue;
}
public static float ToFloat(this string value, float defaultValue = 0)
{
- float result;
- if (CommonHelper.TryConvert(value, out result))
+ if (CommonHelper.TryConvert(value, out float result))
{
return result;
}
@@ -133,8 +133,7 @@ public static float ToFloat(this string value, float defaultValue = 0)
public static bool ToBool(this string value, bool defaultValue = false)
{
- bool result;
- if (CommonHelper.TryConvert(value, out result))
+ if (CommonHelper.TryConvert(value, out bool result))
{
return result;
}
@@ -182,13 +181,13 @@ public static bool ToBool(this string value, bool defaultValue = false)
{
if (value.HasValue())
{
- DateTime dt;
- if (DateTime.TryParseExact(value, "o", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out dt))
+ if (DateTime.TryParseExact(value, "o", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out DateTime dt))
return dt;
if (DateTime.TryParseExact(value, "yyyy-MM-ddTHH:mm:ss.fffZ", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out dt))
return dt;
}
+
return null;
}
@@ -211,29 +210,41 @@ public static Version ToVersion(this string value, Version defaultVersion = null
public static byte[] ToByteArray(this Stream stream)
{
- Guard.NotNull(stream, nameof(stream));
+ if (stream == null)
+ throw new ArgumentNullException(nameof(stream));
- if (stream is MemoryStream)
+ if (stream is MemoryStream mem)
{
- return ((MemoryStream)stream).ToArray();
+ if (mem.TryGetBuffer(out var buffer))
+ {
+ return buffer.Array;
+ }
+
+ return mem.ToArray();
}
else
{
using (var streamReader = new MemoryStream())
{
stream.CopyTo(streamReader);
- return streamReader.ToArray();
+ return streamReader.GetBuffer();
}
}
}
public static async Task ToByteArrayAsync(this Stream stream)
{
- Guard.NotNull(stream, nameof(stream));
+ if (stream == null)
+ throw new ArgumentNullException(nameof(stream));
- if (stream is MemoryStream)
+ if (stream is MemoryStream mem)
{
- return ((MemoryStream)stream).ToArray();
+ if (mem.TryGetBuffer(out var buffer))
+ {
+ return buffer.Array;
+ }
+
+ return mem.ToArray();
}
else
{
@@ -257,7 +268,8 @@ public static Task AsStringAsync(this Stream stream)
public static string AsString(this Stream stream, Encoding encoding)
{
- Guard.NotNull(encoding, nameof(encoding));
+ if (encoding == null)
+ throw new ArgumentNullException(nameof(encoding));
// convert stream to string
string result;
@@ -277,7 +289,8 @@ public static string AsString(this Stream stream, Encoding encoding)
public static Task AsStringAsync(this Stream stream, Encoding encoding)
{
- Guard.NotNull(encoding, nameof(encoding));
+ if (encoding == null)
+ throw new ArgumentNullException(nameof(encoding));
// convert stream to string
Task result;
@@ -328,7 +341,8 @@ public static Stream ToStream(this byte[] bytes)
[DebuggerStepThrough]
public static string Hash(this byte[] value, bool toBase64 = false)
{
- Guard.NotNull(value, nameof(value));
+ if (value == null)
+ throw new ArgumentNullException(nameof(value));
using (MD5 md5 = MD5.Create())
{
@@ -360,7 +374,8 @@ public static string Hash(this byte[] value, bool toBase64 = false)
/// The compressed result
public static byte[] Zip(this byte[] buffer)
{
- Guard.NotNull(buffer, nameof(buffer));
+ if (buffer == null)
+ throw new ArgumentNullException(nameof(buffer));
using (var compressedStream = new MemoryStream())
using (var zipStream = new GZipStream(compressedStream, CompressionMode.Compress))
@@ -378,7 +393,8 @@ public static byte[] Zip(this byte[] buffer)
/// The decompressed result
public static byte[] UnZip(this byte[] buffer)
{
- Guard.NotNull(buffer, nameof(buffer));
+ if (buffer == null)
+ throw new ArgumentNullException(nameof(buffer));
using (var compressedStream = new MemoryStream(buffer))
using (var zipStream = new GZipStream(compressedStream, CompressionMode.Decompress))
diff --git a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs
index 746f45a85d..072e55229d 100644
--- a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs
@@ -49,6 +49,7 @@ public static DateTime GetEvenHourDate(this DateTime? value)
{
value = DateTime.UtcNow;
}
+
DateTime d = value.Value.AddHours(1);
return new DateTime(d.Year, d.Month, d.Day, d.Hour, 0, 0);
}
diff --git a/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs
index b490bb012d..3a3edf2f83 100644
--- a/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs
@@ -48,28 +48,26 @@ public static void Merge(this IDictionary instance,
}
}
- public static void AppendInValue(this IDictionary instance, string key, string separator, object value)
+ public static void AppendInValue(this IDictionary instance, string key, string separator, string value)
{
AddInValue(instance, key, separator, value, false);
}
- public static void PrependInValue(this IDictionary instance, string key, string separator, object value)
+ public static void PrependInValue(this IDictionary instance, string key, string separator, string value)
{
AddInValue(instance, key, separator, value, true);
}
- private static void AddInValue(IDictionary instance, string key, string separator, object value, bool prepend = false)
+ private static void AddInValue(IDictionary instance, string key, string separator, string value, bool prepend = false)
{
- var valueStr = value.ToString();
-
- if (!instance.ContainsKey(key))
+ if (!instance.TryGetValue(key, out var obj))
{
- instance[key] = valueStr;
+ instance[key] = value;
}
else
{
- var arr = instance[key].ToString().Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable();
- var arrValue = valueStr.Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable();
+ var arr = obj.ToString().Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable();
+ var arrValue = value.Trim().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable();
arr = prepend ? arrValue.Union(arr) : arr.Union(arrValue);
@@ -79,7 +77,8 @@ private static void AddInValue(IDictionary instance, string key,
public static TValue Get(this IDictionary instance, TKey key)
{
- Guard.NotNull(instance, nameof(instance));
+ if (instance == null)
+ throw new ArgumentNullException(nameof(instance));
instance.TryGetValue(key, out var val);
return val;
@@ -87,7 +86,8 @@ public static TValue Get(this IDictionary instance,
public static ExpandoObject ToExpandoObject(this IDictionary source, bool castIfPossible = false)
{
- Guard.NotNull(source, nameof(source));
+ if (source == null)
+ throw new ArgumentNullException(nameof(source));
if (castIfPossible && source is ExpandoObject)
{
@@ -100,6 +100,43 @@ public static ExpandoObject ToExpandoObject(this IDictionary sou
return result;
}
+
+ public static bool TryAdd(this Dictionary source, TKey key, TValue value, bool updateIfExists = false)
+ {
+ if (source == null || key == null)
+ {
+ return false;
+ }
+
+ if (source.ContainsKey(key))
+ {
+ if (updateIfExists)
+ {
+ source[key] = value;
+ return true;
+ }
+ }
+ else
+ {
+ source.Add(key, value);
+ return true;
+ }
+
+ return false;
+ }
+
+ public static bool TryRemove(this Dictionary source, TKey key, out TValue value)
+ {
+ value = default(TValue);
+
+ if (source != null && key != null && source.TryGetValue(key, out value))
+ {
+ source.Remove(key);
+ return true;
+ }
+
+ return false;
+ }
}
}
diff --git a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs
index b3b7be8905..cb529dcace 100644
--- a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs
@@ -241,9 +241,14 @@ public static Dictionary ToDictionarySafe elementSelector,
IEqualityComparer comparer)
{
- Guard.NotNull(source, nameof(source));
- Guard.NotNull(keySelector, nameof(keySelector));
- Guard.NotNull(elementSelector, nameof(elementSelector));
+ if (source == null)
+ throw new ArgumentNullException(nameof(source));
+
+ if (keySelector == null)
+ throw new ArgumentNullException(nameof(keySelector));
+
+ if (elementSelector == null)
+ throw new ArgumentNullException(nameof(elementSelector));
var dictionary = new Dictionary(comparer);
@@ -276,8 +281,11 @@ public static IEnumerable DistinctBy(this IEnumerableThe sorted entity collection
public static IEnumerable OrderBySequence(this IEnumerable source, IEnumerable ids) where TEntity : BaseEntity
{
- Guard.NotNull(source, nameof(source));
- Guard.NotNull(ids, nameof(ids));
+ if (source == null)
+ throw new ArgumentNullException(nameof(source));
+
+ if (ids == null)
+ throw new ArgumentNullException(nameof(ids));
var sorted = from id in ids
join entity in source on id equals entity.Id
@@ -309,9 +317,14 @@ public static Multimap ToMultimap(
Func valueSelector,
IEqualityComparer comparer)
{
- Guard.NotNull(source, nameof(source));
- Guard.NotNull(keySelector, nameof(keySelector));
- Guard.NotNull(valueSelector, nameof(valueSelector));
+ if (source == null)
+ throw new ArgumentNullException(nameof(source));
+
+ if (keySelector == null)
+ throw new ArgumentNullException(nameof(keySelector));
+
+ if (valueSelector == null)
+ throw new ArgumentNullException(nameof(valueSelector));
var map = new Multimap(comparer);
@@ -329,9 +342,10 @@ public static Multimap ToMultimap 
+
+
+
+
+
+ 
+ 
+ 
+ 
+ 
+ 