anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

docs: #263 returning normal sized images for deleted original files

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2022-01-16 13:16:42 +03:30
parent 31a04465fd
commit ff7c473fe5
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RMuseum/Controllers/ImageController.cs
View File

@ -54,12 +54,21 @@ namespace RMuseum.Controllers
if(!string.IsNullOrEmpty(imgPath.ExceptionString))
return BadRequest(imgPath.ExceptionString);
if(!System.IO.File.Exists(imgPath.Result))
if(string.IsNullOrEmpty(imgPath.Result))
{
return NotFound();
if(size == "orig")
{
imgPath = _pictureFileService.GetImagePath(img.Result, "norm");
if (!string.IsNullOrEmpty(imgPath.ExceptionString))
return BadRequest(imgPath.ExceptionString);
}
else
{
return NotFound();
}
}
return new FileStreamResult(new FileStream(imgPath.Result, FileMode.Open, FileAccess.Read),
size == "orig" ?
img.Result.ContentType

2
RMuseum/Services/Implementation/PictureFileService.cs
View File

@ -258,6 +258,8 @@ namespace RMuseum.Services.Implementation
public RServiceResult<string> GetImagePath(RPictureFile image, string sz = "orig")
{
string fileName = sz == "thumb" ? image.ThumbnailImageStoredFileName : sz == "norm" ? image.NormalSizeImageStoredFileName : image.StoredFileName;
if (string.IsNullOrEmpty(fileName))
return new RServiceResult<string>(null);
return new RServiceResult<string>(Path.Combine(ImageStoragePath, image.FolderName, fileName));
}