(
skip => GetNewsLetterSubscriptions(ctx, skip),
null,
@@ -383,11 +384,11 @@ private IExportDataSegmenterProvider CreateSegmenter(DataExporterContext ctx, in
break;
default:
- ctx.ExecuteContext.Segmenter = null;
+ ctx.ExecuteContext.DataSegmenter = null;
break;
}
- return ctx.ExecuteContext.Segmenter as IExportDataSegmenterProvider;
+ return ctx.ExecuteContext.DataSegmenter as IExportDataSegmenterProvider;
}
private bool CallProvider(DataExporterContext ctx, string streamId, string method, string path)
@@ -413,7 +414,9 @@ private bool CallProvider(DataExporterContext ctx, string streamId, string metho
if (ctx.IsFileBasedExport && path.HasValue() && ctx.ExecuteContext.DataStream.Length > 0)
{
if (!ctx.ExecuteContext.DataStream.CanSeek)
+ {
ctx.Log.Warning("Data stream seems to be closed!");
+ }
ctx.ExecuteContext.DataStream.Seek(0, SeekOrigin.Begin);
@@ -421,7 +424,6 @@ private bool CallProvider(DataExporterContext ctx, string streamId, string metho
using (var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
{
ctx.Log.Information("Creating file {0}.".FormatInvariant(path));
-
ctx.ExecuteContext.DataStream.CopyTo(fileStream);
}
}
@@ -440,61 +442,90 @@ private bool CallProvider(DataExporterContext ctx, string streamId, string metho
ctx.ExecuteContext.DataStream.Dispose();
ctx.ExecuteContext.DataStream = null;
}
+
+ if (ctx.ExecuteContext.Abort == DataExchangeAbortion.Hard && ctx.IsFileBasedExport && path.HasValue())
+ {
+ FileSystemHelper.Delete(path);
+ }
}
return (ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard);
}
- private void Deploy(DataExporterContext ctx, string zipPath)
+ private bool Deploy(DataExporterContext ctx, string zipPath)
{
- var allFiles = System.IO.Directory.GetFiles(ctx.FolderContent, "*.*", SearchOption.AllDirectories);
+ var allSucceeded = true;
+ var deployments = ctx.Request.Profile.Deployments.OrderBy(x => x.DeploymentTypeId).Where(x => x.Enabled);
+
+ if (deployments.Count() == 0)
+ return false;
var context = new ExportDeploymentContext
{
+ T = T,
Log = ctx.Log,
FolderContent = ctx.FolderContent,
- ZipPath = zipPath
- };
+ ZipPath = zipPath,
+ CreateZipArchive = ctx.Request.Profile.CreateZipArchive
+ };
- foreach (var deployment in ctx.Request.Profile.Deployments.OrderBy(x => x.DeploymentTypeId).Where(x => x.Enabled))
+ foreach (var deployment in deployments)
{
- if (deployment.CreateZip)
- context.DeploymentFiles = new string[] { zipPath };
- else
- context.DeploymentFiles = allFiles;
+ IFilePublisher publisher = null;
- try
+ context.Result = new DataDeploymentResult
{
- IFilePublisher publisher = null;
+ LastExecutionUtc = DateTime.UtcNow
+ };
- if (deployment.DeploymentType == ExportDeploymentType.Email)
- {
- publisher = new EmailFilePublisher(_emailAccountService.Value, _queuedEmailService.Value);
- }
- else if (deployment.DeploymentType == ExportDeploymentType.FileSystem)
- {
- publisher = new FileSystemFilePublisher();
- }
- else if (deployment.DeploymentType == ExportDeploymentType.Ftp)
- {
- publisher = new FtpFilePublisher();
- }
- else if (deployment.DeploymentType == ExportDeploymentType.Http)
+ try
+ {
+ switch (deployment.DeploymentType)
{
- publisher = new HttpFilePublisher();
+ case ExportDeploymentType.Email:
+ publisher = new EmailFilePublisher(_emailAccountService.Value, _queuedEmailService.Value);
+ break;
+ case ExportDeploymentType.FileSystem:
+ publisher = new FileSystemFilePublisher();
+ break;
+ case ExportDeploymentType.Ftp:
+ publisher = new FtpFilePublisher();
+ break;
+ case ExportDeploymentType.Http:
+ publisher = new HttpFilePublisher();
+ break;
+ case ExportDeploymentType.PublicFolder:
+ publisher = new PublicFolderPublisher();
+ break;
}
if (publisher != null)
{
publisher.Publish(context, deployment);
+
+ if (!context.Result.Succeeded)
+ allSucceeded = false;
}
}
catch (Exception exception)
{
+ allSucceeded = false;
+
+ if (context.Result != null)
+ {
+ context.Result.LastError = exception.ToAllMessages();
+ }
+
ctx.Log.Error("Deployment \"{0}\" of type {1} failed: {2}".FormatInvariant(
deployment.Name, deployment.DeploymentType.ToString(), exception.Message), exception);
}
+
+ deployment.ResultInfo = XmlHelper.Serialize(context.Result);
+
+ _exportProfileService.Value.UpdateExportDeployment(deployment);
}
+
+ return allSucceeded;
}
private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
@@ -504,7 +535,7 @@ private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
if (emailAccount == null)
emailAccount = _emailAccountService.Value.GetDefaultEmailAccount();
- var downloadUrl = "{0}Admin/Export/DownloadExportFile/{1}?name=".FormatInvariant(_services.WebHelper.GetStoreLocation(false), ctx.Request.Profile.Id);
+ var downloadUrl = "{0}Admin/Export/DownloadExportFile/{1}?name=".FormatInvariant(_services.WebHelper.GetStoreLocation(ctx.Store.SslEnabled), ctx.Request.Profile.Id);
var languageId = ctx.Projection.LanguageId ?? 0;
var smtpContext = new SmtpContext(emailAccount);
@@ -516,21 +547,21 @@ private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
if (ctx.Result.LastError.HasValue())
{
- body.AppendFormat("{0}
", ctx.Result.LastError);
+ body.AppendFormat("{0}
", ctx.Result.LastError);
}
if (ctx.IsFileBasedExport && File.Exists(zipPath))
{
var fileName = Path.GetFileName(zipPath);
- body.AppendFormat("{1}
", downloadUrl + HttpUtility.UrlDecode(fileName), fileName);
+ body.AppendFormat("{2}
", downloadUrl, HttpUtility.UrlEncode(fileName), fileName);
}
- if (ctx.IsFileBasedExport && ctx.Result.Files.Count > 0)
+ if (ctx.IsFileBasedExport && ctx.Result.Files.Any())
{
body.Append("");
foreach (var file in ctx.Result.Files)
{
- body.AppendFormat("
", downloadUrl + HttpUtility.UrlDecode(file.FileName), file.FileName);
+ body.AppendFormat("", downloadUrl, HttpUtility.UrlEncode(file.FileName), file.FileName);
}
body.Append("");
}
@@ -540,9 +571,6 @@ private void SendCompletionEmail(DataExporterContext ctx, string zipPath)
if (ctx.Request.Profile.CompletedEmailAddresses.HasValue())
message.To.AddRange(ctx.Request.Profile.CompletedEmailAddresses.SplitSafe(",").Where(x => x.IsEmail()).Select(x => new EmailAddress(x)));
- if (message.To.Count == 0 && _contactDataSettings.Value.WebmasterEmailAddress.HasValue())
- message.To.Add(new EmailAddress(_contactDataSettings.Value.WebmasterEmailAddress));
-
if (message.To.Count == 0 && _contactDataSettings.Value.CompanyEmailAddress.HasValue())
message.To.Add(new EmailAddress(_contactDataSettings.Value.CompanyEmailAddress));
@@ -658,7 +686,7 @@ private List GetProducts(DataExporterContext ctx, int skip)
OrderBy = ProductSortingEnum.Position,
PageSize = int.MaxValue,
StoreId = (ctx.Request.Profile.PerStore ? ctx.Store.Id : ctx.Filter.StoreId),
- VisibleIndividuallyOnly = false,
+ VisibleIndividuallyOnly = true,
ParentGroupedProductId = product.Id
};
@@ -701,7 +729,7 @@ private IQueryable GetOrderQuery(DataExporterContext ctx, int skip, int t
null,
null);
- if (ctx.Request.EntitiesToExport.Count > 0)
+ if (ctx.Request.EntitiesToExport.Any())
query = query.Where(x => ctx.Request.EntitiesToExport.Contains(x.Id));
query = query.OrderByDescending(x => x.CreatedOnUtc);
@@ -736,7 +764,7 @@ private IQueryable GetManufacturerQuery(DataExporterContext ctx, i
var query = _manufacturerService.Value.GetManufacturers(showHidden, storeId);
- if (ctx.Request.EntitiesToExport.Count > 0)
+ if (ctx.Request.EntitiesToExport.Any())
query = query.Where(x => ctx.Request.EntitiesToExport.Contains(x.Id));
query = query.OrderBy(x => x.DisplayOrder);
@@ -766,7 +794,7 @@ private IQueryable GetCategoryQuery(DataExporterContext ctx, int skip,
var query = _categoryService.Value.GetCategories(null, showHidden, null, true, storeId);
- if (ctx.Request.EntitiesToExport.Count > 0)
+ if (ctx.Request.EntitiesToExport.Any())
query = query.Where(x => ctx.Request.EntitiesToExport.Contains(x.Id));
query = query
@@ -801,7 +829,62 @@ private IQueryable GetCustomerQuery(DataExporterContext ctx, int skip,
.Expand(x => x.CustomerRoles)
.Where(x => !x.Deleted);
- if (ctx.Request.EntitiesToExport.Count > 0)
+ if (ctx.Filter.IsActiveCustomer.HasValue)
+ query = query.Where(x => x.Active == ctx.Filter.IsActiveCustomer.Value);
+
+ if (ctx.Filter.IsTaxExempt.HasValue)
+ query = query.Where(x => x.IsTaxExempt == ctx.Filter.IsTaxExempt.Value);
+
+ if (ctx.Filter.CustomerRoleIds != null && ctx.Filter.CustomerRoleIds.Length > 0)
+ query = query.Where(x => x.CustomerRoles.Select(y => y.Id).Intersect(ctx.Filter.CustomerRoleIds).Any());
+
+ if (ctx.Filter.BillingCountryIds != null && ctx.Filter.BillingCountryIds.Length > 0)
+ query = query.Where(x => x.BillingAddress != null && ctx.Filter.BillingCountryIds.Contains(x.BillingAddress.Id));
+
+ if (ctx.Filter.ShippingCountryIds != null && ctx.Filter.ShippingCountryIds.Length > 0)
+ query = query.Where(x => x.ShippingAddress != null && ctx.Filter.ShippingCountryIds.Contains(x.ShippingAddress.Id));
+
+ if (ctx.Filter.LastActivityFrom.HasValue)
+ {
+ var activityFrom = _dateTimeHelper.Value.ConvertToUtcTime(ctx.Filter.LastActivityFrom.Value, _dateTimeHelper.Value.CurrentTimeZone);
+ query = query.Where(x => activityFrom <= x.LastActivityDateUtc);
+ }
+
+ if (ctx.Filter.LastActivityTo.HasValue)
+ {
+ var activityTo = _dateTimeHelper.Value.ConvertToUtcTime(ctx.Filter.LastActivityTo.Value, _dateTimeHelper.Value.CurrentTimeZone);
+ query = query.Where(x => activityTo >= x.LastActivityDateUtc);
+ }
+
+ if (ctx.Filter.HasSpentAtLeastAmount.HasValue)
+ {
+ query = query
+ .Join(_orderRepository.Value.Table, x => x.Id, y => y.CustomerId, (x, y) => new { Customer = x, Order = y })
+ .GroupBy(x => x.Customer.Id)
+ .Select(x => new
+ {
+ Customer = x.FirstOrDefault().Customer,
+ OrderTotal = x.Sum(y => y.Order.OrderTotal)
+ })
+ .Where(x => x.OrderTotal >= ctx.Filter.HasSpentAtLeastAmount.Value)
+ .Select(x => x.Customer);
+ }
+
+ if (ctx.Filter.HasPlacedAtLeastOrders.HasValue)
+ {
+ query = query
+ .Join(_orderRepository.Value.Table, x => x.Id, y => y.CustomerId, (x, y) => new { Customer = x, Order = y })
+ .GroupBy(x => x.Customer.Id)
+ .Select(x => new
+ {
+ Customer = x.FirstOrDefault().Customer,
+ OrderCount = x.Count()
+ })
+ .Where(x => x.OrderCount >= ctx.Filter.HasPlacedAtLeastOrders.Value)
+ .Select(x => x.Customer);
+ }
+
+ if (ctx.Request.EntitiesToExport.Any())
query = query.Where(x => ctx.Request.EntitiesToExport.Contains(x.Id));
query = query.OrderByDescending(x => x.CreatedOnUtc);
@@ -833,7 +916,22 @@ private IQueryable GetNewsLetterSubscriptionQuery(DataEx
if (storeId > 0)
query = query.Where(x => x.StoreId == storeId);
- if (ctx.Request.EntitiesToExport.Count > 0)
+ if (ctx.Filter.IsActiveSubscriber.HasValue)
+ query = query.Where(x => x.Active == ctx.Filter.IsActiveSubscriber.Value);
+
+ if (ctx.Filter.CreatedFrom.HasValue)
+ {
+ var createdFrom = _dateTimeHelper.Value.ConvertToUtcTime(ctx.Filter.CreatedFrom.Value, _dateTimeHelper.Value.CurrentTimeZone);
+ query = query.Where(x => createdFrom <= x.CreatedOnUtc);
+ }
+
+ if (ctx.Filter.CreatedTo.HasValue)
+ {
+ var createdTo = _dateTimeHelper.Value.ConvertToUtcTime(ctx.Filter.CreatedTo.Value, _dateTimeHelper.Value.CurrentTimeZone);
+ query = query.Where(x => createdTo >= x.CreatedOnUtc);
+ }
+
+ if (ctx.Request.EntitiesToExport.Any())
query = query.Where(x => ctx.Request.EntitiesToExport.Contains(x.Id));
query = query
@@ -865,9 +963,6 @@ private List Init(DataExporterContext ctx, int? totalRecords = null)
// Init base things that are even required for preview. Init all other things (regular export) in ExportCoreOuter.
List result = null;
- if (ctx.Request.CustomerId == 0)
- ctx.Request.CustomerId = _services.WorkContext.CurrentCustomer.Id;
-
if (ctx.Projection.CurrencyId.HasValue)
ctx.ContextCurrency = _currencyService.Value.GetCurrencyById(ctx.Projection.CurrencyId.Value);
else
@@ -946,7 +1041,8 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
if (ctx.ExecuteContext.Abort != DataExchangeAbortion.None)
return;
- int fileIndex = 0;
+ var fileIndex = 0;
+ var dataExchangeSettings = _services.Settings.LoadSetting(store.Id);
ctx.Store = store;
@@ -958,27 +1054,36 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
logHead.Append("Export profile:\t\t" + ctx.Request.Profile.Name);
logHead.AppendLine(ctx.Request.Profile.Id == 0 ? " (volatile)" : " (Id {0})".FormatInvariant(ctx.Request.Profile.Id));
- logHead.AppendLine("Export provider:\t{0} ({1})".FormatInvariant(ctx.Request.Provider.Metadata.FriendlyName, ctx.Request.Profile.ProviderSystemName));
+ if (ctx.Request.Provider.Metadata.FriendlyName.HasValue())
+ logHead.AppendLine("Export provider:\t{0} ({1})".FormatInvariant(ctx.Request.Provider.Metadata.FriendlyName, ctx.Request.Profile.ProviderSystemName));
+ else
+ logHead.AppendLine("Export provider:\t{0}".FormatInvariant(ctx.Request.Profile.ProviderSystemName));
var plugin = ctx.Request.Provider.Metadata.PluginDescriptor;
- logHead.Append("Plugin:\t\t\t\t");
+ logHead.Append("Plugin:\t\t\t");
logHead.AppendLine(plugin == null ? "".NaIfEmpty() : "{0} ({1}) v.{2}".FormatInvariant(plugin.FriendlyName, plugin.SystemName, plugin.Version.ToString()));
- logHead.AppendLine("Entity:\t\t\t\t" + ctx.Request.Provider.Value.EntityType.ToString());
+ logHead.AppendLine("Entity:\t\t\t" + ctx.Request.Provider.Value.EntityType.ToString());
- var storeInfo = (ctx.Request.Profile.PerStore ? "{0} (Id {1})".FormatInvariant(ctx.Store.Name, ctx.Store.Id) : "All stores");
- logHead.Append("Store:\t\t\t\t" + storeInfo);
+ try
+ {
+ var uri = new Uri(store.Url);
+ logHead.AppendLine("Store:\t\t\t{0} (Id {1})".FormatInvariant(uri.DnsSafeHost.NaIfEmpty(), ctx.Store.Id));
+ }
+ catch { }
+
+ var customer = _services.WorkContext.CurrentCustomer;
+ logHead.Append("Executed by:\t\t" + (customer.Email.HasValue() ? customer.Email : customer.SystemName));
ctx.Log.Information(logHead.ToString());
}
ctx.ExecuteContext.Store = ToDynamic(ctx, ctx.Store);
+ ctx.ExecuteContext.MaxFileNameLength = dataExchangeSettings.MaxFileNameLength;
- ctx.ExecuteContext.MaxFileNameLength = _dataExchangeSettings.Value.MaxFileNameLength;
-
- ctx.ExecuteContext.HasPublicDeployment = ctx.Request.Profile.Deployments.Any(x => x.IsPublic && x.DeploymentType == ExportDeploymentType.FileSystem);
-
- ctx.ExecuteContext.PublicFolderPath = (ctx.ExecuteContext.HasPublicDeployment ? Path.Combine(HttpRuntime.AppDomainAppPath, PublicFolder) : null);
+ var publicDeployment = ctx.Request.Profile.Deployments.FirstOrDefault(x => x.DeploymentType == ExportDeploymentType.PublicFolder);
+ ctx.ExecuteContext.HasPublicDeployment = (publicDeployment != null);
+ ctx.ExecuteContext.PublicFolderPath = publicDeployment.GetDeploymentFolder(true);
var fileExtension = (ctx.Request.Provider.Value.FileExtension.HasValue() ? ctx.Request.Provider.Value.FileExtension.ToLower().EnsureStartsWith(".") : "");
@@ -1008,17 +1113,13 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
ctx.ExecuteContext.FileName = resolvedPattern + fileExtension;
path = Path.Combine(ctx.ExecuteContext.Folder, ctx.ExecuteContext.FileName);
-
- if (ctx.ExecuteContext.HasPublicDeployment)
- ctx.ExecuteContext.PublicFileUrl = ctx.Store.Url.EnsureEndsWith("/") + PublicFolder.EnsureEndsWith("/") + ctx.ExecuteContext.FileName;
}
if (CallProvider(ctx, null, "Execute", path))
{
ctx.Log.Information("Provider reports {0} successfully exported record(s).".FormatInvariant(ctx.ExecuteContext.RecordsSucceeded));
- // create info for deployment list in profile edit
- if (ctx.IsFileBasedExport)
+ if (ctx.IsFileBasedExport && File.Exists(path))
{
ctx.Result.Files.Add(new DataExportResult.ExportFileInfo
{
@@ -1042,17 +1143,16 @@ private void ExportCoreInner(DataExporterContext ctx, Store store)
if (ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard)
{
// always call OnExecuted
- if (ctx.ExecuteContext.ExtraDataStreams.Count == 0)
- ctx.ExecuteContext.ExtraDataStreams.Add(new ExportExtraStreams());
+ if (ctx.ExecuteContext.ExtraDataUnits.Count == 0)
+ ctx.ExecuteContext.ExtraDataUnits.Add(new ExportDataUnit());
- ctx.ExecuteContext.ExtraDataStreams.ForEach(x =>
+ ctx.ExecuteContext.ExtraDataUnits.ForEach(x =>
{
var path = (x.FileName.HasValue() ? Path.Combine(ctx.ExecuteContext.Folder, x.FileName) : null);
-
CallProvider(ctx, x.Id, "OnExecuted", path);
});
- ctx.ExecuteContext.ExtraDataStreams.Clear();
+ ctx.ExecuteContext.ExtraDataUnits.Clear();
}
}
}
@@ -1103,7 +1203,8 @@ private void ExportCoreOuter(DataExporterContext ctx)
{
ctx.DeliveryTimes = _deliveryTimeService.Value.GetAllDeliveryTimes().ToDictionary(x => x.Id);
ctx.QuantityUnits = _quantityUnitService.Value.GetAllQuantityUnits().ToDictionary(x => x.Id);
- ctx.ProductTemplates = _productTemplateService.Value.GetAllProductTemplates().ToDictionary(x => x.Id);
+ ctx.ProductTemplates = _productTemplateService.Value.GetAllProductTemplates().ToDictionary(x => x.Id, x => x.ViewPath);
+ ctx.CategoryTemplates = _categoryTemplateService.Value.GetAllCategoryTemplates().ToDictionary(x => x.Id, x => x.ViewPath);
if (ctx.Request.Provider.Value.EntityType == ExportEntityType.Product)
{
@@ -1140,16 +1241,23 @@ private void ExportCoreOuter(DataExporterContext ctx)
{
if (ctx.IsFileBasedExport)
{
- if (ctx.Request.Profile.CreateZipArchive || ctx.Request.Profile.Deployments.Any(x => x.Enabled && x.CreateZip))
+ if (ctx.Request.Profile.CreateZipArchive)
{
- ZipFile.CreateFromDirectory(ctx.FolderContent, zipPath, CompressionLevel.Fastest, true);
+ ZipFile.CreateFromDirectory(ctx.FolderContent, zipPath, CompressionLevel.Fastest, false);
}
if (ctx.Request.Profile.Deployments.Any(x => x.Enabled))
{
- SetProgress(ctx, T("Common.Deployment"));
+ SetProgress(ctx, T("Common.Publishing"));
- Deploy(ctx, zipPath);
+ var allDeploymentsSucceeded = Deploy(ctx, zipPath);
+
+ if (allDeploymentsSucceeded && ctx.Request.Profile.Cleanup)
+ {
+ logger.Information("Cleaning up export folder");
+
+ FileSystemHelper.ClearDirectory(ctx.FolderContent, false);
+ }
}
}
@@ -1174,7 +1282,7 @@ private void ExportCoreOuter(DataExporterContext ctx)
{
if (!ctx.IsPreview && ctx.Request.Profile.Id != 0)
{
- ctx.Request.Profile.ResultInfo = XmlHelper.Serialize(ctx.Result);
+ ctx.Request.Profile.ResultInfo = XmlHelper.Serialize(ctx.Result);
_exportProfileService.Value.UpdateExportProfile(ctx.Request.Profile);
}
@@ -1184,24 +1292,13 @@ private void ExportCoreOuter(DataExporterContext ctx)
logger.ErrorsAll(exception);
}
- try
- {
- if (ctx.IsFileBasedExport && ctx.ExecuteContext.Abort != DataExchangeAbortion.Hard && ctx.Request.Profile.Cleanup)
- {
- FileSystemHelper.ClearDirectory(ctx.FolderContent, false);
- }
- }
- catch (Exception exception)
- {
- logger.ErrorsAll(exception);
- }
-
DetachAllEntitiesAndClear(ctx);
try
{
ctx.NewsletterSubscriptions.Clear();
ctx.ProductTemplates.Clear();
+ ctx.CategoryTemplates.Clear();
ctx.Countries.Clear();
ctx.Languages.Clear();
ctx.QuantityUnits.Clear();
@@ -1227,7 +1324,7 @@ private void ExportCoreOuter(DataExporterContext ctx)
return;
// post process order entities
- if (ctx.EntityIdsLoaded.Count > 0 && ctx.Request.Provider.Value.EntityType == ExportEntityType.Order && ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None)
+ if (ctx.EntityIdsLoaded.Any() && ctx.Request.Provider.Value.EntityType == ExportEntityType.Order && ctx.Projection.OrderStatusChange != ExportOrderStatusChange.None)
{
using (var logger = new TraceLogger(logPath))
{
@@ -1282,38 +1379,6 @@ public DataExportResult Export(DataExportRequest request, CancellationToken canc
ExportCoreOuter(ctx);
- if (ctx.Result != null && ctx.Result.Succeeded && ctx.Result.Files.Count > 0)
- {
- string prefix = null;
- string suffix = null;
- var extension = Path.GetExtension(ctx.Result.Files.First().FileName);
- var provider = request.Provider.Value;
-
- if (provider.EntityType == ExportEntityType.Product)
- prefix = T("Admin.Catalog.Products");
- else if (provider.EntityType == ExportEntityType.Order)
- prefix = T("Admin.Orders");
- else if (provider.EntityType == ExportEntityType.Category)
- prefix = T("Admin.Catalog.Categories");
- else if (provider.EntityType == ExportEntityType.Manufacturer)
- prefix = T("Admin.Catalog.Manufacturers");
- else if (provider.EntityType == ExportEntityType.Customer)
- prefix = T("Admin.Customers");
- else if (provider.EntityType == ExportEntityType.NewsLetterSubscription)
- prefix = T("Admin.Promotions.NewsLetterSubscriptions");
- else
- prefix = provider.EntityType.ToString();
-
- var selectedEntityCount = (request.EntitiesToExport == null ? 0 : request.EntitiesToExport.Count);
-
- if (selectedEntityCount == 0)
- suffix = T("Common.All");
- else
- suffix = (selectedEntityCount == 1 ? request.EntitiesToExport.First().ToString() : T("Admin.Common.Selected").Text);
-
- ctx.Result.DownloadFileName = string.Concat(prefix, "-", suffix).ToLower().ToValidFileName() + extension;
- }
-
cancellationToken.ThrowIfCancellationRequested();
return ctx.Result;
@@ -1329,13 +1394,13 @@ public IList Preview(DataExportRequest request, int pageIndex, int? tot
var unused = Init(ctx, totalRecords);
if (!HasPermission(ctx))
- throw new SmartException("You do not have permission to perform the selected export");
+ throw new SmartException(T("Admin.AccessDenied"));
using (var segmenter = CreateSegmenter(ctx, pageIndex))
{
if (segmenter == null)
{
- throw new SmartException("Unsupported entity type '{0}'".FormatInvariant(ctx.Request.Provider.Value.EntityType.ToString()));
+ throw new SmartException(T("Admin.Common.UnsupportedEntityType", ctx.Request.Provider.Value.EntityType.ToString()));
}
while (segmenter.HasData)
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs
new file mode 100644
index 0000000000..7fff7a46e5
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/DataDeploymentResult.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ [Serializable]
+ public class DataDeploymentResult
+ {
+ ///
+ /// Whether the deployment succeeded
+ ///
+ public bool Succeeded
+ {
+ get { return LastError.IsEmpty(); }
+ }
+
+ public string LastError { get; set; }
+
+ ///
+ /// Last execution date
+ ///
+ public DateTime LastExecutionUtc { get; set; }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Deployment/EmailFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs
similarity index 88%
rename from src/Libraries/SmartStore.Services/DataExchange/Deployment/EmailFilePublisher.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs
index 0294229103..298d476c41 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Deployment/EmailFilePublisher.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/EmailFilePublisher.cs
@@ -35,21 +35,21 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
{
From = emailAccount.Email,
FromName = emailAccount.DisplayName,
- SendManually = true,
+ SendManually = false,
To = email,
Subject = deployment.EmailSubject.NaIfEmpty(),
CreatedOnUtc = DateTime.UtcNow,
EmailAccountId = deployment.EmailAccountId
};
- foreach (string path in context.DeploymentFiles)
+ foreach (var path in context.GetDeploymentFiles())
{
- string name = Path.GetFileName(path);
+ var name = Path.GetFileName(path);
queuedEmail.Attachments.Add(new QueuedEmailAttachment
{
- StorageLocation = EmailAttachmentStorageLocation.Path,
- Path = path,
+ StorageLocation = EmailAttachmentStorageLocation.Blob,
+ Data = File.ReadAllBytes(path),
Name = name,
MimeType = MimeTypes.MapNameToMimeType(name)
});
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs
new file mode 100644
index 0000000000..6bb56682e1
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FileSystemFilePublisher.cs
@@ -0,0 +1,22 @@
+using System.IO;
+using SmartStore.Core.Domain;
+using SmartStore.Core.Logging;
+using SmartStore.Utilities;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ public class FileSystemFilePublisher : IFilePublisher
+ {
+ public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment)
+ {
+ var targetFolder = deployment.GetDeploymentFolder(true);
+
+ if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(targetFolder)))
+ {
+ context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed");
+ }
+
+ context.Log.Information("Copied export data files to " + targetFolder);
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Deployment/FtpFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs
similarity index 82%
rename from src/Libraries/SmartStore.Services/DataExchange/Deployment/FtpFilePublisher.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs
index 2352d7250f..7a0954a1c7 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Deployment/FtpFilePublisher.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/FtpFilePublisher.cs
@@ -16,7 +16,7 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
var url = deployment.Url;
var buffLength = 32768;
byte[] buff = new byte[buffLength];
- var deploymentFiles = context.DeploymentFiles.ToList();
+ var deploymentFiles = context.GetDeploymentFiles().ToList();
var lastIndex = (deploymentFiles.Count - 1);
if (!url.StartsWith("ftp://", StringComparison.InvariantCultureIgnoreCase))
@@ -26,7 +26,7 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
{
var fileUrl = url.EnsureEndsWith("/") + Path.GetFileName(path);
- var request = (FtpWebRequest)System.Net.WebRequest.Create(fileUrl);
+ var request = (FtpWebRequest)WebRequest.Create(fileUrl);
request.Method = WebRequestMethods.Ftp.UploadFile;
request.KeepAlive = (deploymentFiles.IndexOf(path) != lastIndex);
request.UseBinary = true;
@@ -61,10 +61,9 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
}
else
{
- var msg = "The FTP transfer might fail. {0} ({1}), {2}. File {3}".FormatInvariant(
- response.StatusCode.ToString(), statusCode, response.StatusDescription.NaIfEmpty(), path);
+ context.Result.LastError = context.T("Admin.Common.FtpStatus", statusCode, response.StatusCode.ToString());
- context.Log.Error(msg);
+ context.Log.Error("The FTP transfer failed. FTP status {0} ({1}). File {3}".FormatInvariant(statusCode, response.StatusCode.ToString(), path));
}
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Deployment/HttpFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs
similarity index 73%
rename from src/Libraries/SmartStore.Services/DataExchange/Deployment/HttpFilePublisher.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs
index 48303bd200..4f0d9df8d8 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Deployment/HttpFilePublisher.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/HttpFilePublisher.cs
@@ -12,7 +12,7 @@ public class HttpFilePublisher : IFilePublisher
{
public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment)
{
- var succeeded = 0;
+ var succeededFiles = 0;
var url = deployment.Url;
if (!url.StartsWith("http://", StringComparison.InvariantCultureIgnoreCase) && !url.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase))
@@ -20,7 +20,7 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
if (deployment.HttpTransmissionType == ExportHttpTransmissionType.MultipartFormDataPost)
{
- var count = 0;
+ var countFiles = 0;
ICredentials credentials = null;
if (deployment.Username.HasValue())
@@ -30,24 +30,26 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
using (var client = new HttpClient(handler))
using (var formData = new MultipartFormDataContent())
{
- foreach (var path in context.DeploymentFiles)
+ foreach (var path in context.GetDeploymentFiles())
{
byte[] fileData = File.ReadAllBytes(path);
- formData.Add(new ByteArrayContent(fileData), "file {0}".FormatInvariant(++count), Path.GetFileName(path));
+ formData.Add(new ByteArrayContent(fileData), "file {0}".FormatInvariant(++countFiles), Path.GetFileName(path));
}
var response = client.PostAsync(url, formData).Result;
if (response.IsSuccessStatusCode)
{
- succeeded = count;
+ succeededFiles = countFiles;
}
else if (response.Content != null)
{
+ context.Result.LastError = context.T("Admin.Common.HttpStatus", (int)response.StatusCode, response.StatusCode.ToString());
+
var content = response.Content.ReadAsStringAsync().Result;
- var msg = "Multipart form data upload failed. {0} ({1}). Response: {2}".FormatInvariant(
- response.StatusCode.ToString(), (int)response.StatusCode, content.NaIfEmpty().Truncate(2000, "..."));
+ var msg = "Multipart form data upload failed. HTTP status {0} ({1}). Response: {2}".FormatInvariant(
+ (int)response.StatusCode, response.StatusCode.ToString(), content.NaIfEmpty().Truncate(2000, "..."));
context.Log.Error(msg);
}
@@ -60,16 +62,16 @@ public virtual void Publish(ExportDeploymentContext context, ExportDeployment de
if (deployment.Username.HasValue())
webClient.Credentials = new NetworkCredential(deployment.Username, deployment.Password);
- foreach (var path in context.DeploymentFiles)
+ foreach (var path in context.GetDeploymentFiles())
{
webClient.UploadFile(url, path);
- ++succeeded;
+ ++succeededFiles;
}
}
}
- context.Log.Information("{0} file(s) successfully uploaded via HTTP ({1}).".FormatInvariant(succeeded, deployment.HttpTransmissionType.ToString()));
+ context.Log.Information("{0} file(s) successfully uploaded via HTTP ({1}).".FormatInvariant(succeededFiles, deployment.HttpTransmissionType.ToString()));
}
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs
new file mode 100644
index 0000000000..1ae3301ec4
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.IO;
+using SmartStore.Core.Domain;
+using SmartStore.Core.Localization;
+using SmartStore.Core.Logging;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ public interface IFilePublisher
+ {
+ void Publish(ExportDeploymentContext context, ExportDeployment deployment);
+ }
+
+
+ public class ExportDeploymentContext
+ {
+ public Localizer T { get; set; }
+ public ILogger Log { get; set; }
+
+ public string FolderContent { get; set; }
+
+ public string ZipPath { get; set; }
+ public bool CreateZipArchive { get; set; }
+
+ public DataDeploymentResult Result { get; set; }
+
+ public IEnumerable GetDeploymentFiles()
+ {
+ if (!CreateZipArchive)
+ {
+ return System.IO.Directory.EnumerateFiles(FolderContent, "*", SearchOption.AllDirectories);
+ }
+
+ if (File.Exists(ZipPath))
+ {
+ return new string[] { ZipPath };
+ }
+
+ return new string[0];
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs
new file mode 100644
index 0000000000..d438e808a2
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/PublicFolderPublisher.cs
@@ -0,0 +1,44 @@
+using System.IO;
+using SmartStore.Core.Domain;
+using SmartStore.Core.Logging;
+using SmartStore.Utilities;
+
+namespace SmartStore.Services.DataExchange.Export.Deployment
+{
+ public class PublicFolderPublisher : IFilePublisher
+ {
+ public virtual void Publish(ExportDeploymentContext context, ExportDeployment deployment)
+ {
+ var destinationFolder = deployment.GetDeploymentFolder(true);
+
+ if (destinationFolder.IsEmpty())
+ return;
+
+ if (!System.IO.Directory.Exists(destinationFolder))
+ {
+ System.IO.Directory.CreateDirectory(destinationFolder);
+ }
+
+ if (context.CreateZipArchive)
+ {
+ if (File.Exists(context.ZipPath))
+ {
+ var destinationFile = Path.Combine(destinationFolder, Path.GetFileName(context.ZipPath));
+
+ File.Copy(context.ZipPath, destinationFile, true);
+
+ context.Log.Information("Copied zipped export data to " + destinationFile);
+ }
+ }
+ else
+ {
+ if (!FileSystemHelper.CopyDirectory(new DirectoryInfo(context.FolderContent), new DirectoryInfo(destinationFolder)))
+ {
+ context.Result.LastError = context.T("Admin.DataExchange.Export.Deployment.CopyFileFailed");
+ }
+
+ context.Log.Information("Copied export data files to " + destinationFolder);
+ }
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
similarity index 80%
rename from src/Libraries/SmartStore.Services/DataExchange/DynamicEntityHelper.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
index a3bd172a02..1917084af2 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/DynamicEntityHelper.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
@@ -39,53 +39,50 @@ private void PrepareProductDescription(DataExporterContext ctx, dynamic dynObjec
string description = "";
// description merging
- if (ctx.Projection.DescriptionMerging != ExportDescriptionMerging.None)
+ if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.None)
{
- if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescriptionOrNameIfEmpty)
- {
- description = dynObject.FullDescription;
+ // export empty description
+ }
+ else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescriptionOrNameIfEmpty)
+ {
+ description = dynObject.FullDescription;
- if (description.IsEmpty())
- description = dynObject.ShortDescription;
- if (description.IsEmpty())
- description = dynObject.Name;
- }
- else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescription)
- {
+ if (description.IsEmpty())
description = dynObject.ShortDescription;
- }
- else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.Description)
- {
- description = dynObject.FullDescription;
- }
- else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndShortDescription)
- {
- description = ((string)dynObject.Name).Grow((string)dynObject.ShortDescription, " ");
- }
- else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndDescription)
- {
- description = ((string)dynObject.Name).Grow((string)dynObject.FullDescription, " ");
- }
- else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndShortDescription ||
- ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndDescription)
- {
- var productManus = ctx.ProductExportContext.ProductManufacturers.Load(product.Id);
-
- if (productManus != null && productManus.Any())
- description = productManus.First().Manufacturer.GetLocalized(x => x.Name, languageId, true, false);
-
- description = description.Grow((string)dynObject.Name, " ");
-
- if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndShortDescription)
- description = description.Grow((string)dynObject.ShortDescription, " ");
- else
- description = description.Grow((string)dynObject.FullDescription, " ");
- }
+ if (description.IsEmpty())
+ description = dynObject.Name;
}
- else
+ else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ShortDescription)
+ {
+ description = dynObject.ShortDescription;
+ }
+ else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.Description)
{
description = dynObject.FullDescription;
}
+ else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndShortDescription)
+ {
+ description = ((string)dynObject.Name).Grow((string)dynObject.ShortDescription, " ");
+ }
+ else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.NameAndDescription)
+ {
+ description = ((string)dynObject.Name).Grow((string)dynObject.FullDescription, " ");
+ }
+ else if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndShortDescription ||
+ ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndDescription)
+ {
+ var productManus = ctx.ProductExportContext.ProductManufacturers.Load(product.Id);
+
+ if (productManus != null && productManus.Any())
+ description = productManus.First().Manufacturer.GetLocalized(x => x.Name, languageId, true, false);
+
+ description = description.Grow((string)dynObject.Name, " ");
+
+ if (ctx.Projection.DescriptionMerging == ExportDescriptionMerging.ManufacturerAndNameAndShortDescription)
+ description = description.Grow((string)dynObject.ShortDescription, " ");
+ else
+ description = description.Grow((string)dynObject.FullDescription, " ");
+ }
// append text
if (ctx.Projection.AppendDescriptionText.HasValue() && ((string)dynObject.ShortDescription).IsEmpty() && ((string)dynObject.FullDescription).IsEmpty())
@@ -107,7 +104,7 @@ private void PrepareProductDescription(DataExporterContext ctx, dynamic dynObjec
}
// convert to plain text
- if (ctx.Projection.DescriptionToPlainText)
+ if (description.HasValue() && ctx.Projection.DescriptionToPlainText)
{
//Regex reg = new Regex("<[^>]+>", RegexOptions.IgnoreCase);
//description = HttpUtility.HtmlDecode(reg.Replace(description, ""));
@@ -139,15 +136,30 @@ private void PrepareProductDescription(DataExporterContext ctx, dynamic dynObjec
return price;
}
- private decimal CalculatePrice(DataExporterContext ctx, Product product, bool forAttributeCombination)
+ private decimal CalculatePrice(
+ DataExporterContext ctx,
+ Product product,
+ ProductVariantAttributeCombination combination,
+ IList attributeValues)
{
- decimal price = product.Price;
+ var price = product.Price;
+ var priceCalculationContext = ctx.ProductExportContext as PriceCalculationContext;
- // price type
- if (ctx.Projection.PriceType.HasValue && !forAttributeCombination)
+ if (combination != null)
{
- var priceCalculationContext = ctx.ProductExportContext as PriceCalculationContext;
+ // price for attribute combination
+ var attributesTotalPriceBase = decimal.Zero;
+ if (attributeValues != null)
+ {
+ attributeValues.Each(x => attributesTotalPriceBase += _priceCalculationService.Value.GetProductVariantAttributeValuePriceAdjustment(x));
+ }
+
+ price = _priceCalculationService.Value.GetFinalPrice(product, null, ctx.ContextCustomer, attributesTotalPriceBase, true, 1, null, priceCalculationContext);
+ }
+ else if (ctx.Projection.PriceType.HasValue)
+ {
+ // price for product
if (ctx.Projection.PriceType.Value == PriceDisplayType.LowestPrice)
{
bool displayFromMessage;
@@ -166,7 +178,6 @@ private decimal CalculatePrice(DataExporterContext ctx, Product product, bool fo
return ConvertPrice(ctx, product, price) ?? price;
}
-
private List GetLocalized(DataExporterContext ctx, T entity, params Expression>[] keySelectors)
where T : BaseEntity, ILocalizedEntity
{
@@ -310,6 +321,7 @@ private dynamic ToDynamic(DataExporterContext ctx, Customer customer)
result._HasNewsletterSubscription = false;
result._FullName = null;
+ result._AvatarPictureUrl = null;
return result;
}
@@ -385,14 +397,14 @@ private dynamic ToDynamic(DataExporterContext ctx, Picture picture, int thumbPic
return null;
dynamic result = new DynamicEntity(picture);
+ var relativeUrl = _pictureService.Value.GetPictureUrl(picture, 0, false);
+ result._FileName = relativeUrl.Substring(relativeUrl.LastIndexOf("/") + 1);
+ result._RelativeUrl = relativeUrl;
result._ThumbImageUrl = _pictureService.Value.GetPictureUrl(picture, thumbPictureSize, false, ctx.Store.Url);
result._ImageUrl = _pictureService.Value.GetPictureUrl(picture, detailsPictureSize, false, ctx.Store.Url);
result._FullSizeImageUrl = _pictureService.Value.GetPictureUrl(picture, 0, false, ctx.Store.Url);
- var relativeUrl = _pictureService.Value.GetPictureUrl(picture);
- result._FileName = relativeUrl.Substring(relativeUrl.LastIndexOf("/") + 1);
-
result._ThumbLocalPath = _pictureService.Value.GetThumbLocalPath(picture);
return result;
@@ -489,6 +501,11 @@ private dynamic ToDynamic(DataExporterContext ctx, Category category)
result.Picture = null;
+ if (ctx.CategoryTemplates.ContainsKey(category.CategoryTemplateId))
+ result._CategoryTemplateViewPath = ctx.CategoryTemplates[category.CategoryTemplateId];
+ else
+ result._CategoryTemplateViewPath = "";
+
result._Localized = GetLocalized(ctx, category,
x => x.Name,
x => x.FullName,
@@ -549,8 +566,8 @@ private dynamic ToDynamic(
product.MergeWithCombination(combination);
var languageId = (ctx.Projection.LanguageId ?? 0);
- var productTemplate = ctx.ProductTemplates.FirstOrDefault(x => x.Key == product.ProductTemplateId);
var pictureSize = _mediaSettings.Value.ProductDetailsPictureSize;
+ var numberOfPictures = (ctx.Projection.NumberOfPictures ?? int.MaxValue);
int[] pictureIds = (combination == null ? new int[0] : combination.GetAssignedPictureIds());
if (ctx.Supports(ExportFeatures.CanIncludeMainPicture) && ctx.Projection.PictureSize > 0)
@@ -564,34 +581,66 @@ private dynamic ToDynamic(
var productTags = ctx.ProductExportContext.ProductTags.Load(product.Id);
var specificationAttributes = ctx.ProductExportContext.ProductSpecificationAttributes.Load(product.Id);
+ var variantAttributes = (combination != null ? _productAttributeParser.Value.DeserializeProductVariantAttributes(combination.AttributesXml) : null);
+ var variantAttributeValues = (combination != null ? _productAttributeParser.Value.ParseProductVariantAttributeValues(variantAttributes, productAttributes) : null);
+
if (pictureIds.Length > 0)
- {
productPictures = productPictures.Where(x => pictureIds.Contains(x.PictureId));
- }
+
+ productPictures = productPictures.Take(numberOfPictures);
dynamic dynObject = ToDynamic(ctx, product);
#region gerneral data
- dynObject.Price = CalculatePrice(ctx, product, combination != null);
+ dynObject._CategoryName = null;
+ dynObject._CategoryPath = null;
+ dynObject._AttributeCombination = null;
+ dynObject._AttributeCombinationValues = null;
+ dynObject._AttributeCombinationId = (combination == null ? 0 : combination.Id);
+ dynObject._DetailUrl = ctx.Store.Url.EnsureEndsWith("/") + (string)dynObject.SeName;
- if (combination != null && ctx.Projection.AttributeCombinationValueMerging == ExportAttributeValueMerging.AppendAllValuesToName)
- {
- var values = _productAttributeParser.Value.ParseProductVariantAttributeValues(combination.AttributesXml, productAttributes, ctx.Projection.LanguageId ?? 0);
+ if (combination == null)
+ dynObject._UniqueId = product.Id.ToString();
+ else
+ dynObject._UniqueId = string.Concat(product.Id, "-", combination.Id);
- dynObject.Name = ((string)dynObject.Name).Grow(string.Join(", ", values), " ");
- }
+ dynObject.Price = CalculatePrice(ctx, product, combination, variantAttributeValues);
dynObject._BasePriceInfo = product.GetBasePriceInfo(_services.Localization, _priceFormatter.Value, _currencyService.Value, _taxService.Value,
_priceCalculationService.Value, ctx.ContextCurrency, decimal.Zero, true);
- dynObject._ProductTemplateViewPath = (productTemplate.Value == null ? "" : productTemplate.Value.ViewPath);
+ if (ctx.ProductTemplates.ContainsKey(product.ProductTemplateId))
+ dynObject._ProductTemplateViewPath = ctx.ProductTemplates[product.ProductTemplateId];
+ else
+ dynObject._ProductTemplateViewPath = "";
- dynObject._DetailUrl = ctx.Store.Url.EnsureEndsWith("/") + (string)dynObject.SeName;
+ if (combination != null)
+ {
+ if (ctx.Supports(ExportFeatures.UsesAttributeCombination))
+ {
+ dynObject._AttributeCombination = variantAttributes;
+ dynObject._AttributeCombinationValues = variantAttributeValues;
+ }
- dynObject._CategoryName = null;
+ if (ctx.Projection.AttributeCombinationValueMerging == ExportAttributeValueMerging.AppendAllValuesToName)
+ {
+ var valueNames = variantAttributeValues
+ .Select(x => x.GetLocalized(y => y.Name, languageId, true, false))
+ .ToList();
+
+ dynObject.Name = ((string)dynObject.Name).Grow(string.Join(", ", valueNames), " ");
+ }
+
+ var attributeQueryString = _productAttributeParser.Value.SerializeQueryData(combination.AttributesXml, product.Id);
+ if (attributeQueryString.HasValue())
+ {
+ var url = (string)dynObject._DetailUrl;
+ dynObject._DetailUrl = string.Concat(url, url.Contains("?") ? "&" : "?", "attributes=", attributeQueryString);
+ }
+ }
- if (ctx.Categories.Count > 0 && ctx.CategoryPathes.Count > 0)
+ if (ctx.Categories.Count > 0)
{
dynObject._CategoryPath = _categoryService.Value.GetCategoryPath(
product,
@@ -602,13 +651,8 @@ private dynamic ToDynamic(
productCategories.OrderBy(x => x.DisplayOrder).FirstOrDefault()
);
}
- else
- {
- dynObject._CategoryPath = null;
- }
ToDeliveryTime(ctx, dynObject, product.DeliveryTimeId);
-
ToQuantityUnit(ctx, dynObject, product.QuantityUnitId);
dynObject.ProductPictures = productPictures
@@ -669,7 +713,7 @@ private dynamic ToDynamic(
dynamic dyn = ToDynamic(ctx, x);
var assignedPictures = new List();
- foreach (int pictureId in x.GetAssignedPictureIds())
+ foreach (int pictureId in x.GetAssignedPictureIds().Take(numberOfPictures))
{
var assignedPicture = productPictures.FirstOrDefault(y => y.PictureId == pictureId);
if (assignedPicture != null && assignedPicture.Picture != null)
@@ -769,9 +813,21 @@ private dynamic ToDynamic(
if (ctx.Supports(ExportFeatures.CanIncludeMainPicture))
{
if (productPictures != null && productPictures.Any())
- dynObject._MainPictureUrl = _pictureService.Value.GetPictureUrl(productPictures.First().Picture, ctx.Projection.PictureSize, storeLocation: ctx.Store.Url);
- else
+ {
+ var firstPicture = productPictures.First().Picture;
+ dynObject._MainPictureUrl = _pictureService.Value.GetPictureUrl(firstPicture, ctx.Projection.PictureSize, storeLocation: ctx.Store.Url);
+ dynObject._MainPictureRelativeUrl = _pictureService.Value.GetPictureUrl(firstPicture, ctx.Projection.PictureSize);
+ }
+ else if (!_catalogSettings.Value.HideProductDefaultPictures)
+ {
dynObject._MainPictureUrl = _pictureService.Value.GetDefaultPictureUrl(ctx.Projection.PictureSize, storeLocation: ctx.Store.Url);
+ dynObject._MainPictureRelativeUrl = _pictureService.Value.GetDefaultPictureUrl(ctx.Projection.PictureSize);
+ }
+ else
+ {
+ dynObject._MainPictureUrl = null;
+ dynObject._MainPictureRelativeUrl = null;
+ }
}
if (ctx.Supports(ExportFeatures.UsesSkuAsMpnFallback) && product.ManufacturerPartNumber.IsEmpty())
@@ -817,20 +873,32 @@ private dynamic ToDynamic(
if (ctx.Supports(ExportFeatures.UsesSpecialPrice))
{
- dynObject._SpecialPrice = null;
- dynObject._RegularPrice = null; // price if a special price would not exist
+ dynObject._SpecialPrice = null; // special price which is valid now
+ dynObject._FutureSpecialPrice = null; // special price which is valid now and in future
+ dynObject._RegularPrice = null; // price as if a special price would not exist
if (!(product.ProductType == ProductType.BundledProduct && product.BundlePerItemPricing))
{
+ if (product.SpecialPrice.HasValue && product.SpecialPriceEndDateTimeUtc.HasValue)
+ {
+ var endDate = DateTime.SpecifyKind(product.SpecialPriceEndDateTimeUtc.Value, DateTimeKind.Utc);
+ if (endDate > DateTime.UtcNow)
+ {
+ dynObject._FutureSpecialPrice = ConvertPrice(ctx, product, product.SpecialPrice.Value);
+ }
+ }
+
var specialPrice = _priceCalculationService.Value.GetSpecialPrice(product);
dynObject._SpecialPrice = ConvertPrice(ctx, product, specialPrice);
- if (specialPrice.HasValue)
+ if (specialPrice.HasValue || dynObject._FutureSpecialPrice != null)
{
decimal tmpSpecialPrice = product.SpecialPrice.Value;
product.SpecialPrice = null;
- dynObject._RegularPrice = CalculatePrice(ctx, product, combination != null);
+
+ dynObject._RegularPrice = CalculatePrice(ctx, product, combination, variantAttributeValues);
+
product.SpecialPrice = tmpSpecialPrice;
}
}
@@ -871,6 +939,8 @@ private dynamic ToDynamic(DataExporterContext ctx, OrderItem orderItem)
dynamic result = new DynamicEntity(orderItem);
+ orderItem.Product.MergeWithCombination(orderItem.AttributesXml, _productAttributeParser.Value);
+
result.Product = ToDynamic(ctx, orderItem.Product);
return result;
@@ -964,19 +1034,17 @@ private List Convert(DataExporterContext ctx, Product product)
//var productValues = new Dictionary();
var dbContext = _dbContext as DbContext;
- _dbContext.Attach(product);
-
- var entry = dbContext.Entry(product);
-
- // the returned object is not the entity and is not being tracked by the context.
- // it also does not have any relationships set to other objects.
- // CurrentValues only includes database (thus primitive) values.
- var productClone = entry.CurrentValues.ToObject() as Product;
-
- _dbContext.DetachEntity(product);
-
foreach (var combination in combinations.Where(x => x.IsActive))
{
+ product = _dbContext.Attach(product);
+ var entry = dbContext.Entry(product);
+
+ // the returned object is not the entity and is not being tracked by the context.
+ // it also does not have any relationships set to other objects.
+ // CurrentValues only includes database (thus primitive) values.
+ var productClone = entry.CurrentValues.ToObject() as Product;
+ _dbContext.DetachEntity(product);
+
var dynObject = ToDynamic(ctx, productClone, combinations, combination);
result.Add(dynObject);
}
@@ -1005,10 +1073,13 @@ private List Convert(DataExporterContext ctx, Order order)
{
var result = new List();
- ctx.OrderExportContext.Addresses.Collect(order.ShippingAddressId ?? 0);
+ if (!ctx.IsPreview)
+ {
+ ctx.OrderExportContext.Addresses.Collect(order.ShippingAddressId.HasValue ? order.ShippingAddressId.Value : 0);
+ ctx.OrderExportContext.Addresses.Load(order.BillingAddressId);
+ }
var perfLoadId = (ctx.IsPreview ? 0 : order.Id);
- var addresses = ctx.OrderExportContext.Addresses.Load(ctx.IsPreview ? 0 : order.BillingAddressId);
var customers = ctx.OrderExportContext.Customers.Load(order.CustomerId);
var rewardPointsHistories = ctx.OrderExportContext.RewardPointsHistories.Load(ctx.IsPreview ? 0 : order.CustomerId);
var orderItems = ctx.OrderExportContext.OrderItems.Load(perfLoadId);
@@ -1036,20 +1107,25 @@ private List Convert(DataExporterContext ctx, Order order)
.PointsBalance;
}
- dynObject.BillingAddress = ToDynamic(ctx, addresses.FirstOrDefault(x => x.Id == order.BillingAddressId));
+ if (ctx.OrderExportContext.Addresses.ContainsKey(order.BillingAddressId))
+ {
+ dynObject.BillingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.BillingAddressId].FirstOrDefault());
+ }
- if (order.ShippingAddressId.HasValue)
+ if (order.ShippingAddressId.HasValue && ctx.OrderExportContext.Addresses.ContainsKey(order.ShippingAddressId.Value))
{
- dynObject.ShippingAddress = ToDynamic(ctx, addresses.FirstOrDefault(x => x.Id == order.ShippingAddressId.Value));
+ dynObject.ShippingAddress = ToDynamic(ctx, ctx.OrderExportContext.Addresses[order.ShippingAddressId.Value].FirstOrDefault());
}
dynObject.OrderItems = orderItems
.Select(e =>
{
dynamic dyn = ToDynamic(ctx, e);
- var productTemplate = ctx.ProductTemplates.FirstOrDefault(x => x.Key == e.Product.ProductTemplateId);
- dyn.Product._ProductTemplateViewPath = (productTemplate.Value == null ? "" : productTemplate.Value.ViewPath);
+ if (ctx.ProductTemplates.ContainsKey(e.Product.ProductTemplateId))
+ dyn.Product._ProductTemplateViewPath = ctx.ProductTemplates[e.Product.ProductTemplateId];
+ else
+ dyn.Product._ProductTemplateViewPath = "";
dyn.Product._BasePriceInfo = e.Product.GetBasePriceInfo(_services.Localization, _priceFormatter.Value, _currencyService.Value, _taxService.Value,
_priceCalculationService.Value, ctx.ContextCurrency, decimal.Zero, true);
@@ -1088,9 +1164,10 @@ private List Convert(DataExporterContext ctx, Manufacturer manufacturer
if (!ctx.IsPreview && manufacturer.PictureId.HasValue)
{
- var pictures = ctx.ManufacturerExportContext.Pictures.Load(manufacturer.PictureId.Value);
+ var numberOfPictures = (ctx.Projection.NumberOfPictures ?? int.MaxValue);
+ var pictures = ctx.ManufacturerExportContext.Pictures.Load(manufacturer.PictureId.Value).Take(numberOfPictures);
- if (pictures.Count > 0)
+ if (pictures.Any())
dynObject.Picture = ToDynamic(ctx, pictures.First(), _mediaSettings.Value.ManufacturerThumbPictureSize, _mediaSettings.Value.ManufacturerThumbPictureSize);
}
@@ -1120,16 +1197,17 @@ private List Convert(DataExporterContext ctx, Manufacturer manufacturer
private List Convert(DataExporterContext ctx, Category category)
{
var result = new List();
-
+
var productCategories = ctx.CategoryExportContext.ProductCategories.Load(category.Id);
dynamic dynObject = ToDynamic(ctx, category);
if (!ctx.IsPreview && category.PictureId.HasValue)
{
- var pictures = ctx.CategoryExportContext.Pictures.Load(category.PictureId.Value);
+ var numberOfPictures = (ctx.Projection.NumberOfPictures ?? int.MaxValue);
+ var pictures = ctx.CategoryExportContext.Pictures.Load(category.PictureId.Value).Take(numberOfPictures);
- if (pictures.Count > 0)
+ if (pictures.Any())
dynObject.Picture = ToDynamic(ctx, pictures.First(), _mediaSettings.Value.CategoryThumbPictureSize, _mediaSettings.Value.CategoryThumbPictureSize);
}
@@ -1205,6 +1283,16 @@ private List Convert(DataExporterContext ctx, Customer customer)
dynObject._FullName = firstName.Grow(lastName, " ");
+ if (_customerSettings.Value.AllowCustomersToUploadAvatars)
+ {
+ var pictureId = genericAttributes.FirstOrDefault(x => x.Key == SystemCustomerAttributeNames.AvatarPictureId);
+ if (pictureId != null)
+ {
+ // reduce traffic and do not export default avatar
+ dynObject._AvatarPictureUrl = _pictureService.Value.GetPictureUrl(pictureId.Value.ToInt(), _mediaSettings.Value.AvatarPictureSize, false, ctx.Store.Url);
+ }
+ }
+
result.Add(dynObject);
_services.EventPublisher.Publish(new RowExportingEvent
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Events/RowExportingEvent.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs
similarity index 50%
rename from src/Libraries/SmartStore.Services/DataExchange/Events/RowExportingEvent.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs
index 7459b9ee3f..0b96526e00 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Events/RowExportingEvent.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Events/RowExportingEvent.cs
@@ -4,13 +4,32 @@ namespace SmartStore.Services.DataExchange.Export.Events
{
// TODO: Another event message must be implemented, say 'ColumnsBuildingEvent'
// The consumer of this event (most likely a plugin) could push a list of specific column headers
- // into global the export definition.
+ // into the global export definition.
public class RowExportingEvent
{
- public dynamic Row { get; internal set; }
- public ExportEntityType EntityType { get; internal set; }
- public DataExportRequest ExportRequest { get; internal set; }
- public IExportExecuteContext ExecuteContext { get; internal set; }
+ public dynamic Row
+ {
+ get;
+ internal set;
+ }
+
+ public ExportEntityType EntityType
+ {
+ get;
+ internal set;
+ }
+
+ public DataExportRequest ExportRequest
+ {
+ get;
+ internal set;
+ }
+
+ public ExportExecuteContext ExecuteContext
+ {
+ get;
+ internal set;
+ }
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportConfigurationInfo.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportConfigurationInfo.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/ExportConfigurationInfo.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/ExportConfigurationInfo.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportDataSegmenter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportDataSegmenter.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/ExportDataSegmenter.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/ExportDataSegmenter.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportExecuteContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs
similarity index 72%
rename from src/Libraries/SmartStore.Services/DataExchange/ExportExecuteContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs
index 514c223624..d5f2860ff8 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/ExportExecuteContext.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExecuteContext.cs
@@ -7,132 +7,173 @@
namespace SmartStore.Services.DataExchange.Export
{
- public interface IExportExecuteContext
+ public class ExportExecuteContext
{
+ private DataExportResult _result;
+ private CancellationToken _cancellation;
+ private DataExchangeAbortion _providerAbort;
+
+ internal ExportExecuteContext(DataExportResult result, CancellationToken cancellation, string folder)
+ {
+ _result = result;
+ _cancellation = cancellation;
+ Folder = folder;
+ ExtraDataUnits = new List();
+ CustomProperties = new Dictionary();
+ }
+
///
/// Provides the data to be exported
///
- IExportDataSegmenterConsumer Segmenter { get; }
+ public IExportDataSegmenterConsumer DataSegmenter { get; set; }
///
/// The store context to be used for the export
///
- dynamic Store { get; }
+ public dynamic Store { get; internal set; }
///
/// The customer context to be used for the export
///
- dynamic Customer { get; }
+ public dynamic Customer { get; internal set; }
///
/// The currency context to be used for the export
///
- dynamic Currency { get; }
+ public dynamic Currency { get; internal set; }
///
/// The language context to be used for the export
///
- dynamic Language { get; }
+ public dynamic Language { get; internal set; }
///
/// Projection data
///
- ExportProjection Projection { get; }
+ public ExportProjection Projection { get; internal set; }
///
/// To log information into the export log file
///
- ILogger Log { get; }
+ public ILogger Log { get; internal set; }
///
/// Indicates whether and how to abort the export
///
- DataExchangeAbortion Abort { get; set; }
+ public DataExchangeAbortion Abort
+ {
+ get
+ {
+ if (_cancellation.IsCancellationRequested || IsMaxFailures)
+ return DataExchangeAbortion.Hard;
+ return _providerAbort;
+ }
+ set
+ {
+ _providerAbort = value;
+ }
+ }
+
+ public bool IsMaxFailures
+ {
+ get { return RecordsFailed > 11; }
+ }
///
/// Identifier of current data stream. Can be null.
///
- string DataStreamId { get; set; }
+ public string DataStreamId { get; set; }
///
/// Stream used to write data to
///
- Stream DataStream { get; }
+ public Stream DataStream { get; internal set; }
///
- /// List with extra data streams required by provider
+ /// List with extra data units/streams required by provider
///
- List ExtraDataStreams { get; set; }
-
+ public List ExtraDataUnits { get; private set; }
///
/// The maximum allowed file name length
///
- int MaxFileNameLength { get; }
+ public int MaxFileNameLength { get; internal set; }
///
/// The name of the current export file
///
- string FileName { get; }
+ public string FileName { get; internal set; }
///
/// The path of the export content folder
///
- string Folder { get; }
-
+ public string Folder { get; private set; }
///
/// Whether the profile has a public deployment into "Exchange" folder
///
- bool HasPublicDeployment { get; }
+ public bool HasPublicDeployment { get; internal set; }
///
/// The local path to the public export folder "Exchange". null if the profile has no public deployment.
///
- string PublicFolderPath { get; }
-
- ///
- /// The public URL of the export file (accessible through the internet). null if the profile has no public deployment.
- ///
- string PublicFileUrl { get; }
-
+ public string PublicFolderPath { get; internal set; }
///
/// Provider specific configuration data
///
- object ConfigurationData { get; }
+ public object ConfigurationData { get; internal set; }
///
/// Use this dictionary for any custom data required along the export
///
- Dictionary CustomProperties { get; set; }
+ public Dictionary CustomProperties { get; set; }
///
/// Number of successful processed records
///
- int RecordsSucceeded { get; set; }
+ public int RecordsSucceeded { get; set; }
///
/// Number of failed records
///
- int RecordsFailed { get; set; }
+ public int RecordsFailed { get; set; }
///
/// Processes an exception that occurred while exporting a record
///
- /// Exception
- void RecordException(Exception exc, int entityId);
+ /// Exception
+ public void RecordException(Exception exception, int entityId)
+ {
+ ++RecordsFailed;
+
+ Log.Error("Error while processing record with id {0}: {1}".FormatInvariant(entityId, exception.ToAllMessages()), exception);
+
+ if (IsMaxFailures)
+ _result.LastError = exception.ToString();
+ }
+
+ public ProgressValueSetter ProgressValueSetter { get; internal set; }
///
/// Allows to set a progress message
///
/// Output message
- void SetProgress(string message);
+ public void SetProgress(string message)
+ {
+ if (ProgressValueSetter != null && message.HasValue())
+ {
+ try
+ {
+ ProgressValueSetter.Invoke(0, 0, message);
+ }
+ catch { }
+ }
+ }
}
-
- public class ExportExtraStreams
+ public class ExportDataUnit
{
///
/// Your Id to identify this stream within a list of streams
@@ -149,93 +190,4 @@ public class ExportExtraStreams
///
public string FileName { get; set; }
}
-
-
- public class ExportExecuteContext : IExportExecuteContext
- {
- private DataExportResult _result;
- private CancellationToken _cancellation;
- private DataExchangeAbortion _providerAbort;
-
- internal ExportExecuteContext(DataExportResult result, CancellationToken cancellation, string folder)
- {
- _result = result;
- _cancellation = cancellation;
- Folder = folder;
- ExtraDataStreams = new List();
- CustomProperties = new Dictionary();
- }
-
- public IExportDataSegmenterConsumer Segmenter { get; set; }
-
- public dynamic Store { get; internal set; }
- public dynamic Customer { get; internal set; }
- public dynamic Currency { get; internal set; }
- public dynamic Language { get; internal set; }
- public ExportProjection Projection { get; internal set; }
-
- public ILogger Log { get; internal set; }
- public ProgressValueSetter ProgressValueSetter { get; internal set; }
-
- public DataExchangeAbortion Abort
- {
- get
- {
- if (_cancellation.IsCancellationRequested || IsMaxFailures)
- return DataExchangeAbortion.Hard;
-
- return _providerAbort;
- }
- set
- {
- _providerAbort = value;
- }
- }
-
- public bool IsMaxFailures
- {
- get { return RecordsFailed > 11; }
- }
-
- public string DataStreamId { get; set; }
- public Stream DataStream { get; internal set; }
- public List ExtraDataStreams { get; set; }
-
- public int MaxFileNameLength { get; internal set; }
- public string FileName { get; internal set; }
- public string Folder { get; private set; }
-
- public bool HasPublicDeployment { get; internal set; }
- public string PublicFolderPath { get; internal set; }
- public string PublicFileUrl { get; internal set; }
-
- public object ConfigurationData { get; internal set; }
-
- public Dictionary CustomProperties { get; set; }
-
- public int RecordsSucceeded { get; set; }
- public int RecordsFailed { get; set; }
-
- public void RecordException(Exception exc, int entityId)
- {
- ++RecordsFailed;
-
- Log.Error("Error while processing record with id {0}: {1}".FormatInvariant(entityId, exc.ToAllMessages()), exc);
-
- if (IsMaxFailures)
- _result.LastError = exc.ToString();
- }
-
- public void SetProgress(string message)
- {
- if (ProgressValueSetter != null && message.HasValue())
- {
- try
- {
- ProgressValueSetter.Invoke(0, 0, message);
- }
- catch { }
- }
- }
- }
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
new file mode 100644
index 0000000000..0371702eec
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
@@ -0,0 +1,258 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web;
+using SmartStore.Core;
+using SmartStore.Core.Domain;
+using SmartStore.Core.Domain.DataExchange;
+using SmartStore.Core.Domain.Stores;
+using SmartStore.Core.Plugins;
+using SmartStore.Services.Localization;
+using SmartStore.Utilities;
+
+namespace SmartStore.Services.DataExchange.Export
+{
+ public static class ExportExtensions
+ {
+ ///
+ /// Returns a value indicating whether the export provider is valid
+ ///
+ /// Export provider
+ /// true provider is valid, false provider is invalid.
+ public static bool IsValid(this Provider provider)
+ {
+ return provider != null && provider.Value != null;
+ }
+
+ ///
+ /// Gets the localized friendly name or the system name as fallback
+ ///
+ /// Export provider
+ /// Localization service
+ /// Provider name
+ public static string GetName(this Provider provider, ILocalizationService localizationService)
+ {
+ var systemName = provider.Metadata.SystemName;
+ var resourceName = provider.Metadata.ResourceKeyPattern.FormatInvariant(systemName, "FriendlyName");
+ var name = localizationService.GetResource(resourceName, 0, false, systemName, true);
+
+ return (name.IsEmpty() ? systemName : name);
+ }
+
+ ///
+ /// Get temporary folder for an export profile
+ ///
+ /// Export profile
+ /// Folder path
+ public static string GetExportFolder(this ExportProfile profile, bool content = false, bool create = false)
+ {
+ var path = CommonHelper.MapPath(string.Concat(profile.FolderName, content ? "/Content" : ""));
+
+ if (create && !System.IO.Directory.Exists(path))
+ System.IO.Directory.CreateDirectory(path);
+
+ return path;
+ }
+
+ ///
+ /// Get log file path for an export profile
+ ///
+ /// Export profile
+ /// Log file path
+ public static string GetExportLogPath(this ExportProfile profile)
+ {
+ return Path.Combine(profile.GetExportFolder(), "log.txt");
+ }
+
+ ///
+ /// Gets the ZIP path for a profile
+ ///
+ /// Export profile
+ /// ZIP file path
+ public static string GetExportZipPath(this ExportProfile profile)
+ {
+ var name = (new DirectoryInfo(profile.FolderName)).Name;
+ if (name.IsEmpty())
+ name = "ExportData";
+
+ return Path.Combine(profile.GetExportFolder(), name.ToValidFileName() + ".zip");
+ }
+
+ ///
+ /// Gets existing export files for an export profile
+ ///
+ /// Export profile
+ /// Export provider
+ /// List of file names
+ public static IEnumerable GetExportFiles(this ExportProfile profile, Provider provider)
+ {
+ var exportFolder = profile.GetExportFolder(true);
+
+ if (System.IO.Directory.Exists(exportFolder) && provider.Value.FileExtension.HasValue())
+ {
+ var filter = "*.{0}".FormatInvariant(provider.Value.FileExtension.ToLower());
+
+ return System.IO.Directory.EnumerateFiles(exportFolder, filter, SearchOption.AllDirectories).OrderBy(x => x);
+ }
+
+ return Enumerable.Empty();
+ }
+
+ ///
+ /// Get number of existing export files
+ ///
+ /// Export profile
+ /// Export provider
+ /// Number of export files
+ public static int GetExportFileCount(this ExportProfile profile, Provider provider)
+ {
+ var result = profile.GetExportFiles(provider).Count();
+
+ if (File.Exists(profile.GetExportZipPath()))
+ ++result;
+
+ return result;
+ }
+
+ ///
+ /// Resolves the file name pattern for an export profile
+ ///
+ /// Export profile
+ /// Store
+ /// One based file index
+ /// The maximum length of the file name
+ /// Resolved file name pattern
+ public static string ResolveFileNamePattern(this ExportProfile profile, Store store, int fileIndex, int maxFileNameLength)
+ {
+ var sb = new StringBuilder(profile.FileNamePattern);
+
+ sb.Replace("%Profile.Id%", profile.Id.ToString());
+ sb.Replace("%Profile.FolderName%", profile.FolderName);
+ sb.Replace("%Store.Id%", store.Id.ToString());
+ sb.Replace("%File.Index%", fileIndex.ToString("D4"));
+
+ if (profile.FileNamePattern.Contains("%Profile.SeoName%"))
+ sb.Replace("%Profile.SeoName%", SeoHelper.GetSeName(profile.Name, true, false).Replace("/", "").Replace("-", ""));
+
+ if (profile.FileNamePattern.Contains("%Store.SeoName%"))
+ sb.Replace("%Store.SeoName%", profile.PerStore ? SeoHelper.GetSeName(store.Name, true, false) : "allstores");
+
+ if (profile.FileNamePattern.Contains("%Random.Number%"))
+ sb.Replace("%Random.Number%", CommonHelper.GenerateRandomInteger().ToString());
+
+ if (profile.FileNamePattern.Contains("%Timestamp%"))
+ sb.Replace("%Timestamp%", DateTime.UtcNow.ToString("s", CultureInfo.InvariantCulture));
+
+ var result = sb.ToString()
+ .ToValidFileName("")
+ .Truncate(maxFileNameLength);
+
+ return result;
+ }
+
+ ///
+ /// Get path of the deployment folder
+ ///
+ /// Export deployment
+ /// Deployment folder path
+ public static string GetDeploymentFolder(this ExportDeployment deployment, bool create = false)
+ {
+ if (deployment == null)
+ return null;
+
+ string path = null;
+
+ if (deployment.DeploymentType == ExportDeploymentType.PublicFolder)
+ {
+ if (deployment.SubFolder.HasValue())
+ path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder, deployment.SubFolder);
+ else
+ path = Path.Combine(HttpRuntime.AppDomainAppPath, DataExporter.PublicFolder);
+ }
+ else if (deployment.DeploymentType == ExportDeploymentType.FileSystem)
+ {
+ if (deployment.FileSystemPath.IsEmpty())
+ return null;
+
+ if (Path.IsPathRooted(deployment.FileSystemPath))
+ {
+ path = deployment.FileSystemPath;
+ }
+ else
+ {
+ path = FileSystemHelper.ValidateRootPath(deployment.FileSystemPath);
+ path = CommonHelper.MapPath(path);
+ }
+ }
+
+ if (create && !System.IO.Directory.Exists(path))
+ System.IO.Directory.CreateDirectory(path);
+
+ return path;
+ }
+
+ ///
+ /// Get url of the public folder and take filtering and projection into consideration
+ ///
+ /// Export deployment
+ /// Common services
+ /// Store entity
+ /// Absolute URL of the public folder (always ends with /) or null
+ public static string GetPublicFolderUrl(this ExportDeployment deployment, ICommonServices services, Store store = null)
+ {
+ if (deployment != null && deployment.DeploymentType == ExportDeploymentType.PublicFolder)
+ {
+ if (store == null)
+ {
+ var filter = XmlHelper.Deserialize(deployment.Profile.Filtering);
+ var storeId = filter.StoreId;
+
+ if (storeId == 0)
+ {
+ var projection = XmlHelper.Deserialize(deployment.Profile.Projection);
+ storeId = (projection.StoreId ?? 0);
+ }
+
+ store = (storeId == 0 ? services.StoreContext.CurrentStore : services.StoreService.GetStoreById(storeId));
+ }
+
+ var url = string.Concat(
+ store.Url.EnsureEndsWith("/"),
+ DataExporter.PublicFolder.EnsureEndsWith("/"),
+ deployment.SubFolder.HasValue() ? deployment.SubFolder.EnsureEndsWith("/") : ""
+ );
+
+ return url;
+ }
+
+ return null;
+ }
+
+ ///
+ /// Get icon class for a deployment type
+ ///
+ /// Deployment type
+ /// Icon class
+ public static string GetIconClass(this ExportDeploymentType type)
+ {
+ switch (type)
+ {
+ case ExportDeploymentType.FileSystem:
+ return "fa-folder-open-o";
+ case ExportDeploymentType.Email:
+ return "fa-envelope-o";
+ case ExportDeploymentType.Http:
+ return "fa-globe";
+ case ExportDeploymentType.Ftp:
+ return "fa-files-o";
+ case ExportDeploymentType.PublicFolder:
+ return "fa-unlock";
+ default:
+ return "fa-question";
+ }
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportFeaturesAttribute.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportFeaturesAttribute.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/ExportFeaturesAttribute.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/ExportFeaturesAttribute.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs
similarity index 87%
rename from src/Libraries/SmartStore.Services/DataExchange/ExportProfileService.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs
index 95ff65c586..1814ae56ae 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/ExportProfileService.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs
@@ -56,9 +56,16 @@ public virtual ExportProfile InsertExportProfile(
{
Guard.ArgumentNotEmpty(() => providerSystemName);
+ var profileCount = _exportProfileRepository.Table.Count(x => x.ProviderSystemName == providerSystemName);
+
if (name.IsEmpty())
name = providerSystemName;
+ if (!isSystemProfile)
+ name = string.Concat(_localizationService.GetResource("Common.My"), " ", name);
+
+ name = string.Concat(name, " ", profileCount + 1);
+
var cloneProfile = GetExportProfileById(cloneFromProfileId);
ScheduleTask task = null;
@@ -108,7 +115,8 @@ public virtual ExportProfile InsertExportProfile(
RemoveCriticalCharacters = true,
CriticalCharacters = "¼,½,¾",
PriceType = PriceDisplayType.PreSelectedPrice,
- NoGroupedProducts = (features.HasFlag(ExportFeatures.CanOmitGroupedProducts) ? true : false)
+ NoGroupedProducts = (features.HasFlag(ExportFeatures.CanOmitGroupedProducts) ? true : false),
+ DescriptionMerging = ExportDescriptionMerging.Description
};
var filter = new ExportFilter
@@ -136,11 +144,11 @@ public virtual ExportProfile InsertExportProfile(
.Replace("/", "")
.Replace("-", "");
- profile.FolderName = SeoHelper.GetSeName(cleanedSystemName, true, false)
+ var folderName = SeoHelper.GetSeName(cleanedSystemName, true, false)
.ToValidPath()
.Truncate(_dataExchangeSettings.MaxFileNameLength);
- profile.FolderName = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/App_Data/ExportProfiles"), profile.FolderName);
+ profile.FolderName = "~/App_Data/ExportProfiles/" + FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/App_Data/ExportProfiles"), folderName);
if (profileSystemName.IsEmpty() && isSystemProfile)
profile.SystemName = cleanedSystemName;
@@ -159,13 +167,15 @@ public virtual ExportProfile InsertExportProfile(
{
if (features.HasFlag(ExportFeatures.CreatesInitialPublicDeployment))
{
+ var subFolder = FileSystemHelper.CreateNonExistingDirectoryName(CommonHelper.MapPath("~/" + DataExporter.PublicFolder), folderName);
+
profile.Deployments.Add(new ExportDeployment
{
ProfileId = profile.Id,
Enabled = true,
- IsPublic = true,
- DeploymentType = ExportDeploymentType.FileSystem,
- Name = profile.Name
+ DeploymentType = ExportDeploymentType.PublicFolder,
+ Name = profile.Name,
+ SubFolder = subFolder
});
UpdateExportProfile(profile);
@@ -212,9 +222,7 @@ public virtual void UpdateExportProfile(ExportProfile profile)
if (profile == null)
throw new ArgumentNullException("profile");
- profile.FolderName = profile.FolderName
- .ToValidPath()
- .Truncate(_dataExchangeSettings.MaxFileNameLength);
+ profile.FolderName = FileSystemHelper.ValidateRootPath(profile.FolderName);
_exportProfileRepository.Update(profile);
@@ -258,7 +266,6 @@ public virtual IQueryable GetExportProfiles(bool? enabled = null)
query = query
.OrderBy(x => x.IsSystemProfile)
- .ThenBy(x => x.ProviderSystemName)
.ThenBy(x => x.Name);
return query;
@@ -310,8 +317,8 @@ public virtual IEnumerable> LoadAllExportProviders(int
{
var allProviders = _providerManager.GetAllProviders(storeId)
.Where(x => x.IsValid() && (showHidden || !x.Metadata.IsHidden))
- .OrderBy(x => x.Metadata.SystemName)
- .ThenBy(x => x.Metadata.FriendlyName);
+ //.OrderBy(x => x.Metadata.SystemName)
+ .OrderBy(x => x.Metadata.FriendlyName);
return allProviders;
}
@@ -335,6 +342,16 @@ public virtual ExportDeployment GetExportDeploymentById(int id)
return deployment;
}
+ public virtual void UpdateExportDeployment(ExportDeployment deployment)
+ {
+ if (deployment == null)
+ throw new ArgumentNullException("deployment");
+
+ _exportDeploymentRepository.Update(deployment);
+
+ _eventPublisher.EntityUpdated(deployment);
+ }
+
public virtual void DeleteExportDeployment(ExportDeployment deployment)
{
if (deployment == null)
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportProviderBase.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs
similarity index 85%
rename from src/Libraries/SmartStore.Services/DataExchange/ExportProviderBase.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs
index 2a2d9618f1..c77638f60b 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/ExportProviderBase.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProviderBase.cs
@@ -28,22 +28,22 @@ public virtual ExportConfigurationInfo ConfigurationInfo
get { return null; }
}
+ public void Execute(ExportExecuteContext context)
+ {
+ Export(context);
+ }
+
///
/// Export data to a file
///
/// Export execution context
- protected abstract void Export(IExportExecuteContext context);
-
- public void Execute(IExportExecuteContext context)
- {
- Export(context);
- }
+ protected abstract void Export(ExportExecuteContext context);
///
/// Called once per store when export execution ended
///
/// Export execution context
- public virtual void OnExecuted(IExportExecuteContext context)
+ public virtual void OnExecuted(ExportExecuteContext context)
{
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportXmlHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs
similarity index 94%
rename from src/Libraries/SmartStore.Services/DataExchange/ExportXmlHelper.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs
index 6f84b5f064..68c8b78d55 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/ExportXmlHelper.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs
@@ -49,6 +49,8 @@ public static XmlWriterSettings DefaultSettings
}
}
+ public ExportXmlExclude Exclude { get; set; }
+
public XmlWriter Writer
{
get { return _writer; }
@@ -330,36 +332,41 @@ public void WriteCategory(dynamic category, string node)
}
_writer.Write("Id", entity.Id.ToString());
- _writer.Write("Name", (string)category.Name);
- _writer.Write("FullName", (string)category.FullName);
- _writer.Write("Description", (string)category.Description);
- _writer.Write("BottomDescription", (string)category.BottomDescription);
- _writer.Write("CategoryTemplateId", entity.CategoryTemplateId.ToString());
- _writer.Write("MetaKeywords", (string)category.MetaKeywords);
- _writer.Write("MetaDescription", (string)category.MetaDescription);
- _writer.Write("MetaTitle", (string)category.MetaTitle);
- _writer.Write("SeName", (string)category.SeName);
- _writer.Write("ParentCategoryId", entity.ParentCategoryId.ToString());
- _writer.Write("PictureId", entity.PictureId.HasValue ? entity.PictureId.Value.ToString() : "");
- _writer.Write("PageSize", entity.PageSize.ToString());
- _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString());
- _writer.Write("PageSizeOptions", entity.PageSizeOptions);
- _writer.Write("PriceRanges", entity.PriceRanges);
- _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString());
- _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString());
- _writer.Write("Published", entity.Published.ToString());
- _writer.Write("Deleted", entity.Deleted.ToString());
- _writer.Write("DisplayOrder", entity.DisplayOrder.ToString());
- _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture));
- _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture));
- _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString());
- _writer.Write("LimitedToStores", entity.LimitedToStores.ToString());
- _writer.Write("Alias", (string)category.Alias);
- _writer.Write("DefaultViewMode", entity.DefaultViewMode);
- WritePicture(category.Picture, "Picture");
+ if (!Exclude.HasFlag(ExportXmlExclude.Category))
+ {
+ _writer.Write("Name", (string)category.Name);
+ _writer.Write("FullName", (string)category.FullName);
+ _writer.Write("Description", (string)category.Description);
+ _writer.Write("BottomDescription", (string)category.BottomDescription);
+ _writer.Write("CategoryTemplateId", entity.CategoryTemplateId.ToString());
+ _writer.Write("CategoryTemplateViewPath", (string)category._CategoryTemplateViewPath);
+ _writer.Write("MetaKeywords", (string)category.MetaKeywords);
+ _writer.Write("MetaDescription", (string)category.MetaDescription);
+ _writer.Write("MetaTitle", (string)category.MetaTitle);
+ _writer.Write("SeName", (string)category.SeName);
+ _writer.Write("ParentCategoryId", entity.ParentCategoryId.ToString());
+ _writer.Write("PictureId", entity.PictureId.HasValue ? entity.PictureId.Value.ToString() : "");
+ _writer.Write("PageSize", entity.PageSize.ToString());
+ _writer.Write("AllowCustomersToSelectPageSize", entity.AllowCustomersToSelectPageSize.ToString());
+ _writer.Write("PageSizeOptions", entity.PageSizeOptions);
+ _writer.Write("PriceRanges", entity.PriceRanges);
+ _writer.Write("ShowOnHomePage", entity.ShowOnHomePage.ToString());
+ _writer.Write("HasDiscountsApplied", entity.HasDiscountsApplied.ToString());
+ _writer.Write("Published", entity.Published.ToString());
+ _writer.Write("Deleted", entity.Deleted.ToString());
+ _writer.Write("DisplayOrder", entity.DisplayOrder.ToString());
+ _writer.Write("CreatedOnUtc", entity.CreatedOnUtc.ToString(_culture));
+ _writer.Write("UpdatedOnUtc", entity.UpdatedOnUtc.ToString(_culture));
+ _writer.Write("SubjectToAcl", entity.SubjectToAcl.ToString());
+ _writer.Write("LimitedToStores", entity.LimitedToStores.ToString());
+ _writer.Write("Alias", (string)category.Alias);
+ _writer.Write("DefaultViewMode", entity.DefaultViewMode);
- WriteLocalized(category);
+ WritePicture(category.Picture, "Picture");
+
+ WriteLocalized(category);
+ }
if (node.HasValue())
{
@@ -897,4 +904,15 @@ public void WriteCustomer(dynamic customer, string node)
}
}
}
+
+
+ ///
+ /// Allows to exclude XML nodes from export
+ ///
+ [Flags]
+ public enum ExportXmlExclude
+ {
+ None = 0,
+ Category = 1
+ }
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/IDataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs
similarity index 97%
rename from src/Libraries/SmartStore.Services/DataExchange/IDataExporter.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs
index 97f7cec7f1..34b96faf24 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/IDataExporter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs
@@ -42,7 +42,6 @@ public DataExportRequest(ExportProfile profile, Provider provid
public ProgressValueSetter ProgressValueSetter { get; set; }
- public int CustomerId { get; set; }
public bool HasPermission { get; set; }
public IList EntitiesToExport { get; set; }
diff --git a/src/Libraries/SmartStore.Services/DataExchange/IExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs
similarity index 95%
rename from src/Libraries/SmartStore.Services/DataExchange/IExportProfileService.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs
index 7a61a36def..b0b0c8a6bd 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/IExportProfileService.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs
@@ -108,7 +108,13 @@ ExportProfile InsertExportProfile(
ExportDeployment GetExportDeploymentById(int id);
///
- /// Deleted a export deployment
+ /// Update an export deployment
+ ///
+ /// Export deployment
+ void UpdateExportDeployment(ExportDeployment deployment);
+
+ ///
+ /// Deleted an export deployment
///
/// Export deployment
void DeleteExportDeployment(ExportDeployment deployment);
diff --git a/src/Libraries/SmartStore.Services/DataExchange/IExportProvider.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs
similarity index 90%
rename from src/Libraries/SmartStore.Services/DataExchange/IExportProvider.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs
index e5248b20ba..60be2e11a9 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/IExportProvider.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProvider.cs
@@ -24,12 +24,12 @@ public partial interface IExportProvider : IProvider, IUserEditable
/// Export data to a file
///
/// Export execution context
- void Execute(IExportExecuteContext context);
+ void Execute(ExportExecuteContext context);
///
/// Called once per store when export execution ended
///
/// Export execution context
- void OnExecuted(IExportExecuteContext context);
+ void OnExecuted(ExportExecuteContext context);
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/CategoryExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/CategoryExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CategoryExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/CustomerExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/CustomerExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/CustomerExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/DataExporterContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs
similarity index 94%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/DataExporterContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs
index f909b93678..5c6c1315dd 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Internal/DataExporterContext.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DataExporterContext.cs
@@ -34,7 +34,8 @@ public DataExporterContext(
Stores = new Dictionary();
Languages = new Dictionary();
Countries = new Dictionary();
- ProductTemplates = new Dictionary();
+ ProductTemplates = new Dictionary();
+ CategoryTemplates = new Dictionary();
NewsletterSubscriptions = new HashSet();
RecordsPerStore = new Dictionary();
@@ -109,7 +110,8 @@ public bool IsFileBasedExport
public Dictionary Stores { get; set; }
public Dictionary Languages { get; set; }
public Dictionary Countries { get; set; }
- public Dictionary ProductTemplates { get; set; }
+ public Dictionary ProductTemplates { get; set; }
+ public Dictionary CategoryTemplates { get; set; }
public HashSet NewsletterSubscriptions { get; set; }
// data loaded once per page
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/DynamicEntity.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/DynamicEntity.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/DynamicEntity.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/ManufacturerExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/ManufacturerExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ManufacturerExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/OrderExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/OrderExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/OrderExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Internal/ProductExportContext.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ProductExportContext.cs
similarity index 100%
rename from src/Libraries/SmartStore.Services/DataExchange/Internal/ProductExportContext.cs
rename to src/Libraries/SmartStore.Services/DataExchange/Export/Internal/ProductExportContext.cs
diff --git a/src/Libraries/SmartStore.Services/DataExchange/ExportExtensions.cs b/src/Libraries/SmartStore.Services/DataExchange/ExportExtensions.cs
deleted file mode 100644
index 3d65d673c8..0000000000
--- a/src/Libraries/SmartStore.Services/DataExchange/ExportExtensions.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using SmartStore.Core.Domain;
-using SmartStore.Core.Domain.Stores;
-using SmartStore.Core.Plugins;
-using SmartStore.Services.Localization;
-using SmartStore.Utilities;
-
-namespace SmartStore.Services.DataExchange.Export
-{
- public static class ExportExtensions
- {
- ///
- /// Returns a value indicating whether the export provider is valid
- ///
- /// Export provider
- /// true provider is valid, false provider is invalid.
- public static bool IsValid(this Provider provider)
- {
- return provider != null;
- }
-
- ///
- /// Gets the localized friendly name or the system name as fallback
- ///
- /// Export provider
- /// Localization service
- /// Provider name
- public static string GetName(this Provider provider, ILocalizationService localizationService)
- {
- var systemName = provider.Metadata.SystemName;
- var resourceName = provider.Metadata.ResourceKeyPattern.FormatInvariant(systemName, "FriendlyName");
- var name = localizationService.GetResource(resourceName, 0, false, systemName, true);
-
- return (name.IsEmpty() ? systemName : name);
- }
-
- ///
- /// Get temporary folder for an export profile
- ///
- /// Export profile
- /// Folder path
- public static string GetExportFolder(this ExportProfile profile, bool content = false, bool create = false)
- {
- var path = CommonHelper.MapPath(string.Concat("~/App_Data/ExportProfiles/", profile.FolderName, content ? "/Content" : ""));
-
- if (create && !System.IO.Directory.Exists(path))
- System.IO.Directory.CreateDirectory(path);
-
- return path;
- }
-
- ///
- /// Get log file path for an export profile
- ///
- /// Export profile
- /// Log file path
- public static string GetExportLogPath(this ExportProfile profile)
- {
- return Path.Combine(profile.GetExportFolder(), "log.txt");
- }
-
- ///
- /// Gets the ZIP path for a profile
- ///
- /// Export profile
- /// ZIP file path
- public static string GetExportZipPath(this ExportProfile profile)
- {
- return Path.Combine(profile.GetExportFolder(), profile.FolderName + ".zip");
- }
-
- ///
- /// Gets existing export files for an export profile
- ///
- /// Export profile
- /// List of file names
- public static List GetExportFiles(this ExportProfile profile)
- {
- var exportFolder = profile.GetExportFolder(true);
-
- if (System.IO.Directory.Exists(exportFolder))
- {
- return System.IO.Directory.EnumerateFiles(exportFolder, "*", SearchOption.TopDirectoryOnly)
- .OrderBy(x => x)
- .ToList();
- }
-
- return new List();
- }
-
- ///
- /// Resolves the file name pattern for an export profile
- ///
- /// Export profile
- /// Store
- /// One based file index
- /// The maximum length of the file name
- /// Resolved file name pattern
- public static string ResolveFileNamePattern(this ExportProfile profile, Store store, int fileIndex, int maxFileNameLength)
- {
- var sb = new StringBuilder(profile.FileNamePattern);
-
- sb.Replace("%Profile.Id%", profile.Id.ToString());
- sb.Replace("%Profile.FolderName%", profile.FolderName);
- sb.Replace("%Store.Id%", store.Id.ToString());
- sb.Replace("%File.Index%", fileIndex.ToString("D4"));
-
- if (profile.FileNamePattern.Contains("%Profile.SeoName%"))
- sb.Replace("%Profile.SeoName%", SeoHelper.GetSeName(profile.Name, true, false).Replace("/", "").Replace("-", ""));
-
- if (profile.FileNamePattern.Contains("%Store.SeoName%"))
- sb.Replace("%Store.SeoName%", profile.PerStore ? SeoHelper.GetSeName(store.Name, true, false) : "allstores");
-
- if (profile.FileNamePattern.Contains("%Random.Number%"))
- sb.Replace("%Random.Number%", CommonHelper.GenerateRandomInteger().ToString());
-
- if (profile.FileNamePattern.Contains("%Timestamp%"))
- sb.Replace("%Timestamp%", DateTime.UtcNow.ToString("s", CultureInfo.InvariantCulture));
-
- var result = sb.ToString()
- .ToValidFileName("")
- .Truncate(maxFileNameLength);
-
- return result;
- }
- }
-}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs
index df66ad1e56..14a0ac77e9 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs
@@ -1,12 +1,13 @@
using System;
using System.Collections.Generic;
-using System.Linq;
+using Newtonsoft.Json;
namespace SmartStore.Services.DataExchange.Import
{
public class ColumnMap
{
- private readonly Dictionary _map = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ // maps source column to property
+ private readonly Dictionary _map = new Dictionary(StringComparer.OrdinalIgnoreCase);
private static bool IsIndexed(string name)
{
@@ -23,27 +24,27 @@ private static string CreateSourceName(string name, string index)
return name;
}
- public IReadOnlyDictionary Mappings
+ public IReadOnlyDictionary Mappings
{
get { return _map; }
}
- public static bool ParseSourceColumn(string sourceColumn, out string columnWithoutIndex, out string index)
+ public static bool ParseSourceName(string sourceName, out string nameWithoutIndex, out string index)
{
- columnWithoutIndex = sourceColumn;
+ nameWithoutIndex = sourceName;
index = null;
var result = true;
- if (sourceColumn.HasValue() && IsIndexed(sourceColumn))
+ if (sourceName.HasValue() && IsIndexed(sourceName))
{
- var x1 = sourceColumn.IndexOf('[');
- var x2 = sourceColumn.IndexOf(']', x1);
+ var x1 = sourceName.IndexOf('[');
+ var x2 = sourceName.IndexOf(']', x1);
if (x1 != -1 && x2 != -1 && x2 > x1)
{
- columnWithoutIndex = sourceColumn.Substring(0, x1);
- index = sourceColumn.Substring(x1 + 1, x2 - x1 - 1);
+ nameWithoutIndex = sourceName.Substring(0, x1);
+ index = sourceName.Substring(x1 + 1, x2 - x1 - 1);
}
else
{
@@ -54,29 +55,22 @@ public static bool ParseSourceColumn(string sourceColumn, out string columnWitho
return result;
}
- public IEnumerable> GetInvalidMappings()
+ public void AddMapping(string sourceName, string mappedName, string defaultValue = null)
{
- var mappings = Mappings.Where(x =>
- !IsIndexed(x.Key) &&
- x.Value.Property.HasValue() &&
- Mappings.Count(y => y.Value.Property.IsCaseInsensitiveEqual(x.Value.Property)) > 1
- );
-
- return mappings;
- }
-
- public void AddMapping(string sourceColumn, string entityProperty, string defaultValue = null)
- {
- AddMapping(sourceColumn, null, entityProperty, defaultValue);
+ AddMapping(sourceName, null, mappedName, defaultValue);
}
- public void AddMapping(string sourceColumn, string index, string entityProperty, string defaultValue = null)
+ public void AddMapping(string sourceName, string index, string mappedName, string defaultValue = null)
{
- Guard.ArgumentNotEmpty(() => sourceColumn);
+ Guard.ArgumentNotEmpty(() => sourceName);
+ Guard.ArgumentNotEmpty(() => mappedName);
+
+ var key = CreateSourceName(sourceName, index);
- _map[CreateSourceName(sourceColumn, index)] = new ColumnMappingValue
+ _map[key] = new ColumnMappingItem
{
- Property = entityProperty,
+ SoureName = key,
+ MappedName = mappedName,
Default = defaultValue
};
}
@@ -84,71 +78,70 @@ public void AddMapping(string sourceColumn, string index, string entityProperty,
///
/// Gets a mapped column value
///
- /// The name of the column to get a mapped value for.
- /// The mapped column value OR - if the name is unmapped - a value with the passed
- public ColumnMappingValue GetMapping(string sourceColumn)
- {
- ColumnMappingValue result;
-
- if (_map.TryGetValue(sourceColumn, out result))
- {
- return result;
- }
-
- return new ColumnMappingValue { Property = sourceColumn };
- }
-
- ///
- /// Gets a mapped column value
- ///
- /// The name of the column to get a mapped value for.
+ /// The name of the column to get a mapped value for.
/// The column index, e.g. a language code (de, en etc.)
- /// The mapped column value OR - if the name is unmapped - a value with the passed []
- public ColumnMappingValue GetMapping(string sourceColumn, string index)
+ /// The mapped column value OR - if the name is unmapped - a value with the passed []
+ public ColumnMappingItem GetMapping(string sourceName, string index)
{
- return GetMapping(CreateSourceName(sourceColumn, index));
+ return GetMapping(CreateSourceName(sourceName, index));
}
///
- /// Gets a mapped property name
+ /// Gets a mapped column value
///
- /// The name of the column to get a mapped property name for.
- /// The mapped property name OR - if the name is unmapped - the passed []
- public string GetMappedProperty(string sourceColumn)
+ /// The name of the column to get a mapped value for.
+ /// The mapped column value OR - if the name is unmapped - the value of the passed
+ public ColumnMappingItem GetMapping(string sourceName)
{
- ColumnMappingValue result;
+ ColumnMappingItem result;
- if (_map.TryGetValue(sourceColumn, out result))
+ if (_map.TryGetValue(sourceName, out result))
{
- return result.Property;
+ return result;
}
- return sourceColumn;
- }
-
- ///
- /// Gets a mapped property name
- ///
- /// The name of the column to get a mapped property name for.
- /// The column index, e.g. a language code (de, en etc.)
- /// The mapped property name OR - if the name is unmapped - the passed []
- public string GetMappedProperty(string sourceColumn, string index)
- {
- return GetMappedProperty(CreateSourceName(sourceColumn, index));
+ return new ColumnMappingItem { SoureName = sourceName, MappedName = sourceName };
}
}
- public class ColumnMappingValue
+ [JsonObject(MemberSerialization.OptIn)]
+ public class ColumnMappingItem
{
+ private bool? _ignored;
+
///
- /// The property name of the target entity
+ /// The source name
///
- public string Property { get; set; }
+ [JsonIgnore]
+ public string SoureName { get; set; }
+
+ ///
+ /// The mapped name
+ ///
+ [JsonProperty]
+ public string MappedName { get; set; }
///
/// An optional default value
///
+ [JsonProperty]
public string Default { get; set; }
+
+ ///
+ /// Indicates whether to explicitly ignore this property
+ ///
+ public bool IgnoreProperty
+ {
+ get
+ {
+ if (_ignored == null)
+ {
+ _ignored = Default != null && Default == "[IGNOREPROPERTY]";
+ }
+
+ return _ignored.Value;
+ }
+ }
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs
index 78cbd7fa13..c46b90b82a 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMapConverter.cs
@@ -27,12 +27,12 @@ public override object ConvertFrom(CultureInfo culture, object value)
{
if (value is string)
{
- var dict = JsonConvert.DeserializeObject>((string)value);
+ var dict = JsonConvert.DeserializeObject>((string)value);
var map = new ColumnMap();
foreach (var kvp in dict)
{
- map.AddMapping(kvp.Key, null, kvp.Value.Property, kvp.Value.Default);
+ map.AddMapping(kvp.Key, null, kvp.Value.MappedName, kvp.Value.Default);
}
return map;
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs
index 253bd10b6f..a25235fe00 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImportTask.cs
@@ -28,11 +28,6 @@ public void Execute(TaskExecutionContext ctx)
ctx.SetProgress(val, max, msg, true);
};
- if (ctx.Parameters.ContainsKey("CurrentCustomerId"))
- {
- request.CustomerId = ctx.Parameters["CurrentCustomerId"].ToInt(); // do not use built-in background tasks customer
- }
-
_importer.Import(request, ctx.CancellationToken);
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs
index 55ab3376fb..aeb4b81897 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataImporter.cs
@@ -1,146 +1,68 @@
using System;
using System.IO;
-using System.Linq;
using System.Text;
using System.Threading;
+using System.Linq;
using SmartStore.Core;
-using SmartStore.Core.Data;
-using SmartStore.Core.Domain.Catalog;
+using SmartStore.Core.Domain.Common;
using SmartStore.Core.Domain.Customers;
using SmartStore.Core.Domain.DataExchange;
-using SmartStore.Core.Domain.Forums;
-using SmartStore.Core.Domain.Media;
-using SmartStore.Core.Domain.Messages;
-using SmartStore.Core.Domain.Seo;
+using SmartStore.Core.Email;
using SmartStore.Core.Localization;
using SmartStore.Core.Logging;
-using SmartStore.Services.Affiliates;
-using SmartStore.Services.Catalog;
-using SmartStore.Services.Catalog.Importer;
-using SmartStore.Services.Common;
-using SmartStore.Services.Customers;
-using SmartStore.Services.Customers.Importer;
using SmartStore.Services.DataExchange.Csv;
using SmartStore.Services.DataExchange.Import.Internal;
-using SmartStore.Services.Directory;
-using SmartStore.Services.Helpers;
using SmartStore.Services.Localization;
-using SmartStore.Services.Media;
-using SmartStore.Services.Messages.Importer;
+using SmartStore.Services.Messages;
using SmartStore.Services.Security;
-using SmartStore.Services.Seo;
-using SmartStore.Services.Stores;
using SmartStore.Utilities;
namespace SmartStore.Services.DataExchange.Import
{
public partial class DataImporter : IDataImporter
{
- #region Dependencies
-
private readonly ICommonServices _services;
- private readonly ICustomerService _customerService;
-
- private readonly Lazy> _subscriptionRepository;
- private readonly Lazy> _pictureRepository;
- private readonly Lazy> _productPictureRepository;
- private readonly Lazy> _productManufacturerRepository;
- private readonly Lazy> _productCategoryRepository;
- private readonly Lazy> _urlRecordRepository;
- private readonly Lazy> _productRepository;
- private readonly Lazy> _customerRepository;
- private readonly Lazy> _categoryRepository;
-
- private readonly Lazy _languageService;
- private readonly Lazy _localizedEntityService;
- private readonly Lazy _pictureService;
- private readonly Lazy _manufacturerService;
- private readonly Lazy _categoryService;
- private readonly Lazy _categoryTemplateService;
- private readonly Lazy _productService;
- private readonly Lazy _urlRecordService;
- private readonly Lazy _storeMappingService;
- private readonly Lazy _genericAttributeService;
- private readonly Lazy _affiliateService;
- private readonly Lazy _countryService;
- private readonly Lazy _stateProvinceService;
-
- private readonly Lazy _seoSettings;
- private readonly Lazy _customerSettings;
- private readonly Lazy _dateTimeSettings;
- private readonly Lazy _forumSettings;
+ private readonly IImportProfileService _importProfileService;
+ private readonly ILanguageService _languageService;
+ private readonly Func _importerFactory;
+ private readonly Lazy _emailAccountService;
+ private readonly Lazy _emailSender;
+ private readonly Lazy _contactDataSettings;
+ private readonly Lazy _dataExchangeSettings;
public DataImporter(
ICommonServices services,
- ICustomerService customerService,
- Lazy> subscriptionRepository,
- Lazy> pictureRepository,
- Lazy> productPictureRepository,
- Lazy> productManufacturerRepository,
- Lazy> productCategoryRepository,
- Lazy> urlRecordRepository,
- Lazy> productRepository,
- Lazy> customerRepository,
- Lazy> categoryRepository,
- Lazy languageService,
- Lazy localizedEntityService,
- Lazy pictureService,
- Lazy manufacturerService,
- Lazy categoryService,
- Lazy categoryTemplateService,
- Lazy productService,
- Lazy urlRecordService,
- Lazy storeMappingService,
- Lazy genericAttributeService,
- Lazy affiliateService,
- Lazy countryService,
- Lazy stateProvinceService,
- Lazy seoSettings,
- Lazy customerSettings,
- Lazy dateTimeSettings,
- Lazy forumSettings)
+ IImportProfileService importProfileService,
+ ILanguageService languageService,
+ Func importerFactory,
+ Lazy emailAccountService,
+ Lazy emailSender,
+ Lazy contactDataSettings,
+ Lazy dataExchangeSettings)
{
_services = services;
- _customerService = customerService;
- _subscriptionRepository = subscriptionRepository;
- _pictureRepository = pictureRepository;
- _productPictureRepository = productPictureRepository;
- _productManufacturerRepository = productManufacturerRepository;
- _productCategoryRepository = productCategoryRepository;
- _urlRecordRepository = urlRecordRepository;
- _productRepository = productRepository;
- _customerRepository = customerRepository;
- _categoryRepository = categoryRepository;
-
+ _importProfileService = importProfileService;
_languageService = languageService;
- _localizedEntityService = localizedEntityService;
- _pictureService = pictureService;
- _manufacturerService = manufacturerService;
- _categoryService = categoryService;
- _categoryTemplateService = categoryTemplateService;
- _productService = productService;
- _urlRecordService = urlRecordService;
- _storeMappingService = storeMappingService;
- _genericAttributeService = genericAttributeService;
- _affiliateService = affiliateService;
- _countryService = countryService;
- _stateProvinceService = stateProvinceService;
-
- _seoSettings = seoSettings;
- _customerSettings = customerSettings;
- _dateTimeSettings = dateTimeSettings;
- _forumSettings = forumSettings;
+ _importerFactory = importerFactory;
+ _emailAccountService = emailAccountService;
+ _emailSender = emailSender;
+ _contactDataSettings = contactDataSettings;
+ _dataExchangeSettings = dataExchangeSettings;
T = NullLocalizer.Instance;
}
- #endregion
-
public Localizer T { get; set; }
private bool HasPermission(DataImporterContext ctx)
{
- var customer = _customerService.GetCustomerById(ctx.Request.CustomerId);
+ if (ctx.Request.HasPermission)
+ return true;
+
+ var customer = _services.WorkContext.CurrentCustomer;
+
+ if (customer.SystemName == SystemCustomerNames.BackgroundTask)
+ return true;
if (ctx.Request.Profile.EntityType == ImportEntityType.Product || ctx.Request.Profile.EntityType == ImportEntityType.Category)
return _services.Permissions.Authorize(StandardPermissionProvider.ManageCatalog, customer);
@@ -160,24 +82,24 @@ private void LogResult(DataImporterContext ctx)
var sb = new StringBuilder();
sb.AppendLine();
- sb.AppendFormat("Started:\t\t\t{0}\r\n", result.StartDateUtc.ToLocalTime());
- sb.AppendFormat("Finished:\t\t\t{0}\r\n", result.EndDateUtc.ToLocalTime());
- sb.AppendFormat("Duration:\t\t\t{0}\r\n", (result.EndDateUtc - result.StartDateUtc).ToString("g"));
+ sb.AppendFormat("Started:\t\t{0}\r\n", result.StartDateUtc.ToLocalTime());
+ sb.AppendFormat("Finished:\t\t{0}\r\n", result.EndDateUtc.ToLocalTime());
+ sb.AppendFormat("Duration:\t\t{0}\r\n", (result.EndDateUtc - result.StartDateUtc).ToString("g"));
sb.AppendLine();
- sb.AppendFormat("Total rows:\t\t\t{0}\r\n", result.TotalRecords);
+ sb.AppendFormat("Total rows:\t\t{0}\r\n", result.TotalRecords);
sb.AppendFormat("Rows processed:\t\t{0}\r\n", result.AffectedRecords);
sb.AppendFormat("Records imported:\t{0}\r\n", result.NewRecords);
sb.AppendFormat("Records updated:\t{0}\r\n", result.ModifiedRecords);
sb.AppendLine();
- sb.AppendFormat("Warnings:\t\t\t{0}\r\n", result.Messages.Count(x => x.MessageType == ImportMessageType.Warning));
- sb.AppendFormat("Errors:\t\t\t\t{0}", result.Messages.Count(x => x.MessageType == ImportMessageType.Error));
+ sb.AppendFormat("Warnings:\t\t{0}\r\n", result.Warnings);
+ sb.AppendFormat("Errors:\t\t\t{0}", result.Errors);
ctx.Log.Information(sb.ToString());
foreach (var message in result.Messages)
{
if (message.MessageType == ImportMessageType.Error)
- ctx.Log.Error(message.ToString());
+ ctx.Log.Error(message.ToString(), message.FullMessage);
else if (message.MessageType == ImportMessageType.Warning)
ctx.Log.Warning(message.ToString());
else
@@ -185,9 +107,74 @@ private void LogResult(DataImporterContext ctx)
}
}
+ private void SendCompletionEmail(DataImporterContext ctx)
+ {
+ var emailAccount = _emailAccountService.Value.GetDefaultEmailAccount();
+ var smtpContext = new SmtpContext(emailAccount);
+ var message = new EmailMessage();
+
+ var store = _services.StoreContext.CurrentStore;
+ var storeInfo = "{0} ({1})".FormatInvariant(store.Name, store.Url);
+ var intro = _services.Localization.GetResource("Admin.DataExchange.Import.CompletedEmail.Body").FormatInvariant(storeInfo);
+ var body = new StringBuilder(intro);
+ var result = ctx.ExecuteContext.Result;
+
+ if (result.LastError.HasValue())
+ {
+ body.AppendFormat("{0}
", result.LastError);
+ }
+
+ body.Append("");
+
+ body.AppendFormat("
{0}: {1} · {2}: {3}
",
+ T("Admin.Common.TotalRows"), result.TotalRecords,
+ T("Admin.Common.Skipped"), result.SkippedRecords);
+
+ body.AppendFormat("{0}: {1} · {2}: {3}
",
+ T("Admin.Common.NewRecords"), result.NewRecords,
+ T("Admin.Common.Updated"), result.ModifiedRecords);
+
+ body.AppendFormat("{0}: {1} · {2}: {3}
",
+ T("Admin.Common.Errors"), result.Errors,
+ T("Admin.Common.Warnings"), result.Warnings);
+
+ body.Append("");
+
+ message.From = new EmailAddress(emailAccount.Email, emailAccount.DisplayName);
+
+ if (_contactDataSettings.Value.WebmasterEmailAddress.HasValue())
+ message.To.Add(new EmailAddress(_contactDataSettings.Value.WebmasterEmailAddress));
+
+ if (message.To.Count == 0 && _contactDataSettings.Value.CompanyEmailAddress.HasValue())
+ message.To.Add(new EmailAddress(_contactDataSettings.Value.CompanyEmailAddress));
+
+ if (message.To.Count == 0)
+ message.To.Add(new EmailAddress(emailAccount.Email, emailAccount.DisplayName));
+
+ message.Subject = T("Admin.DataExchange.Import.CompletedEmail.Subject").Text.FormatInvariant(ctx.Request.Profile.Name);
+
+ message.Body = body.ToString();
+
+ _emailSender.Value.SendEmail(smtpContext, message);
+
+ //Core.Infrastructure.EngineContext.Current.Resolve().InsertQueuedEmail(new QueuedEmail
+ //{
+ // From = emailAccount.Email,
+ // FromName = emailAccount.DisplayName,
+ // To = message.To.First().Address,
+ // Subject = message.Subject,
+ // Body = message.Body,
+ // CreatedOnUtc = DateTime.UtcNow,
+ // EmailAccountId = emailAccount.Id,
+ // SendManually = true
+ //});
+ //_services.DbContext.SaveChanges();
+ }
+
private void ImportCoreInner(DataImporterContext ctx, string filePath)
{
- ctx.ExecuteContext.Result.Clear();
+ if (ctx.ExecuteContext.Abort == DataExchangeAbortion.Hard)
+ return;
{
var logHead = new StringBuilder();
@@ -197,8 +184,11 @@ private void ImportCoreInner(DataImporterContext ctx, string filePath)
logHead.Append("Import profile:\t\t" + ctx.Request.Profile.Name);
logHead.AppendLine(ctx.Request.Profile.Id == 0 ? " (volatile)" : " (Id {0})".FormatInvariant(ctx.Request.Profile.Id));
- logHead.AppendLine("Entity:\t\t\t\t" + ctx.Request.Profile.EntityType.ToString());
- logHead.Append("File:\t\t\t\t" + Path.GetFileName(filePath));
+ logHead.AppendLine("Entity:\t\t\t" + ctx.Request.Profile.EntityType.ToString());
+ logHead.AppendLine("File:\t\t\t" + Path.GetFileName(filePath));
+
+ var customer = _services.WorkContext.CurrentCustomer;
+ logHead.Append("Executed by:\t\t" + (customer.Email.HasValue() ? customer.Email : customer.SystemName));
ctx.Log.Information(logHead.ToString());
}
@@ -210,9 +200,8 @@ private void ImportCoreInner(DataImporterContext ctx, string filePath)
CsvConfiguration csvConfiguration = null;
var extension = Path.GetExtension(filePath);
- var take = (ctx.Request.Profile.Take > 0 ? ctx.Request.Profile.Take : int.MaxValue);
- if (extension.IsCaseInsensitiveEqual(".csv"))
+ if ((new string[] { ".csv", ".txt", ".tab" }).Contains(extension, StringComparer.OrdinalIgnoreCase))
{
var converter = new CsvConfigurationConverter();
csvConfiguration = converter.ConvertFrom(ctx.Request.Profile.FileTypeConfiguration);
@@ -221,12 +210,18 @@ private void ImportCoreInner(DataImporterContext ctx, string filePath)
if (csvConfiguration == null)
{
csvConfiguration = CsvConfiguration.ExcelFriendlyConfiguration;
- ctx.Log.Warning("No CSV configuration provided for import profile. Fallback to Excel friendly configuration.");
}
using (var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
{
- ctx.ExecuteContext.DataTable = LightweightDataTable.FromFile(Path.GetFileName(filePath), stream, stream.Length, csvConfiguration, ctx.Request.Profile.Skip, take);
+ ctx.ExecuteContext.DataTable = LightweightDataTable.FromFile(
+ Path.GetFileName(filePath),
+ stream,
+ stream.Length,
+ csvConfiguration,
+ ctx.Request.Profile.Skip,
+ ctx.Request.Profile.Take > 0 ? ctx.Request.Profile.Take : int.MaxValue
+ );
try
{
@@ -235,18 +230,14 @@ private void ImportCoreInner(DataImporterContext ctx, string filePath)
catch (Exception exception)
{
ctx.ExecuteContext.Abort = DataExchangeAbortion.Hard;
- ctx.Log.Error("The importer failed: {0}.".FormatInvariant(exception.ToAllMessages()), exception);
+ ctx.ExecuteContext.Result.AddError(exception, "The importer failed: {0}.".FormatInvariant(exception.ToAllMessages()));
}
- ctx.ExecuteContext.Result.EndDateUtc = DateTime.UtcNow;
-
if (ctx.ExecuteContext.IsMaxFailures)
- ctx.Log.Warning("Import aborted. The maximum number of failures has been reached.");
+ ctx.ExecuteContext.Result.AddWarning("Import aborted. The maximum number of failures has been reached.");
if (ctx.CancellationToken.IsCancellationRequested)
- ctx.Log.Warning("Import aborted. A cancellation has been requested.");
-
- LogResult(ctx);
+ ctx.ExecuteContext.Result.AddWarning("Import aborted. A cancellation has been requested.");
}
}
@@ -265,10 +256,14 @@ private void ImportCoreOuter(DataImporterContext ctx)
{
ctx.Log = logger;
- if (ctx.Request.CustomerId == 0)
- ctx.Request.CustomerId = _services.WorkContext.CurrentCustomer.Id; // fallback to system background task customer
-
- ctx.ExecuteContext.CustomerId = ctx.Request.CustomerId;
+ ctx.ExecuteContext.DataExchangeSettings = _dataExchangeSettings.Value;
+ ctx.ExecuteContext.Services = _services;
+ ctx.ExecuteContext.Log = logger;
+ ctx.ExecuteContext.Languages = _languageService.GetAllLanguages(true);
+ ctx.ExecuteContext.UpdateOnly = ctx.Request.Profile.UpdateOnly;
+ ctx.ExecuteContext.KeyFieldNames = ctx.Request.Profile.KeyFieldNames.SplitSafe(",");
+ ctx.ExecuteContext.ImportFolder = ctx.Request.Profile.GetImportFolder();
+ ctx.ExecuteContext.ExtraData = XmlHelper.Deserialize(ctx.Request.Profile.ExtraData);
{
var mapConverter = new ColumnMapConverter();
@@ -278,80 +273,68 @@ private void ImportCoreOuter(DataImporterContext ctx)
var files = ctx.Request.Profile.GetImportFiles();
if (files.Count == 0)
- throw new SmartException("No files to import found.");
+ throw new SmartException("No files to import.");
if (!HasPermission(ctx))
throw new SmartException("You do not have permission to perform the selected import.");
- if (ctx.Request.Profile.EntityType == ImportEntityType.Product)
+ ctx.Importer = _importerFactory(ctx.Request.Profile.EntityType);
+
+ files.ForEach(x => ImportCoreInner(ctx, x));
+ }
+ catch (Exception exception)
+ {
+ ctx.ExecuteContext.Result.AddError(exception);
+ }
+ finally
+ {
+ try
+ {
+ // database context sharing problem: if there are entities in modified state left by the provider due to SaveChanges failure,
+ // then all subsequent SaveChanges would fail too (e.g. IImportProfileService.UpdateImportProfile, IScheduledTaskService.UpdateTask...).
+ // so whatever it is, detach\dispose all what the tracker still has tracked.
+
+ _services.DbContext.DetachAll(false);
+ }
+ catch (Exception exception)
{
- ctx.Importer = new ProductImporter(
- _productPictureRepository.Value,
- _productManufacturerRepository.Value,
- _productCategoryRepository.Value,
- _urlRecordRepository.Value,
- _productRepository.Value,
- _services,
- _languageService.Value,
- _localizedEntityService.Value,
- _pictureService.Value,
- _manufacturerService.Value,
- _categoryService.Value,
- _productService.Value,
- _urlRecordService.Value,
- _storeMappingService.Value,
- _seoSettings.Value);
+ ctx.ExecuteContext.Result.AddError(exception);
}
- else if (ctx.Request.Profile.EntityType == ImportEntityType.Customer)
+
+ try
{
- ctx.Importer = new CustomerImporter(
- _services,
- _customerRepository.Value,
- _genericAttributeService.Value,
- _customerService,
- _affiliateService.Value,
- _countryService.Value,
- _stateProvinceService.Value,
- _customerSettings.Value,
- _dateTimeSettings.Value,
- _forumSettings.Value);
+ SendCompletionEmail(ctx);
}
- else if (ctx.Request.Profile.EntityType == ImportEntityType.NewsLetterSubscription)
+ catch (Exception exception)
{
- ctx.Importer = new NewsLetterSubscriptionImporter(
- _services,
- _subscriptionRepository.Value);
+ ctx.ExecuteContext.Result.AddError(exception);
}
- else if (ctx.Request.Profile.EntityType == ImportEntityType.Category)
+
+ try
{
- ctx.Importer = new CategoryImporter(
- _categoryRepository.Value,
- _urlRecordRepository.Value,
- _pictureRepository.Value,
- _services,
- _urlRecordService.Value,
- _categoryTemplateService.Value,
- _storeMappingService.Value,
- _pictureService.Value,
- _seoSettings.Value);
+ ctx.ExecuteContext.Result.EndDateUtc = DateTime.UtcNow;
+
+ LogResult(ctx);
}
- else
+ catch (Exception exception)
{
- throw new SmartException("Unsupported entity type {0}.".FormatInvariant(ctx.Request.Profile.EntityType.ToString()));
+ logger.ErrorsAll(exception);
}
- files.ForEach(x => ImportCoreInner(ctx, x));
- }
- catch (Exception exception)
- {
- logger.ErrorsAll(exception);
- }
- finally
- {
try
{
- ctx.Request.CustomData.Clear();
+ ctx.Request.Profile.ResultInfo = XmlHelper.Serialize(ctx.ExecuteContext.Result.Clone());
+ _importProfileService.UpdateImportProfile(ctx.Request.Profile);
+ }
+ catch (Exception exception)
+ {
+ logger.ErrorsAll(exception);
+ }
+
+ try
+ {
+ ctx.Request.CustomData.Clear();
ctx.Log = null;
}
catch (Exception exception)
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs
index 99d3f4db48..52be0a8dfa 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs
@@ -17,6 +17,7 @@ public class LightweightDataTable : IDataTable
private readonly IList _columns;
private readonly IList _rows;
private readonly IDictionary _columnIndexes;
+ private readonly IDictionary _alternativeColumnIndexes;
public LightweightDataTable(IList columns, IList data)
{
@@ -30,30 +31,69 @@ public LightweightDataTable(IList columns, IList data)
_columns = new ReadOnlyCollection(columns);
+ TrimData(data);
+
var rows = data.Select(x => new LightweightDataRow(this, x)).Cast().ToList();
_rows = new ReadOnlyCollection(rows);
_columnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase);
+ _alternativeColumnIndexes = new Dictionary(StringComparer.OrdinalIgnoreCase);
+
for (var i = 0; i < columns.Count; i++)
{
- _columnIndexes[columns[i].Name] = i;
+ var name = columns[i].Name;
+ var alternativeName = GetAlternativeColumnNameFor(name);
+
+ _columnIndexes[name] = i;
+
+ if (!alternativeName.IsCaseInsensitiveEqual(name))
+ _alternativeColumnIndexes[alternativeName] = i;
}
- }
+ }
+
+ private static void TrimData(IList data)
+ {
+ // When a user deletes content instead of whole rows from an excel sheet,
+ // our data table contains completely empty rows at the end.
+ // Here we get rid of them as they are absolutely useless.
+ for (int i = data.Count - 1; i >= 0; i--)
+ {
+ var allColumnsEmpty = data[i].All(x => x == null || x == DBNull.Value);
+ if (allColumnsEmpty)
+ {
+ data.RemoveAt(i);
+ //i--;
+ }
+ else
+ {
+ // get out here on the first occurence of a NON-empty row
+ break;
+ }
+ }
+ }
public bool HasColumn(string name)
{
- if (name.IsEmpty())
- return false;
+ if (name.HasValue())
+ {
+ return (_columnIndexes.ContainsKey(name) || _alternativeColumnIndexes.ContainsKey(name));
+ }
- return _columnIndexes.ContainsKey(name);
+ return false;
}
public int GetColumnIndex(string name)
{
int index;
- if (name.HasValue() && _columnIndexes.TryGetValue(name, out index))
- return index;
+ if (name.HasValue())
+ {
+ if (_columnIndexes.TryGetValue(name, out index))
+ return index;
+
+ if (_alternativeColumnIndexes.TryGetValue(name, out index))
+ return index;
+ }
return -1;
}
@@ -74,6 +114,17 @@ public IList Rows
}
}
+ public static string GetAlternativeColumnNameFor(string name)
+ {
+ if (name.IsEmpty())
+ return name;
+
+ return name
+ .Replace(" ", "")
+ .Replace("-", "")
+ .Replace("_", "");
+ }
+
public static IDataTable FromPostedFile(
HttpPostedFileBase file,
int skip = 0,
@@ -109,7 +160,7 @@ public static IDataTable FromFile(
if (contentLength == 0)
{
- throw Error.Argument("file", "The posted file '{0}' does not contain any data.".FormatInvariant(fileName)); // TODO Loc
+ throw Error.Argument("fileName", "The posted file '{0}' does not contain any data.".FormatInvariant(fileName));
}
IDataReader dataReader = null;
@@ -128,18 +179,18 @@ public static IDataTable FromFile(
break;
}
- var table = LightweightDataTable.FromDataReader(dataReader);
+ var table = LightweightDataTable.FromDataReader(dataReader, skip, take);
if (table.Columns.Count == 0 || table.Rows.Count == 0)
{
- throw Error.InvalidOperation("file", "The posted file '{0}' does not contain any columns or data rows.".FormatInvariant(fileName)); // TODO Loc
+ throw Error.InvalidOperation("The posted file '{0}' does not contain any columns or data rows.".FormatInvariant(fileName));
}
return table;
}
- catch
+ catch (Exception ex)
{
- throw;
+ throw ex;
}
finally
{
@@ -180,6 +231,8 @@ public static IDataTable FromDataReader(
var fieldCount = reader.FieldCount;
+ take = Math.Min(take, int.MaxValue - skip);
+
int i = -1;
while (reader.Read())
{
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs
new file mode 100644
index 0000000000..eff63d8431
--- /dev/null
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/EntityImporterBase.cs
@@ -0,0 +1,302 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Mime;
+using System.Linq;
+using SmartStore.Core.Domain.DataExchange;
+using SmartStore.Core.IO;
+using SmartStore.Utilities;
+using System.Linq.Expressions;
+using SmartStore.Core;
+using Autofac;
+using SmartStore.Services.Localization;
+using SmartStore.Core.Domain.Localization;
+using SmartStore.Core.Domain.Seo;
+using SmartStore.Services.Seo;
+using SmartStore.Core.Data;
+using SmartStore.Services.Stores;
+using SmartStore.Core.Domain.Stores;
+
+namespace SmartStore.Services.DataExchange.Import
+{
+ public abstract class EntityImporterBase : IEntityImporter
+ {
+ private const string _imageDownloadFolder = @"Content\DownloadedImages";
+
+ public DateTime UtcNow
+ {
+ get;
+ private set;
+ }
+
+ public Dictionary DownloadedItems
+ {
+ get;
+ private set;
+ }
+
+ public string ImageDownloadFolder
+ {
+ get;
+ private set;
+ }
+
+ public string ImageFolder
+ {
+ get;
+ private set;
+ }
+
+ public FileDownloadManagerContext DownloaderContext
+ {
+ get;
+ private set;
+ }
+
+ public void Execute(ImportExecuteContext context)
+ {
+ Import(context);
+ }
+
+ protected abstract void Import(ImportExecuteContext context);
+
+ protected void Initialize(ImportExecuteContext context)
+ {
+ UtcNow = DateTime.UtcNow;
+ DownloadedItems = new Dictionary();
+ ImageDownloadFolder = Path.Combine(context.ImportFolder, _imageDownloadFolder);
+
+ var settings = context.DataExchangeSettings;
+
+ if (settings.ImageImportFolder.HasValue())
+ ImageFolder = Path.Combine(context.ImportFolder, settings.ImageImportFolder);
+ else
+ ImageFolder = context.ImportFolder;
+
+ if (!System.IO.Directory.Exists(ImageDownloadFolder))
+ System.IO.Directory.CreateDirectory(ImageDownloadFolder);
+
+ DownloaderContext = new FileDownloadManagerContext
+ {
+ Timeout = TimeSpan.FromMinutes(settings.ImageDownloadTimeout),
+ Logger = context.Log,
+ CancellationToken = context.CancellationToken
+ };
+
+ context.Result.TotalRecords = context.DataSegmenter.TotalRows;
+ }
+
+ public FileDownloadManagerItem CreateDownloadImage(string urlOrPath, string seoName, int displayOrder)
+ {
+ var item = new FileDownloadManagerItem
+ {
+ Id = displayOrder,
+ DisplayOrder = displayOrder,
+ MimeType = MimeTypes.MapNameToMimeType(urlOrPath)
+ };
+
+ if (item.MimeType.IsEmpty())
+ {
+ item.MimeType = MediaTypeNames.Image.Jpeg;
+ }
+
+ var extension = MimeTypes.MapMimeTypeToExtension(item.MimeType);
+
+ if (extension.HasValue())
+ {
+ if (urlOrPath.IsWebUrl())
+ {
+ item.Url = urlOrPath;
+ item.FileName = "{0}-{1}".FormatInvariant(seoName, item.Id).ToValidFileName();
+
+ if (DownloadedItems.ContainsKey(urlOrPath))
+ {
+ item.Path = Path.Combine(ImageDownloadFolder, DownloadedItems[urlOrPath]);
+ item.Success = true;
+ }
+ else
+ {
+ item.Path = Path.Combine(ImageDownloadFolder, item.FileName + extension.EnsureStartsWith("."));
+ }
+ }
+ else if (Path.IsPathRooted(urlOrPath))
+ {
+ item.Path = urlOrPath;
+ item.Success = true;
+ }
+ else
+ {
+ item.Path = Path.Combine(ImageFolder, urlOrPath);
+ item.Success = true;
+ }
+
+ return item;
+ }
+
+ return null;
+ }
+
+ public void Succeeded(FileDownloadManagerItem item)
+ {
+ if ((item.Success ?? false) && item.Url.HasValue() && !DownloadedItems.ContainsKey(item.Url))
+ {
+ DownloadedItems.Add(item.Url, Path.GetFileName(item.Path));
+ }
+ }
+
+ protected virtual int ProcessLocalizations(
+ ImportExecuteContext context,
+ IEnumerable> batch,
+ IDictionary>> localizableProperties) where TEntity : BaseEntity, ILocalizedEntity
+ {
+ Guard.ArgumentNotNull(() => context);
+ Guard.ArgumentNotNull(() => batch);
+ Guard.ArgumentNotNull(() => localizableProperties);
+
+ // Perf: determine whether our localizable properties actually have
+ // counterparts in the source BEFORE import batch begins. This way we spare ourself
+ // to query over and over for values.
+ var localizedProps = (from kvp in localizableProperties
+ where context.DataSegmenter.GetColumnIndexes(kvp.Key).Length > 0
+ select kvp.Key).ToArray();
+
+ if (localizedProps.Length == 0)
+ {
+ return 0;
+ }
+
+ var localizedEntityService = context.Services.Resolve();
+
+ bool shouldSave = false;
+
+ foreach (var row in batch)
+ {
+ foreach (var prop in localizedProps)
+ {
+ var lambda = localizableProperties[prop];
+ foreach (var lang in context.Languages)
+ {
+ var code = lang.UniqueSeoCode;
+ string value;
+
+ if (row.TryGetDataValue(prop /* ColumnName */, code, out value))
+ {
+ localizedEntityService.SaveLocalizedValue(row.Entity, lambda, value, lang.Id);
+ shouldSave = true;
+ }
+ }
+ }
+ }
+
+ if (shouldSave)
+ {
+ // commit whole batch at once
+ return context.Services.DbContext.SaveChanges();
+ }
+
+ return 0;
+ }
+
+ protected virtual int ProcessStoreMappings(
+ ImportExecuteContext context,
+ IEnumerable> batch) where TEntity : BaseEntity, IStoreMappingSupported
+ {
+ var storeMappingService = context.Services.Resolve();
+ var storeMappingRepository = context.Services.Resolve>();
+
+ storeMappingRepository.AutoCommitEnabled = false;
+
+ foreach (var row in batch)
+ {
+ var storeIds = row.GetDataValue>("StoreIds");
+ if (!storeIds.IsNullOrEmpty())
+ {
+ storeMappingService.SaveStoreMappings(row.Entity, storeIds.ToArray());
+ }
+ }
+
+ // commit whole batch at once
+ return context.Services.DbContext.SaveChanges();
+ }
+
+ protected virtual int ProcessSlugs(
+ ImportExecuteContext context,
+ IEnumerable> batch,
+ string entityName) where TEntity : BaseEntity, ISlugSupported
+ {
+ var slugMap = new Dictionary();
+ UrlRecord urlRecord = null;
+
+ var urlRecordService = context.Services.Resolve();
+ var urlRecordRepository = context.Services.Resolve>();
+ var seoSettings = context.Services.Resolve();
+
+ Func slugLookup = ((s) =>
+ {
+ return (slugMap.ContainsKey(s) ? slugMap[s] : null);
+ });
+
+ foreach (var row in batch)
+ {
+ try
+ {
+ string seName = null;
+ string localizedName = null;
+
+ if (row.TryGetDataValue("SeName", out seName) || row.IsNew || row.NameChanged)
+ {
+ seName = row.Entity.ValidateSeName(seName, row.EntityDisplayName, true, urlRecordService, seoSettings, extraSlugLookup: slugLookup);
+
+ if (row.IsNew)
+ {
+ // dont't bother validating SeName for new entities.
+ urlRecord = new UrlRecord
+ {
+ EntityId = row.Entity.Id,
+ EntityName = entityName,
+ Slug = seName,
+ LanguageId = 0,
+ IsActive = true,
+ };
+ urlRecordRepository.Insert(urlRecord);
+ }
+ else
+ {
+ urlRecord = urlRecordService.SaveSlug(row.Entity, seName, 0);
+ }
+
+ if (urlRecord != null)
+ {
+ // a new record was inserted to the store: keep track of it for this batch.
+ slugMap[seName] = urlRecord;
+ }
+ }
+
+ // process localized SeNames
+ foreach (var lang in context.Languages)
+ {
+ var hasSeName = row.TryGetDataValue("SeName", lang.UniqueSeoCode, out seName);
+ var hasLocalizedName = row.TryGetDataValue("Name", lang.UniqueSeoCode, out localizedName);
+
+ if (hasSeName || hasLocalizedName)
+ {
+ seName = row.Entity.ValidateSeName(seName, localizedName, false, urlRecordService, seoSettings, lang.Id, slugLookup);
+ urlRecord = urlRecordService.SaveSlug(row.Entity, seName, lang.Id);
+ if (urlRecord != null)
+ {
+ slugMap[seName] = urlRecord;
+ }
+ }
+ }
+ }
+ catch (Exception exception)
+ {
+ context.Result.AddWarning(exception.Message, row.GetRowInfo(), "SeName");
+ }
+ }
+
+ // commit whole batch at once
+ return context.Services.DbContext.SaveChanges();
+ }
+ }
+}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs
index 404e78f220..8c2fbebf73 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs
@@ -29,10 +29,10 @@ public DataImportRequest(ImportProfile profile)
public ImportProfile Profile { get; private set; }
- public int CustomerId { get; set; }
-
public ProgressValueSetter ProgressValueSetter { get; set; }
+ public bool HasPermission { get; set; }
+
public IList EntitiesToImport { get; set; }
public IDictionary CustomData { get; private set; }
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs
index a33f2a3ccd..bc64b63531 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IEntityImporter.cs
@@ -2,6 +2,6 @@
{
public partial interface IEntityImporter
{
- void Execute(IImportExecuteContext context);
+ void Execute(ImportExecuteContext context);
}
}
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs
index 0cb0ba8ef2..6f7b7d4f8e 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IImportProfileService.cs
@@ -7,12 +7,19 @@ namespace SmartStore.Services.DataExchange.Import
{
public interface IImportProfileService
{
+ ///