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

Cleanup

Browse Source
This commit is contained in:
Stephan
2018-11-13 11:24:30 +01:00
parent ae91da1adb
commit 76b1cd6573
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
View File

@@ -8,15 +8,13 @@ namespace Umbraco.Core.Persistence.Repositories
public interface IDocumentRepository : IContentRepository<int, IContent>, IReadRepository<Guid, IContent>
{
/// <summary>
/// Clears the publishing schedule for all entries before this date
/// Clears the publishing schedule for all entries having an a date before (lower than, or equal to) a specified date.
/// </summary>
/// <param name="date"></param>
void ClearSchedule(DateTime date);
/// <summary>
/// Gets a collection of <see cref="IContent"/> objects, which has an expiration date less than or equal to today.
/// Gets <see cref="IContent"/> objects having an expiration date before (lower than, or equal to) a specified date.
/// </summary>
/// <returns></returns>
/// <remarks>
/// The content returned from this method may be culture variant, in which case the resulting <see cref="IContent.ContentSchedule"/> should be queried
/// for which culture(s) have been scheduled.
@@ -24,9 +22,8 @@ namespace Umbraco.Core.Persistence.Repositories
IEnumerable<IContent> GetContentForExpiration(DateTime date);
/// <summary>
/// Gets a collection of <see cref="IContent"/> objects, which has a release date less than or equal to today.
/// Gets <see cref="IContent"/> objects having a release date before (lower than, or equal to) a specified date.
/// </summary>
/// <returns>An Enumerable list of <see cref="TEntity"/> objects</returns>
/// <remarks>
/// The content returned from this method may be culture variant, in which case the resulting <see cref="IContent.ContentSchedule"/> should be queried
/// for which culture(s) have been scheduled.

65
src/Umbraco.Core/Services/Implement/ContentService.cs
View File

@@ -1164,6 +1164,12 @@ namespace Umbraco.Core.Services.Implement
/// <inheritdoc />
public IEnumerable<PublishResult> PerformScheduledPublish(DateTime date)
=> PerformScheduledPublishInternal(date).ToList();
// beware! this method yields results, so the returned IEnumerable *must* be
// enumerated for anything to happen - dangerous, so private + exposed via
// the public method above, which forces ToList().
private IEnumerable<PublishResult> PerformScheduledPublishInternal(DateTime date)
{
var evtMsgs = EventMessagesFactory.Get();
@@ -1171,61 +1177,64 @@ namespace Umbraco.Core.Services.Implement
{
scope.WriteLock(Constants.Locks.ContentTree);
var now = date;
foreach (var d in _documentRepository.GetContentForRelease(now))
foreach (var d in _documentRepository.GetContentForRelease(date))
{
PublishResult result;
if (d.ContentType.VariesByCulture())
{
//find which cultures have pending schedules
var pendingCultures = d.ContentSchedule.GetPending(ContentScheduleChange.Start, now)
var pendingCultures = d.ContentSchedule.GetPending(ContentScheduleChange.Start, date)
.Select(x => x.Culture)
.Distinct()
.ToList();
foreach (var c in pendingCultures)
var publishing = true;
foreach (var culture in pendingCultures)
{
//Clear this schedule for this culture
d.ContentSchedule.Clear(c, ContentScheduleChange.Start, now);
if (!d.Trashed)
d.PublishCulture(c); //set the culture to be published
d.ContentSchedule.Clear(culture, ContentScheduleChange.Start, date);
if (d.Trashed) continue; // won't publish
publishing &= d.PublishCulture(culture); //set the culture to be published
if (!publishing) break; // no point continuing
}
if (pendingCultures.Count > 0)
{
if (!d.Trashed)
result = SavePublishing(d, d.WriterId);
else
result = new PublishResult(PublishResultType.FailedPublishPathNotPublished, evtMsgs, d);
if (d.Trashed)
result = new PublishResult(PublishResultType.FailedPublishIsTrashed, evtMsgs, d);
else if (!publishing)
result = new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, d);
else
result = SavePublishing(d, d.WriterId);
if (result.Success == false)
Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
yield return result;
}
if (result.Success == false)
Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
yield return result;
}
else
{
//Clear this schedule
d.ContentSchedule.Clear(ContentScheduleChange.Start, now);
if (!d.Trashed)
result = SaveAndPublish(d, userId: d.WriterId);
else
result = new PublishResult(PublishResultType.FailedPublishPathNotPublished, evtMsgs, d);
d.ContentSchedule.Clear(ContentScheduleChange.Start, date);
result = d.Trashed
? new PublishResult(PublishResultType.FailedPublishIsTrashed, evtMsgs, d)
: SaveAndPublish(d, userId: d.WriterId);
if (result.Success == false)
Logger.Error<ContentService>(null, "Failed to publish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
yield return result;
}
}
foreach (var d in _documentRepository.GetContentForExpiration(now))
foreach (var d in _documentRepository.GetContentForExpiration(date))
{
PublishResult result;
if (d.ContentType.VariesByCulture())
{
//find which cultures have pending schedules
var pendingCultures = d.ContentSchedule.GetPending(ContentScheduleChange.End, now)
var pendingCultures = d.ContentSchedule.GetPending(ContentScheduleChange.End, date)
.Select(x => x.Culture)
.Distinct()
.ToList();
@@ -1233,7 +1242,7 @@ namespace Umbraco.Core.Services.Implement
foreach (var c in pendingCultures)
{
//Clear this schedule for this culture
d.ContentSchedule.Clear(c, ContentScheduleChange.End, now);
d.ContentSchedule.Clear(c, ContentScheduleChange.End, date);
//set the culture to be published
d.UnpublishCulture(c);
}
@@ -1249,7 +1258,7 @@ namespace Umbraco.Core.Services.Implement
else
{
//Clear this schedule
d.ContentSchedule.Clear(ContentScheduleChange.End, now);
d.ContentSchedule.Clear(ContentScheduleChange.End, date);
result = Unpublish(d, userId: d.WriterId);
if (result.Success == false)
Logger.Error<ContentService>(null, "Failed to unpublish document id={DocumentId}, reason={Reason}.", d.Id, result.Result);
@@ -1259,7 +1268,7 @@ namespace Umbraco.Core.Services.Implement
}
_documentRepository.ClearSchedule(now);
_documentRepository.ClearSchedule(date);
scope.Complete();
}