yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Published variants in NuCache

Browse Source
This commit is contained in:
Stephan
2017-12-07 13:22:32 +01:00
parent b392d72bc2
commit 269531c570
60 changed files with 557 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web/PublishedCache/NuCache/MediaCache.cs
View File

@@ -32,14 +32,16 @@ namespace Umbraco.Web.PublishedCache.NuCache
public override IPublishedContent GetById(bool preview, int contentId)
{
// ignore preview, there's only draft for media
var n = _snapshot.Get(contentId);
return n?.Published;
return n?.Draft;
}
public override IPublishedContent GetById(bool preview, Guid contentId)
{
// ignore preview, there's only draft for media
var n = _snapshot.Get(contentId);
return n?.Published;
return n?.Draft;
}
public override bool HasById(bool preview, int contentId)
@@ -51,30 +53,27 @@ namespace Umbraco.Web.PublishedCache.NuCache
public override IEnumerable<IPublishedContent> GetAtRoot(bool preview)
{
if (PublishedSnapshotService.CacheContentCacheRoots == false)
return GetAtRootNoCache(preview);
return GetAtRootNoCache();
var cache = preview == false || PublishedSnapshotService.FullCacheWhenPreviewing
? _elementsCache
: _snapshotCache;
if (cache == null)
return GetAtRootNoCache(preview);
return GetAtRootNoCache();
// note: ToArray is important here, we want to cache the result, not the function!
return (IEnumerable<IPublishedContent>)cache.GetCacheItem(
CacheKeys.MediaCacheRoots(preview),
() => GetAtRootNoCache(preview).ToArray());
CacheKeys.MediaCacheRoots(false), // ignore preview, only 1 key!
() => GetAtRootNoCache().ToArray());
}
private IEnumerable<IPublishedContent> GetAtRootNoCache(bool preview)
private IEnumerable<IPublishedContent> GetAtRootNoCache()
{
var c = _snapshot.GetAtRoot();
// there's no .Draft for medias, only non-null .Published
// but we may want published as previewing, still
return c.Select(n => preview
? ContentCache.GetPublishedContentAsPreviewing(n.Published)
: n.Published);
// ignore preview, there's only draft for media
return c.Select(n => n.Draft);
}
public override bool HasContent(bool preview)