Skip to content

Issue 17128 - Fix GetMediaByPath when querying for media which has been uploaded with dimensions in the file name #17314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zeegaan merged 1 commit into from
Oct 21, 2024
Merged

Issue 17128 - Fix GetMediaByPath when querying for media which has been uploaded with dimensions in the file name #17314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MediaRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,20 +305,20 @@ public override IEnumerable<IMedia> GetAllVersions(int nodeId)

public IMedia? GetMediaByPath(string mediaPath)
{
var umbracoFileValue = mediaPath;
const string pattern = ".*[_][0-9]+[x][0-9]+[.].*";
var isResized = Regex.IsMatch(mediaPath, pattern);
var originalMediaPath = string.Empty;

// If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" URL.
if (isResized)
{
var underscoreIndex = mediaPath.LastIndexOf('_');
var dotIndex = mediaPath.LastIndexOf('.');
umbracoFileValue = string.Concat(mediaPath.Substring(0, underscoreIndex), mediaPath.Substring(dotIndex));
originalMediaPath = string.Concat(mediaPath.Substring(0, underscoreIndex), mediaPath.Substring(dotIndex));
}

Sql<ISqlContext> sql = GetBaseQuery(QueryType.Single, joinMediaVersion: true)
.Where<MediaVersionDto>(x => x.Path == umbracoFileValue)
.Where<MediaVersionDto>(x => x.Path == mediaPath || (isResized && x.Path == originalMediaPath))
.SelectTop(1);

ContentDto? dto = Database.Fetch<ContentDto>(sql).FirstOrDefault();
Expand Down