Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Refactor ImageThumbPath to service-specific properties

KrzysztofPajak6a018afe4c69
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.cs
index 145fc9c35..0253ed5e6 100644
--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs
@@ -62,6 +62,7 @@ public class PictureService : IPictureService
private readonly StorageSettings _storageSettings;
private static string ImagePath => Path.Combine("assets", "images");
+ private static string ImageThumbPath => Path.Combine("assets", "images", "thumbs");
#endregion
@@ -120,7 +121,7 @@ public class PictureService : IPictureService
protected virtual Task DeletePictureThumbs(Picture picture)
{
var filter = $"{picture.Id}*.*";
- var thumbDirectoryPath = _mediaFileStore.GetDirectoryInfo(CommonPath.ImageThumbPath);
+ var thumbDirectoryPath = _mediaFileStore.GetDirectoryInfo(ImageThumbPath);
if (thumbDirectoryPath == null) return Task.CompletedTask;
var currentFiles = Directory.GetFiles(thumbDirectoryPath.PhysicalPath, filter, SearchOption.AllDirectories);
foreach (var currentFileName in currentFiles)
@@ -144,7 +145,7 @@ public class PictureService : IPictureService
/// <returns>Local picture physical path</returns>
protected virtual async Task<string> GetThumbPhysicalPath(string thumbFileName)
{
- var thumbFile = _mediaFileStore.Combine(CommonPath.ImageThumbPath, thumbFileName);
+ var thumbFile = _mediaFileStore.Combine(ImageThumbPath, thumbFileName);
var fileInfo = await _mediaFileStore.GetFileInfo(thumbFile);
return fileInfo?.PhysicalPath;
}
@@ -158,7 +159,7 @@ public class PictureService : IPictureService
protected virtual string GetThumbUrl(string thumbFileName, string storeLocation = null)
{
storeLocation = !string.IsNullOrEmpty(storeLocation) ? storeLocation : "";
- return _mediaFileStore.Combine(storeLocation, CommonPath.Param, CommonPath.ImageThumbPath, thumbFileName);
+ return _mediaFileStore.Combine(storeLocation, CommonPath.Param, ImageThumbPath, thumbFileName);
}
/// <summary>
@@ -198,12 +199,12 @@ public class PictureService : IPictureService
{
try
{
- var dirThumb = _mediaFileStore.GetDirectoryInfo(CommonPath.ImageThumbPath);
+ var dirThumb = _mediaFileStore.GetDirectoryInfo(ImageThumbPath);
if (dirThumb == null)
{
- var result = _mediaFileStore.TryCreateDirectory(CommonPath.ImageThumbPath);
+ var result = _mediaFileStore.TryCreateDirectory(ImageThumbPath);
if (result)
- dirThumb = _mediaFileStore.GetDirectoryInfo(CommonPath.ImageThumbPath);
+ dirThumb = _mediaFileStore.GetDirectoryInfo(ImageThumbPath);
}
if (dirThumb != null)
@@ -482,7 +483,7 @@ public class PictureService : IPictureService
public virtual async Task ClearThumbs()
{
const string searchPattern = "*.*";
- var path = _mediaFileStore.GetDirectoryInfo(CommonPath.ImageThumbPath)?.PhysicalPath;
+ var path = _mediaFileStore.GetDirectoryInfo(ImageThumbPath)?.PhysicalPath;
if (!Directory.Exists(path))
return;
diff --git a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs b/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs
index 4be23f134..60a7a4327 100644
--- a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs
+++ b/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs
@@ -21,12 +21,6 @@ public static class CommonPath
/// <returns>The physical path.</returns>
public static string PluginsPath => Path.Combine(BaseDirectory, "Plugins");
- /// <summary>
- /// Maps a image thumb path.
- /// </summary>
- /// <returns>The path.</returns>
- public static string ImageThumbPath => Path.Combine("assets", "images", "thumbs");
-
/// <summary>
/// Maps a image upload path.
/// </summary>
diff --git a/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
index aade36706..6beba6d98 100644
--- a/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
@@ -25,6 +25,8 @@ public class ElFinderViewModelService : IElFinderViewModelService
private readonly string _urlpathUploded;
private readonly string _urlThumb;
+ private static string ImageThumbPath => Path.Combine("assets", "images", "thumbs");
+
public ElFinderViewModelService(
IDriver driver,
IConnector connector,
@@ -60,11 +62,11 @@ public class ElFinderViewModelService : IElFinderViewModelService
_urlpathUploded = (string.IsNullOrEmpty(CommonPath.Param) ? "/" : $"/{CommonPath.Param}/")
+ uploaded.Path.Replace("\\", "/") + "/";
- var thumbs = _mediaFileStore.GetDirectoryInfo(CommonPath.ImageThumbPath);
+ var thumbs = _mediaFileStore.GetDirectoryInfo(ImageThumbPath);
if (thumbs == null)
{
- _mediaFileStore.TryCreateDirectory(CommonPath.ImageThumbPath);
- thumbs = _mediaFileStore.GetDirectoryInfo(CommonPath.ImageThumbPath);
+ _mediaFileStore.TryCreateDirectory(ImageThumbPath);
+ thumbs = _mediaFileStore.GetDirectoryInfo(ImageThumbPath);
}
_fullPathToThumbs = thumbs.PhysicalPath;