dkumar7github
diff --git a/‎src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs‎
Lines changed: 75 additions & 59 deletions b/‎src/Libraries/SmartStore.Services/Customers/Importer/CustomerImporter.cs‎
Lines changed: 75 additions & 59 deletions
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Linq.Expressions;
 using SmartStore.Core.Async;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Common;
@@ -140,62 +139,6 @@ private void UpsertRole(ImportRow<Customer> row, CustomerRole role, bool value)
 			}
 		}
 
-		protected virtual void ProcessAvatar(IImportExecuteContext context, ImportRow<Customer> row)
-		{
-			var urlOrPath = row.GetDataValue<string>("AvatarPictureUrl");
-			if (urlOrPath.IsEmpty())
-				return;
-
-			Picture picture = null;
-			var equalPictureId = 0;
-			var currentPictures = new List<Picture>();
-			var seoName = _pictureService.GetPictureSeName(row.EntityDisplayName);
-			var image = CreateDownloadImage(urlOrPath, seoName, 1);
-
-			if (image == null)
-				return;
-
-			if (image.Url.HasValue() && !image.Success.HasValue)
-			{
-				AsyncRunner.RunSync(() => _fileDownloadManager.DownloadAsync(DownloaderContext, new FileDownloadManagerItem[] { image }));
-			}
-
-			if ((image.Success ?? false) && File.Exists(image.Path))
-			{
-				Succeeded(image);
-				var pictureBinary = File.ReadAllBytes(image.Path);
-
-				if (pictureBinary != null && pictureBinary.Length > 0)
-				{
-					var currentPictureId = row.Entity.GetAttribute<int>(SystemCustomerAttributeNames.AvatarPictureId);
-					if (currentPictureId != 0 && (picture = _pictureRepository.GetById(currentPictureId)) != null)
-					{
-						currentPictures.Add(picture);
-					}
-						
-					pictureBinary = _pictureService.ValidatePicture(pictureBinary);
-					pictureBinary = _pictureService.FindEqualPicture(pictureBinary, currentPictures, out equalPictureId);
-
-					if (pictureBinary != null && pictureBinary.Length > 0)
-					{
-						if ((picture = _pictureService.InsertPicture(pictureBinary, image.MimeType, seoName, true, false, false)) != null)
-						{
-							_pictureRepository.Context.SaveChanges();
-							SaveAttribute(row, SystemCustomerAttributeNames.AvatarPictureId, picture.Id);
-						}
-					}
-					else
-					{
-						context.Result.AddInfo("Found equal picture in data store. Skipping field.", row.GetRowInfo(), "AvatarPictureUrl");
-					}
-				}
-			}
-			else
-			{
-				context.Result.AddInfo("Download of an image failed.", row.GetRowInfo(), "AvatarPictureUrl");
-			}
-		}
-
 		protected virtual int ProcessAddresses(
 			IImportExecuteContext context,
 			IEnumerable<ImportRow<Customer>> batch,
@@ -348,10 +291,68 @@ protected virtual int ProcessGenericAttributes(
 					if (!customerNumber.IsEmpty())
 						allCustomerNumbers.Add(customerNumber);
 				}
+			}
+
+			return _services.DbContext.SaveChanges();
+		}
+
+		protected virtual int ProcessAvatars(
+			IImportExecuteContext context,
+			IEnumerable<ImportRow<Customer>> batch)
+		{
+			foreach (var row in batch)
+			{
+				var urlOrPath = row.GetDataValue<string>("AvatarPictureUrl");
+				if (urlOrPath.IsEmpty())
+					continue;
+
+				Picture picture = null;
+				var equalPictureId = 0;
+				var currentPictures = new List<Picture>();
+				var seoName = _pictureService.GetPictureSeName(row.EntityDisplayName);
+
+				var image = CreateDownloadImage(urlOrPath, seoName, 1);
+				if (image == null)
+					continue;
+
+				if (image.Url.HasValue() && !image.Success.HasValue)
+				{
+					AsyncRunner.RunSync(() => _fileDownloadManager.DownloadAsync(DownloaderContext, new FileDownloadManagerItem[] { image }));
+				}
 
-				if (_customerSettings.AllowCustomersToUploadAvatars)
+				if ((image.Success ?? false) && File.Exists(image.Path))
+				{
+					Succeeded(image);
+					var pictureBinary = File.ReadAllBytes(image.Path);
+
+					if (pictureBinary != null && pictureBinary.Length > 0)
+					{
+						var currentPictureId = row.Entity.GetAttribute<int>(SystemCustomerAttributeNames.AvatarPictureId);
+						if (currentPictureId != 0 && (picture = _pictureRepository.GetById(currentPictureId)) != null)
+						{
+							currentPictures.Add(picture);
+						}
+
+						pictureBinary = _pictureService.ValidatePicture(pictureBinary);
+						pictureBinary = _pictureService.FindEqualPicture(pictureBinary, currentPictures, out equalPictureId);
+
+						if (pictureBinary != null && pictureBinary.Length > 0)
+						{
+							if ((picture = _pictureService.InsertPicture(pictureBinary, image.MimeType, seoName, true, false, false)) != null)
+							{
+								_pictureRepository.Context.SaveChanges();
+								SaveAttribute(row, SystemCustomerAttributeNames.AvatarPictureId, picture.Id);
+							}
+						}
+						else
+						{
+							context.Result.AddInfo("Found equal picture in data store. Skipping field.", row.GetRowInfo(), "AvatarPictureUrl");
+						}
+					}
+				}
+				else
 				{
-					ProcessAvatar(context, row);
+					context.Result.AddInfo("Download of an image failed.", row.GetRowInfo(), "AvatarPictureUrl");
 				}
 			}
 
@@ -584,6 +585,21 @@ protected override void Import(IImportExecuteContext context)
 						context.Result.AddError(exception, segmenter.CurrentSegment, "ProcessGenericAttributes");
 					}
 
+					// ===========================================================================
+					// Process avatars
+					// ===========================================================================
+					if (_customerSettings.AllowCustomersToUploadAvatars)
+					{
+						try
+						{
+							ProcessAvatars(context, batch);
+						}
+						catch (Exception exception)
+						{
+							context.Result.AddError(exception, segmenter.CurrentSegment, "ProcessAvatars");
+						}
+					}
+
 					// ===========================================================================
 					// Process addresses
 					// ===========================================================================