* Implement not-implemented methods for media cache * Fixed test --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk>
93 lines
3.7 KiB
C#
93 lines
3.7 KiB
C#
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services.Navigation;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Infrastructure.HybridCache;
|
|
|
|
public sealed class MediaCache : IPublishedMediaCache
|
|
{
|
|
private readonly IMediaCacheService _mediaCacheService;
|
|
private readonly IPublishedContentTypeCache _publishedContentTypeCache;
|
|
private readonly IMediaNavigationQueryService _mediaNavigationQueryService;
|
|
|
|
public MediaCache(IMediaCacheService mediaCacheService, IPublishedContentTypeCache publishedContentTypeCache, IMediaNavigationQueryService mediaNavigationQueryService)
|
|
{
|
|
_mediaCacheService = mediaCacheService;
|
|
_publishedContentTypeCache = publishedContentTypeCache;
|
|
_mediaNavigationQueryService = mediaNavigationQueryService;
|
|
}
|
|
|
|
public async Task<IPublishedContent?> GetByIdAsync(int id) => await _mediaCacheService.GetByIdAsync(id);
|
|
|
|
public async Task<IPublishedContent?> GetByIdAsync(Guid key) => await _mediaCacheService.GetByKeyAsync(key);
|
|
|
|
public IPublishedContent? GetById(bool preview, int contentId) => GetByIdAsync(contentId).GetAwaiter().GetResult();
|
|
|
|
public IPublishedContent? GetById(bool preview, Guid contentId) =>
|
|
GetByIdAsync(contentId).GetAwaiter().GetResult();
|
|
|
|
|
|
public IPublishedContent? GetById(int contentId) => GetByIdAsync(contentId).GetAwaiter().GetResult();
|
|
|
|
public IPublishedContent? GetById(Guid contentId) => GetByIdAsync(contentId).GetAwaiter().GetResult();
|
|
|
|
|
|
public IPublishedContentType? GetContentType(Guid key) => _publishedContentTypeCache.Get(PublishedItemType.Media, key);
|
|
|
|
public IPublishedContentType GetContentType(int id) => _publishedContentTypeCache.Get(PublishedItemType.Media, id);
|
|
|
|
public IPublishedContentType GetContentType(string alias) => _publishedContentTypeCache.Get(PublishedItemType.Media, alias);
|
|
|
|
[Obsolete("Scheduled for removal in v17")]
|
|
public IPublishedContent? GetById(bool preview, Udi contentId)
|
|
{
|
|
if(contentId is not GuidUdi guidUdi)
|
|
{
|
|
throw new NotSupportedException("Only GuidUdi is supported");
|
|
}
|
|
|
|
return GetById(preview, guidUdi.Guid);
|
|
}
|
|
|
|
[Obsolete("Scheduled for removal in v17")]
|
|
public IPublishedContent? GetById(Udi contentId)
|
|
{
|
|
if(contentId is not GuidUdi guidUdi)
|
|
{
|
|
throw new NotSupportedException("Only GuidUdi is supported");
|
|
}
|
|
|
|
return GetById(guidUdi.Guid);
|
|
}
|
|
|
|
public IEnumerable<IPublishedContent> GetAtRoot(bool preview, string? culture = null)
|
|
{
|
|
_mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
|
|
|
|
IEnumerable<IPublishedContent> rootContent = rootKeys.Select(key => GetById(preview, key)).WhereNotNull();
|
|
return culture is null ? rootContent : rootContent.Where(x => x.IsInvariantOrHasCulture(culture));
|
|
}
|
|
|
|
public IEnumerable<IPublishedContent> GetAtRoot(string? culture = null)
|
|
{
|
|
_mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
|
|
|
|
IEnumerable<IPublishedContent> rootContent = rootKeys.Select(key => GetById(key)).WhereNotNull();
|
|
return culture is null ? rootContent : rootContent.Where(x => x.IsInvariantOrHasCulture(culture));
|
|
}
|
|
|
|
[Obsolete("Media does not support preview, this method will be removed in future versions")]
|
|
public bool HasContent(bool preview) => HasContent();
|
|
|
|
public bool HasContent()
|
|
{
|
|
_mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
|
|
return rootKeys.Any();
|
|
}
|
|
|
|
public IEnumerable<IPublishedContent> GetByContentType(IPublishedContentType contentType) =>
|
|
_mediaCacheService.GetByContentType(contentType);
|
|
}
|