lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Corrections on media resizing process (#8762)

Browse Source 
* Added checks to GetImageProfileUrl function to avoid trying to resize files with no ImagePart. If no content item is passed as a parameter, file gets to be processed anyway (throwing and logging exception is the file isn't processable - e.g. is a svg file)

* Added reference to Orchard.MediaLibrary.
This commit is contained in:
Andrea Piovanelli 2024-02-29 19:39:32 +01:00 committed by GitHub
parent c7d10fd0be
commit 35f1c8d570
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj
View File

@ -123,6 +123,10 @@
<Project>{642A49D7-8752-4177-80D6-BFBBCFAD3DE0}</Project> <Project>{642A49D7-8752-4177-80D6-BFBBCFAD3DE0}</Project>
<Name>Orchard.Forms</Name> <Name>Orchard.Forms</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Orchard.MediaLibrary\Orchard.MediaLibrary.csproj">
<Project>{73a7688a-5bd3-4f7e-adfa-ce36c5a10e3b}</Project>
<Name>Orchard.MediaLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj"> <ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
<Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project> <Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
<Name>Orchard.Tokens</Name> <Name>Orchard.Tokens</Name>
@ -241,4 +245,4 @@
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" /> <Error Condition="!Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
</Target> </Target>
</Project> </Project>

81
src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs
View File

@ -4,12 +4,12 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Security.Cryptography;
using System.Web; using System.Web;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.FileSystems.Media; using Orchard.FileSystems.Media;
using Orchard.Forms.Services; using Orchard.Forms.Services;
using Orchard.Logging; using Orchard.Logging;
using Orchard.MediaLibrary.Models;
using Orchard.MediaProcessing.Descriptors.Filter; using Orchard.MediaProcessing.Descriptors.Filter;
using Orchard.MediaProcessing.Media; using Orchard.MediaProcessing.Media;
using Orchard.MediaProcessing.Models; using Orchard.MediaProcessing.Models;
@ -44,7 +44,7 @@ namespace Orchard.MediaProcessing.Services {
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public string GetImageProfileUrl(string path, string profileName) { public string GetImageProfileUrl(string path, string profileName) {
return GetImageProfileUrl(path, profileName, null, new FilterRecord[] { }); return GetImageProfileUrl(path, profileName, null, new FilterRecord[] { });
} }
@ -69,42 +69,56 @@ namespace Orchard.MediaProcessing.Services {
var filePath = _fileNameProvider.GetFileName(profileName, System.Web.HttpUtility.UrlDecode(path)); var filePath = _fileNameProvider.GetFileName(profileName, System.Web.HttpUtility.UrlDecode(path));
bool process = false; bool process = false;
//after reboot the app cache is empty so we reload the image in the cache if it exists in the _Profiles folder // Before checking everything else, ensure that the content item that needs to be processed has a ImagePart.
if (string.IsNullOrEmpty(filePath)) { // If it's not the case (e.g. if media is a svg file), processing would throw a exception.
var profileFilePath = _storageProvider.Combine("_Profiles", FormatProfilePath(profileName, System.Web.HttpUtility.UrlDecode(path))); // If content item is null (it means it's not passed as a parameter of the ResizeMediaUrl call),
// this function processes the file like it did before this patch;
// this means it could possibly throw and log exceptions for svg files.
bool checkForProfile = (contentItem == null || contentItem.Has<ImagePart>());
if (_storageProvider.FileExists(profileFilePath)) { if (checkForProfile) {
_fileNameProvider.UpdateFileName(profileName, System.Web.HttpUtility.UrlDecode(path), profileFilePath); //after reboot the app cache is empty so we reload the image in the cache if it exists in the _Profiles folder
filePath = profileFilePath; if (string.IsNullOrEmpty(filePath)) {
var profileFilePath = _storageProvider.Combine("_Profiles", FormatProfilePath(profileName, System.Web.HttpUtility.UrlDecode(path)));
if (_storageProvider.FileExists(profileFilePath)) {
_fileNameProvider.UpdateFileName(profileName, System.Web.HttpUtility.UrlDecode(path), profileFilePath);
filePath = profileFilePath;
}
} }
}
// if the filename is not cached, process it
if (string.IsNullOrEmpty(filePath)) {
Logger.Debug("FilePath is null, processing required, profile {0} for image {1}", profileName, path);
process = true; // if the filename is not cached, process it
} if (string.IsNullOrEmpty(filePath)) {
Logger.Debug("FilePath is null, processing required, profile {0} for image {1}", profileName, path);
process = true;
}
// the processd file doesn't exist anymore, process it // the processd file doesn't exist anymore, process it
else if (!_storageProvider.FileExists(filePath)) { else if (!_storageProvider.FileExists(filePath)) {
Logger.Debug("Processed file no longer exists, processing required, profile {0} for image {1}", profileName, path); Logger.Debug("Processed file no longer exists, processing required, profile {0} for image {1}", profileName, path);
process = true; process = true;
} }
// if the original file is more recent, process it // if the original file is more recent, process it
else { else {
DateTime pathLastUpdated; DateTime pathLastUpdated;
if (TryGetImageLastUpdated(path, out pathLastUpdated)) { if (TryGetImageLastUpdated(path, out pathLastUpdated)) {
var filePathLastUpdated = _storageProvider.GetFile(filePath).GetLastUpdated(); var filePathLastUpdated = _storageProvider.GetFile(filePath).GetLastUpdated();
if (pathLastUpdated > filePathLastUpdated) { if (pathLastUpdated > filePathLastUpdated) {
Logger.Debug("Original file more recent, processing required, profile {0} for image {1}", profileName, path); Logger.Debug("Original file more recent, processing required, profile {0} for image {1}", profileName, path);
process = true; process = true;
}
} }
} }
} else {
// Since media with no ImagePart have no profile, filePath is null, so it's set again to its original path on the storage provider.
if (string.IsNullOrWhiteSpace(filePath)) {
filePath = _storageProvider.GetStoragePath(path);
}
} }
// todo: regenerate the file if the profile is newer, by deleting the associated filename cache entries. // todo: regenerate the file if the profile is newer, by deleting the associated filename cache entries.
@ -117,11 +131,10 @@ namespace Orchard.MediaProcessing.Services {
profilePart = _profileService.GetImageProfileByName(profileName); profilePart = _profileService.GetImageProfileByName(profileName);
if (profilePart == null) if (profilePart == null)
return String.Empty; return String.Empty;
} } else {
else {
profilePart = _services.ContentManager.New<ImageProfilePart>("ImageProfile"); profilePart = _services.ContentManager.New<ImageProfilePart>("ImageProfile");
profilePart.Name = profileName; profilePart.Name = profileName;
foreach (var customFilter in customFilters) { foreach (var customFilter in customFilters) {
profilePart.Filters.Add(customFilter); profilePart.Filters.Add(customFilter);
} }
} }
@ -174,8 +187,7 @@ namespace Orchard.MediaProcessing.Services {
// the storage provider may have altered the filepath // the storage provider may have altered the filepath
filterContext.FilePath = newFile.GetPath(); filterContext.FilePath = newFile.GetPath();
} }
} } catch (Exception e) {
catch(Exception e) {
Logger.Error(e, "A profile could not be processed: " + path); Logger.Error(e, "A profile could not be processed: " + path);
} }
} }
@ -203,8 +215,7 @@ namespace Orchard.MediaProcessing.Services {
try { try {
var file = _storageProvider.GetFile(storagePath); var file = _storageProvider.GetFile(storagePath);
return file.OpenRead(); return file.OpenRead();
} } catch (Exception e) {
catch(Exception e) {
Logger.Error(e, "path:" + path + " storagePath:" + storagePath); Logger.Error(e, "path:" + path + " storagePath:" + storagePath);
} }
} }
@ -236,7 +247,7 @@ namespace Orchard.MediaProcessing.Services {
} }
private string FormatProfilePath(string profileName, string path) { private string FormatProfilePath(string profileName, string path) {
var filenameWithExtension = Path.GetFileName(path) ?? ""; var filenameWithExtension = Path.GetFileName(path) ?? "";
var fileLocation = path.Substring(0, path.Length - filenameWithExtension.Length); var fileLocation = path.Substring(0, path.Length - filenameWithExtension.Length);