API: using new FindEqualFile method when importing product images

mgesing · mgesing · commit baa98bc13b4c · 2020-09-15T21:42:13.000+02:00
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs
@@ -37,6 +37,7 @@ public class UploadsController : ApiController
 
         private readonly Lazy<IProductService> _productService;
         private readonly Lazy<IMediaService> _mediaService;
+        private readonly Lazy<IFolderService> _folderService;
         private readonly Lazy<IImportProfileService> _importProfileService;
         private readonly Lazy<IStoreService> _storeService;
         private readonly Lazy<IPermissionService> _permissionService;
@@ -48,6 +49,7 @@ public class UploadsController : ApiController
         public UploadsController(
             Lazy<IProductService> productService,
             Lazy<IMediaService> mediaService,
+            Lazy<IFolderService> folderService,
             Lazy<IImportProfileService> importProfileService,
             Lazy<IStoreService> storeService,
             Lazy<IPermissionService> permissionService,
@@ -58,6 +60,7 @@ public UploadsController(
         {
             _productService = productService;
             _mediaService = mediaService;
+            _folderService = folderService;
             _importProfileService = importProfileService;
             _storeService = storeService;
             _permissionService = permissionService;
@@ -168,29 +171,41 @@ await this.ProcessEntityAsync(async () =>
                             }
                             else
                             {
-                                if (!_mediaService.Value.FindEqualFile(stream, files, true, out var equalFile))
+                                // If TinyImage compresses the image, FindEqualFile will never find an equal image here.
+                                // We have to live with that. There is no ad-hoc solution for it.
+                                if (_mediaService.Value.FindEqualFile(stream, files, true, out var equalFile))
                                 {
-                                    var path = _mediaService.Value.CombinePaths(SystemAlbumProvider.Catalog, image.FileName);
-                                    var newFile = await _mediaService.Value.SaveFileAsync(path, stream, false, DuplicateFileHandling.Rename);
+                                    image.Exists = true;
+                                    image.Picture = equalFile;
+                                }
+                                else
+                                {
+                                    var catalogAlbumId = _folderService.Value.GetNodeByPath(SystemAlbumProvider.Catalog).Value.Id;
 
-                                    if ((newFile?.Id ?? 0) != 0)
+                                    if (_mediaService.Value.FindEqualFile(stream, image.FileName, catalogAlbumId, true, out equalFile))
                                     {
-                                        _productService.Value.InsertProductPicture(new ProductMediaFile
-                                        {
-                                            MediaFileId = newFile.Id,
-                                            ProductId = entity.Id,
-                                            DisplayOrder = ++displayOrder
-                                        });
+                                        image.Exists = true;
+                                        image.Picture = equalFile;
+                                    }
+                                    else
+                                    {
+                                        var path = _mediaService.Value.CombinePaths(SystemAlbumProvider.Catalog, image.FileName);
+                                        var newFile = await _mediaService.Value.SaveFileAsync(path, stream, false, DuplicateFileHandling.Rename);
 
-                                        image.Inserted = true;
-                                        image.Picture = newFile.File;
+                                        if (newFile?.Id > 0)
+                                        {
+                                            _productService.Value.InsertProductPicture(new ProductMediaFile
+                                            {
+                                                MediaFileId = newFile.Id,
+                                                ProductId = entity.Id,
+                                                DisplayOrder = ++displayOrder
+                                            });
+
+                                            image.Inserted = true;
+                                            image.Picture = newFile.File;
+                                        }
                                     }
                                 }
-                                else
-                                {
-                                    image.Exists = true;
-                                    image.Picture = equalFile;
-                                }
                             }
 
                             if (image.Picture != null)
